恭喜获得界面修改

坐骑界面fgui

Assets/Res/Addressable/FGUI/Mount.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W38dvCuvBnmVesAPLygqdFnB2KVZRTiW8W2FqQo00wwzk4yRxJIduBw=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Addressable/FGUI/Mount/Mount_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xngc4XipWnzIDj4F+vKYxIJppKyXF49emDNCNcKQtQ+h7cWrO83qDOs=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Domain/Network/act_fb_ld.cs

@@ -20,7 +20,7 @@ namespace FL.Network
         public int fbid;
 
         /// <summary> 每日更新时间 </summary>
-        public int dtime;
+        public long dtime;
 
         /// <summary> 剩余体力(门票) </summary>
         public int tili;

Assets/Scripts/Business/Domain/Network/act_fb_lwcx.cs

@@ -20,7 +20,7 @@ namespace FL.Network
         public int fbid;
 
         /// <summary> 每日更新时间 </summary>
-        public int dtime;
+        public long dtime;
 
         /// <summary> 剩余体力(门票) </summary>
         public int tili;

Assets/Scripts/Business/Domain/Network/act_fb_sktl.cs

@@ -17,7 +17,7 @@ namespace FL.Network
         {
         }
         /// <summary> 每日更新时间 </summary>
-        public int dtime;
+        public long dtime;
 
         /// <summary> 剩余体力(门票) </summary>
         public int tili;
@@ -35,7 +35,7 @@ namespace FL.Network
         public string fightKey;
 
         /// <summary> 每场战斗开始时间 </summary>
-        public int fightTime;
+        public long fightTime;
 
         /// <summary> 奖励弹窗 </summary>
         public System.Collections.Generic.List<KindItem> items;

Assets/Scripts/Business/Domain/Network/act_fb_yjgc.cs

@@ -20,7 +20,7 @@ namespace FL.Network
         public int fbid;
 
         /// <summary> 每日更新时间 </summary>
-        public int dtime;
+        public long dtime;
 
         /// <summary> 剩余体力(门票) </summary>
         public int tili;

Assets/Scripts/Business/Domain/Network/act_jjc.cs

@@ -17,16 +17,16 @@ namespace FL.Network
         {
         }
         /// <summary> 赛季更新时间 </summary>
-        public int wtime;
+        public long wtime;
 
         /// <summary> 每日更新时间 </summary>
-        public int dtime;
+        public long dtime;
 
         /// <summary> 剩余体力(挑战券) </summary>
         public int tili;
 
         /// <summary> 最后一次回复时间 </summary>
-        public int last;
+        public long last;
 
         /// <summary> 购买次数 </summary>
         public int buyNum;

Assets/Scripts/Business/Domain/Network/act_job_class.cs

@@ -31,7 +31,6 @@ namespace FL.Network
         /// <summary> 方案subPoint </summary>
         public System.Collections.Generic.List<RunePlan> runePlan;
 
-        /// <summary> undefined </summary>
         public int currentPlan;
 
         /// <summary> 总点数 </summary>

Assets/Scripts/Business/Domain/Network/act_longdan.cs

@@ -29,10 +29,10 @@ namespace FL.Network
         public int exp;
 
         /// <summary> 升级结束时间大于0升级中 </summary>
-        public int upLvTime;
+        public long upLvTime;
 
         /// <summary> 下一次（明日）重置时间 </summary>
-        public int time;
+        public long time;
 
         /// <summary> 今日已看广告次数 </summary>
         public int bill;

Assets/Scripts/Business/Domain/Network/act_pve.cs

@@ -23,7 +23,7 @@ namespace FL.Network
         public string fightKey;
 
         /// <summary> 最后一次结算时间 </summary>
-        public int lastTime;
+        public long lastTime;
 
         /// <summary> 在线奖励 </summary>
         public System.Collections.Generic.List<lineRwd> online;

Assets/Scripts/Business/Domain/Network/act_shop.cs

@@ -23,10 +23,10 @@ namespace FL.Network
         public System.Collections.Generic.List<Goods> goods;
 
         /// <summary> 下一次刷新时间 </summary>
-        public int nextTime;
+        public long nextTime;
 
         /// <summary> 下一次刷新时间 </summary>
-        public int nextWeekTime;
+        public long nextWeekTime;
 
     }
 

Assets/Scripts/Business/Domain/Network/act_task_main.cs

@@ -16,10 +16,8 @@ namespace FL.Network
         public void Clear()
         {
         }
-        /// <summary> undefined </summary>
         public int id;
 
-        /// <summary> undefined </summary>
         public int cons;
 
     }

Assets/Scripts/Business/Domain/Network/fuser_all.cs

@@ -35,7 +35,7 @@ namespace FL.Network
         public int level;
 
         /// <summary> 最后一次登录时间 </summary>
-        public int lastlogin;
+        public long lastlogin;
 
         /// <summary> 战力 </summary>
         public long power;

Assets/Scripts/Business/Domain/Network/model/act_jjc_log_m.cs

@@ -9,7 +9,6 @@ namespace FL.Network
 
     public sealed partial class ActJjcLog
     {
-        /// <summary> undefined </summary>
         public int xhid;
 
         /// <summary> 出手方 </summary>

Assets/Scripts/Business/Domain/Network/model/act_jjc_m.cs

@@ -28,7 +28,7 @@ namespace FL.Network
         public int level;
 
         /// <summary> 最后一次登录时间 </summary>
-        public int lastlogin;
+        public long lastlogin;
 
         /// <summary> 战力 </summary>
         public long power;

Assets/Scripts/Business/Domain/Network/model/act_shengbing_m.cs

@@ -17,7 +17,6 @@ namespace FL.Network
         /// <summary> 方案名称 </summary>
         public string name;
 
-        /// <summary> undefined </summary>
         public sealed partial class ActShengBingCao
         {
             public int caoId;

Assets/Scripts/Business/Domain/Network/model/act_shop_m.cs

@@ -9,13 +9,10 @@ namespace FL.Network
 
     public sealed partial class Goods
     {
-        /// <summary> undefined </summary>
         public int id;
 
-        /// <summary> undefined </summary>
         public int buyCount;
 
-        /// <summary> undefined </summary>
         public int exCount;
 
     }

Assets/Scripts/Business/Domain/Network/model/chat_m.cs

@@ -28,7 +28,7 @@ namespace FL.Network
         public string msg;
 
         /// <summary> 时间 </summary>
-        public int time;
+        public long time;
 
     }
 

Assets/Scripts/Business/Domain/Network/model/common_m.cs

@@ -42,6 +42,9 @@ namespace FL.Network
     /// <summary> 道具类型 </summary>
     public sealed partial class KindItem
     {
+        /// <summary> 技术定义类型 0默认道具表id 1装备临时库序号ID </summary>
+        public int kind;
+
         /// <summary> 道具ID </summary>
         public int id;
 

Assets/Scripts/Business/Domain/Network/model/mail_list_m.cs

@@ -21,13 +21,13 @@ namespace FL.Network
         public System.Collections.Generic.List<KindItem> items;
 
         /// <summary> 发送时间 </summary>
-        public int fts;
+        public long fts;
 
         /// <summary> 读取时间 </summary>
-        public int rts;
+        public long rts;
 
         /// <summary> 过期时间 </summary>
-        public int ets;
+        public long ets;
 
     }
 

Assets/Scripts/Business/Domain/Network/model/player_info_m.cs

@@ -19,7 +19,7 @@ namespace FL.Network
         public int level;
 
         /// <summary> 最后一次登录时间 </summary>
-        public int lastlogin;
+        public long lastlogin;
 
     }
 

Assets/Scripts/Business/Domain/Network/model/qufu_list_m.cs

@@ -16,7 +16,7 @@ namespace FL.Network
         public string name;
 
         /// <summary> 开服时间 </summary>
-        public int openAt;
+        public long openAt;
 
         /// <summary> 状态1新服2拥挤3爆满4维护 </summary>
         public int status;

Assets/Scripts/Business/Domain/Network/model/rank_user_m.cs

@@ -28,7 +28,7 @@ namespace FL.Network
         public int level;
 
         /// <summary> 最后一次登录时间 </summary>
-        public int lastlogin;
+        public long lastlogin;
 
         /// <summary> 战力 </summary>
         public long power;

Assets/Scripts/Business/Domain/Network/model/sev_fuben_m.cs

@@ -22,7 +22,7 @@ namespace FL.Network
         public string uuid;
 
         /// <summary> 创建时间 </summary>
-        public int time;
+        public long time;
 
         public System.Collections.Generic.List<SevFubenListMems> mems;
 

Assets/Scripts/Business/Domain/Network/user_info.cs

@@ -38,7 +38,7 @@ namespace FL.Network
         public int exp;
 
         /// <summary> 最后一次登录时间 </summary>
-        public int lastlogin;
+        public long lastlogin;
 
         /// <summary> 累计充值多少金额 </summary>
         public int money;

Assets/Scripts/Business/Runtime/Data/DragonEggData.cs

@@ -63,7 +63,7 @@ namespace FL.Data
         /// <summary>
         /// 开龙蛋宝箱掉落的物品数据
         /// </summary>
-        public List<Network.KindItem> DropItems { set; get; }
+        public List<KindItem> DropItems { set; get; }
 
         // 测试今日不再显示出售高战力装备提示
         public bool CheckDayTipsKey

Assets/Scripts/Business/Runtime/Data/Items/IItem.cs

@@ -7,7 +7,7 @@ namespace FL.Data.Items
         /// <summary>
         /// 物品唯一id
         /// </summary>
-        public long Id { get; }
+        //public long Id { get; }
 
         /// <summary>
         /// 表id

Assets/Scripts/Business/Runtime/Data/Items/Item.cs

@@ -4,10 +4,6 @@ namespace FL.Data.Items
 {
     public class Item : IItem
     {
-        /// <summary>
-        /// 道具唯一id
-        /// </summary>
-        public long Id { get; private set; }
         public ItemTable Table { get; private set; }
 
         public int TableId => Table.Id;
@@ -27,10 +23,9 @@ namespace FL.Data.Items
         public string Count { get; set; }
 
 
-        public void Init(ItemTable table, long id)
+        public void Init(ItemTable table)
         {
             Table = table;
-            Id = id;
         }
     }
 }

Assets/Scripts/Business/Runtime/Data/Items/ItemData.cs

@@ -1,7 +1,5 @@
-using FL.Data.Items;
-using System;
+using System;
 using System.Collections.Generic;
-using XGame;
 using XGame.Framework.Data;
 
 namespace FL.Data

Assets/Scripts/Business/Runtime/Data/Mount.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CnkZ4yP5VypAirREpBFN4kV5AskhaZJ48pFvJN4iTomSm7VixCr9DTg=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Data/Mount/MountData.cs

@@ -0,0 +1,14 @@
+using System;
+using XGame.Framework.Data;
+
+namespace FL
+{
+    public class MountData : DataSingleton<MountData>, IDisposable
+    {
+        void IDisposable.Dispose()
+        {
+
+        }
+
+    }
+}

Assets/Scripts/Business/Runtime/Data/Mount/MountData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DHIY4yupBXsI69b1Zyf3tp4U3MnbbwMMT+u6ZCD0GzEKkJZhoj50FNI=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Data/Mount/MountService.cs

@@ -0,0 +1,9 @@
+using XGame.Framework.Data;
+
+namespace FL
+{
+    public class MountService : DataSingleton<MountService>
+    {
+        
+    }
+}

Assets/Scripts/Business/Runtime/Data/Mount/MountService.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: B35MtyL7Wn3LV6NhpoztePhIL2Rsh/YjEoWuAM23poZ6RCsKOtESIbo=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -37,13 +37,13 @@ namespace FL.FGUI
         {
             VM.ItemPageBtn.onClick.Add(OnClickItemPageBtn);
             VM.MaterialPageBtn.onClick.Add(OnClickMaterialPageBtn);
-
+            VM.ItemsList.ItemClickEvent += OnClcikPropsItem;
         }
         private void RemoveUIListenres()
         {
             VM.ItemPageBtn.onClick.Remove(OnClickItemPageBtn);
             VM.MaterialPageBtn.onClick.Remove(OnClickMaterialPageBtn);
-
+            VM.ItemsList.ItemClickEvent -= OnClcikPropsItem;
         }
         private void OnClickItemPageBtn(EventContext context)
         {
@@ -54,6 +54,24 @@ namespace FL.FGUI
             ShowPageUI(1);
         }
 
+        /// <summary>
+        /// 点击的被动技能项
+        /// </summary>
+        /// <param name="index"></param>
+        private void OnClcikPropsItem(int index)
+        {
+            var data = VM.PageCtrl.selectedIndex == 0 ? _itemDataList[index] : _matterialDataList[index];
+            if (data == null) return;
+            Context.UI.OpenAsync(
+                UIKeys.BagSourceOfPropsPanel,
+                new ItemInfoParam
+                {
+                    itemInfo = data.Table,
+                    numDesc = (int.Parse(data.Count) > 1 ? data.Count : string.Empty),
+                }
+            );
+        }
+
         #endregion
 
         private void Init()
@@ -79,7 +97,7 @@ namespace FL.FGUI
                 {
                     Item _item = new Item();
                     _item.Count = item.Value.num.ToString();
-                    _item.Init(itemInfo, item.Value.id);
+                    _item.Init(itemInfo);
                     if (itemInfo.Type == (int)EItemType.Props)
                         _matterialDataList.Add(_item);
                     else

Assets/Scripts/Business/Runtime/FGUI/Bag/BackpackPanel/BagBackpackPanelVM.Gen.cs

@@ -34,7 +34,7 @@ namespace FL.FGUI
             AddChild(MaskBg);
             PopWin = panel.GetChild("PopWin") as GLabel;
             ItemsList = panel.GetChild("ItemsList") as GList;
-            ItemsList.Init(typeof(CommonItemBaseView), adapter.CreateListItem);
+            ItemsList.Init(typeof(BagPropsListItemView), adapter.CreateListItem);
             ItemPageBtn = panel.GetChild("ItemPageBtn") as GButton;
             MaterialPageBtn = panel.GetChild("MaterialPageBtn") as GButton;
             NumLabel = panel.GetChild("NumLabel") as GTextField;

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DykWvH6vW3iEHJ4IZgT0s7TH2wlTJxCIuthJWmH0BycCFps7p4xph9s=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemCtrl.cs

@@ -0,0 +1,43 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FL.Data.Items;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class BagPropsListItemCtrl : UIController<BagPropsListItemVM>
+    {
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+
+        }
+        private void RemoveUIListenres()
+        {
+
+        }
+
+        #endregion
+
+        public void OnRefresh(int index, Item data)
+        {
+            VM.ItemBase.Ctrl.ShowUI(data);
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: D30Z4CL/U33QysjgQrff8JVtko6eyfpqR8rOABsricQ5keFuSA6agvo=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemVM.Gen.cs

@@ -0,0 +1,30 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// #PropertyDefineArea 属性定义区域
+/// #PropertyAssignArea 属性赋值区域
+/// #ComponentType 组件类型
+/// #PropertyName 属性名字
+/// 该脚本由模板创建，不可编辑
+/// created by cb 2024
+using FairyGUI;
+using XGame.Framework.FGUI;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    /// <summary>
+    /// 该脚本由模板创建，不可修改，不可编辑
+    /// </summary>
+    public partial class BagPropsListItemVM : FguiViewModel
+    {
+        public CommonItemBaseView ItemBase { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            ItemBase = adapter.CreateNested<CommonItemBaseView>(new FguiNested(panel.GetChild("ItemBase").asCom), true);
+            AddChild(ItemBase);
+
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemVM.Gen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WnMW4X+vAi0ImcQUjqOxrugX+xj5mIj14SXsu+39sf2IBqPthlilMcs=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemView.ListItem.cs

@@ -0,0 +1,21 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using FL.Data.Items;
+
+namespace FL.FGUI
+{
+    public partial class BagPropsListItemView : IGListItemHandle
+    {
+        public int ItemIndex { get; private set; }
+        void IGListItemHandle.OnRefresh(int index, object data)
+        {
+            ItemIndex = index;
+            Ctrl.OnRefresh(index, data as Item);
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemView.ListItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CnsZtiilB3geoeBMc4uDRPPfqBI2ngHFkz2tCKbqXxlfpptKwe5AIFU=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemView.cs

@@ -0,0 +1,23 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UINestedKeys
+    {
+        private static UIKey _BagPropsListItem;
+        public static UIKey BagPropsListItem => _BagPropsListItem ?? (_BagPropsListItem = new UIKey("Bag", "PropsListItem", typeof(BagPropsListItemView)));
+    }
+    public partial class BagPropsListItemView : NestedView<BagPropsListItemCtrl, BagPropsListItemVM>
+    {
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

Assets/Scripts/Business/Runtime/FGUI/Bag/PropsListItem/BagPropsListItemView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Dn1L5iP4AC9Z4o+gbTxJonalJYxU6+Nt0sKQvFfrMRheG4kiEgjcVg8=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -11,16 +11,6 @@ using XGame.Framework.UI;
 
 namespace FL.FGUI
 {
-    public class UiParam
-    {
-        public bool bShowName;
-        public bool bShowCount;
-        public bool bShowBtn; // 是否可点击
-        public bool bShowMask;
-        public bool bShowLevel;
-        public bool bShowBaseInfo; // 点击道具是否只显示物品简易信息
-    }
-
     /// <summary>
     /// UI逻辑处理类
     /// </summary>
@@ -59,25 +49,13 @@ namespace FL.FGUI
             {
                 return;
             }
-            else if (_data?.ItemType == EItemType.Equip)
+            else if (_data is EquipItem)
             {
-                if (_data is EquipItem)
-                {
-                    Context.UI.OpenAsync(UIKeys.EquipEquipPanel, _data);
-                }
-                else
-                    Context.UI.OpenAsync(
-                        UIKeys.EquipEquipPanel,
-                        EquipData.Instance.GetBagEquipItem(_data.Id)
-                    );
-            }
-            else if (_bShowBaseInfo)
-            {
-                ShowItemInfoPanel();
+                Context.UI.OpenAsync(UIKeys.EquipEquipPanel, _data);
             }
             else
             {
-                ShowSourceOfPropsPanel();
+                ShowItemInfoPanel();
             }
         }
 
@@ -100,51 +78,30 @@ namespace FL.FGUI
             );
         }
 
-        /// <summary>
-        /// 道具物品的来源信息界面
-        /// </summary>
-        private void ShowSourceOfPropsPanel()
-        {
-            Context.UI.OpenAsync(
-                UIKeys.BagSourceOfPropsPanel,
-                new ItemInfoParam
-                {
-                    itemInfo = ItemTableRepo.Get(_data.TableId),
-                    numDesc = (int.Parse(_data.Count) > 1 ? _data.Count : string.Empty),
-                }
-            );
-        }
-
         public void ShowEmptyUI()
         {
             _data = null;
             VM.QualityImg.icon = "daojukuang1";
         }
 
-        public void ShowUI(IItem item, UiParam uiParam)
+        public void ShowUI(IItem item)
         {
             _data = item;
-            _bShowBaseInfo = uiParam.bShowBaseInfo;
-
             VM.QualityImg.icon = AddressableDefine.ItemFrame(item.Quality);
-
             VM.ItemIcon.icon = item.Icon;
-
-            VM.LvLabel.visible = uiParam.bShowLevel;
-            if (uiParam.bShowLevel)
+            bool bShowLv = item is EquipItem;
+            VM.LvLabel.visible = bShowLv;
+            if (bShowLv)
             {
                 VM.LvLabel.text = $"LV.{item.Level}";
             }
 
-            VM.CountLabel.visible = uiParam.bShowCount;
-            if (uiParam.bShowCount)
+            bool bShowCount = !bShowLv && int.Parse(_data.Count) > 1;
+            VM.CountLabel.visible = bShowCount;
+            if (bShowCount)
             {
                 VM.CountLabel.text = item.Count;
             }
-
-            VM.MaskImg.visible = uiParam.bShowMask;
-
-            VM.ItemBtn.visible = uiParam.bShowBtn;
         }
 
         /// <summary>
@@ -154,13 +111,7 @@ namespace FL.FGUI
         /// <param name="itemData"></param>
         public void OnRefresh(int index, Item itemData)
         {
-            UiParam _uiParam = new UiParam();
-            _uiParam.bShowBtn = true;
-            _uiParam.bShowName = false;
-            _uiParam.bShowCount = true;
-            _uiParam.bShowLevel = false;
-            _uiParam.bShowBaseInfo = false;
-            ShowUI(itemData, _uiParam);
+            ShowUI(itemData);
         }
     }
 }

Assets/Scripts/Business/Runtime/FGUI/DragonEgg/TreasurePanel/DragonEggTreasurePanelCtrl.cs

@@ -311,16 +311,16 @@ namespace FL.FGUI
                 if (_dropItemList == null) _dropItemList = new List<KindItem>();
                 else _dropItemList.Clear();
                 _dropItemList.AddRange(DragonEggData.Instance.DropItems);
-                if (_dropItemList.Count > 1) 
-                {
-                    OnSortByEquipPower();
-                }
-                var obtainData = new ObtainItemsParam()
-                {
-                    dropItems = _dropItemList,
-                    bShowBtn = IsShowOneKeyBtn(DragonEggData.Instance.DropItems),
-                };
-                var loadAsync = Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, obtainData);
+                //if (_dropItemList.Count > 1) 
+                //{
+                //    OnSortByEquipPower();
+                //}
+                //var obtainData = new ObtainItemsParam()
+                //{
+                //    dropItems = _dropItemList,
+                //    bShowBtn = IsShowOneKeyBtn(DragonEggData.Instance.DropItems),
+                //};
+                var loadAsync = Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, _dropItemList);
                 loadAsync.On(_=>
                 {
                     DragonEggData.Instance.DropItems.Clear();
@@ -328,72 +328,72 @@ namespace FL.FGUI
             };
         }
 
-        private void OnSortByEquipPower()
-        {
-            _dropItemList.Sort((aItem, bItem)=>
-            {
-                int aEquipFlag = aItem.count == 0 ? 1 : 0;
-                int bEquipFlag = bItem.count == 0 ? 1 : 0;
-
-                if (aEquipFlag == bEquipFlag)
-                {
-                    if (aEquipFlag == 1)
-                    {
-                        var aEquipData = EquipData.Instance.GetTemporaryEquipItem(aItem.id);
-                        var bEquipData = EquipData.Instance.GetTemporaryEquipItem(bItem.id);
-                        var aHighPower = GetCompareValue(aEquipData);
-                        var bHighPower = GetCompareValue(bEquipData);
-                        if (aHighPower == bHighPower)
-                        {
-                            if (aEquipData.FightingPower == bEquipData.FightingPower)
-                            {
-                                return aEquipData.Id.CompareTo(bEquipData.Id); // 升序
-                            }
-                            return bEquipData.FightingPower.CompareTo(aEquipData.FightingPower); //降序
-                        }
-                        else
-                            return bHighPower.CompareTo(aHighPower);
-                    }
-                    return aItem.count.CompareTo(bItem.count);
+        //private void OnSortByEquipPower()
+        //{
+        //    _dropItemList.Sort((aItem, bItem)=>
+        //    {
+        //        int aEquipFlag = aItem.count == 0 ? 1 : 0;
+        //        int bEquipFlag = bItem.count == 0 ? 1 : 0;
+
+        //        if (aEquipFlag == bEquipFlag)
+        //        {
+        //            if (aEquipFlag == 1)
+        //            {
+        //                var aEquipData = EquipData.Instance.GetTemporaryEquipItem(aItem.id);
+        //                var bEquipData = EquipData.Instance.GetTemporaryEquipItem(bItem.id);
+        //                var aHighPower = GetCompareValue(aEquipData);
+        //                var bHighPower = GetCompareValue(bEquipData);
+        //                if (aHighPower == bHighPower)
+        //                {
+        //                    if (aEquipData.FightingPower == bEquipData.FightingPower)
+        //                    {
+        //                        return aEquipData.Id.CompareTo(bEquipData.Id); // 升序
+        //                    }
+        //                    return bEquipData.FightingPower.CompareTo(aEquipData.FightingPower); //降序
+        //                }
+        //                else
+        //                    return bHighPower.CompareTo(aHighPower);
+        //            }
+        //            return aItem.count.CompareTo(bItem.count);
                     
-                }
-                return bEquipFlag.CompareTo(aEquipFlag);//降序
-            });
-        }
-
-        private int GetCompareValue(EquipItem equipData)
-        {
-            int compareFlag = 0;
-            if (equipData?.Table?.Part > 0)
-            {
-                long compareFightingPower = equipData?.FightingPower ?? 0;
-                var equipItem = EquipData.Instance.GetWearEquipData(equipData.Table.Part);
-                long wearFightingPower = equipItem?.FightingPower ?? 0;
-                if (compareFightingPower > wearFightingPower)
-                    compareFlag = 1;
-            }
-            return compareFlag;
-        }
-
-        /// <summary>
-        /// 打开恭喜获得界面是否需要显示一键处理按钮
-        /// </summary>
-        /// <returns></returns>
-        private bool IsShowOneKeyBtn(List<KindItem> dropItems)
-        {
-            bool bShowBtn = false;
-            if (dropItems.Count > 0) 
-            {
-                for (int i = 0; i < dropItems.Count; i++)
-                {
-                    if (dropItems[i].count == 0)
-                    {
-                        return true;
-                    }
-                }
-            }
-            return bShowBtn;
-        }
+        //        }
+        //        return bEquipFlag.CompareTo(aEquipFlag);//降序
+        //    });
+        //}
+
+        //private int GetCompareValue(EquipItem equipData)
+        //{
+        //    int compareFlag = 0;
+        //    if (equipData?.Table?.Part > 0)
+        //    {
+        //        long compareFightingPower = equipData?.FightingPower ?? 0;
+        //        var equipItem = EquipData.Instance.GetWearEquipData(equipData.Table.Part);
+        //        long wearFightingPower = equipItem?.FightingPower ?? 0;
+        //        if (compareFightingPower > wearFightingPower)
+        //            compareFlag = 1;
+        //    }
+        //    return compareFlag;
+        //}
+
+        ///// <summary>
+        ///// 打开恭喜获得界面是否需要显示一键处理按钮
+        ///// </summary>
+        ///// <returns></returns>
+        //private bool IsShowOneKeyBtn(List<KindItem> dropItems)
+        //{
+        //    bool bShowBtn = false;
+        //    if (dropItems.Count > 0) 
+        //    {
+        //        for (int i = 0; i < dropItems.Count; i++)
+        //        {
+        //            if (dropItems[i].count == 0)
+        //            {
+        //                return true;
+        //            }
+        //        }
+        //    }
+        //    return bShowBtn;
+        //}
         private void OnchangBagState(bool bOpen)
         {
             VM.BagBtn.GetController("State").selectedIndex = bOpen ? 1 : 0;
@@ -433,7 +433,7 @@ namespace FL.FGUI
         /// <returns></returns>
         private int GetItemId(KindItem itemData)
         {
-            if (itemData?.count == 0)
+            if (itemData.kind == 1) // 装备
             {
                 var equipData = EquipData.Instance.GetTemporaryEquipItem(itemData.id);
                 return equipData == null ? 0 : equipData.TableId;
@@ -515,12 +515,12 @@ namespace FL.FGUI
             var rewardItems = DragonEggData.Instance.DragonTreasureRewardItems;
             if (rewardItems?.Count > 0)
             {
-                var obtainData = new ObtainItemsParam()
-                {
-                    dropItems = rewardItems,
-                    bShowBtn = IsShowOneKeyBtn(rewardItems),
-                };
-                var loadAsync = Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, obtainData);
+                //var obtainData = new ObtainItemsParam()
+                //{
+                //    dropItems = rewardItems,
+                //    bShowBtn = IsShowOneKeyBtn(rewardItems),
+                //};
+                var loadAsync = Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, rewardItems);
                 loadAsync.On(_ =>
                 {
                     DragonEggData.Instance.DragonTreasureRewardItems.Clear();

Assets/Scripts/Business/Runtime/FGUI/Equip/EquipItemNested/EquipEquipItemNestedCtrl.cs

@@ -87,9 +87,7 @@ namespace FL.FGUI
 
         private void ShowEquipItemUI(EquipItem equipData)
         {
-            UiParam _uiParam = new UiParam();
-            _uiParam.bShowLevel = true;
-            VM.ItemBtn.Ctrl.ShowUI(equipData, _uiParam);
+            VM.ItemBtn.Ctrl.ShowUI(equipData);
 
             VM.NameLabel.text = equipData.Name;
             VM.NameLabel.color = equipData.Quality.ToEquipNameColor();

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

@@ -17,13 +17,6 @@ using XGame.Framework.UI;
 
 namespace FL.FGUI
 {
-    public class ObtainItemsParam 
-    {
-        public List<KindItem> dropItems;
-        public bool bShowBtn;
-    }
-
-
     /// <summary>
     /// UI逻辑处理类
     /// </summary>
@@ -38,7 +31,7 @@ namespace FL.FGUI
         {
             AddUIListenres();
             AddEventLisenter();
-            ShowUI(intent as ObtainItemsParam);
+            ShowUI(intent as List<KindItem>);
         }
         protected override void OnDisable()
         {
@@ -98,22 +91,25 @@ namespace FL.FGUI
             Context.ClosePanel();
         }
 
-        private void ShowUI(ObtainItemsParam ObtainData)
+        private void ShowUI(List<KindItem> dropItems)
         {
+            if (dropItems == null) return;
+
+            _dropItems = dropItems;
+ 
             ShowBtn(false);
 
-            if (_dropItems == null)
-            {
-                _dropItems = new List<KindItem>();
-            }
-            if (ObtainData?.dropItems != null)
-            {
-                _dropItems.AddRange(ObtainData.dropItems);
-            }
-   
+            //if (_dropItems == null)
+            //{
+            //    _dropItems = new List<KindItem>();
+            //}
+            //if (ObtainData?.dropItems != null)
+            //{
+            //    _dropItems.AddRange(ObtainData.dropItems);
+            //}
+
             ShowDropUI();
-          
-            if(ObtainData != null && ObtainData.bShowBtn)
+            if (IsShowOneKeyBtn())
             {
                 ShowEquipUI();
             }
@@ -137,6 +133,26 @@ namespace FL.FGUI
             VM.ItemList.scrollPane.bouncebackEffect = _dropItems.Count > 15 ? true : false;
         }
 
+        /// <summary>
+        /// 打开恭喜获得界面是否需要显示一键处理按钮
+        /// </summary>
+        /// <returns></returns>
+        private bool IsShowOneKeyBtn()
+        {
+            bool bShowBtn = false;
+            if (_dropItems.Count > 0)
+            {
+                for (int i = 0; i < _dropItems.Count; i++)
+                {
+                    if (_dropItems[i].kind == 1)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return bShowBtn;
+        }
+
 
         private void ShowBtn(bool bShow)
         {
@@ -144,7 +160,8 @@ namespace FL.FGUI
         }
         private void ShowEquipUI() 
         {
-            List<KindItem> equipItemList = _dropItems.FindAll(item => item.count == 0);
+            // 装备类型
+            List<KindItem> equipItemList = _dropItems.FindAll(item => item.kind == 1);
             var highEquipMap = new Dictionary<EEquipType, EquipItem>();
             foreach (var item in equipItemList)
             {
@@ -169,7 +186,9 @@ namespace FL.FGUI
                 DelayToShowHighEquip(highEquipMap);
             }
             else
+            {
                 ShowBtn(true);
+            }
         }
 
         /// <summary>
@@ -230,8 +249,8 @@ namespace FL.FGUI
             }
             else
             {
-                ShowDropUI();
                 ShowBtn(true);
+                RefreshUI();
             }
         }
 
@@ -250,6 +269,16 @@ namespace FL.FGUI
                     _waitEquipIdList.Remove(item);
                 }
             }
+            RefreshUI();
+        }
+
+        /// <summary>
+        /// 装备替换后刷新界面UI
+        /// </summary>
+        private void RefreshUI()
+        {
+            OnSortByEquipPower();
+            ShowDropUI();
         }
 
         /// <summary>
@@ -296,6 +325,10 @@ namespace FL.FGUI
                     EquipData.Instance.BubblingEquipUid = 0;
                     ShowEquipEquipPanel();
                 }
+                else
+                {
+                    //RefreshUI();
+                }
             }
         }
 
@@ -364,5 +397,53 @@ namespace FL.FGUI
             }
             return false;
         }
+
+        private void OnSortByEquipPower()
+        {
+            _dropItems.Sort((aItem, bItem) =>
+            {
+                int aEquipFlag = aItem.count == 0 ? 1 : 0;
+                int bEquipFlag = bItem.count == 0 ? 1 : 0;
+
+                if (aEquipFlag == bEquipFlag)
+                {
+                    if (aEquipFlag == 1)
+                    {
+                        var aEquipData = EquipData.Instance.GetTemporaryEquipItem(aItem.id);
+                        var bEquipData = EquipData.Instance.GetTemporaryEquipItem(bItem.id);
+                        var aHighPower = GetCompareValue(aEquipData);
+                        var bHighPower = GetCompareValue(bEquipData);
+                        if (aHighPower == bHighPower)
+                        {
+                            if (aEquipData.FightingPower == bEquipData.FightingPower)
+                            {
+                                return aEquipData.Id.CompareTo(bEquipData.Id); // 升序
+                            }
+                            return bEquipData.FightingPower.CompareTo(aEquipData.FightingPower); //降序
+                        }
+                        else
+                            return bHighPower.CompareTo(aHighPower);
+                    }
+                    return aItem.count.CompareTo(bItem.count);
+
+                }
+                return bEquipFlag.CompareTo(aEquipFlag);//降序
+            });
+        }
+
+        private int GetCompareValue(EquipItem equipData)
+        {
+            int compareFlag = 0;
+            if (equipData?.Table?.Part > 0)
+            {
+                long compareFightingPower = equipData?.FightingPower ?? 0;
+                var equipItem = EquipData.Instance.GetWearEquipData(equipData.Table.Part);
+                long wearFightingPower = equipItem?.FightingPower ?? 0;
+                if (compareFightingPower > wearFightingPower)
+                    compareFlag = 1;
+            }
+            return compareFlag;
+        }
+
     }
 }

Assets/Scripts/Business/Runtime/FGUI/Item/RewardItem/ItemRewardItemCtrl.cs

@@ -11,15 +11,6 @@ using XGame.Framework.UI;
 
 namespace FL.FGUI
 {
-    public class ItemParam
-    {
-        public long id;
-        public int tableId;
-        public int count;
-        public int level;
-    }
-
-
     /// <summary>
     /// UI逻辑处理类
     /// </summary>
@@ -49,37 +40,55 @@ namespace FL.FGUI
 
         public void OnRefresh(int index, KindItem param)
         {
-            EquipItem equipData = null;
-            Item _item = new Item();
-            bool bEquip = param.count == 0;
-            int itemId = param.id;
-            if (bEquip)
+            if (param == null) return;
+
+            ShowCompareEquip(false, null);
+            if (param.kind == 1)
             {
-                equipData = EquipData.Instance.GetTemporaryEquipItem(itemId);
-                itemId = equipData.TableId;
-                _item.Level = equipData.Level;
-                _equipId = itemId;
+                // 装备
+                ShowEquipItem(param.id);
+            }
+            else if(param.kind == 2)
+            {
+
             }
             else
-                _equipId = 0;
-            ShowCompareEquip(bEquip, equipData);
-            var itemInfo = ItemTableRepo.Get(itemId);
-            if (itemInfo != null)
             {
-                _item.Count = param.count.ToString();
-                _item.Init(itemInfo, bEquip ? param.id : 0);
+                ShowCommonItem(param.id, param.count);
+            }
+        }
 
-                UiParam _uiParam = new UiParam();
-                _uiParam.bShowBtn = true;
-                _uiParam.bShowName = false;
-                _uiParam.bShowCount = param.count > 1;
-                _uiParam.bShowLevel = bEquip;
-                _uiParam.bShowBaseInfo = bEquip ? false : true;
-                VM.ItemBtn.Ctrl.ShowUI(_item, _uiParam);
+        /// <summary>
+        /// 通用道具物品信息
+        /// </summary>
+        /// <param name="tableId"></param>
+        /// <param name="count"></param>
+        /// <param name="uiParam"></param>
+        private void ShowCommonItem(int tableId, int count)
+        {
+            var itemInfo = ItemTableRepo.Get(tableId);
+            if (itemInfo != null)
+            {
+                Item _item = new Item();
+                _item.Init(itemInfo);
+                _item.Count = count.ToString();
+                VM.ItemBtn.Ctrl.ShowUI(_item);
             }
         }
 
         /// <summary>
+        /// 装备物品信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="uiParam"></param>
+        private void ShowEquipItem(long id)
+        {
+            EquipItem equipData = EquipData.Instance.GetBagEquipItem(id);
+            VM.ItemBtn.Ctrl.ShowUI(equipData);
+            ShowCompareEquip(true, equipData);
+        }
+
+        /// <summary>
         /// 装备战力比较标识
         /// </summary>
         private void ShowCompareEquip(bool bEquip, EquipItem equipData)

Assets/Scripts/Business/Runtime/FGUI/Item/RewardItem/ItemRewardItemView.ListItem.cs

@@ -5,6 +5,7 @@
 /// created by cb 2024
 
 using FairyGUI;
+using FL.Network;
 
 namespace FL.FGUI
 {
@@ -14,7 +15,7 @@ namespace FL.FGUI
         void IGListItemHandle.OnRefresh(int index, object data)
         {
             ItemIndex = index;
-            Ctrl.OnRefresh(index, data as Network.KindItem);
+            Ctrl.OnRefresh(index, data as KindItem);
         }
     }
 }

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

@@ -181,16 +181,13 @@ namespace FL.FGUI
         /// </summary>
         private void ShowEquipUI()
         {
-            UiParam _uiParam = new UiParam();
-            _uiParam.bShowBtn = true;
-            _uiParam.bShowLevel = true;
             int index = 1;
             _equipItemList.ForEach((item) =>
             {
                 EquipItem equipData = EquipData.Instance.GetWearEquipData((EEquipType)index);
                 if (equipData != null)
                 {
-                    item.Ctrl.ShowUI(equipData, _uiParam);
+                    item.Ctrl.ShowUI(equipData);
                 }
                 else
                 {
@@ -219,10 +216,7 @@ namespace FL.FGUI
                     CommonItemBaseView equipItem = _equipItemList[(int)equipPart - 1];
                     if (equipItem != null)
                     {
-                        UiParam _uiParam = new UiParam();
-                        _uiParam.bShowBtn = true;
-                        _uiParam.bShowLevel = true;
-                        equipItem.Ctrl.ShowUI(EquipData.Instance.GetWearEquipData(equipPart), _uiParam);
+                        equipItem.Ctrl.ShowUI(EquipData.Instance.GetWearEquipData(equipPart));
                     }
                 }
             }

Assets/Scripts/Business/Runtime/FGUI/TemporaryEquip/EquipItem/TemporaryEquipEquipItemCtrl.cs

@@ -4,10 +4,7 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
-using FairyGUI;
-using FL.Data;
 using FL.Data.Items;
-using XGame.Database;
 using XGame.Framework.UI;
 
 namespace FL.FGUI
@@ -40,12 +37,7 @@ namespace FL.FGUI
 
         public void OnRefresh(int index, EquipItem equipData)
         {
-            UiParam _uiParam = new UiParam();
-            _uiParam.bShowBtn = true;
-            _uiParam.bShowName = false;
-            _uiParam.bShowCount = false;
-            _uiParam.bShowLevel = true;
-            VM.ItemBtn.Ctrl.ShowUI(equipData, _uiParam);
+            VM.ItemBtn.Ctrl.ShowUI(equipData);
             VM.EquipCtrl.selectedIndex = GetCompareValue(equipData);
         }
         /// <summary>

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

@@ -11,7 +11,7 @@
     <component id="n10_ut64" name="PopWin" src="xo2n46" fileName="Components/PopWin/PopWin4.xml" pkg="gt6q23qw" xy="14,86" size="728,1022" group="n12_ut64">
       <Label title="背包"/>
     </component>
-    <list id="n4_nf7w" name="ItemsList" xy="48,215" size="780,806" group="n12_ut64" scale="0.85,0.85" layout="flow_hz" overflow="scroll" lineGap="16" colGap="6" defaultItem="ui://gt6q23qwme3q0" autoClearItems="true">
+    <list id="n4_nf7w" name="ItemsList" xy="48,215" size="780,806" group="n12_ut64" layout="flow_hz" overflow="scroll" lineGap="16" colGap="6" defaultItem="ui://y15iuuxvfx3dl" autoClearItems="true">
       <item/>
       <item/>
       <item/>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="128,128">
+  <displayList>
+    <component id="n0_fx3d" name="ItemBase" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="64,64" pivot="0.5,0.5" anchor="true" size="150,150" aspect="true" scale="0.85,0.85" touchable="false"/>
+  </displayList>
+  <scriptData gencodefx3dl="1" genuitypefx3dl="2"/>
+</component>

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

@@ -20,6 +20,7 @@
     <image id="tf1pi" name="anniu02.png" path="/Images/"/>
     <image id="tf1pj" name="daojukuang1.png" path="/cankaotu/"/>
     <image id="tf1pk" name="ItemIcon_1.png" path="/cankaotu/"/>
+    <component id="fx3dl" name="PropsListItem.xml" path="/" exported="true"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>

fl-fgui-project/assets/Common/Components/PopWin/PopWin6.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,466" extention="Label" designImage="ui://s58m5vbw9sqt2" designImageOffsetX="-195">
+  <displayList>
+    <image id="n0_f8ih" name="n0" src="e5qdp" fileName="images/pop/huodekuangdiban.png" xy="0,0" size="756,466"/>
+    <image id="n1_f8ih" name="n1" src="e5qdo" fileName="images/pop/huodekuang.png" xy="0,-45"/>
+  </displayList>
+</component>

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

@@ -6,7 +6,6 @@
     <text id="n2_b4qr" name="CountLabel" xy="103,103" pivot="1,0.5" size="34,36" fontSize="26" color="#ffffff" align="right" vAlign="middle" leading="0" autoClearText="true" text="88"/>
     <text id="n14_fr8z" name="LvLabel" xy="15,130" pivot="0,0.5" anchor="true" size="52,36" font="font_dengjishuzi" fontSize="26" color="#ffffff" vAlign="middle" leading="0" autoClearText="true" text="Lv.1"/>
     <component id="n13_negq" name="ItemBtn" src="negq2e" fileName="Components/EmptyBtn.xml" xy="7,7" size="136,136"/>
-    <image id="n4_b4qr" name="MaskImg" src="me3q2b" fileName="images/img_itemMask.png" xy="7,7" pivot="0.5,0.5" size="136,136" visible="false"/>
   </displayList>
   <scriptData gencodeme3q0="1" genuitypeme3q0="2"/>
 </component>

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

@@ -63,6 +63,9 @@
     <image id="ut6450" name="commonPageBtn01.png" path="/images/buttons/" scale="9grid" scale9grid="37,20,74,40"/>
     <image id="ut6452" name="commonPageBtn02.png" path="/images/buttons/" scale="9grid" scale9grid="38,22,76,44"/>
     <component id="j7sp54" name="PopWin5.xml" path="/Components/PopWin/" exported="true"/>
+    <image id="e5qdo" name="huodekuang.png" path="/images/pop/"/>
+    <image id="e5qdp" name="huodekuangdiban.png" path="/images/pop/" scale="9grid" scale9grid="14,47,15,2"/>
+    <component id="f8ih55" name="PopWin6.xml" path="/Components/PopWin/"/>
   </resources>
   <publish name="" genCode="true" excluded="q0v63z,ifoa3y"/>
 </packageDescription>

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

@@ -9,8 +9,6 @@
     <component id="qxl0k" name="RewardItem.xml" path="/" exported="true"/>
     <image id="tli0m" name="words.png" path="/images/"/>
     <image id="tli0n" name="恭喜获得.png" path="/NoExport/"/>
-    <image id="e5qdo" name="huodekuang.png" path="/images/"/>
-    <image id="e5qdp" name="huodekuangdiban.png" path="/images/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>

fl-fgui-project/assets/Mount/Components/MountStar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="140,35">
-  <controller name="StarLvCtrl" pages="1,,2,,3,,4,,5,,6," selected="5">
+  <controller name="StarLvCtrl" pages="1,,2,,3,,4,,5,,6," selected="0">
     <remark page="0" value="0星"/>
     <remark page="1" value="1星"/>
     <remark page="2" value="2星"/>
@@ -10,7 +10,7 @@
   </controller>
   <displayList>
     <image id="n43_j7sp" name="n43" src="j7spr" fileName="Images/star1.png" xy="18,17" pivot="0.5,0.5" anchor="true">
-      <gearDisplay controller="StarLvCtrl" pages="2,3,4,5,6"/>
+      <gearDisplay controller="StarLvCtrl" pages="1,2,3,4,5,6"/>
     </image>
     <image id="n47_j7sp" name="n47" src="j7spr" fileName="Images/star1.png" xy="44,17" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="StarLvCtrl" pages="3,4,5,6"/>

fl-fgui-project/assets/Mount/DevelopPanel.xml

@@ -1,166 +1,223 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344" designImage="ui://s58m5vbw9sqt1" designImageOffsetX="-149">
-  <controller name="PageCtrl" pages="0,,1,,2," selected="2">
+  <controller name="PageCtrl" pages="0,,1,,2," selected="0">
     <remark page="0" value="坐骑升级"/>
     <remark page="1" value="坐骑驯养"/>
     <remark page="2" value="高级坐骑"/>
   </controller>
+  <controller name="MountStateCtrl" pages="0,,1,,2," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁可升级"/>
+    <remark page="2" value="已达最大等级"/>
+  </controller>
   <displayList>
     <component id="n4_j7sp" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="378,672" pivot="0.5,0.5" anchor="true">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n0_j7sp" name="n0" src="j7sp54" fileName="Components/PopWin/PopWin5.xml" pkg="gt6q23qw" xy="13,97" size="729,1028">
+    <component id="n0_j7sp" name="n0" src="j7sp54" fileName="Components/PopWin/PopWin5.xml" pkg="gt6q23qw" xy="13,97" size="729,1028" group="n85_f8ih">
       <gearText controller="PageCtrl" pages="0,1,2" values="坐骑升级|坐骑驯养|高级坐骑"/>
-      <Label title="高级坐骑"/>
+      <Label title="坐骑升级"/>
     </component>
-    <image id="n14_j7sp" name="n14" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="32,571" size="692,557">
+    <image id="n14_j7sp" name="n14" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="32,571" size="692,426" group="n85_f8ih">
       <gearSize controller="PageCtrl" pages="2" values="692,557,1,1" default="692,426,1,1"/>
     </image>
-    <loader id="n5_j7sp" name="n5" xy="33,205" size="689,370" url="ui://s58m5vbwj7spi" align="center" vAlign="middle" autoSize="true">
+    <loader id="n5_j7sp" name="n5" xy="33,205" size="689,370" group="n85_f8ih" url="ui://s58m5vbwj7spi" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="PageCtrl" pages="1" values="ui://s58m5vbwj7spj" default="ui://s58m5vbwj7spi"/>
     </loader>
-    <component id="n1_j7sp" name="UpgradeBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="76,1148">
-      <Button title="坐骑升级" controller="PageCtrl" page="0"/>
+    <component id="n1_j7sp" name="UpgradeBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="76,1148" group="n85_f8ih">
+      <Button checked="true" title="坐骑升级" controller="PageCtrl" page="0"/>
     </component>
-    <component id="n2_j7sp" name="TrainBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="298,1148">
+    <component id="n2_j7sp" name="TrainBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="298,1148" group="n85_f8ih">
       <Button title="坐骑驯养" controller="PageCtrl" page="1"/>
     </component>
-    <component id="n3_j7sp" name="AdvancedMountBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="525,1148">
-      <Button checked="true" title="高级坐骑" controller="PageCtrl" page="2"/>
+    <component id="n3_j7sp" name="AdvancedMountBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="525,1148" group="n85_f8ih">
+      <Button title="高级坐骑" controller="PageCtrl" page="2"/>
     </component>
-    <image id="n7_j7sp" name="n7" src="9sqtc" fileName="Images/mingzidikuang.png" xy="159,266" pivot="0.5,0.5" anchor="true" size="246,85">
+    <image id="n7_j7sp" name="n7" src="9sqtc" fileName="Images/mingzidikuang.png" xy="159,266" pivot="0.5,0.5" anchor="true" size="246,85" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0,2"/>
     </image>
-    <image id="n8_j7sp" name="n8" src="9sqtg" fileName="NoExport/zuoqi.png" xy="416,362" pivot="0.5,0.5" anchor="true">
+    <image id="n8_j7sp" name="n8" src="9sqtg" fileName="NoExport/zuoqi.png" xy="416,362" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearXY controller="PageCtrl" pages="1" values="416,520" default="416,362"/>
     </image>
-    <loader3D id="n9_j7sp" name="MountSpine" xy="416,362" pivot="0.5,0.5" anchor="true" size="211,283" animation="" skin="" loop="true">
+    <loader3D id="n9_j7sp" name="MountSpine" xy="416,362" pivot="0.5,0.5" anchor="true" size="211,283" group="n85_f8ih" animation="" skin="" loop="true">
       <gearXY controller="PageCtrl" pages="1" values="416,521" default="416,362"/>
     </loader3D>
     <text id="n10_j7sp" name="MountNameLabel" xy="67,226" pivot="0,0.5" size="164,44" group="n48_j7sp" fontSize="32" color="#fefefe" vAlign="middle" leading="0" autoClearText="true" text="坐骑的名称"/>
     <component id="n43_j7sp" name="MountStar" src="j7spt" fileName="Components/MountStar.xml" xy="147,287" pivot="0.5,0.5" anchor="true" group="n48_j7sp"/>
-    <group id="n48_j7sp" name="n48" xy="67,226" size="164,79" advanced="true" layout="vt" excludeInvisibles="true">
+    <group id="n48_j7sp" name="n48" xy="67,226" size="164,79" group="n85_f8ih" advanced="true" layout="vt" excludeInvisibles="true">
       <gearDisplay controller="PageCtrl" pages="0,2"/>
       <relation target="" sidePair="middle-middle"/>
     </group>
-    <component id="n11_j7sp" name="LastBtn" src="j7spo" fileName="Components/ArrowBtn.xml" xy="36,371">
+    <component id="n11_j7sp" name="LastBtn" src="j7spo" fileName="Components/ArrowBtn.xml" xy="36,371" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </component>
-    <component id="n12_j7sp" name="NextBtn" src="j7spo" fileName="Components/ArrowBtn.xml" xy="664,371" scale="-1,1">
+    <component id="n12_j7sp" name="NextBtn" src="j7spo" fileName="Components/ArrowBtn.xml" xy="664,371" group="n85_f8ih" scale="-1,1">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </component>
-    <component id="n13_j7sp" name="Ride&#xA;Btn" src="sfx62x" fileName="Components/ComButtons/ComBlueBtn.xml" pkg="gt6q23qw" xy="242,490" scale="0.6,0.6">
+    <component id="n13_j7sp" name="Ride&#xA;Btn" src="sfx62x" fileName="Components/ComButtons/ComBlueBtn.xml" pkg="gt6q23qw" xy="242,490" group="n85_f8ih" scale="0.6,0.6">
       <Button title="骑乘" titleFontSize="43"/>
     </component>
-    <component id="n15_j7sp" name="n15" src="j7spv" fileName="Components/EffectComponent.xml" xy="381,644" pivot="0.5,0.5" anchor="true">
+    <component id="n15_j7sp" name="n15" src="j7spv" fileName="Components/EffectComponent.xml" xy="381,644" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
       <Label title="特殊属性加成"/>
     </component>
-    <component id="n63_j7sp" name="n63" src="j7spv" fileName="Components/EffectComponent.xml" xy="381,799" pivot="0.5,0.5" anchor="true" size="624,173">
+    <component id="n63_j7sp" name="n63" src="j7spv" fileName="Components/EffectComponent.xml" xy="381,799" pivot="0.5,0.5" anchor="true" size="624,173" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
       <Label title="基础属性加成"/>
     </component>
-    <component id="n66_j7sp" name="n66" src="j7spv" fileName="Components/EffectComponent.xml" xy="378,668" pivot="0.5,0.5" anchor="true" size="624,157">
+    <component id="n66_j7sp" name="n66" src="j7spv" fileName="Components/EffectComponent.xml" xy="378,668" pivot="0.5,0.5" anchor="true" size="624,157" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="2"/>
       <Label title="额外坐骑技能"/>
     </component>
-    <component id="n67_j7sp" name="n67" src="j7spv" fileName="Components/EffectComponent.xml" xy="378,868" pivot="0.5,0.5" anchor="true" size="624,221">
+    <component id="n67_j7sp" name="n67" src="j7spv" fileName="Components/EffectComponent.xml" xy="378,868" pivot="0.5,0.5" anchor="true" size="624,221" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="2"/>
       <Label title="坐骑拥有效果"/>
     </component>
-    <image id="n65_j7sp" name="n65" src="rwcw5" fileName="images/pop/tanchuangdiban3.png" pkg="gt6q23qw" xy="387,846" pivot="0.5,0.5" anchor="true" size="624,138">
+    <image id="n65_j7sp" name="n65" src="rwcw5" fileName="images/pop/tanchuangdiban3.png" pkg="gt6q23qw" xy="387,846" pivot="0.5,0.5" anchor="true" size="624,138" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n21_j7sp" name="n21" xy="82,627" pivot="0,0.5" size="52,34" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="星级">
+    <text id="n21_j7sp" name="n21" xy="82,627" pivot="0,0.5" size="52,34" group="n85_f8ih" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="星级">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <text id="n23_j7sp" name="StarLvLabel" xy="262,627" pivot="1,0.5" size="52,34" fontSize="24" color="#6187ca" align="right" vAlign="middle" leading="0" text="当前">
+    <text id="n23_j7sp" name="StarLvLabel" xy="262,627" pivot="1,0.5" size="52,34" group="n85_f8ih" fontSize="24" color="#6187ca" align="right" vAlign="middle" leading="0" text="当前">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <component id="n22_j7sp" name="SpecialAttrItem" src="j7spq" fileName="AttrItemList.xml" xy="377,678" pivot="0.5,0.5" anchor="true" size="588,32">
+    <component id="n22_j7sp" name="SpecialAttrItem" src="j7spq" fileName="AttrItemList.xml" xy="377,678" pivot="0.5,0.5" anchor="true" size="588,32" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </component>
-    <image id="n24_j7sp" name="n24" src="j7spp" fileName="Images/shengji.png" xy="424,658" pivot="0.5,0.5" anchor="true">
+    <image id="n24_j7sp" name="n24" src="j7spp" fileName="Images/shengji.png" xy="424,658" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </image>
-    <image id="n39_j7sp" name="n39" src="j7spp" fileName="Images/shengji.png" xy="424,815" pivot="0.5,0.5" anchor="true">
+    <image id="n73_j7sp" name="n73" src="j7spp" fileName="Images/shengji.png" xy="377,822" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </image>
-    <text id="n25_j7sp" name="StarLvLabel" xy="496,628" pivot="0,0.5" size="180,34" fontSize="24" color="#0cca3d" vAlign="middle" leading="0" text="99阶99星后解锁">
+    <image id="n39_j7sp" name="n39" src="j7spp" fileName="Images/shengji.png" xy="378,823" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </image>
+    <text id="n25_j7sp" name="StarLvLabel" xy="496,628" pivot="0,0.5" size="180,34" group="n85_f8ih" fontSize="24" color="#0cca3d" vAlign="middle" leading="0" text="99阶99星后解锁">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <text id="n28_j7sp" name="n28" xy="82,751" pivot="0,0.5" size="52,34" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="星级">
+    <text id="n28_j7sp" name="n28" xy="82,751" pivot="0,0.5" size="52,34" group="n85_f8ih" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="星级">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <text id="n29_j7sp" name="StarLvLabel1" xy="262,751" pivot="0,0.5" size="52,34" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="当前">
+    <text id="n29_j7sp" name="StarLvLabel1" xy="262,751" pivot="0,0.5" size="52,34" group="n85_f8ih" fontSize="24" color="#6187ca" vAlign="middle" leading="0" text="当前">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <list id="n31_j7sp" name="BaseAttrList" xy="82,783" size="588,95" overflow="scroll" lineGap="-2" defaultItem="ui://s58m5vbwj7spq" autoClearItems="true">
+    <list id="n31_j7sp" name="BaseAttrList" xy="82,783" size="588,95" group="n85_f8ih" overflow="scroll" lineGap="-2" defaultItem="ui://s58m5vbwj7spq" autoClearItems="true">
       <gearDisplay controller="PageCtrl" pages="0"/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n32_j7sp" name="n32" xy="57,935" pivot="0,0.5" size="82,36" fontSize="26" color="#4e517e" vAlign="middle" leading="0" text="经验值">
+    <text id="n32_j7sp" name="n32" xy="57,935" pivot="0,0.5" size="82,36" group="n85_f8ih" fontSize="26" color="#4e517e" vAlign="middle" leading="0" text="经验值">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </text>
-    <component id="n42_j7sp" name="StarBar" src="j7sps" fileName="Components/StarBar.xml" xy="382,911" pivot="0.5,0.5" anchor="true" size="445,35">
+    <component id="n42_j7sp" name="StarBar" src="j7sps" fileName="Components/StarBar.xml" xy="382,911" pivot="0.5,0.5" anchor="true" size="445,35" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </component>
-    <component id="n33_j7sp" name="ExpBar" src="j7spm" fileName="Components/ExpBar.xml" xy="430,952" pivot="0.5,0.5" anchor="true" size="545,27">
+    <component id="n33_j7sp" name="ExpBar" src="j7spm" fileName="Components/ExpBar.xml" xy="430,952" pivot="0.5,0.5" anchor="true" size="545,27" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n37_j7sp" name="FeedCostItem" src="j7yv3n" fileName="Components/ComCostNested.xml" pkg="gt6q23qw" xy="196,1029" pivot="0.5,0.5" anchor="true">
+    <component id="n37_j7sp" name="FeedCostItem" src="j7yv3n" fileName="Components/ComCostNested.xml" pkg="gt6q23qw" xy="196,1029" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0,1"/>
     </component>
-    <component id="n38_j7sp" name="AllFeedCostitem" src="j7yv3n" fileName="Components/ComCostNested.xml" pkg="gt6q23qw" xy="564,1029" pivot="0.5,0.5" anchor="true">
+    <component id="n38_j7sp" name="AllFeedCostitem" src="j7yv3n" fileName="Components/ComCostNested.xml" pkg="gt6q23qw" xy="564,1029" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0"/>
     </component>
-    <component id="n34_j7sp" name="FeedBtn" src="sfx62x" fileName="Components/ComButtons/ComBlueBtn.xml" pkg="gt6q23qw" xy="80,1050" size="228,75" aspect="true">
+    <component id="n34_j7sp" name="FeedBtn" src="sfx62x" fileName="Components/ComButtons/ComBlueBtn.xml" pkg="gt6q23qw" xy="80,1050" size="228,75" group="n85_f8ih" aspect="true">
       <gearDisplay controller="PageCtrl" pages="0,1"/>
       <gearText controller="PageCtrl" pages="1" values="赋能" default="喂养"/>
       <Button title="喂养"/>
     </component>
-    <component id="n35_j7sp" name="OneClickFeedingBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="452,1050" size="228,75" aspect="true">
+    <component id="n35_j7sp" name="OneClickFeedingBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="452,1050" size="228,75" group="n85_f8ih" aspect="true">
       <gearDisplay controller="PageCtrl" pages="0,1"/>
       <gearText controller="PageCtrl" pages="1" values="一键赋能" default="一键喂养"/>
       <Button title="一键喂养"/>
     </component>
-    <text id="n50_j7sp" name="n50" xy="72,935" pivot="0,0.5" size="82,36" fontSize="26" color="#4e517e" vAlign="middle" leading="0" text="驯养值">
+    <text id="n50_j7sp" name="n50" xy="72,935" pivot="0,0.5" size="82,36" group="n85_f8ih" fontSize="26" color="#4e517e" vAlign="middle" leading="0" text="驯养值">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </text>
-    <component id="n49_j7sp" name="TrainExpBar" src="j7spm" fileName="Components/ExpBar.xml" xy="439,952" pivot="0.5,0.5" anchor="true" size="545,27">
+    <component id="n49_j7sp" name="TrainExpBar" src="j7spm" fileName="Components/ExpBar.xml" xy="439,952" pivot="0.5,0.5" anchor="true" size="545,27" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="1"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n55_j7sp" name="TrainingTheHead" src="j7spu" fileName="TrainingAreaNested.xml" xy="388,304" pivot="0.5,0.5" anchor="true">
+    <component id="n55_j7sp" name="TrainingTheHead" src="j7spu" fileName="TrainingAreaNested.xml" xy="388,304" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </component>
-    <component id="n56_j7sp" name="TrainingTheBody" src="j7spu" fileName="TrainingAreaNested.xml" xy="178,632" pivot="0.5,0.5" anchor="true">
+    <component id="n56_j7sp" name="TrainingTheBody" src="j7spu" fileName="TrainingAreaNested.xml" xy="178,632" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </component>
-    <component id="n57_j7sp" name="TrainingFeet" src="j7spu" fileName="TrainingAreaNested.xml" xy="602,632" pivot="0.5,0.5" anchor="true">
+    <component id="n57_j7sp" name="TrainingFeet" src="j7spu" fileName="TrainingAreaNested.xml" xy="602,632" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </component>
-    <text id="n58_j7sp" name="n58" xy="265,705" pivot="0,0.5" size="246,32" fontSize="22" color="#fff603" vAlign="middle" leading="0" text="驯养属性对所有坐骑生效">
+    <text id="n58_j7sp" name="n58" xy="265,705" pivot="0,0.5" size="246,32" group="n85_f8ih" fontSize="22" color="#fff603" vAlign="middle" leading="0" text="驯养属性对所有坐骑生效">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </text>
-    <text id="n59_j7sp" name="TrainTotalLvLabel" xy="258,788" pivot="0,0.5" size="252,42" fontSize="30" color="#6187ca" vAlign="middle" leading="0" text="驯养总等级：9999">
+    <text id="n59_j7sp" name="TrainTotalLvLabel" xy="258,788" pivot="0,0.5" size="252,42" group="n85_f8ih" fontSize="30" color="#6187ca" vAlign="middle" leading="0" text="驯养总等级：9999">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </text>
-    <text id="n60_j7sp" name="TrainRate&#xA;Label" xy="258,824" pivot="0,0.5" size="263,42" fontSize="30" color="#6187ca" vAlign="middle" leading="0" text="驯养成功率：999%">
+    <text id="n60_j7sp" name="TrainRate&#xA;Label" xy="258,824" pivot="0,0.5" size="263,42" group="n85_f8ih" fontSize="30" color="#6187ca" vAlign="middle" leading="0" text="驯养成功率：999%">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </text>
-    <text id="n62_j7sp" name="n62" xy="275,874" pivot="0,0.5" size="224,29" fontSize="20" color="#9fa7ba" vAlign="middle" leading="0" text="随机提升其中一个的等级">
+    <text id="n62_j7sp" name="n62" xy="275,874" pivot="0,0.5" size="224,29" group="n85_f8ih" fontSize="20" color="#9fa7ba" vAlign="middle" leading="0" text="随机提升其中一个的等级">
       <gearDisplay controller="PageCtrl" pages="1"/>
     </text>
-    <component id="n68_j7sp" name="UpgradePreviewBtn" src="j7spx" fileName="Components/UpgradePreviewBtn.xml" xy="424,586">
+    <component id="n68_j7sp" name="UpgradePreviewBtn" src="j7spx" fileName="Components/UpgradePreviewBtn.xml" xy="424,586" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="2"/>
     </component>
-    <component id="n69_j7sp" name="EnableSkillBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="519,600" size="152,50" aspect="true">
+    <component id="n69_j7sp" name="EnableSkillBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="519,600" size="152,50" group="n85_f8ih" aspect="true">
       <Button title="使用" titleFontSize="26"/>
     </component>
+    <loader id="n70_j7sp" name="SkillIcon" xy="131,685" pivot="0.5,0.5" anchor="true" size="82,94" group="n85_f8ih">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </loader>
+    <text id="n71_j7sp" name="SkillNameLabel" xy="192,655" pivot="0,0.5" anchor="true" size="108,36" group="n85_f8ih" fontSize="26" color="#424450" vAlign="middle" leading="0" text="技能名称">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </text>
+    <text id="n72_j7sp" name="SkillNameLabel" xy="192,678" size="475,29" group="n85_f8ih" fontSize="20" color="#58608f" leading="4" autoSize="height" autoClearText="true" text="技能描述：">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </text>
+    <text id="n75_j7sp" name="SkillAttrNameLabel" xy="94,822" pivot="0,0.5" anchor="true" size="173,36" group="n85_f8ih" fontSize="26" color="#58608f" vAlign="middle" leading="0" text="属性名称：0%">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </text>
+    <text id="n76_j7sp" name="SkillAttrNameLabel" xy="530,822" pivot="0,0.5" anchor="true" size="58,36" group="n85_f8ih" fontSize="26" color="#58608f" vAlign="middle" leading="0" text="99%">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </text>
+    <image id="n77_j7sp" name="n77" src="j7spy" fileName="Images/fengexian.png" xy="378,847" pivot="0.5,0.5" anchor="true" size="564,5" group="n85_f8ih">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </image>
+    <component id="n82_rkls" name="MountItem" src="j7spz" fileName="MountListItem.xml" xy="266,916" pivot="0.5,0.5" anchor="true" group="n85_f8ih">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+    </component>
+    <component id="n80_j7sp" name="UpgradeMountBtn" src="sfx62z" fileName="Components/ComButtons/ComYellowBtn.xml" pkg="gt6q23qw" xy="396,890" size="152,50" group="n85_f8ih" aspect="true">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+      <gearDisplay2 controller="MountStateCtrl" pages="1" condition="0"/>
+      <Button title="升级" titleFontSize="26"/>
+    </component>
+    <component id="n84_f8ih" name="UnlockMountBtn" src="sfx62x" fileName="Components/ComButtons/ComBlueBtn.xml" pkg="gt6q23qw" xy="396,890" size="152,50" group="n85_f8ih" aspect="true">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+      <gearDisplay2 controller="MountStateCtrl" pages="0" condition="0"/>
+      <Button title="解锁" titleFontSize="26"/>
+    </component>
+    <list id="n81_j7sp" name="MountList" xy="66,984" size="628,122" group="n85_f8ih" layout="row" overflow="scroll" scroll="horizontal" colGap="3" defaultItem="ui://s58m5vbwj7spz" autoClearItems="true">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n83_f8ih" name="n83" xy="383,896" pivot="0,0.5" size="184,42" group="n85_f8ih" fontSize="30" vAlign="middle" leading="0" text="已达最高星级">
+      <gearDisplay controller="PageCtrl" pages="2"/>
+      <gearDisplay2 controller="MountStateCtrl" pages="2" condition="0"/>
+    </text>
+    <group id="n85_f8ih" name="n85" xy="13,97" size="729,1131" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
+  <scriptData gencodej7sph="1" genuilayerj7sph="2"/>
 </component>

fl-fgui-project/assets/Mount/MountListItem.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="112,122">
+  <controller name="LockCtrl" pages="0,,1," selected="0">
+    <remark page="0" value="已解锁"/>
+    <remark page="1" value="未解锁"/>
+  </controller>
+  <controller name="RideCtrl" pages="0,,1," selected="0">
+    <remark page="0" value="无"/>
+    <remark page="1" value="骑乘状态"/>
+  </controller>
+  <displayList>
+    <component id="n0_j7sp" name="ItemBase" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="56,65" pivot="0.5,0.5" anchor="true" scale="0.75,0.75">
+      <gearLook controller="LockCtrl" pages="1" values="1,0,1,1" default="1,0,0,1"/>
+    </component>
+    <image id="n3_j7sp" name="SelectImg" src="9sqtf" fileName="Images/xuanzhongkuang.png" xy="56,60" pivot="0.5,0.5" anchor="true"/>
+    <image id="n1_j7sp" name="n1" src="9sqtb" fileName="Images/dikuang02.png" xy="76,17" pivot="0.5,0.5" anchor="true" size="72,36">
+      <gearDisplay controller="RideCtrl" pages="1"/>
+    </image>
+    <text id="n2_j7sp" name="n2" xy="77,14" pivot="0.5,0.5" anchor="true" size="58,26" fontSize="18" align="center" vAlign="middle" leading="0" text="骑乘中">
+      <gearDisplay controller="RideCtrl" pages="1"/>
+    </text>
+    <image id="n4_rkls" name="n4" src="9sqt6" fileName="Images/suo.png" xy="56,60" pivot="0.5,0.5" anchor="true">
+      <gearDisplay controller="LockCtrl" pages="1"/>
+    </image>
+  </displayList>
+</component>

fl-fgui-project/assets/Mount/TrainingAreaNested.xml

@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="263,185">
-  <controller name="PageCtrl" pages="0,,1,,2," selected="1">
-    <remark page="0" value="坐骑升级"/>
-    <remark page="1" value="坐骑驯养"/>
-    <remark page="2" value="高级坐骑"/>
-  </controller>
+<component size="263,148">
   <displayList>
-    <image id="n51_j7sp" name="n51" src="9sqt9" fileName="Images/dengjidikuang.png" xy="0,37" pivot="0.5,0.5" anchor="true">
-      <gearDisplay controller="PageCtrl" pages="1"/>
-    </image>
-    <text id="n52_j7sp" name="n52" xy="8,0" pivot="0.5,0.5" anchor="true" size="64,42" fontSize="30" color="#4e517e" align="center" vAlign="middle" leading="0" text="等级">
-      <gearDisplay controller="PageCtrl" pages="1"/>
-    </text>
-    <text id="n53_j7sp" name="TrainLvLabel" xy="4,37" pivot="0.5,0.5" anchor="true" size="55,42" fontSize="30" color="#4e517e" align="center" vAlign="middle" leading="0" text="666">
-      <gearDisplay controller="PageCtrl" pages="1"/>
-    </text>
-    <text id="n54_j7sp" name="EffectLabel" xy="0,80" pivot="0.5,0.5" anchor="true" size="227,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" ubb="true" text="属性加成描述+999%">
-      <gearDisplay controller="PageCtrl" pages="1"/>
-    </text>
+    <image id="n55_j7sp" name="n55" src="9sqt9" fileName="Images/dengjidikuang.png" xy="0,0"/>
+    <text id="n56_j7sp" name="n56" xy="131,21" pivot="0.5,0.5" anchor="true" size="64,42" fontSize="30" color="#4e517e" align="center" vAlign="middle" leading="0" text="等级"/>
+    <text id="n57_j7sp" name="TrainLvLabel" xy="131,66" pivot="0.5,0.5" anchor="true" size="55,42" fontSize="30" color="#4e517e" align="center" vAlign="middle" leading="0" text="666"/>
+    <text id="n58_j7sp" name="EffectLabel" xy="131,117" pivot="0.5,0.5" anchor="true" size="227,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" ubb="true" text="属性加成描述+999%"/>
   </displayList>
+  <scriptData genuitypej7spu="1" gencodej7spu="1"/>
 </component>

fl-fgui-project/assets/Mount/UpgradeSuccessfulPanel.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,1344" designImage="ui://s58m5vbw9sqt2" designImageOffsetX="-195">
+  <displayList>
+    <component id="n1_f8ih" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="378,672" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n0_f8ih" name="n0" src="tli0l" fileName="Bg/bg.png" pkg="gt6q23qw" xy="378,748" pivot="0.5,0.5" anchor="true"/>
+    <text id="n2_f8ih" name="n2" xy="378,434" pivot="0.5,0.5" anchor="true" size="196,64" fontSize="48" color="#ffffff" leading="0" strokeColor="#000000" strokeSize="2" text="升级成功"/>
+  </displayList>
+</component>

fl-fgui-project/assets/Mount/package.xml

@@ -12,7 +12,7 @@
     <image id="9sqt8" name="zuoqi.png" path="/Images/"/>
     <image id="9sqt9" name="dengjidikuang.png" path="/Images/"/>
     <image id="9sqta" name="dikuang01.png" path="/Images/" scale="9grid" scale9grid="7,9,4,18"/>
-    <image id="9sqtb" name="dikuang02.png" path="/Images/"/>
+    <image id="9sqtb" name="dikuang02.png" path="/Images/" scale="9grid" scale9grid="16,9,32,12"/>
     <image id="9sqtc" name="mingzidikuang.png" path="/Images/" scale="9grid" scale9grid="9,21,17,42"/>
     <image id="9sqtd" name="shengjicailiao01.png" path="/Images/"/>
     <image id="9sqte" name="shengjicailiao02.png" path="/Images/"/>
@@ -35,6 +35,9 @@
     <component id="j7spv" name="EffectComponent.xml" path="/Components/"/>
     <image id="j7spw" name="shengjiyulan.png" path="/Images/"/>
     <component id="j7spx" name="UpgradePreviewBtn.xml" path="/Components/"/>
+    <image id="j7spy" name="fengexian.png" path="/Images/" scale="9grid" scale9grid="32,0,6,5"/>
+    <component id="j7spz" name="MountListItem.xml" path="/"/>
+    <component id="f8ih10" name="UpgradeSuccessfulPanel.xml" path="/"/>
   </resources>
   <publish name=""/>
 </packageDescription>