搭建英雄界面的UI

Assets/Art/UIAssets/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

Assets/Art/UIAssets/TextrueJson/itemIcon.txt

@@ -1 +1 @@
-{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"}],"keyToValue":{}}
+{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"}],"keyToValue":{}}

Assets/Art/UIAssets/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DXpOtSioWi3AHAh2KW+pYR0ej7VrfnvuGrXPQ80ul70ppJeg3ejUapo=
+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
+  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/Config/LanguageChineseConfig.json

@@ -251,6 +251,10 @@
     {
       "ID": 63,
       "txt": "主力英雄等级差不得超过10级"
+    },
+    {
+      "ID": 64,
+      "txt": "主力英雄等级：{0}"
     }
   ]
 }

Assets/Res/UI/HeroBagPanel.prefab

@@ -181,8 +181,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1088,8 +1086,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -3075,8 +3071,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4548,8 +4542,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4748,8 +4740,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4890,8 +4880,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6007,12 +5995,12 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 7939915476203004500}
+  - component: {fileID: 8510129603972019916}
   - component: {fileID: 3181852693172486306}
   - component: {fileID: 9154997696072646161}
   - component: {fileID: 6059881785422164945}
   - component: {fileID: 524429718100663683}
   - component: {fileID: 5600907577368196505}
-  - component: {fileID: 8510129603972019916}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroBagPanel
@@ -6028,7 +6016,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3881840993377848576}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -6044,6 +6032,48 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8510129603972019916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3881840993377848576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: btnBack
+    gameObject: {fileID: 696790876193891420}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: btnEquip
+    gameObject: {fileID: 5497223473099171}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: mainHeroes
+    gameObject: {fileID: 8497996233803173388}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 1004509144920360798}
+    - gameObject: {fileID: 633043608376079090}
+    - gameObject: {fileID: 2353568671963198049}
+    - gameObject: {fileID: 2092809658225085607}
+  - key: txtMainLv
+    gameObject: {fileID: 1354275986950538440}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1004509144920360798}
+    - gameObject: {fileID: 633043608376079090}
+    - gameObject: {fileID: 2353568671963198049}
+    - gameObject: {fileID: 2092809658225085607}
+  isAssetBundle: 1
 --- !u!222 &3181852693172486306
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6134,30 +6164,6 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!114 &8510129603972019916
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3881840993377848576}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: btnBack
-    gameObject: {fileID: 696790876193891420}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: btnEquip
-    gameObject: {fileID: 5497223473099171}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
 --- !u!1 &4002006122008443889
 GameObject:
   m_ObjectHideFlags: 0
@@ -7312,8 +7318,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11374,8 +11378,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11538,8 +11540,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Res/UI/MainUIPanel.prefab

@@ -2432,8 +2432,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9120029036529632753}
   - component: {fileID: 5455270301715299168}
-  - component: {fileID: 6864125694973355175}
-  - component: {fileID: 5605121588562016193}
+  - component: {fileID: 1799918944523038801}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Border
@@ -2456,10 +2455,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4391858190883622590}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 2, y: 2}
+  m_SizeDelta: {x: 38, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5455270301715299168
 CanvasRenderer:
@@ -2469,7 +2468,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3448175583277746731}
   m_CullTransparentMesh: 1
---- !u!114 &6864125694973355175
+--- !u!114 &1799918944523038801
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2478,7 +2477,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3448175583277746731}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -2489,8 +2488,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1307fbb8952fb4e8f8169aa09bd692ed, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2499,26 +2498,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &5605121588562016193
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3448175583277746731}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
+  _icon_name: dec_Alert_Dot_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
 --- !u!1 &3483752019383459044
 GameObject:
   m_ObjectHideFlags: 0
@@ -3677,8 +3664,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7362160405140399304}
   - component: {fileID: 7796557343502220076}
-  - component: {fileID: 3014597195209789819}
-  - component: {fileID: 3056601540023571549}
+  - component: {fileID: 6067803364732538754}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -3704,7 +3690,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2.6, y: 11}
-  m_SizeDelta: {x: 108, y: 101}
+  m_SizeDelta: {x: 117, y: 109}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796557343502220076
 CanvasRenderer:
@@ -3714,7 +3700,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4804264927101951070}
   m_CullTransparentMesh: 1
---- !u!114 &3014597195209789819
+--- !u!114 &6067803364732538754
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3723,7 +3709,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4804264927101951070}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -3734,7 +3720,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2cb23211c834e49d9a4e2836aa2e6711, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3744,21 +3730,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &3056601540023571549
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4804264927101951070}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 0, y: -4}
-  m_UseGraphicAlpha: 1
+  _icon_name: icon_Helmet
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
 --- !u!1 &4820970414644533842
 GameObject:
   m_ObjectHideFlags: 0
@@ -4581,7 +4560,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1623.9999}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1056032702526251692
 MonoBehaviour:
@@ -4749,6 +4728,15 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: btnHeroBag
+    gameObject: {fileID: 1277215176106341}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4867,141 +4855,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6780802483241756600}
   m_CullTransparentMesh: 1
---- !u!1 &6789756013667246598
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4325603635048879701}
-  - component: {fileID: 321649979549736233}
-  - component: {fileID: 4942945834179944820}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4325603635048879701
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6789756013667246598}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4391858190883622590}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 18.84, y: 49}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &321649979549736233
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6789756013667246598}
-  m_CullTransparentMesh: 1
---- !u!114 &4942945834179944820
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6789756013667246598}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 2
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 715855d65a80d4bd1afb15a96bcf5a78, type: 2}
-  m_sharedMaterial: {fileID: 8923021707789016035, guid: 715855d65a80d4bd1afb15a96bcf5a78, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 34
-  m_fontSizeBase: 34
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: -5, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6927447534267390032
 GameObject:
   m_ObjectHideFlags: 0
@@ -5372,9 +5225,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4391858190883622590}
   - component: {fileID: 5791296258592111927}
-  - component: {fileID: 6820583644934673956}
-  - component: {fileID: 241381334777847186}
-  - component: {fileID: 7545739860512140264}
+  - component: {fileID: 1268618840442841001}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Alert_Circle_s_Green
@@ -5395,14 +5246,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4325603635048879701}
   - {fileID: 9120029036529632753}
+  - {fileID: 9152630222983204973}
   m_Father: {fileID: 8091112176597121872}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 48.09996, y: 46.635864}
-  m_SizeDelta: {x: 0, y: 58}
+  m_AnchoredPosition: {x: 40, y: 46.635864}
+  m_SizeDelta: {x: 35, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5791296258592111927
 CanvasRenderer:
@@ -5412,7 +5263,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7803319478472451267}
   m_CullTransparentMesh: 1
---- !u!114 &6820583644934673956
+--- !u!114 &1268618840442841001
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -5421,7 +5272,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7803319478472451267}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -5432,8 +5283,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: fe62dbba2502e4766a8150113c51bef0, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -5442,46 +5293,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &241381334777847186
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7803319478472451267}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 18
-    m_Right: 18
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!114 &7545739860512140264
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7803319478472451267}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  _icon_name: dec_Alert_Dot_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
 --- !u!1 &8160896584844719095
 GameObject:
   m_ObjectHideFlags: 0
@@ -5962,6 +5781,141 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &9143375631026266705
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9152630222983204973}
+  - component: {fileID: 1240165218298724847}
+  - component: {fileID: 6433044716245704488}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: txtNum
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9152630222983204973
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9143375631026266705}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4391858190883622590}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 8.4, y: 6.3}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1240165218298724847
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9143375631026266705}
+  m_CullTransparentMesh: 1
+--- !u!114 &6433044716245704488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9143375631026266705}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 1
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &9151276064513474823
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,77 +11,78 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
     - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
-    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
-    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
-    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
     - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
     - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
     - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
+    - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -55,5 +55,9 @@ namespace Fort23.Core
       /// 关卡更新
       /// </summary>
       LevelUpdate,
+      /// <summary>
+      /// 主力等级提升
+      /// </summary>
+      MainLvUp,
     }
 }

Assets/Scripts/GameLogic/Combat/CombatEvent/SimpleEventData.cs

@@ -0,0 +1,9 @@
+using Core.Utility.Event;
+
+namespace Common.Utility.CombatEvent
+{
+    public class SimpleEventData: EventDataBasic<SimpleEventData>
+    {
+        public int intData;
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/SimpleEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce19686514e84397b1b78bba3e1bc2e9
+timeCreated: 1733939844

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -53,6 +53,8 @@ namespace GameLogic.Hero
             }
             
             m_MainLevel = tmpLv;
+            
+            EventManager.Instance.Dispatch(CustomEventType.MainLvUp, new SimpleEventData(){intData = m_MainLevel});
         }
 
         public HeroUpResultType CanUpgrade(HeroInfo heroInfo, bool isOpenPre = false)

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

@@ -1,20 +1,70 @@
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Core.Language;
+using Fort23.Core;
+using GameLogic.Hero;
+using UnityEngine;
+
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "HeroBagPanel"  )]
-	public partial class HeroBagPanel : UIPanel
-	{
-	private void Init()
-	{
-	}
-	protected override void AddEvent()
-	{
-	}
-	protected override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
+    [UIBinding(prefab = "HeroBagPanel"  )]
+    public partial class HeroBagPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+        protected override void AddEvent()
+        {
+            EventManager.Instance.AddEventListener(CustomEventType.MainLvUp, OnMainLvUp);
+        }
+
+        protected override void DelEvent()
+        {
+            EventManager.Instance.AddEventListener(CustomEventType.MainLvUp, OnMainLvUp);
+        }
+        public override void AddButtonEvent()
+        {
+            btnBack.onClick.AddListener(OnclickClose);
+        }
+        
+        private void OnMainLvUp(IEventData e)
+        {
+            // SimpleEventData data = e as SimpleEventData;
+            UpdateMainLv();
+        }
+
+        private void OnclickClose()
+        {
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        private void UpdateMainLv()
+        {
+            txtMainLv.text = LanguageManager.Instance.Text(64, PlayerManager.Instance.heroController.mainLevel);
+        }
+        
+        public void InitPanel()
+        {
+            InitMainHeroWidget();
+            UpdateMainLv();
+
+        }
+        private List<WidgetHero> widgetHeroes = new List<WidgetHero>();
+        private async void InitMainHeroWidget()
+        {
+            widgetHeroes.Clear();
+            int i = 0;
+            foreach (KeyValuePair<int,HeroInfo> keyValuePair in PlayerManager.Instance.heroController.heroDicInLead)
+            {
+                RectTransform rectTransform = mainHeroes[i] as RectTransform;
+                WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
+                    poolName: "WidgetHero", root: rectTransform);
+                itemHero.InitHeroForBag(keyValuePair.Value);
+                
+                widgetHeroes.Add(itemHero);
+                i++;
+            }
+        }
 
-	}
-}
+    }
+}

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

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroBagPanel 
+	{
+	  #region 自定义数据 
+	  private Button _btnBack;
+	  public Button btnBack
+	   {
+	   get{
+	      if (_btnBack == null)
+	       {
+	         _btnBack  = GetUIUnit<Button>("btnBack"); 
+	       }
+	      return _btnBack;
+	     }
+	   }
+	  private Button _btnEquip;
+	  public Button btnEquip
+	   {
+	   get{
+	      if (_btnEquip == null)
+	       {
+	         _btnEquip  = GetUIUnit<Button>("btnEquip"); 
+	       }
+	      return _btnEquip;
+	     }
+	   }
+	  private List<object> _mainHeroes;
+	  public List<object> mainHeroes
+	   {
+	   get{
+	      if (_mainHeroes == null)
+	       {
+	         _mainHeroes  = GetUIUnit<List<object>>("mainHeroes"); 
+	       }
+	      return _mainHeroes;
+	     }
+	   }
+	  private Text _txtMainLv;
+	  public Text txtMainLv
+	   {
+	   get{
+	      if (_txtMainLv == null)
+	       {
+	         _txtMainLv  = GetUIUnit<Text>("txtMainLv"); 
+	       }
+	      return _txtMainLv;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/Hero/HeroBagPanelData.cs.meta

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

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

@@ -52,12 +52,12 @@ namespace Fort23.Mono
                 objUpLvTips.SetActive(false);
                 objUpSkill.SetActive(true);
                 objAtts.SetActive(false);
-                
-                object[] data = new object[skillConfig.effectValue.Length];
-                for (int j = 0; j < skillConfig.effectValue.Length; j++)
-                {
-                    data[j] = skillConfig.effectValue[j];
-                }
+
+                object[] data = GetSkillParam(skillConfig);//new object[skillConfig.effectValue.Length];
+                // for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                // {
+                //     data[j] = skillConfig.effectValue[j];
+                // }
 
                 imgNewSkill4Up.icon_name = skillConfig.icon;
                 txtSkillName4Up.text = LanguageManager.Instance.Text(skillConfig.name);
@@ -119,26 +119,24 @@ namespace Fort23.Mono
                 objProSkillUnlock.SetActive(true);
                 starsPos.localPosition = new Vector3(0, GlobalParam.Hero_Promote_UI_BG_Star_Pos_2, 0);
                 
-                skillConfig = nextLvInfo.SkillData.GetSkillConfig(upConfig.ID);
-                object[] data = null;
-                if (skillConfig.SkillType == 5)
-                {
-                    data = new object[skillConfig.addPropertyValue.Length];
-                    for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
-                    {
-                        data[j] = skillConfig.addPropertyValue[j];
-                    }
-                }
-                else
-                {
-                    data = new object[skillConfig.effectValue.Length];
-                    for (int j = 0; j < skillConfig.effectValue.Length; j++)
-                    {
-                        data[j] = skillConfig.effectValue[j];
-                    }
-                }
-                
-
+                // skillConfig = nextLvInfo.SkillData.GetSkillConfig(upConfig.ID);
+                object[] data = GetSkillParam(skillConfig);
+                // if (skillConfig.SkillType == 5)
+                // {
+                //     data = new object[skillConfig.addPropertyValue.Length];
+                //     for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
+                //     {
+                //         data[j] = skillConfig.addPropertyValue[j];
+                //     }
+                // }
+                // else
+                // {
+                //     data = new object[skillConfig.effectValue.Length];
+                //     for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                //     {
+                //         data[j] = skillConfig.effectValue[j];
+                //     }
+                // }
 
                 imgNewSkill4Pro.icon_name = skillConfig.icon;
                 txtSkillName4Pro.text = LanguageManager.Instance.Text(skillConfig.name);
@@ -155,6 +153,29 @@ namespace Fort23.Mono
             // objProSkillUp.SetActive(false);
         }
 
+        private object[] GetSkillParam(SkillConfig skillConfig)
+        {
+            object[] data = null;
+            if (skillConfig.SkillType == 5)
+            {
+                data = new object[skillConfig.addPropertyValue.Length];
+                for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
+                {
+                    data[j] = skillConfig.addPropertyValue[j];
+                }
+            }
+            else
+            {
+                data = new object[skillConfig.effectValue.Length];
+                for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                {
+                    data[j] = skillConfig.effectValue[j];
+                }
+            }
+
+            return data;
+        }
+
         private void SetAttInfo(HeroInfo heroInfo, HeroInfo nextLvInfo)
         {
             objAtts.SetActive(true);

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

@@ -23,10 +23,12 @@ namespace Fort23.Mono
         public override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.HeroClick, HeroClickEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
         }
 
         public override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
         }
 
         public override void AddButtonEvent()
@@ -37,6 +39,17 @@ namespace Fort23.Mono
             btnHeroPanel.onClick.AddListener(OnHeroPanelClick);
             Button_came.onClick.AddListener(OnHeroClickCame);
         }
+        
+        private void OnHeroPowerUp(IEventData eventData)
+        {
+            HeroPowerUpEventData data = eventData as HeroPowerUpEventData;
+            HeroInfo heroInfo = (HeroInfo)PlayerManager.Instance.heroController.GetHeroInfo(data.heroModelID);
+            
+            if (this.heroInfo.modelID == heroInfo.modelID)
+            {
+                UpdateWidgetUI(heroInfo);
+            }
+        }
 
         private void HeroClickEvent(IEventData iEventData)
         {
@@ -141,7 +154,7 @@ namespace Fort23.Mono
             //     heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
             // }
             HeroDetailPanel heroDetailPanel =
-                await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback, UILayer.Top, isFullUI: true);
+                await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback, isFullUI: true);
             heroDetailPanel.InitHeroDetailPanel(heroInfo);
         }
 
@@ -160,13 +173,22 @@ namespace Fort23.Mono
         public void InitHero(HeroInfo heroInfo)
         {
             this.heroInfo = heroInfo;
-            // lv.text = heroInfo.level.Value.ToString();
-            iconHero.icon_name = heroInfo.modelConfig.headicon;
-            // iconHero.SetNativeSize();
-            iconZhiYe.icon_name = heroInfo.iconZhiYe;
+            SetBasicData();
+            SetDynamicData();
+        }
 
-            // HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+        public void InitHeroForBag(HeroInfo heroInfo)
+        {
+            this.heroInfo = heroInfo;
+            SetBasicData();
             SetDynamicData();
+            Button_came_icon.gameObject.SetActive(false);
+        }
+
+        private void SetBasicData()
+        {
+            iconHero.icon_name = heroInfo.modelConfig.headicon;
+            iconZhiYe.icon_name = heroInfo.iconZhiYe;
         }
 
         public void UpdateWidgetUI(HeroInfo heroInfo)

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -29,7 +29,7 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
-            EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
+            // EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
             EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, OnItemUpdate);
             EventManager.Instance.AddEventListener(CustomEventType.ShowBossHp, ShowBossHp);
             EventManager.Instance.AddEventListener(CustomEventType.LevelUpdate, LevelUpdate);
@@ -64,7 +64,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
-            EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
+            // EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroPowerUp);
             EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, OnItemUpdate);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShowBossHp, ShowBossHp);
             EventManager.Instance.RemoveEventListener(CustomEventType.LevelUpdate, LevelUpdate);
@@ -74,9 +74,16 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            btnHeroBag.onClick.AddListener(OnClickHeroBag);
         }
-        
-        
+
+        private async void OnClickHeroBag()
+        {
+            HeroBagPanel heroBagPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBagPanel>(null);
+            heroBagPanel.InitPanel();
+        }
+
+
         private void OnItemUpdate(IEventData e)
         {
             ItemUpdateData data = e as ItemUpdateData;
@@ -137,20 +144,20 @@ namespace Fort23.Mono
             TextExp.text = levelBattleCombatType.exp + "/" + levelBattleCombatType.CurrMaxExp;
         }
 
-        private void OnHeroPowerUp(IEventData eventData)
-        {
-            HeroPowerUpEventData data = eventData as HeroPowerUpEventData;
-            HeroInfo heroInfo = (HeroInfo)PlayerManager.Instance.heroController.GetHeroInfo(data.heroModelID);
-
-            foreach (WidgetHero widgetHero in widgetHeroes)
-            {
-                if (widgetHero.heroInfo.modelID == heroInfo.modelID)
-                {
-                    widgetHero.UpdateWidgetUI(heroInfo);
-                    break;
-                }
-            }
-        }
+        // private void OnHeroPowerUp(IEventData eventData)
+        // {
+        //     HeroPowerUpEventData data = eventData as HeroPowerUpEventData;
+        //     HeroInfo heroInfo = (HeroInfo)PlayerManager.Instance.heroController.GetHeroInfo(data.heroModelID);
+        //
+        //     foreach (WidgetHero widgetHero in widgetHeroes)
+        //     {
+        //         if (widgetHero.heroInfo.modelID == heroInfo.modelID)
+        //         {
+        //             widgetHero.UpdateWidgetUI(heroInfo);
+        //             break;
+        //         }
+        //     }
+        // }
 
         private List<WidgetHero> widgetHeroes = new List<WidgetHero>();
 

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -132,7 +132,6 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _txtCoin;
-	  
 	  public TextMeshProUGUI txtCoin
 	   {
 	   get{
@@ -198,6 +197,17 @@ namespace Fort23.Mono
 	      return _levelName;
 	     }
 	   }
+	  private Button _btnHeroBag;
+	  public Button btnHeroBag
+	   {
+	   get{
+	      if (_btnHeroBag == null)
+	       {
+	         _btnHeroBag  = GetUIUnit<Button>("btnHeroBag"); 
+	       }
+	      return _btnHeroBag;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"8e0fed06f6e134745d1fa1d786d61cbc"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"fa49328bf742943f4c4be4a33a63901e"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson\\itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"8f9c5969449e5a0e15746046d5a75c9d"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"bf80d9ac134912f98d951197cdcc8fc6"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"fa49328bf742943f4c4be4a33a63901e"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"","lasetJsonGUID":""}],"isJiaoYan":true}

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

美术/unity_use_ui/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

美术/unity_use_ui/TextrueJson/itemIcon.txt

@@ -1 +1 @@
-{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"}],"keyToValue":{}}
+{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"}],"keyToValue":{}}

美术/unity_use_ui/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}