diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas0.png b/Assets/ResRaw/Fgui/Common/Common_atlas0.png index ed83c4ae7..9dfe18abe 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas0.png and b/Assets/ResRaw/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes index b0c811c74..bbb342df5 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_fui.bytes and b/Assets/ResRaw/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Scripts/UI/Binders/CommonBinder.cs b/Assets/Scripts/UI/Binders/CommonBinder.cs index 6313dd95b..694cfd82a 100644 --- a/Assets/Scripts/UI/Binders/CommonBinder.cs +++ b/Assets/Scripts/UI/Binders/CommonBinder.cs @@ -16,6 +16,9 @@ namespace NBF UIObjectFactory.SetPackageItemExtension(CommonMenuRight.URL, typeof(CommonMenuRight)); UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList)); UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu)); + UIObjectFactory.SetPackageItemExtension(MainMenu.URL, typeof(MainMenu)); + UIObjectFactory.SetPackageItemExtension(BtnMainMenu.URL, typeof(BtnMainMenu)); + UIObjectFactory.SetPackageItemExtension(CommonSubMenu.URL, typeof(CommonSubMenu)); UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag)); UIObjectFactory.SetPackageItemExtension(BtnInputName.URL, typeof(BtnInputName)); UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl)); diff --git a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.Designer.cs b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.Designer.cs index 3a12226f8..98b317a1c 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.Designer.cs +++ b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.Designer.cs @@ -9,15 +9,19 @@ namespace NBF { public partial class CommonSubMenu { - public const string URL = "ui://6hgkvlaur03us"; + public const string URL = "ui://6hgkvlaujd2r17u"; public GList List; + public BtnInputControl BtnPrev; + public BtnInputControl BtnNext; public override void ConstructFromXML(XML xml) { base.ConstructFromXML(xml); List = (GList)GetChild("List"); + BtnPrev = (BtnInputControl)GetChild("BtnPrev"); + BtnNext = (BtnInputControl)GetChild("BtnNext"); OnInited(); UILanguage.TrySetComponentLanguage(this); } diff --git a/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs new file mode 100644 index 000000000..f185a64e6 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs @@ -0,0 +1,35 @@ +/**本脚本为自动生成,每次生成会覆盖!请勿手动修改,生成插件文档及项目地址:https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class MainMenu + { + public const string URL = "ui://6hgkvlauh6z617p"; + + public BtnInputControl BtnPrev; + public BtnInputControl BtnNext; + public GList List; + public GButton BtnSetting; + public GButton BtnNotice; + public GButton BtnActivity; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + BtnPrev = (BtnInputControl)GetChild("BtnPrev"); + BtnNext = (BtnInputControl)GetChild("BtnNext"); + List = (GList)GetChild("List"); + BtnSetting = (GButton)GetChild("BtnSetting"); + BtnNotice = (GButton)GetChild("BtnNotice"); + BtnActivity = (GButton)GetChild("BtnActivity"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs.meta b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs.meta new file mode 100644 index 000000000..7eb5b4115 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/MainMenu.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c47886a037cbaae4a9eced246a1a5b07 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/MainMenu.cs b/Assets/Scripts/UI/Common/Menu/MainMenu.cs new file mode 100644 index 000000000..3d48bac2c --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/MainMenu.cs @@ -0,0 +1,89 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using System; +using System.Collections.Generic; +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class MainMenu : GComponent + { + public event Action OnTabChange; + + private void OnInited() + { + List.onClickItem.Add(OnClickItem); + } + + private string _leftActionName; + private string _rightActionName; + + public void SetBtnActionName(string leftActionName, string rightActionName) + { + _leftActionName = leftActionName; + _rightActionName = rightActionName; + BtnPrev.SetData(leftActionName, string.Empty); + BtnNext.SetData(rightActionName, string.Empty); + } + + public void SetTabs(List tabList, int selectIndex = 0) + { + SetBtnActionName(InputDef.UI.Prev, InputDef.UI.Next); + List.RemoveChildrenToPool(); + var listWidth = 0f; + for (int i = 0; i < tabList.Count; i++) + { + var tabData = tabList[i]; + var tabItem = List.AddItemFromPool().asButton; + tabItem.SetLanguage(tabData.Key); + + listWidth += tabItem.width; + if (i > 0) + { + listWidth += List.columnGap; + } + } + + Log.Info($"Set tab index={List.selectedIndex}"); + List.selectedIndex = selectIndex; + List.width = listWidth; + OnClickItem(); + } + + + private void OnClickItem() + { + OnTabChange?.Invoke(List.selectedIndex); + } + + public void OnClickBtnPrev() + { + if (List.selectedIndex > 0) + { + List.selectedIndex -= 1; + } + else + { + List.selectedIndex = List.numItems - 1; + } + + OnClickItem(); + } + + public void OnClickBtnNext() + { + if (List.selectedIndex < List.numItems - 1) + { + List.selectedIndex += 1; + } + else + { + List.selectedIndex = 0; + } + + OnClickItem(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/MainMenu.cs.meta b/Assets/Scripts/UI/Common/Menu/MainMenu.cs.meta new file mode 100644 index 000000000..d30532541 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/MainMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c951a510f257548488796b56edde416d \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs new file mode 100644 index 000000000..557181a42 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs @@ -0,0 +1,25 @@ +/**本脚本为自动生成,每次生成会覆盖!请勿手动修改,生成插件文档及项目地址:https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/ + + +using FairyGUI; +using FairyGUI.Utils; +using NBC; + +namespace NBF +{ + public partial class BtnMainMenu + { + public const string URL = "ui://6hgkvlaujd2r17t"; + + public GImage selectLine; + + public override void ConstructFromXML(XML xml) + { + base.ConstructFromXML(xml); + + selectLine = (GImage)GetChild("selectLine"); + OnInited(); + UILanguage.TrySetComponentLanguage(this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs.meta new file mode 100644 index 000000000..74eea2366 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.Designer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fca9f9d4ed378444289233a235ff417f \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs new file mode 100644 index 000000000..1faf28fdb --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs @@ -0,0 +1,15 @@ +// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 + +using UnityEngine; +using FairyGUI; +using NBC; + +namespace NBF +{ + public partial class BtnMainMenu : GButton + { + private void OnInited() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs.meta b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs.meta new file mode 100644 index 000000000..c1e977f33 --- /dev/null +++ b/Assets/Scripts/UI/Common/Menu/item/BtnMainMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e348502ac496944db6ee459d2eaa21f \ No newline at end of file diff --git a/FGUIProject/PSD/副标题花纹.psd b/FGUIProject/PSD/副标题花纹.psd new file mode 100644 index 000000000..7484c57ed Binary files /dev/null and b/FGUIProject/PSD/副标题花纹.psd differ diff --git a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml index de8ab621c..83a9c50ab 100644 --- a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml +++ b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml index 349a5680b..019096c0e 100644 --- a/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml +++ b/FGUIProject/assets/Common/Com/Buttons/BtnInputControl.xml @@ -2,7 +2,7 @@ - + diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnMenuIcon.xml b/FGUIProject/assets/Common/Com/Buttons/BtnMenuIcon.xml new file mode 100644 index 000000000..0d281979b --- /dev/null +++ b/FGUIProject/assets/Common/Com/Buttons/BtnMenuIcon.xml @@ -0,0 +1,10 @@ + + + + + + + + +