Merge branch 'dev_spine' into dev_hero

Assets/arts/spines/characters/m10003/m10003.atlas.txt

@@ -1,41 +1,66 @@
 m10003.png
-size:256,256
+size:1024,1024
 filter:Linear,Linear
-clothes_1
+FX1/FX1_00000
-bounds:2,35,84,37
+bounds:2,463,300,169
 rotate:90
-clothes_2
+FX1/FX1_00001
-bounds:92,62,61,30
+bounds:250,846,300,169
+FX1/FX1_00002
+bounds:2,161,300,169
 rotate:90
+FX1/FX1_00003
+bounds:552,846,300,169
+FX1/FX1_00004
+bounds:250,675,300,169
+FX2/FX2_00000
+bounds:218,655,26,18
+offsets:22,15,150,84
+FX2/FX2_00001
+bounds:67,16,49,39
+offsets:27,15,150,84
+FX2/FX2_00002
+bounds:855,781,74,63
+offsets:31,13,150,84
+FX2/FX2_00003
+bounds:854,846,84,65
+offsets:32,12,150,84
+FX2/FX2_00004
+bounds:2,2,53,63
+offsets:62,14,150,84
+rotate:90
+ear_l
+bounds:679,761,86,83
+offsets:1,2,88,86
+ear_r
+bounds:767,761,86,83
+offsets:1,1,88,85
 eye
-bounds:169,152,47,23
+bounds:552,739,125,105
+offsets:1,1,127,107
+eye_yun
+bounds:552,690,43,47
+hand_l_1
+bounds:940,847,64,64
+offsets:1,1,66,66
+hand_l_2
+bounds:2,57,154,102
+offsets:1,2,156,105
+hand_r
+bounds:854,913,154,102
+offsets:1,2,156,105
+shanzi1
+bounds:173,276,109,26
+offsets:1,1,111,28
+rotate:90
+shanzi2
+bounds:218,675,88,26
+offsets:1,1,90,28
 rotate:90
-gutou
-bounds:123,201,70,53
-hair
-bounds:195,200,58,54
-head
-bounds:2,185,119,69
-hit_yan3
-bounds:51,2,28,28
-kulou
-bounds:2,121,77,62
-offsets:0,1,77,63
-leg_L
-bounds:133,162,34,37
-leg_R
-bounds:133,123,34,37
 spine
-bounds:81,125,58,50
+bounds:2,765,246,250
-rotate:90
+offsets:2,2,250,254
-upperarm_l
-bounds:2,2,28,47
-rotate:90
-upperarm_r
-bounds:194,156,23,42
-weapon
-bounds:41,32,87,28
-rotate:90
 yingzi
-bounds:71,36,83,19
+bounds:173,387,376,43
+offsets:1,1,378,45
 rotate:90

Assets/arts/spines/characters/m10003/m10003.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: b30538bffd4e878498d893c50ae71b12
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10003/m10003.png.meta

@@ -36,9 +36,9 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
+    wrapU: 0
-    wrapV: 1
+    wrapV: 0
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -63,20 +63,32 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -89,6 +101,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
@@ -101,30 +125,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +143,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10003/m10003.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: d82520b420b4e9b41a3b1477ffdb72cc
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10003/m10003_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10003/m10003_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: m10003_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords:
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
@@ -29,6 +29,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -39,6 +40,7 @@ Material:
     - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/arts/spines/characters/m10003/m10003_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10003/m10003_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10003.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004.atlas.txt

@@ -1,39 +1,66 @@
 m10004.png
-size:256,256
+size:1024,1024
 filter:Linear,Linear
-clothes_1
+FX1/FX1_00000
-bounds:2,34,85,37
+bounds:2,463,300,169
 rotate:90
-clothes_2
+FX1/FX1_00001
-bounds:2,2,61,30
+bounds:250,846,300,169
+FX1/FX1_00002
+bounds:2,161,300,169
+rotate:90
+FX1/FX1_00003
+bounds:552,846,300,169
+FX1/FX1_00004
+bounds:250,675,300,169
+FX2/FX2_00000
+bounds:218,655,26,18
+offsets:22,15,150,84
+FX2/FX2_00001
+bounds:67,16,49,39
+offsets:27,15,150,84
+FX2/FX2_00002
+bounds:855,781,74,63
+offsets:31,13,150,84
+FX2/FX2_00003
+bounds:854,846,84,65
+offsets:32,12,150,84
+FX2/FX2_00004
+bounds:2,2,53,63
+offsets:62,14,150,84
+rotate:90
+ear_l
+bounds:679,761,86,83
+offsets:1,2,88,86
+ear_r
+bounds:767,761,86,83
+offsets:1,1,88,85
 eye
-bounds:62,71,48,23
+bounds:552,739,125,105
+offsets:1,1,127,107
+eye_yun
+bounds:552,690,43,47
+hand_l_1
+bounds:940,847,64,64
+offsets:1,1,66,66
+hand_l_2
+bounds:2,57,154,102
+offsets:1,2,156,105
+hand_r
+bounds:854,913,154,102
+offsets:1,2,156,105
+shanzi1
+bounds:173,276,109,26
+offsets:1,1,111,28
+rotate:90
+shanzi2
+bounds:218,675,88,26
+offsets:1,1,90,28
 rotate:90
-gutou
-bounds:123,201,70,53
-hair
-bounds:195,200,58,54
-head
-bounds:2,185,119,69
-hit_yan3
-bounds:211,170,28,28
-kulou
-bounds:2,121,77,62
-offsets:0,1,77,63
-leg_L
-bounds:158,113,33,37
-leg_R
-bounds:87,86,34,37
 spine
-bounds:81,125,58,50
+bounds:2,765,246,250
-rotate:90
+offsets:2,2,250,254
-upperarm_l
-bounds:158,152,27,47
-upperarm_r
-bounds:187,156,22,42
-weapon
-bounds:133,112,87,23
-rotate:90
 yingzi
-bounds:41,36,83,19
+bounds:173,387,376,43
+offsets:1,1,378,45
 rotate:90

Assets/arts/spines/characters/m10004/m10004.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: ab94d131b25768f458ba4aa3f36847e0
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004.png.meta

@@ -63,7 +63,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -101,18 +101,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
@@ -125,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +143,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: 92440a25a2a4c7544872ae9014c294b3
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: m10004_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords:
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
@@ -29,6 +29,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -39,6 +40,7 @@ Material:
     - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/arts/spines/characters/m10004/m10004_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10004/m10004_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10004.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005.atlas.txt

@@ -1,100 +1,66 @@
 m10005.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
-FX/FX1
+FX1/FX1_00000
-bounds:95,359,25,37
+bounds:2,463,300,169
-offsets:21,31,68,100
 rotate:90
-FX/FX10
+FX1/FX1_00001
-bounds:363,482,28,40
+bounds:250,846,300,169
-offsets:20,30,68,100
+FX1/FX1_00002
+bounds:2,161,300,169
 rotate:90
-FX/FX11
+FX1/FX1_00003
-bounds:405,482,28,40
+bounds:552,846,300,169
-offsets:20,30,68,100
+FX1/FX1_00004
+bounds:250,675,300,169
+FX2/FX2_00000
+bounds:218,655,26,18
+offsets:22,15,150,84
+FX2/FX2_00001
+bounds:67,16,49,39
+offsets:27,15,150,84
+FX2/FX2_00002
+bounds:855,781,74,63
+offsets:31,13,150,84
+FX2/FX2_00003
+bounds:854,846,84,65
+offsets:32,12,150,84
+FX2/FX2_00004
+bounds:2,2,53,63
+offsets:62,14,150,84
 rotate:90
-FX/FX12
-bounds:447,482,28,40
-offsets:20,30,68,100
-rotate:90
-FX/FX13
-bounds:95,386,26,40
-offsets:21,30,68,100
-FX/FX14
-bounds:2,2,26,36
-offsets:21,30,68,96
-FX/FX15
-bounds:137,319,26,38
-offsets:21,29,68,96
-FX/FX16
-bounds:30,2,26,36
-offsets:21,30,68,96
-FX/FX2
-bounds:105,250,25,38
-offsets:22,31,68,100
-FX/FX3
-bounds:207,447,25,40
-offsets:22,30,68,100
-rotate:90
-FX/FX4
-bounds:81,317,26,40
-offsets:21,30,68,100
-FX/FX5
-bounds:109,317,26,40
-offsets:21,30,68,100
-FX/FX6
-bounds:81,290,25,40
-offsets:22,30,68,100
-rotate:90
-FX/FX7
-bounds:77,248,26,40
-offsets:21,30,68,100
-FX/FX8
-bounds:123,396,28,40
-offsets:20,30,68,100
-FX/FX9
-bounds:153,396,28,40
-offsets:20,30,68,100
-clothes_1
-bounds:207,474,66,36
-clothes_3
-bounds:2,169,66,60
-clothes_4
-bounds:2,359,91,67
 ear_l
-bounds:275,476,34,40
+bounds:679,761,86,83
-rotate:90
+offsets:1,2,88,86
 ear_r
-bounds:134,359,30,35
+bounds:767,761,86,83
-gutou
+offsets:1,1,88,85
-bounds:2,97,70,53
+eye
-rotate:90
+bounds:552,739,125,105
+offsets:1,1,127,107
+eye_yun
+bounds:552,690,43,47
+hand_l_1
+bounds:940,847,64,64
+offsets:1,1,66,66
+hand_l_2
+bounds:2,57,154,102
+offsets:1,2,156,105
 hand_r
-bounds:489,488,21,22
+bounds:854,913,154,102
-head_1
+offsets:1,2,156,105
-bounds:2,428,107,82
+shanzi1
-head_2
+bounds:173,276,109,26
-bounds:2,231,73,62
+offsets:1,1,111,28
-head_3
-bounds:111,459,94,51
-hit_yan3
-bounds:249,444,28,28
-kulou
-bounds:2,295,77,62
-offsets:0,1,77,63
-leg_l
-bounds:165,323,30,34
-leg_r
-bounds:279,443,31,34
 rotate:90
-nose
+shanzi2
-bounds:57,137,22,30
+bounds:218,675,88,26
-upperarm_l
+offsets:1,1,90,28
-bounds:317,484,26,44
 rotate:90
-upperarm_r
+spine
-bounds:166,359,29,35
+bounds:2,765,246,250
-weapon
+offsets:2,2,250,254
-bounds:2,40,45,55
 yingzi
-bounds:111,438,83,19
+bounds:173,387,376,43
+offsets:1,1,378,45
+rotate:90

Assets/arts/spines/characters/m10005/m10005.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: ba56dd7cbe5c05948ad77785276b9707
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005.png.meta

@@ -63,7 +63,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -101,18 +101,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
@@ -125,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +143,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: c55adb6ef5fc62b408e37da86158d622
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: m10005_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords:
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
@@ -29,6 +29,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -39,6 +40,7 @@ Material:
     - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/arts/spines/characters/m10005/m10005_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10005/m10005_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10005.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006.atlas.txt

@@ -1,101 +1,66 @@
 m10006.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
-FX/FX1
+FX1/FX1_00000
-bounds:94,359,25,37
+bounds:2,463,300,169
-offsets:21,31,68,100
 rotate:90
-FX/FX10
+FX1/FX1_00001
-bounds:321,482,28,40
+bounds:250,846,300,169
-offsets:20,30,68,100
+FX1/FX1_00002
+bounds:2,161,300,169
 rotate:90
-FX/FX11
+FX1/FX1_00003
-bounds:363,482,28,40
+bounds:552,846,300,169
-offsets:20,30,68,100
+FX1/FX1_00004
+bounds:250,675,300,169
+FX2/FX2_00000
+bounds:218,655,26,18
+offsets:22,15,150,84
+FX2/FX2_00001
+bounds:67,16,49,39
+offsets:27,15,150,84
+FX2/FX2_00002
+bounds:855,781,74,63
+offsets:31,13,150,84
+FX2/FX2_00003
+bounds:854,846,84,65
+offsets:32,12,150,84
+FX2/FX2_00004
+bounds:2,2,53,63
+offsets:62,14,150,84
 rotate:90
-FX/FX12
-bounds:405,482,28,40
-offsets:20,30,68,100
-rotate:90
-FX/FX13
-bounds:94,386,26,40
-offsets:21,30,68,100
-FX/FX14
-bounds:40,2,26,36
-offsets:21,30,68,96
-FX/FX15
-bounds:81,294,26,38
-offsets:21,29,68,96
-rotate:90
-FX/FX16
-bounds:248,436,26,36
-offsets:21,30,68,96
-FX/FX2
-bounds:145,333,25,38
-offsets:22,31,68,100
-rotate:90
-FX/FX3
-bounds:180,396,25,40
-offsets:22,30,68,100
-FX/FX4
-bounds:152,396,26,40
-offsets:21,30,68,100
-FX/FX5
-bounds:206,446,26,40
-offsets:21,30,68,100
-rotate:90
-FX/FX6
-bounds:77,252,25,40
-offsets:22,30,68,100
-FX/FX7
-bounds:207,404,26,40
-offsets:21,30,68,100
-FX/FX8
-bounds:447,482,28,40
-offsets:20,30,68,100
-rotate:90
-FX/FX9
-bounds:122,396,28,40
-offsets:20,30,68,100
-clothes_1
-bounds:206,474,67,36
-clothes_3
-bounds:2,169,66,60
-clothes_4
-bounds:2,359,90,67
 ear_l
-bounds:2,2,36,36
+bounds:679,761,86,83
+offsets:1,2,88,86
 ear_r
-bounds:81,322,31,35
+bounds:767,761,86,83
-gutou
+offsets:1,1,88,85
-bounds:2,97,70,53
+eye
-rotate:90
+bounds:552,739,125,105
+offsets:1,1,127,107
+eye_yun
+bounds:552,690,43,47
+hand_l_1
+bounds:940,847,64,64
+offsets:1,1,66,66
+hand_l_2
+bounds:2,57,154,102
+offsets:1,2,156,105
 hand_r
-bounds:489,488,20,22
+bounds:854,913,154,102
-head_1
+offsets:1,2,156,105
-bounds:2,428,107,82
+shanzi1
-head_2
+bounds:173,276,109,26
-bounds:2,231,73,62
+offsets:1,1,111,28
-head_3
-bounds:111,459,93,51
-hit_yan3
-bounds:121,292,28,28
-kulou
-bounds:2,295,77,62
-offsets:0,1,77,63
-leg_l
-bounds:166,360,30,34
-leg_r
-bounds:133,360,31,34
-nose
-bounds:77,228,22,30
 rotate:90
-upperarm_l
+shanzi2
-bounds:275,485,25,44
+bounds:218,675,88,26
+offsets:1,1,90,28
 rotate:90
-upperarm_r
+spine
-bounds:114,322,29,35
+bounds:2,765,246,250
-weapon
+offsets:2,2,250,254
-bounds:2,40,44,55
 yingzi
-bounds:111,438,83,19
+bounds:173,387,376,43
+offsets:1,1,378,45
+rotate:90

Assets/arts/spines/characters/m10006/m10006.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: b1be16d55afe2ff49833ff8517319aba
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006.png.meta

@@ -63,7 +63,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -101,18 +101,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 50
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
@@ -125,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +143,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: 9eeccbfdadb9827489206fe002262af8
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: m10006_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords:
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
@@ -29,6 +29,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -39,6 +40,7 @@ Material:
     - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/arts/spines/characters/m10006/m10006_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/characters/m10006/m10006_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/characters/m10006.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/prefabs/spine/ui/characters/m10003.prefab

@@ -27,6 +27,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2663275627370592771}
   m_Father: {fileID: 0}
@@ -81,6 +82,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 110436067314948100}
   m_Father: {fileID: 2951863086470196126}
@@ -119,6 +121,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2663275627370592771}
   m_RootOrder: 0
@@ -160,6 +163,7 @@ MonoBehaviour:
   additiveMaterial: {fileID: 0}
   multiplyMaterial: {fileID: 0}
   screenMaterial: {fileID: 0}
+  m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
   initialSkinName: 
   initialFlipX: 0
   initialFlipY: 0
@@ -167,6 +171,13 @@ MonoBehaviour:
   startingLoop: 0
   timeScale: 1
   freeze: 0
+  layoutScaleMode: 0
+  referenceSize: {x: 0, y: 0}
+  pivotOffset: {x: 0, y: 0}
+  referenceScale: 1
+  layoutScale: 1
+  rectTransformSize: {x: 0, y: 0}
+  editReferenceRect: 0
   updateWhenInvisible: 3
   allowMultipleCanvasRenderers: 0
   canvasRenderers: []
@@ -174,16 +185,20 @@ MonoBehaviour:
   enableSeparatorSlots: 0
   separatorParts: []
   updateSeparatorPartLocation: 1
+  updateSeparatorPartScale: 0
   disableMeshAssignmentOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   meshGenerator:
     settings:
       useClipping: 1
       zSpacing: 0
-      pmaVertexColors: 1
       tintBlack: 0
-      canvasGroupTintBlack: 0
+      canvasGroupCompatible: 0
-      calculateTangents: 0
+      pmaVertexColors: 1
       addNormals: 0
+      calculateTangents: 0
       immutableTriangles: 0
   updateTiming: 1
   unscaledTime: 0

Assets/prefabs/spine/ui/characters/m10004.prefab

@@ -27,6 +27,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2663275627370592771}
   m_Father: {fileID: 0}
@@ -81,6 +82,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 110436067314948100}
   m_Father: {fileID: 2951863086470196126}
@@ -119,6 +121,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2663275627370592771}
   m_RootOrder: 0
@@ -160,6 +163,7 @@ MonoBehaviour:
   additiveMaterial: {fileID: 0}
   multiplyMaterial: {fileID: 0}
   screenMaterial: {fileID: 0}
+  m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
   initialSkinName: 
   initialFlipX: 0
   initialFlipY: 0
@@ -167,6 +171,13 @@ MonoBehaviour:
   startingLoop: 0
   timeScale: 1
   freeze: 0
+  layoutScaleMode: 0
+  referenceSize: {x: 0, y: 0}
+  pivotOffset: {x: 0, y: 0}
+  referenceScale: 1
+  layoutScale: 1
+  rectTransformSize: {x: 0, y: 0}
+  editReferenceRect: 0
   updateWhenInvisible: 3
   allowMultipleCanvasRenderers: 0
   canvasRenderers: []
@@ -174,16 +185,20 @@ MonoBehaviour:
   enableSeparatorSlots: 0
   separatorParts: []
   updateSeparatorPartLocation: 1
+  updateSeparatorPartScale: 0
   disableMeshAssignmentOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   meshGenerator:
     settings:
       useClipping: 1
       zSpacing: 0
-      pmaVertexColors: 1
       tintBlack: 0
-      canvasGroupTintBlack: 0
+      canvasGroupCompatible: 0
-      calculateTangents: 0
+      pmaVertexColors: 1
       addNormals: 0
+      calculateTangents: 0
       immutableTriangles: 0
   updateTiming: 1
   unscaledTime: 0

Assets/prefabs/spine/ui/characters/m10006.prefab

@@ -27,6 +27,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2663275627370592771}
   m_Father: {fileID: 0}
@@ -81,6 +82,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 110436067314948100}
   m_Father: {fileID: 2951863086470196126}
@@ -119,6 +121,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2663275627370592771}
   m_RootOrder: 0
@@ -160,6 +163,7 @@ MonoBehaviour:
   additiveMaterial: {fileID: 0}
   multiplyMaterial: {fileID: 0}
   screenMaterial: {fileID: 0}
+  m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
   initialSkinName: 
   initialFlipX: 0
   initialFlipY: 0
@@ -167,6 +171,13 @@ MonoBehaviour:
   startingLoop: 0
   timeScale: 1
   freeze: 0
+  layoutScaleMode: 0
+  referenceSize: {x: 0, y: 0}
+  pivotOffset: {x: 0, y: 0}
+  referenceScale: 1
+  layoutScale: 1
+  rectTransformSize: {x: 0, y: 0}
+  editReferenceRect: 0
   updateWhenInvisible: 3
   allowMultipleCanvasRenderers: 0
   canvasRenderers: []
@@ -174,16 +185,20 @@ MonoBehaviour:
   enableSeparatorSlots: 0
   separatorParts: []
   updateSeparatorPartLocation: 1
+  updateSeparatorPartScale: 0
   disableMeshAssignmentOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   meshGenerator:
     settings:
       useClipping: 1
       zSpacing: 0
-      pmaVertexColors: 1
       tintBlack: 0
-      canvasGroupTintBlack: 0
+      canvasGroupCompatible: 0
-      calculateTangents: 0
+      pmaVertexColors: 1
       addNormals: 0
+      calculateTangents: 0
       immutableTriangles: 0
   updateTiming: 1
   unscaledTime: 0