diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 705ab3487..9af60958f 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -22830,8 +22830,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: f08e8dd58157955ebca6ffc7dbe79a1c - Size: 7664401 + Hash: b5960cf3a8b37f3a62a4e92771a6be08 + Size: 7611844 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 6e3f95cf8..1389df8ec 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 75f644d85..864fb7bb8 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 79f9f3d0c..421f881a4 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/Scenes/StartUp.unity b/Assets/Scenes/StartUp.unity index b6066d7d3..460a627e9 100644 --- a/Assets/Scenes/StartUp.unity +++ b/Assets/Scenes/StartUp.unity @@ -909,85 +909,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &869065583 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 869065584} - - component: {fileID: 869065586} - - component: {fileID: 869065585} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &869065584 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 869065583} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1439106037} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -20.035} - m_SizeDelta: {x: 160, y: 70.0701} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &869065585 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 869065583} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 9ca2618301686b342867f34f731938f0, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u9009\u9879" ---- !u!222 &869065586 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 869065583} - m_CullTransparentMesh: 1 --- !u!1 &884989002 GameObject: m_ObjectHideFlags: 0 @@ -1207,121 +1128,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1439106032 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1439106037} - - component: {fileID: 1439106036} - - component: {fileID: 1439106035} - - component: {fileID: 1439106034} - - component: {fileID: 1439106033} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1439106033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1439106032} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b189222c6db8433db1239d314f92cf9f, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::DontDestroy ---- !u!114 &1439106034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1439106032} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4513599 ---- !u!114 &1439106035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1439106032} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1439106036 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1439106032} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1439106037 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1439106032} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 869065584} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &1729919008 GameObject: m_ObjectHideFlags: 0 @@ -2052,4 +1858,3 @@ SceneRoots: - {fileID: 1199298675} - {fileID: 646846706} - {fileID: 159075240} - - {fileID: 1439106037} diff --git a/Assets/Scripts/Editor/Builder/Tasks/BuildAppTask.cs b/Assets/Scripts/Editor/Builder/Tasks/BuildAppTask.cs index b85c8f471..a895de56b 100644 --- a/Assets/Scripts/Editor/Builder/Tasks/BuildAppTask.cs +++ b/Assets/Scripts/Editor/Builder/Tasks/BuildAppTask.cs @@ -70,7 +70,7 @@ namespace NBF string outputPath = $"{ProjectDir}/Release"; string location = - $"{outputPath}/{_context.Ver}_{DateTime.Now:yyyyMMddHHmm}/Fishing.exe"; + $"{outputPath}/{_context.Ver}/Fishing.exe"; BuildTarget activeTarget = EditorUserBuildSettings.activeBuildTarget; switch (activeTarget) @@ -94,7 +94,7 @@ namespace NBF var buildOptions = BuildOptions.CompressWithLz4; BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions() { - scenes = new[] { "Assets/Scenes/Main.unity" }, + scenes = new[] { "Assets/Scenes/StartUp.unity" },//Assets/Scenes/StartUp.unity locationPathName = location, options = buildOptions, target = activeTarget, diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index 348517165..c432bfea3 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -60,8 +60,8 @@ namespace NBF { // await Task.Delay(100); CommonTopPanel.Show(); - SettingPanel.Show(); - // LoginPanel.Show(); + // SettingPanel.Show(); + LoginPanel.Show(); // PreviewPanel.Show(); } } diff --git a/Assets/Scripts/NBC/Language/Runtime/Lan.cs b/Assets/Scripts/NBC/Language/Runtime/Lan.cs index 6a8f318f2..ea87aaf99 100644 --- a/Assets/Scripts/NBC/Language/Runtime/Lan.cs +++ b/Assets/Scripts/NBC/Language/Runtime/Lan.cs @@ -35,6 +35,7 @@ namespace NBC public static void SetLanguage(this GObject child, string key, params object[] args) { + if(string.IsNullOrEmpty(key)) return; if (Text == null) return; child.lang = key; diff --git a/Assets/Scripts/UI/Bag/BagPanel.cs b/Assets/Scripts/UI/Bag/BagPanel.cs index 0a53a3086..0f0d11195 100644 --- a/Assets/Scripts/UI/Bag/BagPanel.cs +++ b/Assets/Scripts/UI/Bag/BagPanel.cs @@ -31,7 +31,6 @@ namespace NBF tabItemList.Add(tabItem); } - ItemList.SetPanel(this); ItemList.SetData(tabItemList, true, true); } diff --git a/Assets/Scripts/UI/Binders/MainBinder.cs b/Assets/Scripts/UI/Binders/MainBinder.cs index 4bc8253aa..408829a0e 100644 --- a/Assets/Scripts/UI/Binders/MainBinder.cs +++ b/Assets/Scripts/UI/Binders/MainBinder.cs @@ -9,8 +9,6 @@ namespace NBF [UIExtensionAutoBind] public static void BindAll() { - UIObjectFactory.SetPackageItemExtension(KeyboardInput.URL, typeof(KeyboardInput)); - UIObjectFactory.SetPackageItemExtension(SettingInputItem.URL, typeof(SettingInputItem)); UIObjectFactory.SetPackageItemExtension(SettingItem.URL, typeof(SettingItem)); UIObjectFactory.SetPackageItemExtension(IntroduceTag.URL, typeof(IntroduceTag)); UIObjectFactory.SetPackageItemExtension(HomeMainPage.URL, typeof(HomeMainPage)); diff --git a/Assets/Scripts/UI/Common/List/ClassifyList.cs b/Assets/Scripts/UI/Common/List/ClassifyList.cs index cb58a8c80..152c3365c 100644 --- a/Assets/Scripts/UI/Common/List/ClassifyList.cs +++ b/Assets/Scripts/UI/Common/List/ClassifyList.cs @@ -23,48 +23,19 @@ namespace NBF private int _columnsCount; - public ListSelector _selector; + public ListSelector Selector; private void OnInited() { - InputManager.OnUICanceled += OnUICanceled; List.onClickItem.Add(OnClickListItem); - _selector = new ListSelector(List, typeof(ListTitleItem)); + Selector = new ListSelector(List, typeof(ListTitleItem)); } - public override void Dispose() + public void InvokeClickItem(object data) { - InputManager.OnUICanceled -= OnUICanceled; - base.Dispose(); - } - - private void OnUICanceled(string action) - { - if (action == InputDef.UI.Right) - { - _selector.Right(); - } - else if (action == InputDef.UI.Left) - { - _selector.Left(); - } - else if (action == InputDef.UI.Up) - { - _selector.Up(); - } - else if (action == InputDef.UI.Down) - { - _selector.Down(); - } - else if (action == InputDef.UI.Enter) - { - var selectedItem = _selector.SelectedItem; - if (selectedItem != null) - { - OnClickItem?.Invoke(selectedItem); - } - } + OnClickItem?.Invoke(data); } + public void SetListData(List listData, ListSelectionMode selectionMode = ListSelectionMode.Single) @@ -93,7 +64,7 @@ namespace NBF } _columnsCount = 6; - _selector.Refresh(); + Selector.Refresh(); } void OnClickListItem(EventContext context) diff --git a/Assets/Scripts/UI/Common/List/CommonItemList.cs b/Assets/Scripts/UI/Common/List/CommonItemList.cs index 19fb5ab0f..ed3868f94 100644 --- a/Assets/Scripts/UI/Common/List/CommonItemList.cs +++ b/Assets/Scripts/UI/Common/List/CommonItemList.cs @@ -15,11 +15,7 @@ namespace NBF private List _tabList = new List(); private TabItemData _currentTab; - public void SetPanel(UIPanel panel) - { - Menu.SetPanel(panel); - } - + private void OnInited() { Menu.OnTabChange += ChangeTab; diff --git a/Assets/Scripts/UI/Common/Menu/BottomMenu.cs b/Assets/Scripts/UI/Common/Menu/BottomMenu.cs index 1c8b605a4..147eba91d 100644 --- a/Assets/Scripts/UI/Common/Menu/BottomMenu.cs +++ b/Assets/Scripts/UI/Common/Menu/BottomMenu.cs @@ -10,8 +10,6 @@ namespace NBF { public partial class BottomMenu : GComponent { - private UIPanel _panel; - private void OnInited() { List.onClickItem.Add(OnClickItem); diff --git a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonMenu.cs index e59086f91..0f892201b 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs +++ b/Assets/Scripts/UI/Common/Menu/CommonMenu.cs @@ -12,46 +12,28 @@ namespace NBF public partial class CommonMenu : GLabel { public event Action OnTabChange; - private UIPanel _panel; - - public void SetPanel(UIPanel panel) - { - _panel = panel; - } private void OnInited() { List.onClickItem.Add(OnClickItem); BtnPrev.onClick.Add(OnClickBtnPrev); BtnNext.onClick.Add(OnClickBtnNext); - - InputManager.OnUICanceled += OnUICanceled; } + private string _leftActionName; + private string _rightActionName; - public override void Dispose() + public void SetBtnActionName(string leftActionName, string rightActionName) { - InputManager.OnUICanceled -= OnUICanceled; - base.Dispose(); - } - - private void OnUICanceled(string action) - { - if (_panel == null) return; - if (!_panel.IsShowing) return; - if (!_panel.IsTop) return; - if (action == InputDef.UI.Prev) - { - OnClickBtnPrev(); - } - else if (action == InputDef.UI.Next) - { - OnClickBtnNext(); - } + _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++) diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index c53a6cb3f..20881655c 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -36,8 +36,9 @@ namespace NBF // BagPanel.Show(); // BagSlotPanel.Show(); + // SettingPanel.Show(); + HomePanel.Show(); // FishingShopPanel.Show(); - SettingPanel.Show(); Del(); } diff --git a/Assets/Scripts/UI/Settings/SettingPanel.cs b/Assets/Scripts/UI/Settings/SettingPanel.cs index 5d989d705..df5d89f85 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.cs @@ -269,7 +269,7 @@ namespace NBF }); } - [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight, "返回")] + [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)] private void OnBack() { if (Settings.Instance.HaveNotAppleSettings()) diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs index e090b40de..23207003c 100644 --- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs +++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs @@ -19,31 +19,14 @@ namespace NBF protected override void OnShow() { + InputManager.Instance.On(this); ItemList.List.OnClickItem += OnClickItem; - InputManager.OnUICanceled += OnUICanceled; List tabItemList = GoodsConfigHelper.TabItemList; - ItemList.SetPanel(this); ItemList.SetData(tabItemList, true, true); } - private void OnUICanceled(string action) - { - if (!IsTop) return; - if (action == InputDef.UI.SubPrev) - { - } - else if (action == InputDef.UI.SubNext) - { - } - else if (action == InputDef.UI.Up) - { - } - else if (action == InputDef.UI.Down) - { - } - } private void OnClickItem(object item) { @@ -52,11 +35,69 @@ namespace NBF // ItemDetailsPanel.Show(bagItem.ItemInfo); ShopDetailsPanel.Show(gearItem.Config); } - + + #region UI事件 + + [InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)] + private void OnPrev() + { + ItemList.Menu.OnClickBtnPrev(); + } + + [InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)] + private void OnNext() + { + ItemList.Menu.OnClickBtnNext(); + } + + [InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)] + private void OnLeft() + { + ItemList.List.Selector.Left(); + } + + [InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)] + private void OnRight() + { + ItemList.List.Selector.Right(); + } + + [InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)] + private void OnUp() + { + ItemList.List.Selector.Up(); + // ChangeListSelected(); + } + + [InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)] + private void OnDown() + { + ItemList.List.Selector.Down(); + } + + [InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "查看")] + private void OnApplySettings() + { + var selectedItem = ItemList.List.Selector.SelectedItem; + if (selectedItem != null) + { + ItemList.List.InvokeClickItem(selectedItem); + } + } + + + [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)] + private void OnBack() + { + Hide(); + } + + #endregion + protected override void OnHide() { - InputManager.OnUICanceled -= OnUICanceled; ItemList.List.OnClickItem -= OnClickItem; + InputManager.Instance.Off(this); } protected override void OnDestroy() diff --git a/Assets/Scripts/UI/Shops/ShopDetailsPanel.cs b/Assets/Scripts/UI/Shops/ShopDetailsPanel.cs index b2b6fbf03..78326c5dc 100644 --- a/Assets/Scripts/UI/Shops/ShopDetailsPanel.cs +++ b/Assets/Scripts/UI/Shops/ShopDetailsPanel.cs @@ -10,6 +10,45 @@ namespace NBF protected override void OnShow() { // Model.SetData(ItemInfo); + InputManager.Instance.On(this); + } + + #region UI输入事件 + + [InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)] + private void OnUp() + { + // ItemList.List.Selector.Up(); + // ChangeListSelected(); + } + + [InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)] + private void OnDown() + { + // ItemList.List.Selector.Down(); + } + [InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "购买")] + private void OnApplySettings() + { + // var selectedItem = ItemList.List.Selector.SelectedItem; + // if (selectedItem != null) + // { + // ItemList.List.InvokeClickItem(selectedItem); + // } + } + + + [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)] + private void OnBack() + { + Hide(); + } + + #endregion + + protected override void OnHide() + { + InputManager.Instance.Off(this); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Tools/PreviewPanel.cs b/Assets/Scripts/UI/Tools/PreviewPanel.cs index 963a52b19..1e9e33ebf 100644 --- a/Assets/Scripts/UI/Tools/PreviewPanel.cs +++ b/Assets/Scripts/UI/Tools/PreviewPanel.cs @@ -41,7 +41,7 @@ namespace NBF tabItemList.Add(tabItem); } - ItemList.SetPanel(this); + // ItemList.SetPanel(this); ItemList.SetData(tabItemList, true, true); } diff --git a/FGUIProject/assets/Common/Com/List/CommonItemList.xml b/FGUIProject/assets/Common/Com/List/CommonItemList.xml index e19613e31..025c8e728 100644 --- a/FGUIProject/assets/Common/Com/List/CommonItemList.xml +++ b/FGUIProject/assets/Common/Com/List/CommonItemList.xml @@ -1,6 +1,6 @@ - + @@ -11,9 +11,9 @@ - + - + diff --git a/FGUIProject/assets/Common/Com/Menu/CommonMenu.xml b/FGUIProject/assets/Common/Com/Menu/CommonMenu.xml index 4231a611e..f44afe453 100644 --- a/FGUIProject/assets/Common/Com/Menu/CommonMenu.xml +++ b/FGUIProject/assets/Common/Com/Menu/CommonMenu.xml @@ -1,8 +1,8 @@ - - + + @@ -13,9 +13,8 @@ - - - - + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/ComNew/BtnMenu.xml b/FGUIProject/assets/Common/ComNew/BtnMenu.xml index ea54a28e6..9c1853314 100644 --- a/FGUIProject/assets/Common/ComNew/BtnMenu.xml +++ b/FGUIProject/assets/Common/ComNew/BtnMenu.xml @@ -1,13 +1,13 @@ - + - + diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 61b3de22e..b509ffd94 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -242,10 +242,10 @@ - - + + - + @@ -258,7 +258,7 @@ - + @@ -272,7 +272,7 @@ - + diff --git a/FGUIProject/assets/Main/Assets/效果图/商店/20260201110006_1.jpg b/FGUIProject/assets/Main/Assets/效果图/商店/20260201110006_1.jpg new file mode 100644 index 000000000..42dc73aaa Binary files /dev/null and b/FGUIProject/assets/Main/Assets/效果图/商店/20260201110006_1.jpg differ diff --git a/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml b/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml index 3f9e0c37f..99baf5d6c 100644 --- a/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml +++ b/FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml @@ -1,13 +1,13 @@ - + - - + + - +