邮件系统

Assets/AssetConfigs/Addressable/CustomSearch.txt

@@ -1,4 +1,4 @@
-643
+647
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF.asset
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF_outline.mat
@@ -7,8 +7,10 @@ Assets/Res/Addressable/Tables/arena_jqrTable.bytes
 Assets/Res/Addressable/Tables/arena_phbTable.bytes
 Assets/Res/Addressable/Tables/arenaTable.bytes
 Assets/Res/Addressable/Tables/artifactBaseTable.bytes
+Assets/Res/Addressable/Tables/artifactBuweiTable.bytes
 Assets/Res/Addressable/Tables/artifactFumoTable.bytes
 Assets/Res/Addressable/Tables/artifactInfoTable.bytes
+Assets/Res/Addressable/Tables/artifactProbTable.bytes
 Assets/Res/Addressable/Tables/artifactStarTable.bytes
 Assets/Res/Addressable/Tables/artifactYuansuTable.bytes
 Assets/Res/Addressable/Map/Effects/atk_007.prefab
@@ -302,6 +304,8 @@ Assets/Res/Addressable/UI/Atlas/DragonIcon/long2.png
 Assets/Res/Addressable/UI/Atlas/DragonIcon/long3.png
 Assets/Res/Addressable/UI/Atlas/DragonIcon/long4.png
 Assets/Res/Addressable/UI/Atlas/DragonIcon/long5.png
+Assets/Res/Addressable/FGUI/Mail/Mail_atlas0.png
+Assets/Res/Addressable/FGUI/Mail/Mail_fui.bytes
 Assets/Res/Addressable/FGUI/Main/Main_atlas0.png
 Assets/Res/Addressable/FGUI/Main/Main_fui.bytes
 Assets/Res/Addressable/UI/Prefabs/MainMap/MainMapUI.prefab

Assets/AssetConfigs/Addressable/ProductAssetManifest.asset

@@ -45,6 +45,10 @@ MonoBehaviour:
     addressableName: artifactbasetable
     assetGUID: 0916fadbc1101ac43a0ba2cd60545f7f
     relativePath: 
+  - addressableId: 3956140414
+    addressableName: artifactbuweitable
+    assetGUID: 3387b2c4d11bd1747a5218d70e9b17fd
+    relativePath: 
   - addressableId: 3353736691
     addressableName: artifactfumotable
     assetGUID: a058d17f282f6544faeac693c616048c
@@ -53,6 +57,10 @@ MonoBehaviour:
     addressableName: artifactinfotable
     assetGUID: d7a8740993c61c0479d382b3b753be47
     relativePath: 
+  - addressableId: 122018642
+    addressableName: artifactprobtable
+    assetGUID: 90e4e4462ce5f8245899721418e804e2
+    relativePath: 
   - addressableId: 2059057615
     addressableName: artifactstartable
     assetGUID: 0a312c9c4cc2cea4eb679d7dda8fd4f2
@@ -1225,6 +1233,14 @@ MonoBehaviour:
     addressableName: long5
     assetGUID: 69751234e8324104395e2e65aa648d3c
     relativePath: 
+  - addressableId: 2328394287
+    addressableName: mail_atlas0
+    assetGUID: 2f9e556596f6e5540ba8a1cc9f912824
+    relativePath: 
+  - addressableId: 2581338311
+    addressableName: mail_fui
+    assetGUID: c9eb5216b1ce2bc499700def49fc6c05
+    relativePath: 
   - addressableId: 415564177
     addressableName: main_atlas0
     assetGUID: cd338aaed44d5f443ba175a2ed02bc25

Assets/Res/Addressable/UI/Atlas/BuffIcon/atlas_rauab_bufficon.spriteatlas

@@ -80,12 +80,49 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - aba8cff1499f39143b01a4e94b5c5249: 21300000
+    - a98897527c7288c47b76ef2173900341: 21300000
+    - a9cf5bc2309639046ab11dc5a8340bf9: 21300000
+    - d532c973b3180254fbccd55cf78a10d2: 21300000
+    - 7126bbe75e0e1684999028c51aaccad8: 21300000
+    - db24957bc394d3a41865111856c1c0a9: 21300000
+    - 7230659b695c88a488908d6134c2fd89: 21300000
+    - 8f48e65defef92b41864249d6cbcb040: 21300000
+    - 2db9f2be5f8d38d4c8c0c71baa9c5d04: 21300000
+    - b100d5afc5c2d1246bec3acf399a7851: 21300000
+    - 2272fbaf881bd7b499273c7753b9245d: 21300000
+    - 534cf4cf119ebd24f9782915eb978b38: 21300000
+    - 5f682defa872c184b8765d81e4b449f8: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
+  - {fileID: 21300000, guid: aba8cff1499f39143b01a4e94b5c5249, type: 3}
+  - {fileID: 21300000, guid: a98897527c7288c47b76ef2173900341, type: 3}
+  - {fileID: 21300000, guid: a9cf5bc2309639046ab11dc5a8340bf9, type: 3}
+  - {fileID: 21300000, guid: d532c973b3180254fbccd55cf78a10d2, type: 3}
+  - {fileID: 21300000, guid: 7126bbe75e0e1684999028c51aaccad8, type: 3}
+  - {fileID: 21300000, guid: db24957bc394d3a41865111856c1c0a9, type: 3}
+  - {fileID: 21300000, guid: 7230659b695c88a488908d6134c2fd89, type: 3}
+  - {fileID: 21300000, guid: 8f48e65defef92b41864249d6cbcb040, type: 3}
+  - {fileID: 21300000, guid: 2db9f2be5f8d38d4c8c0c71baa9c5d04, type: 3}
+  - {fileID: 21300000, guid: b100d5afc5c2d1246bec3acf399a7851, type: 3}
+  - {fileID: 21300000, guid: 2272fbaf881bd7b499273c7753b9245d, type: 3}
+  - {fileID: 21300000, guid: 534cf4cf119ebd24f9782915eb978b38, type: 3}
+  - {fileID: 21300000, guid: 5f682defa872c184b8765d81e4b449f8, type: 3}
   m_PackedSpriteNamesToIndex:
-  - vcard_img_mingpian_exhbition_bg
+  - buff_icon_20331101
+  - buff_light_layer5_2
+  - buff_icon_20171101
+  - buff_icon_1003
+  - buff_icon_205211
+  - buff_icon_1006
+  - buff_light_layer3
+  - buff_icon_1005
+  - buff_icon_1004
+  - buff_icon_20171102
+  - buff_light_layer5
+  - buff_icon_bg
+  - buff_icon_1001
   m_RenderDataMap: {}
   m_Tag: atlas_rauab_bufficon
   m_IsVariant: 0

Assets/Res/Addressable/UI/Atlas/Partner/atlas_rauap_partner.spriteatlas

@@ -93,6 +93,8 @@ SpriteAtlas:
     - d75c40140ef5f4847ba7a3d9c3b60fe4: 21300000
     - d080aa44dd5497c4e8722a9c7ed88ae2: 21300000
     - 5fb74ab4c6908364fb847afe4bb8ad8a: 21300000
+    - 3e878dc428d246e48bd7d8be197aa2e8: 21300000
+    - 38bd5d155c21afd4bbee617ea6208ddb: 21300000
     - 62857935cb718254c80306d94a02322c: 21300000
     - 28e24b65f0c900f47a665b7d05526906: 21300000
     - d997cfb5985a42e479ee01f698a55f12: 21300000
@@ -105,6 +107,7 @@ SpriteAtlas:
     - 17ecf90731ce6ff4392eeff168cbbf51: 21300000
     - 24ef1847a11535c419dd65bcca7cabbc: 21300000
     - b30484c782024804280e6598747ed018: 21300000
+    - c3d88cc7d2d509a49811adbc4a9525c4: 21300000
     - fd69ead73c6b3124ba67546bbc905594: 21300000
     - 7e8140f7aafa5ec419b699bf57646c46: 21300000
     - e7e190f78351d134eaf1408c6eafbe3d: 21300000
@@ -115,6 +118,7 @@ SpriteAtlas:
     - 103cf5198ffe9434f992c85ec0cdb4f7: 21300000
     - 1cb0b1298af1d0744ad588c352493fdf: 21300000
     - 46728559ad51d3a47b47707c536655e0: 21300000
+    - 8f7abf694540f0f498e46043d1d151be: 21300000
     - 0b850ad9f12423f41a855d412e9f29ec: 21300000
     - 92394c1a1208af644bee54d7e9f73cf3: 21300000
     - 1303926a12f069640827f2bdcbc0c7c6: 21300000
@@ -135,6 +139,7 @@ SpriteAtlas:
     - ff78e35de8728a5428e5850a13622edb: 21300000
     - 46b2b97d5fda8b244a944a99729f4c46: 21300000
     - 5cc42dadf49af514fbcc4e4003a65f26: 21300000
+    - f3b6079e6d23d5e4b99bd35b91a1d532: 21300000
     - b9e79cbef0c6aea4ab680a44ac30e9cc: 21300000
     - 4f3ffcbe3f7219a44a790bae47163632: 21300000
     - 7f037bcef4637a14d90259f40190a50c: 21300000
@@ -160,6 +165,8 @@ SpriteAtlas:
   - {fileID: 21300000, guid: d75c40140ef5f4847ba7a3d9c3b60fe4, type: 3}
   - {fileID: 21300000, guid: d080aa44dd5497c4e8722a9c7ed88ae2, type: 3}
   - {fileID: 21300000, guid: 5fb74ab4c6908364fb847afe4bb8ad8a, type: 3}
+  - {fileID: 21300000, guid: 3e878dc428d246e48bd7d8be197aa2e8, type: 3}
+  - {fileID: 21300000, guid: 38bd5d155c21afd4bbee617ea6208ddb, type: 3}
   - {fileID: 21300000, guid: 62857935cb718254c80306d94a02322c, type: 3}
   - {fileID: 21300000, guid: 28e24b65f0c900f47a665b7d05526906, type: 3}
   - {fileID: 21300000, guid: d997cfb5985a42e479ee01f698a55f12, type: 3}
@@ -172,6 +179,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 17ecf90731ce6ff4392eeff168cbbf51, type: 3}
   - {fileID: 21300000, guid: 24ef1847a11535c419dd65bcca7cabbc, type: 3}
   - {fileID: 21300000, guid: b30484c782024804280e6598747ed018, type: 3}
+  - {fileID: 21300000, guid: c3d88cc7d2d509a49811adbc4a9525c4, type: 3}
   - {fileID: 21300000, guid: fd69ead73c6b3124ba67546bbc905594, type: 3}
   - {fileID: 21300000, guid: 7e8140f7aafa5ec419b699bf57646c46, type: 3}
   - {fileID: 21300000, guid: e7e190f78351d134eaf1408c6eafbe3d, type: 3}
@@ -182,6 +190,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 103cf5198ffe9434f992c85ec0cdb4f7, type: 3}
   - {fileID: 21300000, guid: 1cb0b1298af1d0744ad588c352493fdf, type: 3}
   - {fileID: 21300000, guid: 46728559ad51d3a47b47707c536655e0, type: 3}
+  - {fileID: 21300000, guid: 8f7abf694540f0f498e46043d1d151be, type: 3}
   - {fileID: 21300000, guid: 0b850ad9f12423f41a855d412e9f29ec, type: 3}
   - {fileID: 21300000, guid: 92394c1a1208af644bee54d7e9f73cf3, type: 3}
   - {fileID: 21300000, guid: 1303926a12f069640827f2bdcbc0c7c6, type: 3}
@@ -202,6 +211,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: ff78e35de8728a5428e5850a13622edb, type: 3}
   - {fileID: 21300000, guid: 46b2b97d5fda8b244a944a99729f4c46, type: 3}
   - {fileID: 21300000, guid: 5cc42dadf49af514fbcc4e4003a65f26, type: 3}
+  - {fileID: 21300000, guid: f3b6079e6d23d5e4b99bd35b91a1d532, type: 3}
   - {fileID: 21300000, guid: b9e79cbef0c6aea4ab680a44ac30e9cc, type: 3}
   - {fileID: 21300000, guid: 4f3ffcbe3f7219a44a790bae47163632, type: 3}
   - {fileID: 21300000, guid: 7f037bcef4637a14d90259f40190a50c, type: 3}
@@ -226,6 +236,8 @@ SpriteAtlas:
   - partner_pzdi_8
   - epigraph_pzempty_2
   - sb_elementType_2
+  - sb_elementTypeRhombus_2
+  - sb_elementTypeRhombus_1
   - sb_pzdi_7
   - epigraph_mwpz_8
   - partner_jindutiao_7
@@ -238,6 +250,7 @@ SpriteAtlas:
   - sb_type_2
   - sb_type_1
   - epigraph_pztype_3
+  - sb_elementTypeRhombus_3
   - epigraph_mwpz_6
   - epigraph_pztype_6
   - epigraph_pzempty_8
@@ -248,6 +261,7 @@ SpriteAtlas:
   - partner_jindutiao_2
   - epigraph_pztype_5
   - sb_pzdi_4
+  - sb_elementTypeRhombus_4
   - sb_pzdi_1
   - partner_jindutiao_1
   - partner_pzdi_1
@@ -268,6 +282,7 @@ SpriteAtlas:
   - epigraph_pzempty_3
   - partner_jindutiao_3
   - partner_elementType_5
+  - sb_elementTypeRhombus_5
   - epigraph_pztype_7
   - epigraph_pzempty_4
   - sb_type_3

Assets/Res/Static/UI/Atlas/MainMap/atlas_rsuam_mainmap.spriteatlas

@@ -93,51 +93,48 @@ SpriteAtlas:
     isAtlasV2: 0
     cachedData: {fileID: 0}
     packedSpriteRenderDataKeys:
-    - ea3bc26246db9d5408b6b230af4461f5: 21300000
-    - 07519175365aaa742ac9a18b0b036b65: 21300000
-    - 31d823758f284744486949723b1342c9: 21300000
-    - 49c3ad96036ea41418889296d42d331c: 21300000
-    - d5056f876c35c9d40abbba4df5280eb0: 21300000
-    - 79278859f639d7148b89258a999346f3: 21300000
-    - 93b74debab8820b4db6699d6251c3013: 21300000
-    - ba4052acc887ee24d9345938a2f3437d: 21300000
-    - d09b39cca801ced47ba608faebc9de24: 21300000
-    - 2dd9070d5ec85cd44a4c3f7b39a4fd59: 21300000
-    - abc8764dd353a514fb9158c8eb66013a: 21300000
-    - e179916d29da5084fb49c4e2029ca69f: 21300000
-    - b3b6b5bddd1f800468047722e9c53b20: 21300000
-    - 6d27f08e246194740931871d91205940: 21300000
+    - d48d5630ca24e654e864a2b844235d1c: 21300000
+    - 986fa950e8d232a4a94537fc08049529: 21300000
+    - c79afe110c73c9448a046e75db90dbe1: 21300000
+    - 0a0517b57293c7c4e8b5381382730408: 21300000
+    - 6de6d0c5bb728324cb60e9668f4af343: 21300000
+    - c7dda376c5bef764b932a86e90985acf: 21300000
+    - 314da558ba3e17547a38dcc425515908: 21300000
+    - 51377f3a17e442c4da56171f237e8c14: 21300000
+    - eed5889a61370624b9e6239335a491aa: 21300000
+    - af804ebae43185c47a211893483c5171: 21300000
+    - ced3f0fad2d68cf4499bea768bc95b3b: 21300000
+    - 0a843abb9deee764aa4f277f89ede312: 21300000
+    - b965ac4d435288349a4df15522476f8a: 21300000
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: ea3bc26246db9d5408b6b230af4461f5, type: 3}
-  - {fileID: 21300000, guid: 07519175365aaa742ac9a18b0b036b65, type: 3}
-  - {fileID: 21300000, guid: 31d823758f284744486949723b1342c9, type: 3}
-  - {fileID: 21300000, guid: 49c3ad96036ea41418889296d42d331c, type: 3}
-  - {fileID: 21300000, guid: d5056f876c35c9d40abbba4df5280eb0, type: 3}
-  - {fileID: 21300000, guid: 79278859f639d7148b89258a999346f3, type: 3}
-  - {fileID: 21300000, guid: 93b74debab8820b4db6699d6251c3013, type: 3}
-  - {fileID: 21300000, guid: ba4052acc887ee24d9345938a2f3437d, type: 3}
-  - {fileID: 21300000, guid: d09b39cca801ced47ba608faebc9de24, type: 3}
-  - {fileID: 21300000, guid: 2dd9070d5ec85cd44a4c3f7b39a4fd59, type: 3}
-  - {fileID: 21300000, guid: abc8764dd353a514fb9158c8eb66013a, type: 3}
-  - {fileID: 21300000, guid: e179916d29da5084fb49c4e2029ca69f, type: 3}
-  - {fileID: 21300000, guid: b3b6b5bddd1f800468047722e9c53b20, type: 3}
-  - {fileID: 21300000, guid: 6d27f08e246194740931871d91205940, type: 3}
+  - {fileID: 21300000, guid: d48d5630ca24e654e864a2b844235d1c, type: 3}
+  - {fileID: 21300000, guid: 986fa950e8d232a4a94537fc08049529, type: 3}
+  - {fileID: 21300000, guid: c79afe110c73c9448a046e75db90dbe1, type: 3}
+  - {fileID: 21300000, guid: 0a0517b57293c7c4e8b5381382730408, type: 3}
+  - {fileID: 21300000, guid: 6de6d0c5bb728324cb60e9668f4af343, type: 3}
+  - {fileID: 21300000, guid: c7dda376c5bef764b932a86e90985acf, type: 3}
+  - {fileID: 21300000, guid: 314da558ba3e17547a38dcc425515908, type: 3}
+  - {fileID: 21300000, guid: 51377f3a17e442c4da56171f237e8c14, type: 3}
+  - {fileID: 21300000, guid: eed5889a61370624b9e6239335a491aa, type: 3}
+  - {fileID: 21300000, guid: af804ebae43185c47a211893483c5171, type: 3}
+  - {fileID: 21300000, guid: ced3f0fad2d68cf4499bea768bc95b3b, type: 3}
+  - {fileID: 21300000, guid: 0a843abb9deee764aa4f277f89ede312, type: 3}
+  - {fileID: 21300000, guid: b965ac4d435288349a4df15522476f8a, type: 3}
   m_PackedSpriteNamesToIndex:
-  - Jindutiao4
-  - Jindutiao3
-  - playerph02
-  - bossph06
-  - bossph01
-  - TiaozhanBoss
-  - Shijianjindutiao2
-  - bossphbg
-  - bossph02
-  - Shijianjindutiao1
-  - Jindutiao5
-  - Kulou
-  - Shizhong
-  - playerph01
+  - boss
+  - Hourglass
+  - BossBloodbg
+  - Bloodhudun
+  - PlayerBloodbg
+  - LevelProgress1
+  - Map
+  - LevelBar
+  - BossBlood
+  - tzboss
+  - PlayerBlood
+  - xiaoguaiBlood
+  - LevelProgress2
   m_RenderDataMap: {}
   m_Tag: atlas_rsuam_mainmap
   m_IsVariant: 0

Assets/Scripts/Business/Runtime/FGUI/Mail/MailPanel/MailMailPanelCtrl.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using XGame.Database;
 using XGame.Framework.UI;
+using static UnityEditor.Progress;
 
 namespace FL.FGUI
 {
@@ -23,7 +24,7 @@ namespace FL.FGUI
     {
 
         private List<MailInfo> _mailList;
-        private List<Item> _mailRwdList;
+        private List<ItemBase> _mailRwdList;
         private bool _isOpenMail;// 是否打开单封邮件
         private string _mailId;// 当前打开的邮件id
 
@@ -69,7 +70,7 @@ namespace FL.FGUI
         private void Init()
         {
             if (_mailList == null) _mailList = new List<MailInfo>();
-            if (_mailRwdList == null) _mailRwdList = new List<Item>();
+            if (_mailRwdList == null) _mailRwdList = new List<ItemBase>();
         }
 
         private void ShowUI()
@@ -128,9 +129,8 @@ namespace FL.FGUI
                     for (global::System.Int32 i = 0; i < mailInfo.items.Count; i++)
                     {
                         ItemTable itemInfo = ItemTableRepo.Get(mailInfo.items[i].id);
-                        Item _item = new Item();
-                        _item.Count = mailInfo.items[i].count.ToString();
-                        _item.Init(itemInfo, mailInfo.items[i].id);
+                        ItemBase _item = new ItemBase();
+                        _item.Init(itemInfo.Id, mailInfo.items[i].count);
                         _mailRwdList.Add(_item);
                     }
                     ShowItemsUI(_mailRwdList);
@@ -165,7 +165,7 @@ namespace FL.FGUI
             VM.MailCountLabel.text = $"邮件数量：{num}/{KeyValue.mailMax}";
         }
         //单封邮件内的奖励
-        private void ShowItemsUI(List<Item> dataList)
+        private void ShowItemsUI(List<ItemBase> dataList)
         {
             VM.ItemList.BindDatas(dataList);
         }

Assets/Scripts/Business/Runtime/FGUI/Mail/MailPanelItem/MailMailPanelItemCtrl.cs

@@ -13,7 +13,7 @@ using XGame.Database;
 using XGame.Framework.Time;
 using XGame.Framework.UI;
 using static UnityEditor.Progress;
-using Item = FL.Data.Items.Item;
+using Item = FL.Data.Items.ItemBase;
 
 namespace FL.FGUI
 {
@@ -25,7 +25,7 @@ namespace FL.FGUI
     {
         private MailInfo _mailInfo;
         private string _mailId;
-        private List<Item> _itemDataList;
+        private List<ItemBase> _itemDataList;
         protected override void OnEnable(object intent)
         {
             AddUIListenres();
@@ -62,15 +62,14 @@ namespace FL.FGUI
                 for (global::System.Int32 i = 0; i < _mailInfo.items.Count; i++)
                 {
                     ItemTable itemInfo = ItemTableRepo.Get(_mailInfo.items[i].id);
-                    Item _item = new Item();
-                    _item.Count = _mailInfo.items[i].count.ToString();
-                    _item.Init(itemInfo, _mailInfo.items[i].id);
+                    ItemBase _item = new ItemBase();
+                    _item.Init(itemInfo.Id, _mailInfo.items[i].count);
                     _itemDataList.Add(_item);
                 }
                 ShowItemsUI(_itemDataList);
             }
         }
-        private void ShowItemsUI(List<Item> dataList)
+        private void ShowItemsUI(List<ItemBase> dataList)
         {
             VM.ItemList.BindDatas(dataList);
         }