UI界面显示层级修改；

角色界面空装备UI显示

Assets/Scripts/Business/Domain/Database/DatabaseVersion.cs

@@ -5,7 +5,7 @@ namespace XGame.Database
 {
     public static class DatabaseVersion
     {
-        // version 1731664071
+        // version 1731671346
         static long _version = -1;
 
         public static long Version
@@ -14,7 +14,7 @@ namespace XGame.Database
             {
                 if (_version == -1)
                 {
-                    _version = 1731664071;
+                    _version = 1731671346;
                 }
                 return _version;
             }

Assets/Scripts/Business/Domain/Database/KeyValue.cs

@@ -24,5 +24,9 @@ namespace XGame.Database
         /// <summary> 【宝箱升级】公会协助缩短升级的时间\n单个协助缩短时长(单位：秒) </summary>
         /// <summary> 30 </summary>
         public static readonly int boxUpGuidHelpTime = 30;
+
+        /// <summary> 【背包格子上限】种类上限，叠加无上限 </summary>
+        /// <summary> 100 </summary>
+        public static readonly int boxMax = 100;
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelCtrl.cs

@@ -114,7 +114,7 @@ namespace FL.FGUI
         /// <param name="num"></param>
         private void ShowNum(int num) 
         {
-            VM.NumLabel.text = num.ToString();
+            VM.NumLabel.text = $"{num}/{KeyValue.boxMax}";
         }
 
     }

Assets/Scripts/Business/Runtime/FGUI/Bag/SourceOfPropsPanel/BagSourceOfPropsPanelCtrl.cs

@@ -4,6 +4,7 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
+using Codice.CM.Common;
 using FairyGUI;
 using XGame.Database;
 using XGame.Framework.UI;
@@ -16,6 +17,8 @@ namespace FL.FGUI
     /// <typeparam name=""></typeparam>
     public partial class BagSourceOfPropsPanelCtrl : UIController<BagSourceOfPropsPanelVM>
     {
+        private ItemTable _itemInfo;
+
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
@@ -41,6 +44,7 @@ namespace FL.FGUI
         }
         private void OnClickUseBtn(EventContext context)
         {
+            Context.UI.OpenAsync(UIKeys.BagUsePanel,_itemInfo);
             Context.ClosePanel();
         }
 
@@ -48,20 +52,24 @@ namespace FL.FGUI
 
         private void ShowUI(ItemInfoParam data)
         {
-            VM.NameLabel.text = data.itemInfo.Name;
-            VM.DescLabel.text = data.itemInfo.Desc;
-            bool bShowNum = data.numDesc != null;
-            VM.CountLabel.visible = bShowNum;
-            if (bShowNum) VM.CountLabel.text = data.numDesc;
-            VM.QualityIcon.icon = AddressableDefine.ItemFrame(data.itemInfo.Quality);
-            VM.ItemIcon.icon = data.itemInfo.Icon;
-            VM.UseBtn.visible = data.itemInfo.Type == (int)EItemType.Gift || data.itemInfo.Type == (int)EItemType.RedEnvelope;
-
-            bool bHideJumpUI = data.itemInfo.Jump?.Length == 0;
-            VM.JumpUICtrl.selectedIndex = bHideJumpUI ? 1 : 0;
-            if (!bHideJumpUI)
+            if (data.itemInfo != null) 
             {
-                ShowJumpUI(data.itemInfo.Jump);
+                _itemInfo = data.itemInfo;
+                VM.NameLabel.text = _itemInfo.Name;
+                VM.DescLabel.text = _itemInfo.Desc;
+                bool bShowNum = data.numDesc != null;
+                VM.CountLabel.visible = bShowNum;
+                if (bShowNum) VM.CountLabel.text = data.numDesc;
+                VM.QualityIcon.icon = AddressableDefine.ItemFrame(_itemInfo.Quality);
+                VM.ItemIcon.icon = _itemInfo.Icon;
+                VM.UseBtn.visible = _itemInfo.Type == (int)EItemType.Gift || _itemInfo.Type == (int)EItemType.RedEnvelope;
+
+                bool bHideJumpUI = _itemInfo.Jump?.Length == 0;
+                VM.JumpUICtrl.selectedIndex = bHideJumpUI ? 1 : 0;
+                if (!bHideJumpUI)
+                {
+                    ShowJumpUI(_itemInfo.Jump);
+                }
             }
         }
 

Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelCtrl.cs

@@ -1,11 +1,15 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
 /// created by cb 2024
 
+using Codice.CM.Common;
 using FairyGUI;
+using FL.Data;
+using XGame.Database;
 using XGame.Framework.UI;
+using static Codice.CM.WorkspaceServer.WorkspaceTreeDataStore;
 
 namespace FL.FGUI
 {
@@ -15,9 +19,12 @@ namespace FL.FGUI
     /// <typeparam name=""></typeparam>
     public partial class BagUsePanelCtrl : UIController<BagUsePanelVM>
     {
+        private int _useNum; // 要使用的数量
+        private int _maxNum; // 拥有的数量
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
+            ShowUI(intent as ItemTable);
         }
         protected override void OnDisable()
         {
@@ -46,23 +53,59 @@ namespace FL.FGUI
         }
         private void OnClickUseBtn(EventContext context)
         {
+            
         }
         private void OnClickReduceOneBtn(EventContext context)
         {
+            ShowUseNum(_useNum - 1);
         }
         private void OnClickReduceTenBtn(EventContext context)
         {
+            ShowUseNum(_useNum - 10);
         }
         private void OnClickAddOneBtn(EventContext context)
         {
+            ShowUseNum(_useNum + 1);
         }
         private void OnClickAddTenBtn(EventContext context)
         {
+            ShowUseNum(_useNum + 10);
         }
         private void OnClickMaxBtn(EventContext context)
         {
+            ShowUseNum(_maxNum);
         }
 
         #endregion
+
+        private void ShowUI(ItemTable itemInfo)
+        {
+            if (itemInfo != null)
+            {
+                _maxNum = (int)ItemData.Instance.GetItemNum(itemInfo.Id);
+                VM.CountLabel.text = _maxNum.ToString();
+                VM.QualityIcon.icon = AddressableDefine.ItemFrame(itemInfo.Quality);
+                VM.ItemIcon.icon = itemInfo.Icon;
+                ShowUseNum(1);
+            }
+        }
+
+        private void ShowUseNum(int count)
+        {
+            if (count < 0 || count > _maxNum) return;
+            _useNum = count;
+            VM.UseNumLabel.text = _useNum.ToString();
+            ShowBtnState();
+        }
+        /// <summary>
+        /// 增加|减少数量的按钮状态
+        /// </summary>
+        private void ShowBtnState()
+        {
+            VM.ReduceOneBtn.enabled = _useNum != 0;
+            VM.ReduceTenBtn.enabled = _useNum != 0;
+            VM.AddOneBtn.enabled = _useNum != _maxNum;
+            VM.AddTenBtn.enabled = _useNum != _maxNum;
+        }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelVM.Gen.cs

@@ -20,29 +20,32 @@ namespace FL.FGUI
     {
         public CommonBackGroundNestedView MaskBg { get; private set; }
         public GLabel Bg { get; private set; }
-        public CommonItemBaseView ItemBase { get; private set; }
+        public GLoader QualityIcon { get; private set; }
+        public GLoader ItemIcon { get; private set; }
+        public GTextField CountLabel { get; private set; }
         public GButton UseBtn { get; private set; }
         public GButton ReduceOneBtn { get; private set; }
         public GButton ReduceTenBtn { get; private set; }
         public GButton AddOneBtn { get; private set; }
         public GButton AddTenBtn { get; private set; }
         public GButton MaxBtn { get; private set; }
-        public GTextField NumLabel { get; private set; }
+        public GTextField UseNumLabel { get; private set; }
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
             MaskBg = adapter.CreateNested<CommonBackGroundNestedView>(new FguiNested(panel.GetChild("MaskBg").asCom), true);
             AddChild(MaskBg);
             Bg = panel.GetChild("Bg") as GLabel;
-            ItemBase = adapter.CreateNested<CommonItemBaseView>(new FguiNested(panel.GetChild("ItemBase").asCom), true);
-            AddChild(ItemBase);
+            QualityIcon = panel.GetChild("QualityIcon") as GLoader;
+            ItemIcon = panel.GetChild("ItemIcon") as GLoader;
+            CountLabel = panel.GetChild("CountLabel") as GTextField;
             UseBtn = panel.GetChild("UseBtn") as GButton;
             ReduceOneBtn = panel.GetChild("ReduceOneBtn") as GButton;
             ReduceTenBtn = panel.GetChild("ReduceTenBtn") as GButton;
             AddOneBtn = panel.GetChild("AddOneBtn") as GButton;
             AddTenBtn = panel.GetChild("AddTenBtn") as GButton;
             MaxBtn = panel.GetChild("MaxBtn") as GButton;
-            NumLabel = panel.GetChild("NumLabel") as GTextField;
+            UseNumLabel = panel.GetChild("UseNumLabel") as GTextField;
 
         }
     }

Assets/Scripts/Business/Runtime/FGUI/Bag/UsePanel/BagUsePanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class BagUsePanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new BagUsePanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Common/ItemBase/CommonItemBaseCtrl.cs

@@ -115,6 +115,12 @@ namespace FL.FGUI
             );
         }
 
+        public void ShowEmptyUI()
+        {
+            _data = null;
+            VM.QualityImg.icon = "daojukuang1";
+        }
+
         public void ShowUI(IItem item, UiParam uiParam)
         {
             _data = item;

Assets/Scripts/Business/Runtime/FGUI/Common/RenamePanel/CommonRenamePanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class CommonRenamePanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new CommonRenamePanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Equip/EquipPanel/EquipEquipPanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class EquipEquipPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new EquipEquipPanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Item/GetItemPanel/ItemGetItemPanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class ItemGetItemPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new ItemGetItemPanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Item/InformationPanel/ItemInformationPanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class ItemInformationPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new ItemInformationPanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Player/ChangeImprintPanel/PlayerChangeImprintPanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class PlayerChangeImprintPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new PlayerChangeImprintPanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/Player/MainPanel/PlayerMainPanelCtrl.cs

@@ -194,6 +194,10 @@ namespace FL.FGUI
                 {
                     item.Ctrl.ShowUI(equipData, _uiParam);
                 }
+                else
+                {
+                    item.Ctrl.ShowEmptyUI();
+                }
                 index++;
             });
         }

Assets/Scripts/Business/Runtime/FGUI/Player/TransferPanel/PlayerTransferPanelView.cs

@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class PlayerTransferPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new PlayerTransferPanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/TemporaryEquip/BagPanel/TemporaryEquipBagPanelView.cs

@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class TemporaryEquipBagPanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
 
         protected override void AddController(IUIControllerGroup group)
         {

Assets/Scripts/Business/Runtime/FGUI/TreasureChest/ReduceTimePanel/TreasureChestReduceTimePanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class TreasureChestReduceTimePanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new TreasureChestReduceTimePanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/TreasureChest/UpgradePanel/TreasureChestUpgradePanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class TreasureChestUpgradePanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.Middle;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new TreasureChestUpgradePanelCtrl());

Assets/Scripts/Business/Runtime/FGUI/WatchAD/FreePanel/WatchADFreePanelView.cs

@@ -1,4 +1,4 @@
-/// #pkgName FGUI包名
+/// #pkgName FGUI包名
 /// #panelName UIPanel名字
 /// #UIName = $"{#pkgName}{#panelName}" UIKey名字
 /// 该脚本由模板创建
@@ -15,7 +15,7 @@ namespace FL.FGUI
     }
     public partial class WatchADFreePanelView : UIView
     {
-        public static UILayer Layer => UILayer.Popup;
+        public static UILayer Layer => UILayer.High;
         protected override void AddController(IUIControllerGroup group)
         {
             group.Add(new WatchADFreePanelCtrl());

fl-fgui-project/assets/Bag/UsePanel.xml

@@ -7,7 +7,9 @@
     <component id="n0_tf1p" name="Bg" src="drii3u" fileName="Components/PopWin/PopWin3.xml" pkg="gt6q23qw" xy="377,612" pivot="0.5,0.5" anchor="true" size="729,461" group="n11_tf1p">
       <Label title="提示"/>
     </component>
-    <component id="n1_tf1p" name="ItemBase" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="378,550" pivot="0.5,0.5" anchor="true" group="n11_tf1p" scale="0.75,0.75"/>
+    <loader id="n14_tf1p" name="QualityIcon" xy="303,475" pivot="0.5,0.5" size="150,150" group="n11_tf1p" scale="0.75,0.75" touchable="false" url="ui://y15iuuxvtf1pj" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
+    <loader id="n15_tf1p" name="ItemIcon" xy="314,486" pivot="0.5,0.5" size="128,128" group="n11_tf1p" scale="0.75,0.75" touchable="false" url="ui://y15iuuxvtf1pk" align="center" vAlign="middle" autoSize="true" clearOnPublish="true"/>
+    <text id="n16_tf1p" name="CountLabel" xy="392,566" pivot="1,0.5" size="34,36" group="n11_tf1p" fontSize="26" color="#ffffff" align="right" vAlign="middle" leading="0" autoClearText="true" text="88"/>
     <image id="n3_tf1p" name="n3" src="tf1pf" fileName="Images/shuliangdikuang.png" xy="378,661" pivot="0.5,0.5" anchor="true" size="141,43" group="n11_tf1p"/>
     <component id="n2_tf1p" name="UseBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="254,737" size="246,81" group="n11_tf1p" aspect="true">
       <Button title="使用"/>
@@ -22,10 +24,10 @@
       <Button title="+"/>
     </component>
     <component id="n6_tf1p" name="AddTenBtn" src="tf1pg" fileName="Components/NumBtn.xml" xy="491,637" group="n11_tf1p">
-      <Button title="-10"/>
+      <Button title="+10"/>
     </component>
     <component id="n10_tf1p" name="MaxBtn" src="tf1ph" fileName="Components/MaxBtn.xml" xy="570,637" group="n11_tf1p"/>
-    <text id="n9_tf1p" name="NumLabel" xy="378,661" pivot="0.5,0.5" anchor="true" size="21,42" group="n11_tf1p" fontSize="30" color="#ffffff" leading="0" text="1"/>
+    <text id="n9_tf1p" name="UseNumLabel" xy="378,661" pivot="0.5,0.5" anchor="true" size="21,42" group="n11_tf1p" fontSize="30" color="#ffffff" leading="0" text="1"/>
     <group id="n11_tf1p" name="n11" xy="13,382" size="729,461" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
@@ -33,5 +35,5 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
   </displayList>
-  <scriptData genuilayertf1pe="4" gencodetf1pe="1"/>
+  <scriptData genuilayertf1pe="3" gencodetf1pe="1"/>
 </component>

fl-fgui-project/assets/Common/RenamePanel.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344">
   <displayList>
-    <component id="n0_hflb" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" xy="0,0"/>
+    <component id="n0_hflb" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
     <component id="n1_hflb" name="PopWin" src="drii3u" fileName="Components/PopWin/PopWin3.xml" xy="13,380" size="729,490" group="n6_hflb">
       <Label title="修改"/>
     </component>
@@ -15,5 +17,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayerhflb3w="4" gencodehflb3w="1"/>
+  <scriptData genuilayerhflb3w="3" gencodehflb3w="1"/>
 </component>

fl-fgui-project/assets/Equip/EquipPanel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344">
-  <controller name="BtnState" pages="0,,1,,3," selected="1">
+  <controller name="BtnState" pages="0,,1,,3," selected="2">
     <remark page="0" value="装备属性详情，不显示按钮"/>
     <remark page="1" value=" 替换"/>
     <remark page="2" value="穿戴"/>
@@ -9,22 +9,22 @@
     <component id="n9_pz0h" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n1_ja3r" name="n1" src="rwcw3" fileName="images/pop/tanchuangdiban1.png" pkg="gt6q23qw" xy="65,237" size="626,880">
+    <image id="n1_ja3r" name="n1" src="rwcw3" fileName="images/pop/tanchuangdiban1.png" pkg="gt6q23qw" xy="65,421" size="626,512">
       <gearSize controller="BtnState" pages="0,1,3" values="626,512,1,1|626,880,1,1|626,512,1,1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n2_fr8z" name="WearEquipItem" src="ja3r2o" fileName="EquipItemNested.xml" xy="78,250" group="n10_pz0h"/>
-    <component id="n3_fr8z" name="NewEquipItem" src="ja3r2o" fileName="EquipItemNested.xml" xy="78,616" group="n10_pz0h"/>
-    <component id="n5_fr8z" name="WearBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="240,998" size="276,89" group="n10_pz0h" scale="0.7,0.7">
-      <gearDisplay controller="BtnState" pages="0,1,3"/>
+    <component id="n2_fr8z" name="WearEquipItem" src="ja3r2o" fileName="EquipItemNested.xml" xy="78,85" group="n10_pz0h"/>
+    <component id="n3_fr8z" name="NewEquipItem" src="ja3r2o" fileName="EquipItemNested.xml" xy="78,451" group="n10_pz0h"/>
+    <component id="n5_fr8z" name="WearBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="240,833" size="276,89" group="n10_pz0h" scale="0.7,0.7">
+      <gearDisplay controller="BtnState" pages="1,3"/>
       <gearText controller="BtnState" pages="0,1" values="替换|替换" default="穿戴"/>
       <relation target="n3_fr8z" sidePair="top-bottom"/>
-      <Button title="替换" titleColor="#ffffff" icon="ui://gt6q23qwrwcw2v"/>
+      <Button title="穿戴" titleColor="#ffffff" icon="ui://gt6q23qwrwcw2v"/>
     </component>
-    <group id="n10_pz0h" name="n10" xy="78,250" size="600,837" advanced="true">
+    <group id="n10_pz0h" name="n10" xy="78,85" size="600,837" advanced="true">
       <gearXY controller="BtnState" pages="0,1,3" values="78,85|78,250|78,85"/>
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayerja3r2n="4" gencodeja3r2n="1"/>
+  <scriptData genuilayerja3r2n="3" gencodeja3r2n="1"/>
 </component>

fl-fgui-project/assets/Item/GetItemPanel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344" designImage="ui://zd907u9atli0n">
-  <controller name="EmptyComCtrl" pages="0,,1,,2," selected="2">
+  <controller name="EmptyComCtrl" pages="0,,1,,2," selected="0">
     <remark page="0" value="单行"/>
     <remark page="1" value="两行"/>
     <remark page="2" value="3行及以上"/>
@@ -9,10 +9,10 @@
     <component id="n0_rwcw" name="Background" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n15_iv2y" name="n15" src="ih082t" fileName="Components/EmptyCom.xml" pkg="gt6q23qw" xy="0,377" size="756,573" group="n18_tli0">
+    <component id="n15_iv2y" name="n15" src="ih082t" fileName="Components/EmptyCom.xml" pkg="gt6q23qw" xy="0,377" size="756,273" group="n18_tli0">
       <gearSize controller="EmptyComCtrl" pages="0,1,2" values="756,273,1,1|756,402,1,1|756,573,1,1"/>
     </component>
-    <image id="n16_tli0" name="n16" src="tli0l" fileName="Bg/bg.png" xy="0,96" group="n18_tli0" pkg="gt6q23qw"/>
+    <image id="n16_tli0" name="n16" src="tli0l" fileName="Bg/bg.png" pkg="gt6q23qw" xy="0,96" group="n18_tli0"/>
     <image id="n17_tli0" name="n17" src="tli0m" fileName="images/words.png" xy="207,331" group="n18_tli0"/>
     <list id="n11_qxl0" name="ItemList" xy="30,499" size="696,415" group="n18_tli0" layout="flow_hz" overflow="scroll" margin="0,0,36,0" lineGap="24" colGap="30" defaultItem="ui://zd907u9aqxl0k" autoClearItems="true">
       <item/>
@@ -53,5 +53,5 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayerrwcwh="4" gencoderwcwh="1"/>
+  <scriptData genuilayerrwcwh="2" gencoderwcwh="1"/>
 </component>

fl-fgui-project/assets/Item/InformationPanel.xml

@@ -4,22 +4,22 @@
     <component id="n0_rwcw" name="Background" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n2_rwcw" name="n2" src="rwcw3" fileName="images/tanchuangdiban1.png" pkg="gt6q23qw" xy="12,395" size="730,477" group="n14_rwcw"/>
-    <image id="n1_rwcw" name="n1" src="rwcw6" fileName="images/tanchuangding.png" pkg="gt6q23qw" xy="13,382" group="n14_rwcw"/>
+    <image id="n2_rwcw" name="n2" src="rwcw3" fileName="images/pop/tanchuangdiban1.png" pkg="gt6q23qw" xy="12,395" size="730,477" group="n14_rwcw"/>
+    <image id="n1_rwcw" name="n1" src="rwcw6" fileName="images/pop/tanchuangding.png" pkg="gt6q23qw" xy="13,382" group="n14_rwcw"/>
     <image id="n3_rwcw" name="n3" src="rwcw7" fileName="images/wupin.png" xy="342,405" group="n14_rwcw"/>
-    <image id="n4_rwcw" name="n4" src="rwcw4" fileName="images/tanchuangdiban2.png" pkg="gt6q23qw" xy="33,453" size="690,302" group="n14_rwcw"/>
-    <image id="n5_rwcw" name="n5" src="rwcw5" fileName="images/tanchuangdiban3.png" pkg="gt6q23qw" xy="72,477" size="613,248" group="n14_rwcw"/>
+    <image id="n4_rwcw" name="n4" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="33,453" size="690,302" group="n14_rwcw"/>
+    <image id="n5_rwcw" name="n5" src="rwcw5" fileName="images/pop/tanchuangdiban3.png" pkg="gt6q23qw" xy="72,477" size="613,248" group="n14_rwcw"/>
     <loader id="n7_rwcw" name="QualityIcon" xy="94,497" pivot="0.5,0.5" size="101,101" group="n14_rwcw" align="center" vAlign="middle" fill="scaleFree"/>
     <loader id="n8_rwcw" name="ItemIcon" xy="104,507" pivot="0.5,0.5" size="80,80" group="n14_rwcw" align="center" vAlign="middle" fill="scaleFree"/>
     <text id="n9_rwcw" name="NumLabel" xy="163,567" pivot="1,1" size="26,29" group="n14_rwcw" scale="0.8,0.8" font="font_dengjishuzi" fontSize="20" color="#ffffff" align="right" vAlign="bottom" leading="0" text="13"/>
     <text id="n10_rwcw" name="NameLabel" xy="205,497" size="196,34" group="n14_rwcw" fontSize="24" color="#d29100" leading="0" text="【中级】神眷铸石"/>
     <text id="n11_rwcw" name="DescLabel" xy="217,535" size="450,176" group="n14_rwcw" fontSize="20" color="#59616e" leading="12" autoSize="none" text=""/>
-    <component id="n12_rwcw" name="SureBtn" src="sfx62z" fileName="Components/ComBtn/ComYellowBtn.xml" pkg="gt6q23qw" xy="239,769" group="n14_rwcw">
+    <component id="n12_rwcw" name="SureBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="239,769" group="n14_rwcw">
       <Button title="确认"/>
     </component>
     <group id="n14_rwcw" name="n14" xy="12,382" size="730,490" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayerrwcwc="4" gencoderwcwc="1"/>
+  <scriptData genuilayerrwcwc="3" gencoderwcwc="1"/>
 </component>

fl-fgui-project/assets/Player/ChangeImprintPanel.xml

@@ -26,5 +26,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayere5qd33="4" gencodee5qd33="1"/>
+  <scriptData genuilayere5qd33="3" gencodee5qd33="1"/>
 </component>

fl-fgui-project/assets/Player/TransferPanel.xml

@@ -51,5 +51,5 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
   </displayList>
-  <scriptData genuilayerf3jl22="4" gencodef3jl22="1"/>
+  <scriptData genuilayerf3jl22="2" gencodef3jl22="1"/>
 </component>

fl-fgui-project/assets/TemporaryEquip/BagPanel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344">
-  <controller name="EmptyCtrl" pages="0,,1," selected="1">
+  <controller name="EmptyCtrl" pages="0,,1," selected="0">
     <remark page="0" value="至少有一件装备"/>
     <remark page="1" value="没有装备道具"/>
   </controller>
@@ -32,5 +32,5 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>
-  <scriptData gencodeq6li4="1" genuilayerq6li4="4"/>
+  <scriptData gencodeq6li4="1" genuilayerq6li4="2"/>
 </component>

fl-fgui-project/assets/TreasureChest/ReduceTimePanel.xml

@@ -22,5 +22,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData gencodenbej4="1" gencodeqpp5b="1" genuilayerqpp5b="4" genuitypesw0m3l="0" genuilayersw0m3l="4" gencodesw0m3l="1" gencodesw0m50="1" genuilayersw0m50="4"/>
+  <scriptData gencodenbej4="1" gencodeqpp5b="1" genuilayerqpp5b="4" genuitypesw0m3l="0" genuilayersw0m3l="4" gencodesw0m3l="1" gencodesw0m50="1" genuilayersw0m50="3"/>
 </component>

fl-fgui-project/assets/TreasureChest/UpgradePanel.xml

@@ -122,5 +122,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData genuilayermrm24g="4" gencodemrm24g="1"/>
+  <scriptData genuilayermrm24g="2" gencodemrm24g="1"/>
 </component>

fl-fgui-project/assets/WatchAD/FreePanel.xml

@@ -13,5 +13,5 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <scriptData gencodenbej4="1" gencodeqpp5b="1" genuilayerqpp5b="4" genuitypesw0m3l="0" genuilayersw0m3l="4" gencodesw0m3l="1"/>
+  <scriptData gencodenbej4="1" gencodeqpp5b="1" genuilayerqpp5b="4" genuitypesw0m3l="0" genuilayersw0m3l="3" gencodesw0m3l="1"/>
 </component>