diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 8acaddf01..ec4690acd 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -22830,8 +22830,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: 8317904954692e0856b6b3e168b631f5 - Size: 7611837 + Hash: 271eae96f4937c0b88d46d03f6d4544a + Size: 7618236 Assets: - Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png Address: UI/Common_atlas0 diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas0.png b/Assets/ResRaw/Fgui/Common/Common_atlas0.png index 6664fa457..09659fc06 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 86628dc05..014fb2eec 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/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 24743e199..74ab93f24 100644 Binary files a/Assets/ResRaw/Fgui/Main/Main_fui.bytes and b/Assets/ResRaw/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index a5454178f..b90e2cd3c 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -61,9 +61,9 @@ namespace NBF // await Task.Delay(100); CommonTopPanel.Show(); // SettingPanel.Show(); - // LoginPanel.Show(); + LoginPanel.Show(); // MessageBox.Show(); - FishingShopPanel.Show(); + // FishingShopPanel.Show(); // PreviewPanel.Show(); } } diff --git a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs index 2e249b5cc..29c4b839a 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs +++ b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs @@ -45,7 +45,7 @@ namespace NBF for (int i = 0; i < subItems.Count; i++) { var tabData = subItems[i]; - var tabItem = List.AddItemFromPool(i == 0 ? BtnSubMenuLeft.URL : BtnSubMenu.URL).asButton; + var tabItem = List.AddItemFromPool(BtnSubMenu.URL).asButton;//i == 0 ? BtnSubMenuLeft.URL : tabItem.SetLanguage(tabData.Key); width += tabItem.width; diff --git a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs index 7822b3f6c..8f11515cd 100644 --- a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs +++ b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs @@ -32,7 +32,8 @@ namespace NBF } else if (btn == BtnFishBag) { - FishBagPanel.Show(); + // FishBagPanel.Show(); + FishingShopPanel.Show(); } else if (btn == BtnMake) { diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 82f32b5c6..9da979ab4 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -22,9 +22,9 @@ namespace NBF { if (btn == BtnLogin) { - // OnLoginClick().Coroutine(); - Debug.LogError("test"); - MessageBox.Show(); + OnLoginClick().Coroutine(); + // Debug.LogError("test"); + // MessageBox.Show(); } } @@ -32,15 +32,14 @@ namespace NBF { await LoginHelper.Login(InputAccount.text); - // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); - // await MapHelper.EnterMap(mapId, role.RoomCode); + await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); // BagPanel.Show(); // BagSlotPanel.Show(); // SettingPanel.Show(); // HomePanel.Show(); - FishingShopPanel.Show(); + Del(); } diff --git a/Assets/Scripts/UI/Settings/SettingItem.Designer.cs b/Assets/Scripts/UI/Settings/SettingItem.Designer.cs index ff92ae23f..77e236308 100644 --- a/Assets/Scripts/UI/Settings/SettingItem.Designer.cs +++ b/Assets/Scripts/UI/Settings/SettingItem.Designer.cs @@ -13,6 +13,7 @@ namespace NBF public Controller style; public GImage back; + public GImage back2; public GTextField TextName; public GTextField TextInfo; public GSlider Slider; @@ -29,6 +30,7 @@ namespace NBF style = GetController("style"); back = (GImage)GetChild("back"); + back2 = (GImage)GetChild("back2"); TextName = (GTextField)GetChild("TextName"); TextInfo = (GTextField)GetChild("TextInfo"); Slider = (GSlider)GetChild("Slider"); diff --git a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs index e9d4c6ff7..82b38dc37 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.Designer.cs @@ -14,6 +14,8 @@ namespace NBF public override string UIPackName => "Main"; public override string UIResName => "SettingPanel"; + [AutoFind(Name = "Title")] + public GComponent Title; [AutoFind(Name = "MenuList")] public CommonSubMenu MenuList; [AutoFind(Name = "Introduce")] @@ -24,8 +26,6 @@ namespace NBF public BottomMenu BottomMenu; [AutoFind(Name = "Mask")] public GLabel Mask; - [AutoFind(Name = "Title")] - public GComponent Title; public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; } public static void Show(object param = null){ UI.Inst.OpenUI(param); } diff --git a/Assets/Scripts/UI/Settings/SettingPanel.cs b/Assets/Scripts/UI/Settings/SettingPanel.cs index 9e383e087..ab3d2bb86 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.cs @@ -82,16 +82,15 @@ namespace NBF var url = UIPackage.GetItemURL(UIPackName, "SettingSubTitleItem"); - var groupIndex = 0; + foreach (var key in groupOptions.Keys) { var value = groupOptions[key]; - if (groupIndex > 0) + + + if (List.AddItemFromPool(url) is GLabel label) { - if (List.AddItemFromPool(url) is GLabel label) - { - label.SetLanguage(key); - } + label.SetLanguage(key); } foreach (var option in value) @@ -103,8 +102,6 @@ namespace NBF _canSelectIndex.Add(index); } } - - groupIndex++; } } diff --git a/Assets/Scripts/UI/Settings/SettingWaitInputPanel.Designer.cs b/Assets/Scripts/UI/Settings/SettingWaitInputPanel.Designer.cs index 962710067..df39c7824 100644 --- a/Assets/Scripts/UI/Settings/SettingWaitInputPanel.Designer.cs +++ b/Assets/Scripts/UI/Settings/SettingWaitInputPanel.Designer.cs @@ -14,6 +14,8 @@ namespace NBF public override string UIPackName => "Main"; public override string UIResName => "SettingWaitInputPanel"; + [AutoFind(Name = "back")] + public GImage back; [AutoFind(Name = "TextTime")] public GTextField TextTime; [AutoFind(Name = "BtnCancel")] diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs index a16347ad0..3534b719f 100644 --- a/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs +++ b/Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs @@ -14,16 +14,18 @@ namespace NBF public override string UIPackName => "Main"; public override string UIResName => "FishingShopPanel"; - [AutoFind(Name = "BottomMenu")] - public BottomMenu BottomMenu; [AutoFind(Name = "ItemList")] public CommonItemList ItemList; + [AutoFind(Name = "BottomMenu")] + public BottomMenu BottomMenu; [AutoFind(Name = "Currencys")] public GComponent Currencys; [AutoFind(Name = "Loading")] public GLabel Loading; [AutoFind(Name = "Head")] public GButton Head; + [AutoFind(Name = "Title")] + public GComponent Title; public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; } public static void Show(object param = null){ UI.Inst.OpenUI(param); } diff --git a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml index 83a24f7f2..fabee3f5c 100644 --- a/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml +++ b/FGUIProject/assets/Common/Com/Back/UIBlurBackground.xml @@ -2,7 +2,7 @@ - + diff --git a/FGUIProject/assets/Common/Com/Buttons/BtnTriangle.xml b/FGUIProject/assets/Common/Com/Buttons/BtnTriangle.xml index 11e79b05a..b134aa037 100644 --- a/FGUIProject/assets/Common/Com/Buttons/BtnTriangle.xml +++ b/FGUIProject/assets/Common/Com/Buttons/BtnTriangle.xml @@ -1,8 +1,9 @@ - + - - + + +