已知bug：重建索引时，出错，导致找不到道具。

Assets/Art/UIAssets/icon/icon_item_1001.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Ci5N4Cz+AS3cHeFYYiTUwKf5uaKJqk15HPxbPgOajRTJkc7tCM7eLuU=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/HeroBagPanel.prefab

@@ -7036,12 +7036,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_tx105
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a59a676e2ab5c4925ab687adc8940d7b
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &4765268764217086275
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_空.prefab

@@ -719,12 +719,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_4_3_2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6133001126499716445
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_紫装.prefab

@@ -414,12 +414,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_3_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6530925603937626076
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_红装.prefab

@@ -1021,12 +1021,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_5_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &6974233485650447944
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_绿装.prefab

@@ -78,12 +78,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_4_3_2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &2194073403744203526
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_黄装.prefab

@@ -465,12 +465,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_eq_1_2_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &3178120875985470737
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/allIcon.spriteatlasv2

@@ -13,6 +13,7 @@ SpriteAtlasAsset:
     packables:
     - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
     - {fileID: 2800000, guid: a4f6d78a36655554e89a5c8fb7b9b66f, type: 3}
+    - {fileID: 2800000, guid: 5dbe6cbfcf5194c28bfb3570894f5718, type: 3}
     - {fileID: 2800000, guid: ad3e276b2c4977b4ca8c556f0705577c, type: 3}
     - {fileID: 2800000, guid: 3be19fb50648f6541aca133c33f43ea2, type: 3}
     - {fileID: 2800000, guid: 84f0f4450b0e3644eb1e97be34b42463, type: 3}
@@ -32,7 +33,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 2ce3304b383ea0340b452a3f9740720b, type: 3}
     - {fileID: 2800000, guid: 3c6a10c5b63d5784c8176b5883fdddfb, type: 3}
     - {fileID: 2800000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
-    - {fileID: 2800000, guid: d84b79a30f6baa04aad2377702a6fff8, type: 3}
     - {fileID: 2800000, guid: d900d9dbc91df1e4e982b19a93fe6129, type: 3}
     - {fileID: 2800000, guid: 0de81f9e73c92c143b567089238db6bc, type: 3}
     - {fileID: 2800000, guid: ab0f19aa367e5594ab23e9ba0270758b, type: 3}

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -30,6 +30,7 @@ namespace GameLogic.Bag
             {
                 ItemInfo itemInfo = new ItemInfo(itemData);
                 // m_bagList.Add(itemInfo);
+                LogTool.Log(itemInfo.guid);
                 m_allBagDic.Add(itemInfo.guid, itemInfo);
                 PlayerManager.Instance.eqController.Init(itemInfo);
             }
@@ -316,9 +317,13 @@ namespace GameLogic.Bag
             ItemInfo newItem = new ItemInfo(itemId);
             if (newItem.config.ID > 0)
             {
-                // m_bagList.Add(newItem);
                 m_allBagDic.Add(newItem.guid, newItem);
             }
+            else
+            {
+                LogTool.Error("没有找到这个道具：" + itemId);
+                return null;
+            }
 
             return newItem;
         }

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -35,13 +35,6 @@ namespace GameLogic.Hero
 
         private void CalMainLevel()
         {
-            //主力英雄不足4个时，就没有主力等级的说法
-            // if (heroDicInLead.Count < GlobalParam.Max_Deploy_HERO)
-            // {
-            //     m_MainLevel = -1;
-            //     return;
-            // }
-
             //计算主力英雄的最低等级
             int tmpLv = 9999;
             foreach (var keyValuePair in heroDicInLead)

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -173,6 +173,14 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         }
         else
         {
+            foreach (ItemData itemData in playerData.ItemListData)
+            {
+                if (itemData.guid == itemInfo.guid)
+                {
+                    LogTool.Error("??? guid重复了" + itemInfo.itemID + "-" + itemData.guid);
+                }
+            }
+            
             // 添加新数据并更新索引表
             playerData.ItemListData.Add(itemInfo.ToItemData());
             itemIndexMap[itemInfo.guid] = playerData.ItemListData.Count - 1;

Assets/Scripts/GameUI/UI/Hero/EqRecyclePanel.cs

@@ -74,7 +74,7 @@ namespace Fort23.Mono
             pendingEqs.Clear();
             
 
-            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null);
+            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null, layer: UILayer.Top);
             
             rewardsPanel.InitRewardsPanel(awardDic, delegate
             {

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"a6fab45fc6a5f0b09679bb4eedcdd188"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"ba8dbdc12cfea95132d75e229eac99b8"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""},{"packName":"allIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/allIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/allIcon.spriteatlasv2","lasetJsonGUID":"083ae4b3a7b2beffb51fed7b1b7800d3"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"a6fab45fc6a5f0b09679bb4eedcdd188"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"ba8dbdc12cfea95132d75e229eac99b8"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""},{"packName":"allIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/allIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/allIcon.spriteatlasv2","lasetJsonGUID":"dccaa28d1756f79b182936feaa531f96"}],"isJiaoYan":true}