修改表，UI逻辑

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

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -55,9 +55,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -118,7 +118,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

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

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -55,9 +55,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -118,7 +118,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

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

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -55,9 +55,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -118,7 +118,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

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

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -55,9 +55,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -118,7 +118,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/VFX/Materials/fx_guaiwu01_suikuai.mat

@@ -50,7 +50,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 92fc740541949af4192bba27c358b0b4, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Res/Config/GameConstantConfig.json

@@ -0,0 +1,22 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "refreshTime": 5,
+      "HeroInitialCriRate": 5,
+      "HeroInitialCriDamage": 150,
+      "heroRarityAttributeFactor": [
+        100,
+        110,
+        120
+      ],
+      "monsterRarityAttributeFactor": [
+        100,
+        110,
+        115,
+        130,
+        120
+      ]
+    }
+  ]
+}

Assets/Res/Config/GameConstantConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cnwftnj5V3jjtyHZPFZ9zV/ZxCfbQ41Xm2WnVnuF0LQjEr/+FmubbzI=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/HeroModelConfig.json

@@ -5,9 +5,10 @@
       "nickName": -1,
       "name": 1,
       "headicon": "icon_tx101",
-      "model": "101",
+      "model": "",
       "isUseGpu": false,
-      "rarity": 3,
+      "starGrade": 3,
+      "rarity": 2,
       "profession": 1,
       "hp": 100,
       "def": 2,
@@ -26,9 +27,10 @@
       "nickName": -1,
       "name": 2,
       "headicon": "icon_tx102",
-      "model": "102",
+      "model": "",
       "isUseGpu": false,
-      "rarity": 3,
+      "starGrade": 3,
+      "rarity": 2,
       "profession": 1,
       "hp": 100,
       "def": 3,
@@ -47,9 +49,10 @@
       "nickName": -1,
       "name": 3,
       "headicon": "icon_tx103",
-      "model": "103",
+      "model": "",
       "isUseGpu": false,
-      "rarity": 3,
+      "starGrade": 3,
+      "rarity": 1,
       "profession": 1,
       "hp": 100,
       "def": 4,
@@ -63,6 +66,329 @@
       ],
       "heroStory": 70093
     },
+    {
+      "ID": 104,
+      "nickName": -1,
+      "name": 4,
+      "headicon": "icon_tx104",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 1,
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "heroStory": null
+    },
+    {
+      "ID": 105,
+      "nickName": -1,
+      "name": 5,
+      "headicon": "icon_tx105",
+      "model": "Hero01",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 3,
+      "profession": 1,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 106,
+      "nickName": -1,
+      "name": 6,
+      "headicon": "icon_tx106",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 2,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
+    {
+      "ID": 107,
+      "nickName": -1,
+      "name": 7,
+      "headicon": "icon_tx107",
+      "model": "Hero03",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 3,
+      "profession": 2,
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "heroStory": null
+    },
+    {
+      "ID": 108,
+      "nickName": -1,
+      "name": 8,
+      "headicon": "icon_tx108",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 2,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 109,
+      "nickName": -1,
+      "name": 9,
+      "headicon": "icon_tx109",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 2,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
+    {
+      "ID": 110,
+      "nickName": -1,
+      "name": 10,
+      "headicon": "icon_tx110",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 2,
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "heroStory": null
+    },
+    {
+      "ID": 111,
+      "nickName": -1,
+      "name": 11,
+      "headicon": "icon_tx111",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 3,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 112,
+      "nickName": -1,
+      "name": 12,
+      "headicon": "icon_tx112",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 3,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
+    {
+      "ID": 113,
+      "nickName": -1,
+      "name": 13,
+      "headicon": "icon_tx113",
+      "model": "Hero02",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 3,
+      "profession": 3,
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "heroStory": null
+    },
+    {
+      "ID": 114,
+      "nickName": -1,
+      "name": 14,
+      "headicon": "icon_tx114",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 3,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 115,
+      "nickName": -1,
+      "name": 15,
+      "headicon": "icon_tx115",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 3,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
+    {
+      "ID": 116,
+      "nickName": -1,
+      "name": 16,
+      "headicon": "icon_tx116",
+      "model": "Hero04",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 3,
+      "profession": 4,
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "heroStory": null
+    },
+    {
+      "ID": 117,
+      "nickName": -1,
+      "name": 17,
+      "headicon": "icon_tx117",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 4,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 118,
+      "nickName": -1,
+      "name": 18,
+      "headicon": "icon_tx118",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 2,
+      "profession": 4,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
+    {
+      "ID": 119,
+      "nickName": -1,
+      "name": 19,
+      "headicon": "icon_tx119",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 4,
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "heroStory": null
+    },
+    {
+      "ID": 120,
+      "nickName": -1,
+      "name": 20,
+      "headicon": "icon_tx120",
+      "model": "",
+      "isUseGpu": false,
+      "starGrade": 3,
+      "rarity": 1,
+      "profession": 4,
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "heroStory": null
+    },
     {
       "ID": 9000101,
       "nickName": -1,
@@ -70,6 +396,7 @@
       "headicon": "icon_tx9000101",
       "model": "Guaiwu01",
       "isUseGpu": true,
+      "starGrade": 1,
       "rarity": 1,
       "profession": 1,
       "hp": 100,
@@ -91,7 +418,8 @@
       "headicon": "icon_tx9000102",
       "model": "GuaiwuJY01",
       "isUseGpu": true,
-      "rarity": 1,
+      "starGrade": 1,
+      "rarity": 2,
       "profession": 1,
       "hp": 300,
       "def": 6,
@@ -114,7 +442,8 @@
       "headicon": "icon_tx9000103",
       "model": "GuaiwuBoss01",
       "isUseGpu": true,
-      "rarity": 1,
+      "starGrade": 1,
+      "rarity": 5,
       "profession": 1,
       "hp": 1000,
       "def": 7,

Assets/Res/Config/HeroPromoteConfig.json

@@ -3,7 +3,7 @@
     {
       "ID": 1,
       "starGrade": 1,
-      "star_Power": -1,
+      "star_Power": 100,
       "heroCost1_type": -1,
       "heroCost1_count": -1,
       "itemCostCount": -1
@@ -11,7 +11,7 @@
     {
       "ID": 2,
       "starGrade": 2,
-      "star_Power": -1,
+      "star_Power": 100,
       "heroCost1_type": -1,
       "heroCost1_count": -1,
       "itemCostCount": -1
@@ -19,7 +19,7 @@
     {
       "ID": 3,
       "starGrade": 3,
-      "star_Power": 150,
+      "star_Power": 110,
       "heroCost1_type": 1,
       "heroCost1_count": 1,
       "itemCostCount": 0,
@@ -33,7 +33,7 @@
     {
       "ID": 4,
       "starGrade": 4,
-      "star_Power": 150,
+      "star_Power": 120,
       "heroCost1_type": 1,
       "heroCost1_count": 1,
       "itemCostCount": 0,
@@ -47,7 +47,7 @@
     {
       "ID": 5,
       "starGrade": 5,
-      "star_Power": 150,
+      "star_Power": 130,
       "heroCost1_type": 1,
       "heroCost1_count": 1,
       "itemCostCount": 0,
@@ -61,7 +61,7 @@
     {
       "ID": 6,
       "starGrade": 6,
-      "star_Power": 150,
+      "star_Power": 140,
       "heroCost1_type": 1,
       "heroCost1_count": 1,
       "itemCostCount": 0,
@@ -89,7 +89,7 @@
     {
       "ID": 8,
       "starGrade": 8,
-      "star_Power": 150,
+      "star_Power": 160,
       "heroCost1_type": 1,
       "heroCost1_count": 2,
       "itemCostCount": 0,
@@ -103,7 +103,7 @@
     {
       "ID": 9,
       "starGrade": 9,
-      "star_Power": 100,
+      "star_Power": 170,
       "heroCost1_type": 1,
       "heroCost1_count": 3,
       "itemCostCount": 0,
@@ -117,7 +117,7 @@
     {
       "ID": 10,
       "starGrade": 10,
-      "star_Power": 100,
+      "star_Power": 180,
       "heroCost1_type": 1,
       "heroCost1_count": 4,
       "itemCostCount": 0,
@@ -131,7 +131,7 @@
     {
       "ID": 11,
       "starGrade": 11,
-      "star_Power": 100,
+      "star_Power": 190,
       "heroCost1_type": 1,
       "heroCost1_count": 5,
       "itemCostCount": 0,
@@ -145,7 +145,7 @@
     {
       "ID": 12,
       "starGrade": 12,
-      "star_Power": 100,
+      "star_Power": 200,
       "heroCost1_type": 1,
       "heroCost1_count": 6,
       "itemCostCount": 0,
@@ -159,7 +159,7 @@
     {
       "ID": 13,
       "starGrade": 13,
-      "star_Power": 100,
+      "star_Power": 210,
       "heroCost1_type": 1,
       "heroCost1_count": 7,
       "itemCostCount": 0,
@@ -173,7 +173,7 @@
     {
       "ID": 14,
       "starGrade": 14,
-      "star_Power": 100,
+      "star_Power": 220,
       "heroCost1_type": 1,
       "heroCost1_count": 8,
       "itemCostCount": 0,
@@ -187,7 +187,7 @@
     {
       "ID": 15,
       "starGrade": 15,
-      "star_Power": 100,
+      "star_Power": 230,
       "heroCost1_type": -1,
       "heroCost1_count": -1,
       "itemCostCount": 0,

Assets/Res/UI/HeroDetailPanel.prefab

@@ -1059,7 +1059,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1071,7 +1071,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_circle122
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -1164,7 +1164,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1176,7 +1176,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_Friends_Invie
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -1690,7 +1690,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1702,12 +1702,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_star
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &1228541237770425762
 GameObject:
   m_ObjectHideFlags: 0
@@ -1807,7 +1807,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1819,12 +1819,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_zy_Bow
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 82d8260bf79d26bf5d5c645a10f9974f
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &1299186991969034571
 GameObject:
   m_ObjectHideFlags: 0
@@ -2361,7 +2361,7 @@ GameObject:
   - component: {fileID: 3289702276652194812}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Buttom
+  m_Name: Bottom
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2687,7 +2687,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2699,7 +2699,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Alert_Dot_Light
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -2775,7 +2775,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2787,12 +2787,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &2292960775602257974
 GameObject:
   m_ObjectHideFlags: 0
@@ -2861,7 +2861,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2873,7 +2873,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_l_Green
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -3446,7 +3446,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3458,12 +3458,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_Arrow_Prev
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &2664990367668867389
 GameObject:
   m_ObjectHideFlags: 0
@@ -4056,7 +4056,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4068,7 +4068,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_res_Gem
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -4279,7 +4279,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4291,12 +4291,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &2950312874718177582
 GameObject:
   m_ObjectHideFlags: 0
@@ -4434,7 +4434,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4446,12 +4446,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_star
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &3004711444938965894
 GameObject:
   m_ObjectHideFlags: 0
@@ -4534,7 +4534,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4546,7 +4546,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_Lock
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -4976,7 +4976,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4988,7 +4988,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_att_Shield
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -5064,7 +5064,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5076,12 +5076,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &3578638386479442796
 GameObject:
   m_ObjectHideFlags: 0
@@ -5332,7 +5332,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5344,7 +5344,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_Back
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -5462,7 +5462,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 69c249842084043e0b2152a611527273, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5474,12 +5474,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_Arrow_Next1
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &3865374556050604018
 GameObject:
   m_ObjectHideFlags: 0
@@ -5800,7 +5800,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5812,7 +5812,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_att_Sword02
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -5886,7 +5886,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5898,7 +5898,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round04
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -6365,7 +6365,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 044267119b30c460785747c947493225, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6377,7 +6377,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_equip_Shield
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -6595,7 +6595,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6607,7 +6607,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -6937,7 +6937,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6949,12 +6949,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &4990842854640410597
 GameObject:
   m_ObjectHideFlags: 0
@@ -7603,7 +7603,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7615,7 +7615,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_LeftFlush_Dark
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -8030,7 +8030,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8042,12 +8042,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_Arrow_Next
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &5664409606135363520
 GameObject:
   m_ObjectHideFlags: 0
@@ -8116,7 +8116,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8128,12 +8128,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_l_Green
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 99bbe8ff52add7a8f14185f86f37e982
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &5664635391068350170
 GameObject:
   m_ObjectHideFlags: 0
@@ -9118,7 +9118,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -9130,7 +9130,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_att_shanbi
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -10651,7 +10651,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10663,7 +10663,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round12
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -11066,7 +11066,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -11078,12 +11078,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_star
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &7818972949738590079
 GameObject:
   m_ObjectHideFlags: 0
@@ -11588,7 +11588,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -11600,12 +11600,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_star
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &7977026083850148408
 GameObject:
   m_ObjectHideFlags: 0
@@ -11975,7 +11975,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03108c847a5054b63971245729018c27, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -11987,7 +11987,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Alert_Dot_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -12062,7 +12062,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12074,12 +12074,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_di1_Gray
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &8079762927171247560
 GameObject:
   m_ObjectHideFlags: 0
@@ -12162,7 +12162,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12174,12 +12174,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_item_Gear_Sword
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 4b8397a4261acc47a81bd9e0e383f582
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &8156415190177839806
 GameObject:
   m_ObjectHideFlags: 0
@@ -12524,7 +12524,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12536,12 +12536,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_Arrow_Prev1
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &8262466841460713280
 GameObject:
   m_ObjectHideFlags: 0
@@ -12625,7 +12625,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12637,7 +12637,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Round04
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -12725,7 +12725,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12737,7 +12737,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_at_hp
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -12920,7 +12920,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12932,7 +12932,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Alert_Dot_Bg
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
@@ -13442,7 +13442,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -13454,12 +13454,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_star
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: f88cd88b3b13a0be31c4dd4afaa25208
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &9071254396080257806
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/Widget_Hero.prefab → Assets/Res/UI/WidgetHero.prefab

@@ -113,7 +113,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 25.9, y: 22.4}
+  m_AnchoredPosition: {x: 37.9, y: 44.1}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6661789324897689400
@@ -187,9 +187,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20.29, y: -16.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8144389359825814294
@@ -474,9 +474,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 84.29, y: -16.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2739737631316204749
@@ -550,9 +550,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 68.29, y: -16.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2708601044019718149
@@ -626,9 +626,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 36.29, y: -16.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8783385350428690739
@@ -784,7 +784,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -5.5, y: 37.8}
+  m_AnchoredPosition: {x: -16.1, y: 54.3}
   m_SizeDelta: {x: 94.79, y: 28.9}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1738032295264763748
@@ -903,12 +903,12 @@ GameObject:
   - component: {fileID: 1237577693768947228}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Widget_Hero
+  m_Name: WidgetHero
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5106666997551906113
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1347,9 +1347,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 52.29, y: -16.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6307304734260365425

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,281 +11,28 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 9e1e95ba28b5f491e8d4563d9a52df27, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: e981024e549264182ba84159fd75f380, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 9e1e95ba28b5f491e8d4563d9a52df27, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: e981024e549264182ba84159fd75f380, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 9e1e95ba28b5f491e8d4563d9a52df27, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: e981024e549264182ba84159fd75f380, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, 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: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, 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: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, 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: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, 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: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
     - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
     - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
     - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
     - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
     - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
     - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
     - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
     - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
     - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
     - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
     - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
     - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
     - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
     - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
@@ -297,6 +44,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
     - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
     - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
     - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
@@ -307,11 +55,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
     - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
     - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
     - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
@@ -320,6 +69,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
     - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
     - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
     - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
     - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
@@ -341,6 +91,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
     - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
     - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
     - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
@@ -351,11 +102,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 5db7efc3e62fe49acb90e7d113d85942, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
     - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
     - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
     - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
@@ -397,7 +149,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 5fcae3d7cde0f4eb78049b17d426be17, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0

Assets/Res/UIAtlas/all.spriteatlasv2.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XHMYsS2oWn1lTcVYPTBO8+QgCNKZYhJGdeKsSfoCAZtDQ3BzRdVatcA=
+guid: CCgft3yuUS3kXaSAo/jlyZScHv/lNarwOLOvZsXqWfVzu1OX7LlcUX0=
 SpriteAtlasImporter:
   externalObjects: {}
   textureSettings:
@@ -17,11 +17,11 @@ SpriteAtlasImporter:
   platformSettings: []
   packingSettings:
     serializedVersion: 2
-    padding: 4
+    padding: 8
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
+    enableRotation: 0
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

Assets/Scripts/Core/UI/Core/UGUIPackLoad.cs

@@ -43,7 +43,8 @@ public class UGUIPackLoad : IUGUIPackLoad
             string[] allFilePath = System.IO.Directory.GetFiles(Application.dataPath + @"/Art/UIAssets/TextrueJson/");
             for (int i = 0; i < allFilePath.Length; i++)
             {
-                if (allFilePath[i].Contains(".meta"))
+                //mac 有这个文件.DS_Store会报错，so. 加了一个忽略
+                if (allFilePath[i].Contains(".meta") || allFilePath[i].Contains(".DS_Store"))
                 {
                     continue;
                 }

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -0,0 +1,56 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\GameConstant.xlsx. SheetName: GameConstantConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "GameConstantConfig.json")]
+	public partial class GameConstantConfigHolder : ConfigHolder<GameConstantConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct GameConstantConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///刷新时间点（utc+8时间）
+		/// </summary>
+public int refreshTime;
+
+
+		/// <summary>
+		///英雄初始暴击几率 5=5%
+		/// </summary>
+public int HeroInitialCriRate;
+
+
+		/// <summary>
+		///英雄初始暴击伤害百分比 150=150%
+		/// </summary>
+public int HeroInitialCriDamage;
+
+
+		/// <summary>
+		///稀有度属性倍率 100=100% r;sr;ssr 依次递增
+		/// </summary>
+public int[] heroRarityAttributeFactor;
+
+
+		/// <summary>
+		///稀有度属性倍率 100=100% 小兵;精英1;精英2;BOSS;精英3
+		/// </summary>
+public int[] monsterRarityAttributeFactor;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXod4C//VXqZwk/FOg/Xb+OiPzLSrU/bIkE9W+Y6iu9RSgnq7D2Q3cI=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -53,6 +53,12 @@ public bool isUseGpu;
 		/// <summary>
 		///星级
 		/// </summary>
+public int starGrade;
+
+
+		/// <summary>
+		///稀有度 1.精英r / 小怪 2.史诗 sr / 精英小怪1 3.传说ssr / 精英小怪2 4. BOSS 5. 精英小怪3
+		/// </summary>
 public int rarity;
 
 

Assets/Scripts/GameData/ExcelConfig/HeroPowerConfig.cs

@@ -50,6 +50,12 @@ public long ATK;
 public long DEF;
 
 
+		/// <summary>
+		///闪避%
+		/// </summary>
+public int SHANBI;
+
+
 		/// <summary>
 		///经验消耗
 		/// </summary>

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -10,19 +10,28 @@ using UnityEngine.Serialization;
 public class CombatHeroInfo
 {
     
-    public EncryptionLong hp=new EncryptionLong();
-    public EncryptionLong defense=new EncryptionLong();
-    public EncryptionLong attack=new EncryptionLong();
-    public EncryptionFloat attSpeed=new EncryptionFloat();
-    public EncryptionFloat crit=new EncryptionFloat();
-    public EncryptionFloat critDamage=new EncryptionFloat();
-    public EncryptionFloat dodge=new EncryptionFloat();
-
-    public int lv;
+    public EncryptionLong hp = new EncryptionLong();
+    public EncryptionLong defense = new EncryptionLong();
+    public EncryptionLong attack = new EncryptionLong();
+    /// <summary>
+    /// 闪避 evasion
+    /// </summary>
+    public EncryptionInt shanbi = new EncryptionInt(); 
+    
+    public EncryptionFloat attSpeed = new EncryptionFloat();
+    public EncryptionFloat crit =new EncryptionFloat();
+    public EncryptionFloat critDamage =new EncryptionFloat();
+    public EncryptionFloat dodge = new EncryptionFloat();
+
+    public int level;
     public int star;
     
     public HeroModelConfig modelConfig;
 
+    public HeroPowerConfig powerConfig;
+    public HeroPromoteConfig promoteConfig;
+    public HeroBasicEquipConfig basicEquipConfig;
+    
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
     /// </summary>
@@ -34,11 +43,70 @@ public class CombatHeroInfo
     public int[] skillId;
     public bool isGpu;
 
+    public CombatHeroInfo()
+    {
+        
+    }
+
+    // public CombatHeroInfo(AccountFileInfo.HeroData heroData)
+    // {
+    //     modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
+    //     promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
+    //     powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
+    //     star = promoteConfig.starGrade;
+    //     lv = powerConfig.heroLevel;
+    // }
+
+
+    private float rarityFactor;
+    private float starFactor;
+    
+    /// <summary>
+    /// 计算影响基础属性的参数
+    /// （稀有度、星级）
+    /// </summary>
+    protected void CalFactor()
+    {
+        rarityFactor = PlayerManager.Instance.gameConstantConfig.monsterRarityAttributeFactor[modelConfig.rarity-1]
+                       / 100f;
+        starFactor = promoteConfig.star_Power / 100f;
+    }
+
+    protected void CalAttribute()
+    {
+        hp = (EncryptionLong)(modelConfig.hp * rarityFactor * starFactor);
+        defense = (EncryptionLong)(modelConfig.def * rarityFactor * starFactor);
+        attack = (EncryptionLong)(modelConfig.attack * rarityFactor * starFactor);
+        shanbi = (EncryptionInt)powerConfig.SHANBI;
+
+        attSpeed = (EncryptionFloat)modelConfig.speed_atk;
+        crit = (EncryptionFloat)modelConfig.crit;
+        skillId = modelConfig.skillID;
+        modelName = modelConfig.model;
+        isGpu = modelConfig.isUseGpu;
+        maxDis = modelConfig.range_atk;
+        maxDisTo = maxDis * maxDis;
+    }
+
+    protected void SetDataConfig(int id,int level, int star)
+    {
+        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
+        powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(level);
+        promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
+    }
+    
+    public void InitMonster(int id,int level, int star)
+    {
+        SetDataConfig(id, level, star);
+        CalFactor();
+        CalAttribute();
+    }
+
     public void InitMonster(int id,int level)
     {
         HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
         HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
-        hp=(EncryptionLong)(heroModelConfig.hp*heroPowerUpConfig.HPFactor);
+        hp = (EncryptionLong)(heroModelConfig.hp*heroPowerUpConfig.HPFactor);
         defense=(EncryptionLong)(heroModelConfig.def*heroPowerUpConfig.DEFFactor);
         attack=(EncryptionLong)(heroModelConfig.attack*heroPowerUpConfig.ATKFactor);
         attSpeed=(EncryptionFloat)heroModelConfig.speed_atk;

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -5,27 +5,7 @@ namespace GameLogic.Hero
 {
     public class HeroInfo : CombatHeroInfo
     {
-        public HeroPowerConfig powerConfig;
-        public HeroPromoteConfig promoteConfig;
-        public HeroBasicEquipConfig basicEquipConfig;
-        
-        public int level;
-        public int star;
-
-
-        public HeroInfo()
-        {
-            
-        }
-        
-        public HeroInfo(AccountFileInfo.HeroData heroData)
-        {
-            modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
-            promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
-            powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
-            star = promoteConfig.starGrade;
-        }
-
+       
         private string _iconZhiYe;
         
         public string iconZhiYe
@@ -52,5 +32,31 @@ namespace GameLogic.Hero
                 return _iconZhiYe;
             }
         }
+        
+        //
+        // public int level;
+        // public int star;
+        
+        
+        public void InitHero(AccountFileInfo.HeroData heroData)
+        {
+            SetDataConfig(heroData.heroModelId, 
+                heroData.heroPowerId, 
+                heroData.heroPromoteId);
+            CalFactor();
+            CalAttribute();
+        }
+        
+        // public HeroInfo(AccountFileInfo.HeroData heroData)
+        // {
+        //     modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
+        //     promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
+        //     powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
+        //     
+        //     lv = powerConfig.heroLevel;
+        //     star = promoteConfig.starGrade;
+        // }
+
+        
     }
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -38,7 +38,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         {
             LogTool.Log("没有文件: " + persistentDataPath);
             ClearInitPlayerData();
-            File.Create(persistentDataPath).Close();
+            // File.Create(persistentDataPath).Close();
         }
 
         LogTool.Log("读取=文件: " + persistentDataPath);

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using Excel2Json;
+using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
 using Utility;
@@ -12,13 +14,22 @@ public class PlayerManager : Singleton<PlayerManager>
     /// </summary>
     public List<HeroInfo> heroListInLead = new List<HeroInfo>();
 
-    public void InitGameData()
+    public GameConstantConfig gameConstantConfig;
+
+    public void Init()
+    {
+        gameConstantConfig = ConfigComponent.Instance.Get<GameConstantConfig>(1);
+        InitGameData();
+    }
+
+    private void InitGameData()
     {
         AccountFileInfo.Instance.LoadPlayerData();
         for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
         {
             AccountFileInfo.HeroData heroData = AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i];
-            HeroInfo heroInfo = new HeroInfo(heroData);
+            HeroInfo heroInfo = new HeroInfo();
+            heroInfo.InitHero(heroData);
             heroListInLead.Add(heroInfo);
         }
         

Assets/Scripts/GameUI/GameApplction.cs

@@ -52,7 +52,7 @@ public class GameApplction : MonoBehaviour
         await UIManager.Instance.InitUI();
         CustomTweenManager.Init();
 
-        PlayerManager.Instance.InitGameData();
+        PlayerManager.Instance.Init();
         //主UI加载
         MainSceneController.Instance.Init();
 

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

@@ -30,8 +30,7 @@ namespace Fort23.Mono
 
         public void InitHeroDetailPanel(HeroInfo heroInfo)
         {
-            UGUITextTool.GetLanguageMassage(1);
-            iconZhiYe.icon_name = "";
+            iconZhiYe.icon_name = heroInfo.iconZhiYe;
             
             LogTool.Log(heroInfo);
         }

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

@@ -6,7 +6,7 @@ using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
-    [UIBinding(prefab = "Widget_Hero"  )]
+    [UIBinding(prefab = "WidgetHero")]
     public partial class WidgetHero : UIComponent
     {
         private void Init()
@@ -58,7 +58,7 @@ namespace Fort23.Mono
             // GetComponent<RectTransform>().anchorMin = new Vector2(0.5f, 0.5f);
             // GetComponent<RectTransform>().anchorMax = new Vector2(0.5f, 0.5f);
             this.heroInfo = heroInfo;
-            lv.text = heroInfo.lv.ToString();
+            lv.text = heroInfo.level.ToString();
             
             // 最大星级展示个数（6星，只显示一颗星星，换颜色）
             int maxShowStar = 5;

ProjectSettings/EditorSettings.asset

@@ -9,7 +9,7 @@ EditorSettings:
   m_DefaultBehaviorMode: 0
   m_PrefabRegularEnvironment: {fileID: 0}
   m_PrefabUIEnvironment: {fileID: 0}
-  m_SpritePackerMode: 0
+  m_SpritePackerMode: 5
   m_SpritePackerCacheSize: 10
   m_SpritePackerPaddingPower: 1
   m_Bc7TextureCompressor: 0
@@ -23,8 +23,6 @@ EditorSettings:
   m_EnableTextureStreamingInPlayMode: 1
   m_EnableEditorAsyncCPUTextureLoading: 0
   m_AsyncShaderCompilation: 1
-  m_DllEncryptionRootInEditor: 
-  m_EnableDllEncryptionInEditor: 0
   m_PrefabModeAllowAutoSave: 1
   m_EnterPlayModeOptionsEnabled: 0
   m_EnterPlayModeOptions: 3

UserSettings/EditorUserSettings.asset

@@ -30,19 +30,25 @@ EditorUserSettings:
       value: 5b0255535d0c510e5e565e7249250f4413154d2b787e76317f2c1e63b1e26568
       flags: 0
     RecentlyUsedSceneGuid-3:
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      flags: 0
+    RecentlyUsedSceneGuid-4:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
+    RecentlyUsedSceneGuid-5:
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b2968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f9aaffff8e85dd8390e3949c8899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b2968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f9aaffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9198978797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9198978797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=900,100
+Size=666,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1300,0
+Pos=1066,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=900,70
+Size=666,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=900,130
+Size=666,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=900,420
+Size=666,420
 Collapsed=0
 
 [Docking][Data]