修改bug

Assets/Art/UIAssets/icon/bak_icon_skill_10001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/bakicon_skill_20001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/bakicon_skill_30001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/bakicon_skill_40001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_10001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_10002.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_10003.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_10004.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_10005.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_20001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_20002.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_20004.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_20005.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_30001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_30002.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_30004.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_30005.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_40001.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_40002.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_40004.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Art/UIAssets/icon/icon_skill_40005.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
@@ -188,7 +188,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/Res/UIAtlas/battle.spriteatlasv2

@@ -11,32 +11,32 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 88618356bb55a304280196e7fffbc11b, type: 3}
+    - {fileID: 2800000, guid: ed4f487e92f7228488e6761c3195ce63, type: 3}
     - {fileID: 2800000, guid: 289e281c65c1c5547bbf5637330a92b9, type: 3}
     - {fileID: 2800000, guid: 4909dd28f612aba43aafc836ea21c1d2, type: 3}
-    - {fileID: 2800000, guid: 37b8b341bcf7f974193af3f51b574e27, type: 3}
-    - {fileID: 2800000, guid: 2b77daa02c22e8e41b2595fa79397885, type: 3}
-    - {fileID: 2800000, guid: 35e94d96e70170040b93a446058585a0, type: 3}
-    - {fileID: 2800000, guid: 4a3a21e5b0e643c4cafb81a670593867, type: 3}
+    - {fileID: 2800000, guid: 37ac8271bbc15dc4184c08096df5b374, type: 3}
+    - {fileID: 2800000, guid: 8feb6b66b8c97e74aa6611a34bf203c2, type: 3}
+    - {fileID: 2800000, guid: 335d092c70d42864db7408201593e62e, type: 3}
+    - {fileID: 2800000, guid: 6c334e216a62ac94282ea07a0873cd7c, type: 3}
     - {fileID: 2800000, guid: c764dca922d22104d883d11a2ba097ce, type: 3}
-    - {fileID: 2800000, guid: b6f32c854b6712248a0e1405ab01f436, type: 3}
-    - {fileID: 2800000, guid: 1a6c0a002f0c6504ba2dc9026d463510, type: 3}
-    - {fileID: 2800000, guid: ecb58a1580064d2429cfb6b0212f12ae, type: 3}
+    - {fileID: 2800000, guid: a3178eda8f1ba914b82935602d128450, type: 3}
+    - {fileID: 2800000, guid: b845f98d3db279d41b8e0cddd75b1e66, type: 3}
+    - {fileID: 2800000, guid: a65d33338596ffd4a967ebbf07076a2e, type: 3}
     - {fileID: 2800000, guid: f3bf02f43ae683245a9fd08ea3669254, type: 3}
     - {fileID: 2800000, guid: 78191d7c1ee1bc34c87bb6690e8da67f, type: 3}
-    - {fileID: 2800000, guid: 23bb89b123ea1dd4faccf2e4cf808ef2, type: 3}
+    - {fileID: 2800000, guid: c193021d18c48174fa2774c5bb9ce942, type: 3}
     - {fileID: 2800000, guid: 17278af695d218f4db68c44f54051175, type: 3}
     - {fileID: 2800000, guid: f812f2cc0fb3e214f957e38d3240cae7, type: 3}
     - {fileID: 2800000, guid: dd29c735c83523c438f49f6c5a84b917, type: 3}
-    - {fileID: 2800000, guid: edf189f2557046b4caecbd8c94eeb367, type: 3}
-    - {fileID: 2800000, guid: 5364c9f78d5ecef40ba8a8cec85750d8, type: 3}
+    - {fileID: 2800000, guid: b8390464696c712499e852112d209bce, type: 3}
+    - {fileID: 2800000, guid: 9420c6149c9ecea40829470293c18bf1, type: 3}
     - {fileID: 2800000, guid: 3ebef0b933c6a884a9443eb76c68048a, type: 3}
     - {fileID: 2800000, guid: 11a050c820c03994a83b8d5cb60e55b8, type: 3}
     - {fileID: 2800000, guid: c3e90883db7078b42966fd3e59cb5bbc, type: 3}
     - {fileID: 2800000, guid: 4fb0a524cb1413f4ab2740a9e1279736, type: 3}
-    - {fileID: 2800000, guid: 8e1b51b17351edf4d89c92c4b3adab3f, type: 3}
-    - {fileID: 2800000, guid: b662473a0a91a714a8785856c2855b91, type: 3}
-    - {fileID: 2800000, guid: 5ade5164961d09e4593591e100311ef2, type: 3}
-    - {fileID: 2800000, guid: 6889fec7c06e3b5449610421866c77ec, type: 3}
+    - {fileID: 2800000, guid: 859c467862c6d5e408904afb25b01467, type: 3}
+    - {fileID: 2800000, guid: 5b6fda27d9bfe18458d0b85669ae6b78, type: 3}
+    - {fileID: 2800000, guid: ffac0fa4b1177d246955929412713166, type: 3}
+    - {fileID: 2800000, guid: 2d0b3427962df984886d854afe24ce78, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/skillIcon.spriteatlasv2

@@ -11,34 +11,34 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 0867be35f4f0ae145bc6145b13770418, type: 3}
-    - {fileID: 2800000, guid: 868a1b0a44b48b743883918a6d0f0b64, type: 3}
+    - {fileID: 2800000, guid: b76941c63ba5ced44833915a303f4c2b, type: 3}
+    - {fileID: 2800000, guid: 7252158098dbcb34cad5374d3976f610, type: 3}
     - {fileID: 2800000, guid: 26e0f7c71e95f4b67b429f478069bc93, type: 3}
     - {fileID: 2800000, guid: 9a8da91ac8b0b3042b18b5f66a65c614, type: 3}
     - {fileID: 2800000, guid: 49a56cefdb25e1d4781964df6ef99cee, type: 3}
     - {fileID: 2800000, guid: cd17866a0bfb911429fe498a0431277c, type: 3}
     - {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
-    - {fileID: 2800000, guid: e05b5e3ffea63d0458c33bd6641b97cd, type: 3}
-    - {fileID: 2800000, guid: dd7f08ac22eb2d747b0fb1d62bedc93b, type: 3}
-    - {fileID: 2800000, guid: 136448b2e62da6e4e8b4ae32c28cfc92, type: 3}
+    - {fileID: 2800000, guid: bd3f9bb867024e04991167cd7a9f443f, type: 3}
+    - {fileID: 2800000, guid: 7ae5779dd56137d4585d0ce1ec82132c, type: 3}
+    - {fileID: 2800000, guid: 548eaa9e1f4e8664589a2237a84da628, type: 3}
     - {fileID: 2800000, guid: a878d3156a1104bb5a021cc9db275ec9, type: 3}
     - {fileID: 2800000, guid: 4805970872efad343a8559b5ddf6160a, type: 3}
     - {fileID: 2800000, guid: 9e6ea24bb7a75d649a177f0c404c14ce, type: 3}
     - {fileID: 2800000, guid: 377bbbee9636d8749b06a6ff1eff1b68, type: 3}
-    - {fileID: 2800000, guid: b8b39aa05a51b8a46aa8836f7afdfa00, type: 3}
+    - {fileID: 2800000, guid: 3360d62b58fdba64581010621ecefeab, type: 3}
     - {fileID: 2800000, guid: 2d02827d80f314b27ad033444533c025, type: 3}
     - {fileID: 2800000, guid: 44e771c4fac834747917264ec667b36d, type: 3}
     - {fileID: 2800000, guid: 420e401ffc649de45b6789ff546e7b69, type: 3}
     - {fileID: 2800000, guid: 91b32d7475b6ca44e932bb93a5b5b040, type: 3}
-    - {fileID: 2800000, guid: d550f03e4d348fd449a88d5f748cfa13, type: 3}
+    - {fileID: 2800000, guid: d85633605e80fc64aa6c53feed79ab33, type: 3}
     - {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     - {fileID: 2800000, guid: bd02d94a9e7e5b2488e9bf34e210e4e9, type: 3}
     - {fileID: 2800000, guid: 28e6a1e003583174188048aadd974b70, type: 3}
     - {fileID: 2800000, guid: 400a70f93890a604fb5dba2d1d0de503, type: 3}
-    - {fileID: 2800000, guid: c5819b45a6a4e4948a4cca50ef5b51e8, type: 3}
-    - {fileID: 2800000, guid: b39aa57a36e21ba4bb22b6c30c33e89f, type: 3}
-    - {fileID: 2800000, guid: 2274266728f81f646804b200c6d27805, type: 3}
-    - {fileID: 2800000, guid: d48f758f0aa4b3c4da8e7e4e1e7e96b1, type: 3}
-    - {fileID: 2800000, guid: 39c6c06d6f38e9a439ff834d88a563c3, type: 3}
+    - {fileID: 2800000, guid: ebb471d39e684484c8d3cce44b2d8f00, type: 3}
+    - {fileID: 2800000, guid: 31281ed01993a0e4ca6bee3b7b9690ac, type: 3}
+    - {fileID: 2800000, guid: b7787b77a811bfd4785757ae694fe922, type: 3}
+    - {fileID: 2800000, guid: d0750edc999011646bdf2c73d715df30, type: 3}
+    - {fileID: 2800000, guid: a7370b500c3142349b5decc8437426e8, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scenes/testCombat.scene

@@ -371,7 +371,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 88618356bb55a304280196e7fffbc11b, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -452,13 +452,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 255
+      y: 0
       width: 493
       height: 112
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 255}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 246.5, z: 100, w: 311}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 246.5, z: 100, w: 56}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -1.5749999, y: -0.38}
@@ -752,14 +752,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
-      y: 264
+      x: 105
+      y: 395
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 105, y: 395}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 150, z: 100, w: 440}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -1011,14 +1011,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 497
+      x: 421
       y: 0
       width: 68.9665
       height: 360
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 497, y: 0}
+    atlasRectOffset: {x: 421, y: 0}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 531.5, z: 100, w: 180}
+    uvTransform: {x: 100, y: 455.5, z: 100, w: 180}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.024999999, y: -0.82}
@@ -2187,13 +2187,17 @@ PrefabInstance:
       propertyPath: enemyHeroInfo.Array.data[0].hp
       value: 1000000
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[0].heroID
+      value: 9101
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10002
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_Name
@@ -2359,7 +2363,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 37b8b341bcf7f974193af3f51b574e27, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -2439,14 +2443,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 702
-      y: 140
+      x: 0
+      y: 0
       width: 91
       height: 154
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 702, y: 140}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 747.5, z: 100, w: 217}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 45.5, z: 100, w: 77}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.33499998, y: 0.77}
@@ -2854,7 +2858,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 1a6c0a002f0c6504ba2dc9026d463510, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -2934,14 +2938,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 256
-      y: 371
+      x: 0
+      y: 0
       width: 66
       height: 68
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 256, y: 371}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 289, z: 100, w: 405}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 33, z: 100, w: 34}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.13, y: 0.19999999}
@@ -3182,7 +3186,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 37b8b341bcf7f974193af3f51b574e27, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -3262,14 +3266,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 702
-      y: 140
+      x: 0
+      y: 0
       width: 91
       height: 154
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 702, y: 140}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 747.5, z: 100, w: 217}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 45.5, z: 100, w: 77}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.33499998, y: 0.77}
@@ -3464,7 +3468,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: e05b5e3ffea63d0458c33bd6641b97cd, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -3544,14 +3548,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 182
-      y: 408
+      x: 0
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 182, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 223.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.155, y: 0.415}
@@ -3748,7 +3752,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -3828,14 +3832,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 272
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 272, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -4392,14 +4396,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 570
-      y: 140
+      x: 255
+      y: 166
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 570, y: 140}
+    atlasRectOffset: {x: 255, y: 166}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 634, z: 100, w: 204}
+    uvTransform: {x: 100, y: 319, z: 100, w: 230}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.62, y: -0.14}
@@ -4543,7 +4547,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 0867be35f4f0ae145bc6145b13770418, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -4624,13 +4628,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 408
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 41.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.36499998, y: 0.305}
@@ -4799,7 +4803,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -4879,14 +4883,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 272
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 272, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -5768,7 +5772,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 0867be35f4f0ae145bc6145b13770418, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -5849,13 +5853,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 408
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 41.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.36499998, y: 0.305}
@@ -6418,7 +6422,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 37b8b341bcf7f974193af3f51b574e27, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -6498,14 +6502,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 702
-      y: 140
+      x: 0
+      y: 0
       width: 91
       height: 154
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 702, y: 140}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 747.5, z: 100, w: 217}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 45.5, z: 100, w: 77}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.33499998, y: 0.77}
@@ -6802,7 +6806,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: dd7f08ac22eb2d747b0fb1d62bedc93b, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -6882,14 +6886,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 91
-      y: 408
+      x: 0
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 91, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 132.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.355, y: 0.305}
@@ -7222,7 +7226,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 0867be35f4f0ae145bc6145b13770418, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -7303,13 +7307,13 @@ Sprite:
     textureRect:
       serializedVersion: 2
       x: 0
-      y: 408
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 41.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.36499998, y: 0.305}
@@ -7445,7 +7449,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 5364c9f78d5ecef40ba8a8cec85750d8, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -7525,14 +7529,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 190
-      y: 371
+      x: 0
+      y: 0
       width: 62
       height: 93
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 190, y: 371}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 221, z: 100, w: 417.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 31, z: 100, w: 46.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.29, y: -0.024999999}
@@ -7824,14 +7828,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
-      y: 264
+      x: 105
+      y: 395
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 105, y: 395}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 150, z: 100, w: 440}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -8218,7 +8222,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -8298,14 +8302,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 272
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 272, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -9071,7 +9075,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -9151,14 +9155,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 272
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 272, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -9528,14 +9532,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
-      y: 264
+      x: 105
+      y: 395
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 105, y: 395}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 150, z: 100, w: 440}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -9769,7 +9773,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+    texture: {fileID: 2800000, guid: 37b8b341bcf7f974193af3f51b574e27, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -9849,14 +9853,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 702
-      y: 140
+      x: 0
+      y: 0
       width: 91
       height: 154
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 702, y: 140}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 747.5, z: 100, w: 217}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 45.5, z: 100, w: 77}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.33499998, y: 0.77}
@@ -10756,7 +10760,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -10836,14 +10840,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 136
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 136, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 200, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -11034,7 +11038,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -11114,14 +11118,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 136
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 136, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 200, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -11346,7 +11350,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -11426,14 +11430,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 272
+      x: 0
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 272, y: 0}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 336, z: 100, w: 64}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 64, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -11813,7 +11817,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
+    texture: {fileID: 2800000, guid: dd7f08ac22eb2d747b0fb1d62bedc93b, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -11893,14 +11897,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 91
-      y: 408
+      x: 0
+      y: 0
       width: 83
       height: 83
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 91, y: 408}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 132.5, z: 100, w: 449.5}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 41.5, z: 100, w: 41.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.355, y: 0.305}

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

@@ -273,7 +273,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
                 return 4;
             }
 
-            return CurrCombatHeroInfo.attSpeed.Value;
+            return CurrCombatHeroInfo.GetAnimationSpeed;
         }
 
         return 1;

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

@@ -27,7 +27,10 @@ public class CombatHeroInfo
     public EncryptionLong attack = new EncryptionLong();
 
 
-    public EncryptionFloat attSpeed = (EncryptionFloat)2;
+    public EncryptionFloat attSpeed
+    {
+        get { return _attSpeed; }
+    }
 
     public EncryptionInt level;
     public EncryptionInt exp = new EncryptionInt();
@@ -36,6 +39,7 @@ public class CombatHeroInfo
 
     public HeroPowerUpConfig powerUpConfig;
     public MonsterPowerUpConfig MonsterPowerUpConfig;
+    public EncryptionFloat _attSpeed;
 
     /// <summary>
     /// 功法强度的加成 %
@@ -144,13 +148,18 @@ public class CombatHeroInfo
                 addAttSpeed_bl + 100);
             if (speed < 0)
             {
-                speed = 0;
+                speed = 0.01f;
             }
 
             return speed;
         }
     }
 
+    public float GetAnimationSpeed
+    {
+        get { return GetAttSpeed / _attSpeed.Value; }
+    }
+
     public CombatHeroInfo()
     {
     }
@@ -242,8 +251,29 @@ public class CombatHeroInfo
             {
                 for (int i = 0; i < modelConfig.skillID.Length; i++)
                 {
-                    int skillid = modelConfig.skillID[i] * 10 + MonsterPowerUpConfig.GongfaStar;
+                    int id = modelConfig.skillID[i];
+                    if (id <= 0)
+                    {
+                        continue;
+                    }
+
+                    int start = MonsterPowerUpConfig.GongfaStar;
+                    int skillid = id * 10 + start;
+                    while (start >= 0)
+                    {
+                        SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillid);
+                        if (skillConfig.ID > 0)
+                        {
+                            break;
+                        }
+
+                        start--;
+                        skillid = id * 10 + start;
+                    }
+
+
                     SkillInfo skillInfo = new SkillInfo(skillid, MonsterPowerUpConfig.GongfaLv);
+                    skillInfo.index = i;
                     unLockSkills.Add(skillInfo);
                 }
             }
@@ -253,9 +283,12 @@ public class CombatHeroInfo
                 for (int i = 0; i < modelConfig.fa_bao_id.Length; i++)
                 {
                     int faBaoId = modelConfig.fa_bao_id[i];
-                    FaBaoInfo faBaoInfo = new FaBaoInfo(faBaoId, MonsterPowerUpConfig.FabaoLv,
-                        MonsterPowerUpConfig.FabaoStar);
-                    MagicWeaponID.Add(faBaoInfo);
+                    if (faBaoId > 0)
+                    {
+                        FaBaoInfo faBaoInfo = new FaBaoInfo(faBaoId, MonsterPowerUpConfig.FabaoLv,
+                            MonsterPowerUpConfig.FabaoStar);
+                        MagicWeaponID.Add(faBaoInfo);
+                    }
                 }
             }
         }
@@ -312,7 +345,7 @@ public class CombatHeroInfo
     {
         CalBasicAttribute();
 
-        attSpeed = (EncryptionFloat)modelConfig.speed_atk;
+        _attSpeed = (EncryptionFloat)(1.0f / modelConfig.speed_atk);
 
         // skillId = modelConfig.skillID;
         modelName = modelConfig.model;

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -96,7 +96,7 @@ namespace GameLogic.Combat.Hero.Turntable
                     }
 
 
-                    SetSkill(i, skillBasic);
+                    SetSkill(skillInfo.index, skillBasic);
 
                     if (!string.IsNullOrEmpty(skillConfig.scriptName))
                     {

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -23,6 +23,11 @@ namespace GameLogic.Hero
             SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillPowerup);
             if (skillConfig.ID != 0)
             {
+                if (skillConfig.effectValue == null)
+                {
+                    skillConfig.effectValue = new float[1];
+                }
+
                 effectValue = new float[skillConfig.effectValue.Length];
                 Array.Copy(skillConfig.effectValue, effectValue, skillConfig.effectValue.Length);
                 if (skillConfig.intensifierIndex != null)