临时背包和装备弹窗信息对比UI显示修改；

宝藏的积分奖励一键领取

Assets/AssetConfigs/Addressable/ProductAssetManifest.asset

@@ -937,10 +937,6 @@ MonoBehaviour:
     addressableName: item_atlas0
     assetGUID: c9e330d65f412a8459e66696a66492de
     relativePath: 
-  - addressableId: 2531482489
-    addressableName: item_atlas_tli0l
-    assetGUID: 99c9ace2377268a47afda8d4a26ab72b
-    relativePath: 
   - addressableId: 2040671644
     addressableName: item_fui
     assetGUID: db31a4e812df30c45b88bd8d16761adc

Assets/Res/Addressable/UI/Atlas/ItemIcon/atlas_rauai_itemicon.spriteatlas

@@ -80,12 +80,181 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - 961c6c60efa6c4f4ca250f0ddec2adc7: 21300000
+    - 59a71c704d4fb2f489743af33d231438: 21300000
+    - b869eff043911bd4a97b23a3cbf93635: 21300000
+    - 17434301afa05174f842e58076d75e01: 21300000
+    - 16e44b7144944ec48bc6e67ddaa3a552: 21300000
+    - 9ecf0ac151c4eb144afb54c16e8237d6: 21300000
+    - 26450dc1f7c2ecc4ab43e3944fb9c18f: 21300000
+    - a153fe422f616534caa640a7fb19551e: 21300000
+    - 7025ac521e6e9fd47b204c5eb43b46f7: 21300000
+    - 6a688d62e7000a44f94fa46c20419b08: 21300000
+    - c54ad1b2f48e38e4da939c3b2e9753e5: 21300000
+    - adda6e23389223d4c92afb7f654b17db: 21300000
+    - 0455c343f3420f841bb6c8bd665cd4b7: 21300000
+    - 03eb3483d8d1e87419a763ad09e7c945: 21300000
+    - f81f13a3e0317c74d8a6609a69e38e64: 21300000
+    - a8e872e3264e6674f95f2475419d6993: 21300000
+    - 984cff14e5800ca40859c5ab01d4eba2: 21300000
+    - 951e0a541f216534eaab0b58fab910fe: 21300000
+    - 1a504064c320a4f44a850941900f134f: 21300000
+    - 4097330583a64b943954f3d997e6d9b2: 21300000
+    - 7d1f5a957a416bf42bf130c249417a2b: 21300000
+    - 6e732db5cda607f47bd6106b4b639e40: 21300000
+    - 3f29f3363cc0f6440890902b14a5dc87: 21300000
+    - db93d8c6f016e5243876b0a9996aadd0: 21300000
+    - 4f5aa36701116f440a2203031dedb845: 21300000
+    - bbd6d487feb947042afed91d819b68f5: 21300000
+    - 269de1c724d6e324b94d9c5e0692d779: 21300000
+    - 3e2a29485d627d446b181bb711b5f62a: 21300000
+    - fd8e27b8e5b02b045a8a168d6a6b0778: 21300000
+    - c2ccc1c8caf5a624097c5b62d204482b: 21300000
+    - d1f61ec81a746684381bb3d57663a52d: 21300000
+    - 2ce265d865bf35b42a7f2d1bffdd6fad: 21300000
+    - d8f36a19c251fea43963fe3b114269c5: 21300000
+    - 2ded1f596c6ba9b44b95fc814be28291: 21300000
+    - bda8bb69083a143459dc8bb174985fe4: 21300000
+    - f80c34b9b43e15741a732ecc408ccbfc: 21300000
+    - 91d9352ab0bb95645ae90df10172d0ec: 21300000
+    - 793c3e5ad07665645afe7d4015f71f5d: 21300000
+    - d887147a341034a40a7e02adaedc7430: 21300000
+    - 71d40baaf86b80347bd16fc9e04ffb02: 21300000
+    - ce3973fad12c3f14ba586dc1dc50775c: 21300000
+    - 02ebae1b1da4c134793c3d92ed0b39e7: 21300000
+    - 8da8d62b10fd2254ba85cb0622c5ed90: 21300000
+    - d1bb084ba3f78e742bc9781278c5d00e: 21300000
+    - 68d7d59b0002f7146a81241d44d81e7a: 21300000
+    - 34c5ceeb3f0eb2f4bbfeefbd9b1a9345: 21300000
+    - 3a9f801cbeafc9d4385dc9938422d2af: 21300000
+    - bca7503cf07c44043aa40ea5a2e4acd5: 21300000
+    - f665c1fc0f2ad624988185cc62ef3551: 21300000
+    - 0fa12ffc200c7f64fb4d350e873a41dd: 21300000
+    - 4f5c427d96599a447a7363f14044a8a0: 21300000
+    - 400743ddbbab5cb40a1534a491e3e96d: 21300000
+    - 6665f3ed45e2ed548b5a06b86b85398d: 21300000
+    - 45f4b0ae2448f9744baee018dc21583d: 21300000
+    - ce26833f5cc3e1948ac8475b2566efc1: 21300000
+    - d594797f58341904d9dbe2056c95ba03: 21300000
+    - 8bba91af604f8b045ba1dad87aaed685: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
+  - {fileID: 21300000, guid: 961c6c60efa6c4f4ca250f0ddec2adc7, type: 3}
+  - {fileID: 21300000, guid: 59a71c704d4fb2f489743af33d231438, type: 3}
+  - {fileID: 21300000, guid: b869eff043911bd4a97b23a3cbf93635, type: 3}
+  - {fileID: 21300000, guid: 17434301afa05174f842e58076d75e01, type: 3}
+  - {fileID: 21300000, guid: 16e44b7144944ec48bc6e67ddaa3a552, type: 3}
+  - {fileID: 21300000, guid: 9ecf0ac151c4eb144afb54c16e8237d6, type: 3}
+  - {fileID: 21300000, guid: 26450dc1f7c2ecc4ab43e3944fb9c18f, type: 3}
+  - {fileID: 21300000, guid: a153fe422f616534caa640a7fb19551e, type: 3}
+  - {fileID: 21300000, guid: 7025ac521e6e9fd47b204c5eb43b46f7, type: 3}
+  - {fileID: 21300000, guid: 6a688d62e7000a44f94fa46c20419b08, type: 3}
+  - {fileID: 21300000, guid: c54ad1b2f48e38e4da939c3b2e9753e5, type: 3}
+  - {fileID: 21300000, guid: adda6e23389223d4c92afb7f654b17db, type: 3}
+  - {fileID: 21300000, guid: 0455c343f3420f841bb6c8bd665cd4b7, type: 3}
+  - {fileID: 21300000, guid: 03eb3483d8d1e87419a763ad09e7c945, type: 3}
+  - {fileID: 21300000, guid: f81f13a3e0317c74d8a6609a69e38e64, type: 3}
+  - {fileID: 21300000, guid: a8e872e3264e6674f95f2475419d6993, type: 3}
+  - {fileID: 21300000, guid: 984cff14e5800ca40859c5ab01d4eba2, type: 3}
+  - {fileID: 21300000, guid: 951e0a541f216534eaab0b58fab910fe, type: 3}
+  - {fileID: 21300000, guid: 1a504064c320a4f44a850941900f134f, type: 3}
+  - {fileID: 21300000, guid: 4097330583a64b943954f3d997e6d9b2, type: 3}
+  - {fileID: 21300000, guid: 7d1f5a957a416bf42bf130c249417a2b, type: 3}
+  - {fileID: 21300000, guid: 6e732db5cda607f47bd6106b4b639e40, type: 3}
+  - {fileID: 21300000, guid: 3f29f3363cc0f6440890902b14a5dc87, type: 3}
+  - {fileID: 21300000, guid: db93d8c6f016e5243876b0a9996aadd0, type: 3}
+  - {fileID: 21300000, guid: 4f5aa36701116f440a2203031dedb845, type: 3}
+  - {fileID: 21300000, guid: bbd6d487feb947042afed91d819b68f5, type: 3}
+  - {fileID: 21300000, guid: 269de1c724d6e324b94d9c5e0692d779, type: 3}
+  - {fileID: 21300000, guid: 3e2a29485d627d446b181bb711b5f62a, type: 3}
+  - {fileID: 21300000, guid: fd8e27b8e5b02b045a8a168d6a6b0778, type: 3}
+  - {fileID: 21300000, guid: c2ccc1c8caf5a624097c5b62d204482b, type: 3}
+  - {fileID: 21300000, guid: d1f61ec81a746684381bb3d57663a52d, type: 3}
+  - {fileID: 21300000, guid: 2ce265d865bf35b42a7f2d1bffdd6fad, type: 3}
+  - {fileID: 21300000, guid: d8f36a19c251fea43963fe3b114269c5, type: 3}
+  - {fileID: 21300000, guid: 2ded1f596c6ba9b44b95fc814be28291, type: 3}
+  - {fileID: 21300000, guid: bda8bb69083a143459dc8bb174985fe4, type: 3}
+  - {fileID: 21300000, guid: f80c34b9b43e15741a732ecc408ccbfc, type: 3}
+  - {fileID: 21300000, guid: 91d9352ab0bb95645ae90df10172d0ec, type: 3}
+  - {fileID: 21300000, guid: 793c3e5ad07665645afe7d4015f71f5d, type: 3}
+  - {fileID: 21300000, guid: d887147a341034a40a7e02adaedc7430, type: 3}
+  - {fileID: 21300000, guid: 71d40baaf86b80347bd16fc9e04ffb02, type: 3}
+  - {fileID: 21300000, guid: ce3973fad12c3f14ba586dc1dc50775c, type: 3}
+  - {fileID: 21300000, guid: 02ebae1b1da4c134793c3d92ed0b39e7, type: 3}
+  - {fileID: 21300000, guid: 8da8d62b10fd2254ba85cb0622c5ed90, type: 3}
+  - {fileID: 21300000, guid: d1bb084ba3f78e742bc9781278c5d00e, type: 3}
+  - {fileID: 21300000, guid: 68d7d59b0002f7146a81241d44d81e7a, type: 3}
+  - {fileID: 21300000, guid: 34c5ceeb3f0eb2f4bbfeefbd9b1a9345, type: 3}
+  - {fileID: 21300000, guid: 3a9f801cbeafc9d4385dc9938422d2af, type: 3}
+  - {fileID: 21300000, guid: bca7503cf07c44043aa40ea5a2e4acd5, type: 3}
+  - {fileID: 21300000, guid: f665c1fc0f2ad624988185cc62ef3551, type: 3}
+  - {fileID: 21300000, guid: 0fa12ffc200c7f64fb4d350e873a41dd, type: 3}
+  - {fileID: 21300000, guid: 4f5c427d96599a447a7363f14044a8a0, type: 3}
+  - {fileID: 21300000, guid: 400743ddbbab5cb40a1534a491e3e96d, type: 3}
+  - {fileID: 21300000, guid: 6665f3ed45e2ed548b5a06b86b85398d, type: 3}
+  - {fileID: 21300000, guid: 45f4b0ae2448f9744baee018dc21583d, type: 3}
+  - {fileID: 21300000, guid: ce26833f5cc3e1948ac8475b2566efc1, type: 3}
+  - {fileID: 21300000, guid: d594797f58341904d9dbe2056c95ba03, type: 3}
+  - {fileID: 21300000, guid: 8bba91af604f8b045ba1dad87aaed685, type: 3}
   m_PackedSpriteNamesToIndex:
-  - vcard_img_mingpian_exhbition_bg
+  - ItemIcon_610201
+  - ItemIcon_210601
+  - daojukuang5
+  - daojukuang7
+  - ItemIcon_510501
+  - ItemIcon_110601
+  - daojukuang6
+  - ItemIcon_110401
+  - ItemIcon_4
+  - ItemIcon_110501
+  - ItemIcon_610601
+  - ItemIcon_6
+  - daojukuang1
+  - ItemIcon_310601
+  - ItemIcon_410601
+  - ItemIcon_610501
+  - ItemIcon_410201
+  - ItemIcon_510201
+  - daojukuang10
+  - ItemIcon_210201
+  - daojukuang11
+  - ItemIcon_510601
+  - ItemIcon_310301
+  - ItemIcon_210101
+  - ItemIcon_2
+  - ItemIcon_410301
+  - ItemIcon_3001
+  - ItemIcon_110201
+  - ItemIcon_410401
+  - ItemIcon_210501
+  - ItemIcon_610301
+  - ItemIcon_610401
+  - ItemIcon_110101
+  - ItemIcon_210301
+  - ItemIcon_110301
+  - ItemIcon_310401
+  - daojukuang3
+  - ItemIcon_310201
+  - daojukuang4
+  - ItemIcon_1
+  - ItemIcon_410101
+  - ItemIcon_1024
+  - ItemIcon_210401
+  - ItemIcon_99
+  - ItemIcon_310501
+  - ItemIcon_610101
+  - ItemIcon_510301
+  - ItemIcon_1001
+  - ItemIcon_5
+  - ItemIcon_510101
+  - daojukuang9
+  - daojukuang2
+  - ItemIcon_3
+  - ItemIcon_510401
+  - daojukuang8
+  - ItemIcon_310101
+  - ItemIcon_410501
   m_RenderDataMap: {}
   m_Tag: atlas_rauai_itemicon
   m_IsVariant: 0

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

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

Assets/Scripts/Business/Domain/Database/Tables/shop_shangpinTable.cs

@@ -20,8 +20,11 @@ namespace XGame.Database
         /// <summary> 商城标题1=每日限购2=每周限购3=永久限购4=钻石特购5=玄钻6=钻石7=超值礼包 </summary>
         public int Type { get; private set; }
 
-        /// <summary> 商品价格类型1=钻石2=RMB </summary>
-        public int Moneytype { get; private set; }
+        /// <summary> 商品名称 </summary>
+        public string Name { get; private set; }
+
+        /// <summary> 商品价格类型道具id（货币类型）+数量 </summary>
+        public int[] Moneytype { get; private set; }
 
         /// <summary> 商品价格0=免费 </summary>
         public int Money { get; private set; }
@@ -55,7 +58,8 @@ namespace XGame.Database
             Id = reader.ReadInt();
             Malltype = reader.ReadInt();
             Type = reader.ReadInt();
-            Moneytype = reader.ReadInt();
+            Name = reader.ReadString();
+            Moneytype = reader.ReadEnumerable<int[]>();
             Money = reader.ReadInt();
             Discount = reader.ReadInt();
             Goods = reader.ReadEnumerable<int[]>();
@@ -72,6 +76,7 @@ namespace XGame.Database
             writer.Write(Id);
             writer.Write(Malltype);
             writer.Write(Type);
+            writer.Write(Name);
             writer.Write(Moneytype);
             writer.Write(Money);
             writer.Write(Discount);

Assets/Scripts/Business/Domain/Framework/FGUI/FguiViewModel.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UIElements;
 using XGame.Framework.UI;
 
 namespace XGame.Framework.FGUI
@@ -12,6 +13,19 @@ namespace XGame.Framework.FGUI
     public abstract class FguiViewModel : IUIViewModel, IUIVMInternal, IDisposable
     {
         protected GComponent Panel { get; private set; }
+
+        public Vector3 Pos
+        {
+            get=> Panel.position;
+            set => Panel.position = value;
+        }
+
+        public Vector2 Scale
+        {
+            get => Panel.scale;
+            set => Panel.scale = value;
+        }
+
         public EventListener PanelEvent => Panel.onClick;
         public Transform Tr => Panel.displayObject.gameObject.transform;
         private HashSet<INestedInternal> _nestedViews;

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

@@ -52,6 +52,8 @@ namespace FL.Network
 
         public int progress;
 
+        public System.Collections.Generic.List<KindItem> items;
+
     }
 
     /// <summary> id=201102 </summary>

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

@@ -0,0 +1,34 @@
+// <auto-generated>
+//   Input: act_shop.proto
+//   DO NOT EDIT!
+// </auto-generated>
+
+using XGame.Framework.Network;
+namespace FL.Network
+{
+
+    /// <summary> id=203700 </summary>
+    public sealed partial class ActShopPush : IMsgPush
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 203700;
+        public void Clear()
+        {
+        }
+        /// <summary> 1杂货 </summary>
+        public int hdcid;
+
+        /// <summary> undefined </summary>
+        public System.Collections.Generic.List<Goods> goods;
+
+        /// <summary> 下一次刷新时间 </summary>
+        public int nextTime;
+
+        /// <summary> 下一次刷新时间 </summary>
+        public int nextWeekTime;
+
+    }
+
+}
+

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

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

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

@@ -0,0 +1,24 @@
+// <auto-generated>
+//   Input: act_shop_m.proto
+//   DO NOT EDIT!
+// </auto-generated>
+
+using XGame.Framework.Network;
+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/act_shop_m.cs.meta

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

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

@@ -7,23 +7,73 @@ using XGame.Framework.Network;
 namespace FL.Network
 {
 
-    /// <summary> id= </summary>
-    public sealed partial class ShopBuyRequest
+    /// <summary> id=104301 </summary>
+    public sealed partial class ShopBuyRequest : IMsgRequest
     {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 104301;
+        public void Clear()
+        {
+        }
         /// <summary> 类型(1杂货商店2钻石商店3礼包商店4特惠商店) </summary>
         public int hdcid;
 
         /// <summary> 商品id </summary>
         public int id;
 
-        /// <summary> 购买数量 </summary>
-        public string count;
+    }
+
+    /// <summary> id=104301 </summary>
+    public sealed partial class ShopBuyResponse : IMsgResponse
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 104301;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
+        /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
+        public int code;
+
+        /// <summary> 返回提示 </summary>
+        public string msg;
+
+    }
+
+    /// <summary> id=104302 </summary>
+    public sealed partial class ShopRmbBuyRequest : IMsgRequest
+    {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 104302;
+        public void Clear()
+        {
+        }
+        /// <summary> 类型(1杂货商店2钻石商店3礼包商店4特惠商店) </summary>
+        public int hdcid;
+
+        /// <summary> 商品id </summary>
+        public int id;
+
+        /// <summary> 是否使用代币 </summary>
+        public int daibi;
 
     }
 
-    /// <summary> id= </summary>
-    public sealed partial class ShopBuyResponse
+    /// <summary> id=104302 </summary>
+    public sealed partial class ShopRmbBuyResponse : IMsgResponse
     {
+        int IMessage.InstanceID { get; set; }
+        object IMessage.Context { get; set; }
+        int IMessage.ProtocolID => 104302;
+        public void Clear()
+        {
+        }
+        long IMsgResponse.GetCode() => code;
+        string IMsgResponse.GetInfo() => msg;
         /// <summary> 消息返回类型0正常 1业务报错 2其他 </summary>
         public int code;
 

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

@@ -1,4 +1,5 @@
-using System;
+using FL.Network;
+using System;
 using System.Collections.Generic;
 using XGame.Framework.Data;
 
@@ -17,7 +18,11 @@ namespace FL.Data
         /// 当前宝藏进度积分
         /// </summary>
         public int DragonTreasureSocre { set; get; }
-        
+
+        /// <summary>
+        /// 领取龙蛋积分宝箱掉落道具列表
+        /// </summary>
+        public List<KindItem> DragonTreasureRewardItems;
 
         /// <summary>
         /// 龙蛋宝箱等级
@@ -92,6 +97,11 @@ namespace FL.Data
             {
                 _treasureChestIdList.Clear();
             }
+            if (DragonTreasureRewardItems != null) 
+            {
+                DragonTreasureRewardItems.Clear();
+                DragonTreasureRewardItems = null;
+            }
         }
     }
 }

Assets/Scripts/Business/Runtime/Define/StringDefine.cs

@@ -6,6 +6,7 @@ namespace FL
         public static string dragonTreasureScore = "还差{0}积分可以领取{1}";
         public static string sellHightPowerEquip = "出售的装备战力高于当前装备，是否确定？";
         public static string resetCurrentPlan = "重置当前方案";
+        public static string resetCareer = "重置职业";
         public static string dragonEggsEmpty = "龙裔宝卵数量不足";
         public static string temporaryEquipEmpty = "当前背包中没有装备";
         public static string notOpen = "功能暂未开放，敬请期待";

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

@@ -69,7 +69,7 @@ namespace FL.FGUI
             }
             else if (data?.ItemType == EItemType.Equip)
             {
-                Context.UI.OpenAsync(UIKeys.EquipEquipPanel, data);
+                Context.UI.OpenAsync(UIKeys.EquipEquipPanel, EquipData.Instance.GetBagEquipItem(data.Id));
             }
             else
             {

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

@@ -27,7 +27,7 @@ namespace FL.FGUI
         private bool _bFlyingAni; // 是否处于开龙宝藏飞行动画状态
         private int _useCount; // 使用的品质宝箱数量
         private int _maxTreasureSocre; // 当前宝藏进度的最大积分值
-        private int _treasureRewardId; // 奖励宝箱道具id
+        //private int _treasureRewardId; // 奖励宝箱道具id
         private string _treasureChestName; // 当前宝藏宝箱名称
         private ITimer _openBoxTimer;
         private Vector3 _startPos;
@@ -509,14 +509,19 @@ namespace FL.FGUI
         /// </summary>
         private void RefreshTreasureProgressUI(int eventId, object args)
         {
-            if (_treasureRewardId > 0)
+            var rewardItems = DragonEggData.Instance.DragonTreasureRewardItems;
+            if (rewardItems?.Count > 0)
             {
                 var obtainData = new ObtainItemsParam()
                 {
-                    dropItems = new List<KindItem>() { new KindItem() { id = _treasureRewardId, count = 1 } },
-                    bShowBtn = false
+                    dropItems = rewardItems,
+                    bShowBtn = IsShowOneKeyBtn(rewardItems),
                 };
-                Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, obtainData);
+                var loadAsync = Context.UI.OpenAsync(UIKeys.ItemGetItemPanel, obtainData);
+                loadAsync.On(_ =>
+                {
+                    DragonEggData.Instance.DragonTreasureRewardItems.Clear();
+                });
             }
 
             var treasureInfo = treasureBonusTableRepo.Get(DragonEggData.Instance.DragonTreasureId);
@@ -541,7 +546,7 @@ namespace FL.FGUI
             if (itemInfo != null)
             {
                 _treasureChestName = itemInfo.Name;
-                _treasureRewardId = itemInfo.Id;
+                //_treasureRewardId = itemInfo.Id;
             }
             ShowDragonEggScoreUI(false);
             int index = DragonEggData.Instance.GetTreasureChestIndex(treasureInfo.Reward);

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

@@ -74,7 +74,7 @@ namespace FL.FGUI
                 _uiParam.bShowName = false;
                 _uiParam.bShowCount = param.count > 1;
                 _uiParam.bShowLevel = bEquip;
-                _uiParam.bShowBaseInfo = true;
+                _uiParam.bShowBaseInfo = bEquip ? false : true;
                 VM.ItemBtn.Ctrl.ShowUI(_item, _uiParam);
             }
         }

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel.meta

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

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelCtrl.cs

@@ -0,0 +1,57 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FairyGUI;
+using FL.Data;
+using FL.FGUI;
+using XGame.Framework.UI;
+
+namespace FL.FGUIP
+{
+    /// <summary>
+    /// UI逻辑处理类
+    /// </summary>
+    /// <typeparam name=""></typeparam>
+    public partial class PlayerJobCareerPreviewPanelCtrl : UIController<PlayerJobCareerPreviewPanelVM>
+    {
+        protected override void OnEnable(object intent)
+        {
+            AddUIListenres();
+        }
+        protected override void OnDisable()
+        {
+            RemoveUIListenres();
+        }
+        #region UI事件
+        private void AddUIListenres()
+        {
+            VM.BackBtn.onClick.Add(OnClickBackBtn);
+            VM.ResetBtn.onClick.Add(OnClickResetBtn);
+
+        }
+        private void RemoveUIListenres()
+        {
+            VM.BackBtn.onClick.Remove(OnClickBackBtn);
+            VM.ResetBtn.onClick.Remove(OnClickResetBtn);
+
+        }
+        private void OnClickBackBtn(EventContext context)
+        {
+            Context.ClosePanel();
+        }
+        private void OnClickResetBtn(EventContext context)
+        {
+            ConfirmationBoxParam dialogParam = new ConfirmationBoxParam()
+            {
+                cnt = StringDefine.resetCareer,
+                onPromiseCallback = PlayerService.Instance.SendToResetJob
+            };
+            Context.UI.OpenAsync(UIKeys.CommonConfirmationBox, dialogParam);
+        }
+
+        #endregion
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelVM.Gen.cs

@@ -0,0 +1,31 @@
+/// #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 PlayerJobCareerPreviewPanelVM : FguiViewModel
+    {
+        public GButton BackBtn { get; private set; }
+        public GButton ResetBtn { get; private set; }
+
+        protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
+        {
+            BackBtn = panel.GetChild("BackBtn") as GButton;
+            ResetBtn = panel.GetChild("ResetBtn") as GButton;
+
+        }
+    }
+}

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelVM.Gen.cs.meta

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

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelView.cs

@@ -0,0 +1,35 @@
+/// #pkgName FGUI包名
+/// #panelName UIPanel名字
+/// #UIName = $"{#pkgName}{#panelName}" UIKey名字
+/// 该脚本由模板创建
+/// created by cb 2024
+
+using FL.FGUIP;
+using XGame.Framework.UI;
+
+namespace FL.FGUI
+{
+    public static partial class UIKeys
+    {
+        private static UIKey _PlayerJobCareerPreviewPanel;
+        public static UIKey PlayerJobCareerPreviewPanel => _PlayerJobCareerPreviewPanel ?? (_PlayerJobCareerPreviewPanel = new UIKey("Player", "JobCareerPreviewPanel", typeof(PlayerJobCareerPreviewPanelView)));
+    }
+    public partial class PlayerJobCareerPreviewPanelView : UIView
+    {
+        public static UILayer Layer => UILayer.Middle;
+        protected override void AddController(IUIControllerGroup group)
+        {
+            group.Add(new PlayerJobCareerPreviewPanelCtrl());
+        }
+
+        protected override IUIViewModel CreateViewModel()
+        {
+            return new PlayerJobCareerPreviewPanelVM();
+        }
+
+        protected override void OnDispose()
+        {
+        }
+    }
+}
+

Assets/Scripts/Business/Runtime/FGUI/Player/JobCareerPreviewPanel/PlayerJobCareerPreviewPanelView.cs.meta

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

Assets/Scripts/Business/Runtime/FGUI/Player/JokSkillNested/PlayerJokSkillNestedCtrl.cs

@@ -83,6 +83,7 @@ namespace FL.FGUI
         private void OnClickJobBtn(EventContext context)
         {
             Context.ShowTips("职业(整个线路图)预览");
+            Context.UI.OpenAsync(UIKeys.PlayerJobCareerPreviewPanel);
         }
         private void OnClickSkillBtn(EventContext context)
         {

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

@@ -56,6 +56,13 @@ namespace FL.FGUI
         #endregion
         private void ShowUI()
         {
+            bool bEmpty = EquipData.Instance.IsEquipbagEmpty();
+            VM.EmptyCtrl.selectedIndex = bEmpty ? 1 : 0;
+            if (bEmpty)
+            {
+                return;
+            }
+
             var equipDataList = new List<EquipItem>();
             EquipData.Instance.GetBagEquipList(ref equipDataList);
             OnSortEquipDataList(ref equipDataList);

Assets/Scripts/Business/Runtime/FGUI/TemporaryEquip/BagPanel/TemporaryEquipBagPanelVM.Gen.cs

@@ -18,6 +18,7 @@ namespace FL.FGUI
     /// </summary>
     public partial class TemporaryEquipBagPanelVM : FguiViewModel
     {
+        public Controller EmptyCtrl { get; private set; }
         public CommonBackGroundNestedView Background { get; private set; }
         public GComponent EmptyCom { get; private set; }
         public GImage ListBG { get; private set; }
@@ -27,6 +28,7 @@ namespace FL.FGUI
 
         protected override void BindComponents(GComponent panel, IUIViewAdapter adapter)
         {
+            EmptyCtrl = panel.GetController("EmptyCtrl");
             Background = adapter.CreateNested<CommonBackGroundNestedView>(new FguiNested(panel.GetChild("Background").asCom), true);
             AddChild(Background);
             EmptyCom = panel.GetChild("EmptyCom") as GComponent;

Assets/Scripts/Business/Runtime/Network/Controllers/ActLongdanTreasureIdPushCtrl.cs

@@ -7,16 +7,25 @@ namespace FL.Network
     {
         protected override void OnProcess(ActLongdanTreasureIdPush message, object context)
         {
-            if (message != null) 
+            if (message.treasureId != null) 
             {
-                if (message?.treasureId != null) 
+                DragonEggData.Instance.DragonTreasureId = message.treasureId;
+            }
+            if (message.progress != null)
+            {
+                DragonEggData.Instance.DragonTreasureSocre = message.progress;
+            }
+            if (message.items != null && message.items.Count > 0)
+            {
+                if (DragonEggData.Instance.DragonTreasureRewardItems == null)
                 {
-                    DragonEggData.Instance.DragonTreasureId = message.treasureId;
+                    DragonEggData.Instance.DragonTreasureRewardItems = new System.Collections.Generic.List<KindItem>();
                 }
-                if (message?.progress != null)
+                else
                 {
-                    DragonEggData.Instance.DragonTreasureSocre = message.progress;
+                    DragonEggData.Instance.DragonTreasureRewardItems.Clear();
                 }
+                DragonEggData.Instance.DragonTreasureRewardItems.AddRange(message.items);
             }
         }
     }

Assets/Scripts/Business/Runtime/Network/Controllers/ActShopPushCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ActShopPushCtrl : MsgController<ActShopPush>
+    {
+        protected override void OnProcess(ActShopPush message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ActShopPushCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Bi8Ysij7Wir9a/vJWBOnT7+nMIzgl49ZeWcTDAJLUae+6cfQFckfa+4=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Network/Controllers/EquipIntoLsResponseCtrl.cs

@@ -8,15 +8,7 @@ namespace FL.Network
     {
         protected override void OnProcess(EquipIntoLsResponse message, object context)
         {
-            if (message?.code == 0)
-            {
-                if (EquipData.Instance.IsEquipbagEmpty())
-                    EventSingle.Instance.Notify(EventDefine.ShowTips, StringDefine.temporaryEquipEmpty);
-                else
-                {
-                    EventSingle.Instance.Notify(EventDefine.OpenEquipBag);
-                }
-            }
+            EventSingle.Instance.Notify(EventDefine.OpenEquipBag);
         }
     }
 }

Assets/Scripts/Business/Runtime/Network/Controllers/ShopBuyResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ShopBuyResponseCtrl : MsgController<ShopBuyResponse>
+    {
+        protected override void OnProcess(ShopBuyResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ShopBuyResponseCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CX4asyL/B3x25/SMoDBxl0hBgGusrw/RKXL5MHIVWkiaRKLS4/QG9UU=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Business/Runtime/Network/Controllers/ShopRmbBuyResponseCtrl.cs

@@ -0,0 +1,11 @@
+using XGame.Framework.Network;
+
+namespace FL.Network
+{
+    public class ShopRmbBuyResponseCtrl : MsgController<ShopRmbBuyResponse>
+    {
+        protected override void OnProcess(ShopRmbBuyResponse message, object context)
+        {
+        }
+    }
+}

Assets/Scripts/Business/Runtime/Network/Controllers/ShopRmbBuyResponseCtrl.cs.meta

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

Assets/Scripts/Business/Runtime/Network/FLMsgGenerator.cs

@@ -93,6 +93,8 @@ namespace FL.Network
                 case 104101: return new TaskMainRwdResponseCtrl();
                 case 104201: return new TaskDailyRwdResponseCtrl();
                 case 104202: return new TaskDailyActivityRwdResponseCtrl();
+                case 104301: return new ShopBuyResponseCtrl();
+                case 104302: return new ShopRmbBuyResponseCtrl();
                 case 200100: return new PlatBackPushCtrl();
                 case 200200: return new QufuListPushCtrl();
                 case 200300: return new OrderListPushCtrl();
@@ -199,6 +201,7 @@ namespace FL.Network
                 case 203600: return new SevFubenPushCtrl();
                 case 203601: return new SevFubenListPushCtrl();
                 case 203602: return new SevFubenDelIdsPushCtrl();
+                case 203700: return new ActShopPushCtrl();
 
                 default:
                     return null;
@@ -293,6 +296,8 @@ namespace FL.Network
                 case 104101: return new TaskMainRwdResponse();
                 case 104201: return new TaskDailyRwdResponse();
                 case 104202: return new TaskDailyActivityRwdResponse();
+                case 104301: return new ShopBuyResponse();
+                case 104302: return new ShopRmbBuyResponse();
                 case 200100: return new PlatBackPush();
                 case 200200: return new QufuListPush();
                 case 200300: return new OrderListPush();
@@ -399,6 +404,7 @@ namespace FL.Network
                 case 203600: return new SevFubenPush();
                 case 203601: return new SevFubenListPush();
                 case 203602: return new SevFubenDelIdsPush();
+                case 203700: return new ActShopPush();
 
                 default:
                     return null;
@@ -493,6 +499,8 @@ namespace FL.Network
                 case 104101: return typeof(TaskMainRwdResponse);
                 case 104201: return typeof(TaskDailyRwdResponse);
                 case 104202: return typeof(TaskDailyActivityRwdResponse);
+                case 104301: return typeof(ShopBuyResponse);
+                case 104302: return typeof(ShopRmbBuyResponse);
                 case 200100: return typeof(PlatBackPush);
                 case 200200: return typeof(QufuListPush);
                 case 200300: return typeof(OrderListPush);
@@ -599,6 +607,7 @@ namespace FL.Network
                 case 203600: return typeof(SevFubenPush);
                 case 203601: return typeof(SevFubenListPush);
                 case 203602: return typeof(SevFubenDelIdsPush);
+                case 203700: return typeof(ActShopPush);
 
                 default:
                     return null;