Merge branch 'dev_spine' into dev_hero

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

@@ -1,59 +1,83 @@
 p0006.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
-eye_L
+bing
-bounds:408,440,13,24
+bounds:546,597,206,187
-offsets:1,1,15,26
+offsets:0,2,206,189
+chi_l
+bounds:583,158,184,178
+offsets:2,1,188,180
+chi_r
+bounds:754,612,172,166
+offsets:2,1,176,168
 rotate:90
-eye_R
+cy
-bounds:487,458,13,24
+bounds:2,2,418,543
-offsets:1,1,15,26
+offsets:0,2,418,547
-eye_xuanyun
+cy2
-bounds:219,377,22,22
+bounds:2,547,542,471
-gutou
+offsets:1,2,544,474
-bounds:60,11,70,53
+eye_l
+bounds:769,291,39,46
+offsets:1,1,41,48
+eye_r
+bounds:821,787,37,44
+offsets:1,1,39,46
 rotate:90
-hand_L
+eye_yun
-bounds:60,83,67,57
+bounds:922,629,51,51
+hand_l_1
+bounds:791,514,113,96
+offsets:1,1,115,98
+hand_l_2
+bounds:703,339,109,91
+offsets:1,1,111,93
 rotate:90
-hand_R
+hand_l_3
-bounds:189,372,27,28
+bounds:519,100,67,62
+offsets:1,1,69,64
 rotate:90
-head_1
+hand_r_1
-bounds:254,432,107,77
+bounds:796,364,92,85
-head_2
+offsets:1,1,94,87
-bounds:130,401,122,108
+hand_r_2
-head_3
+bounds:583,98,95,58
-bounds:2,2,90,56
+offsets:1,1,97,60
+hand_r_3
+bounds:922,758,72,66
+offsets:1,1,74,68
+head
+bounds:546,786,273,232
+offsets:1,1,275,234
+leg_l_1
+bounds:703,450,145,86
+offsets:1,1,147,88
 rotate:90
-hit_yan1
+leg_l_2
-bounds:335,412,16,18
+bounds:680,93,74,63
-hit_yan2
+leg_r_1
-bounds:313,410,20,20
+bounds:422,80,137,95
-huarui
+offsets:1,1,139,97
-bounds:408,455,43,27
-kulou
-bounds:60,152,77,62
-offsets:0,1,77,63
 rotate:90
-spine_1
+leg_r_2
-bounds:2,231,133,119
+bounds:922,682,74,63
 rotate:90
-spine_2
+pifeng
-bounds:2,94,135,56
+bounds:583,338,257,118
+offsets:1,1,259,120
 rotate:90
-toufa1
+spine
-bounds:130,378,21,57
+bounds:821,826,176,192
+wuqi
+bounds:422,219,326,114
 rotate:90
-toufa2
+xiabai_l
-bounds:254,410,20,57
+bounds:791,451,113,61
-rotate:90
+offsets:1,1,115,63
-upperarm_R
+xiabai_r
-bounds:363,433,43,49
+bounds:422,17,98,61
-weapon_1
+offsets:1,1,100,63
-bounds:2,366,126,143
+yingzi
-yinying
+bounds:538,169,376,43
-bounds:363,484,141,25
+offsets:1,1,378,45
-zui
-bounds:453,458,24,32
 rotate:90

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

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

Assets/arts/spines/characters/p0006/p0006.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/p0006.ab
+  assetBundleName: 
   assetBundleVariant: 

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

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

Assets/arts/spines/characters/p0006/p0006_atlas.asset.meta

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

Assets/arts/spines/characters/p0006/p0006_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: p0006_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/p0006/p0006_material.mat.meta

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

Assets/arts/spines/characters/p0006/p0006_skeletondata.asset.meta

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

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

@@ -1,69 +1,47 @@
 p0007.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
-eye_L
+bing
-bounds:2,2,10,21
+bounds:533,603,206,187
-eye_R
+offsets:0,2,206,189
-bounds:14,2,10,21
+canying
-eye_xuanyun
+bounds:2,601,529,413
-bounds:77,64,22,22
+offsets:2,0,533,415
-guang
+eye_l
-bounds:324,411,66,72
+bounds:2,2,40,30
-gutou
+offsets:1,1,42,32
-bounds:2,115,70,53
+eye_r
-hand_L
+bounds:486,570,40,29
-bounds:74,116,23,26
+offsets:1,1,42,31
-rotate:90
+eye_yun
-hand_R
+bounds:922,963,51,51
-bounds:77,88,23,26
+hand_l_1
+bounds:347,432,73,53
+hand_l_2
+bounds:741,692,91,98
+offsets:1,1,93,100
+hand_r_2
+bounds:47,197,85,77
+offsets:1,1,87,79
+hand_r_3
+bounds:838,839,64,52
+offsets:1,1,66,54
 head
-bounds:2,234,91,79
+bounds:533,792,303,222
-head_1
+leg
-bounds:207,408,115,102
+bounds:47,276,224,134
-head_2
+mouth
-bounds:102,395,103,115
+bounds:273,320,90,41
-hit_yan1
+offsets:1,1,92,43
-bounds:26,2,16,18
-hit_yan2
-bounds:431,417,20,20
-hit_yan3
-bounds:248,378,28,28
-kulou
-bounds:2,170,77,62
-offsets:0,1,77,63
-leg_l_1
-bounds:392,439,52,44
-leg_l_2
-bounds:178,356,31,37
-leg_r_1
-bounds:31,61,52,44
 rotate:90
-leg_r_2
+spine1
-bounds:392,406,31,37
+bounds:347,487,137,112
+spine2
+bounds:838,893,82,121
+wuqi
+bounds:2,412,343,187
+offsets:2,2,346,190
+yingzi
+bounds:2,34,376,43
+offsets:1,1,378,45
 rotate:90
-sheng_1
-bounds:278,379,27,29
-rotate:90
-sheng_2
-bounds:81,170,28,28
-spine_1
-bounds:102,323,74,70
-upperarm_l_01
-bounds:467,473,43,37
-upperarm_l_02
-bounds:178,318,36,36
-upperarm_r_01
-bounds:31,22,43,37
-upperarm_r_02
-bounds:211,370,35,36
-weapon_1
-bounds:2,315,98,195
-yaodai
-bounds:2,25,88,27
-rotate:90
-yinying
-bounds:324,485,141,25
-zui
-bounds:81,200,24,32
-zui1
-bounds:74,141,29,27

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

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

Assets/arts/spines/characters/p0007/p0007.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/p0007.ab
+  assetBundleName: 
   assetBundleVariant: 

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

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

Assets/arts/spines/characters/p0007/p0007_atlas.asset.meta

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

Assets/arts/spines/characters/p0007/p0007_material.mat

@@ -8,9 +8,8 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: p0007_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_ValidKeywords:
+  m_ValidKeywords: []
-  - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
@@ -29,6 +28,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -36,9 +36,10 @@ Material:
     - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilRef: 1
-    - _StraightAlphaInput: 1
+    - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/arts/spines/characters/p0007/p0007_material.mat.meta

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

Assets/arts/spines/characters/p0007/p0007_skeletondata.asset.meta

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

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

@@ -1,64 +1,79 @@
 p0008.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
-eye_L
+bing
-bounds:223,316,12,23
+bounds:365,333,206,187
+offsets:0,2,206,189
+cy
+bounds:2,522,681,500
+offsets:2,0,684,501
+eye_biyan
+bounds:573,352,27,29
+offsets:1,1,29,30
+eye_l
+bounds:685,525,32,44
+offsets:1,1,34,46
+eye_r
+bounds:254,142,29,42
+offsets:1,1,31,44
+eye_yun
+bounds:879,583,51,51
+hand_l_1
+bounds:934,951,71,88
+offsets:0,2,71,90
 rotate:90
-eye_R
+hand_l_2
-bounds:131,71,12,23
+bounds:273,20,75,86
-eye_xuanyun
+offsets:1,1,77,88
-bounds:429,460,22,22
-gutou
-bounds:2,50,70,53
-hand_L
-bounds:89,128,62,53
 rotate:90
-hand_R
+hand_r_1
-bounds:310,427,59,55
+bounds:254,186,121,95
+rotate:90
+hand_r_2
+bounds:879,695,72,77
+offsets:1,1,74,79
+hand_r_3
+bounds:879,636,67,57
+offsets:1,1,69,59
 head
-bounds:223,330,89,76
+bounds:2,142,250,165
+offsets:1,2,252,169
+leg_l
+bounds:934,826,77,123
+offsets:0,1,77,124
+leg_r
+bounds:148,18,77,123
+offsets:0,1,77,124
 rotate:90
-head_1
+mei_l
-bounds:223,421,85,88
+bounds:273,2,23,16
-head_2
+offsets:1,1,25,18
-bounds:2,192,144,120
+mei_r
-hit_yan1
+bounds:365,317,21,14
-bounds:429,442,16,18
+offsets:1,1,23,16
+spine
+bounds:685,571,192,201
+wuqi1_1
+bounds:953,695,58,59
+offsets:1,2,61,62
 rotate:90
-hit_yan2
+wuqi1_2
-bounds:144,128,20,20
+bounds:953,755,69,69
-jian_l
+offsets:1,1,71,71
-bounds:2,2,61,46
+wuqi1_3
-jian_r
+bounds:573,383,137,99
-bounds:144,150,53,40
+offsets:1,1,139,101
-kulou
-bounds:148,235,77,62
-offsets:0,1,77,63
 rotate:90
-leg_L
+wuqi1_4
-bounds:453,474,35,55
+bounds:2,309,361,211
+offsets:1,1,363,213
+wuqi1_5
+bounds:2,30,65,144
+offsets:1,1,67,146
 rotate:90
-leg_R
+wuqi1_6
-bounds:89,96,30,58
+bounds:685,774,247,248
-rotate:90
+offsets:1,1,249,250
-spine_2
+yingzi
-bounds:2,105,85,85
+bounds:2,97,376,43
-weapon_1
+offsets:1,1,378,45
-bounds:74,58,36,55
-rotate:90
-weapon_2
-bounds:371,409,35,54
-rotate:90
-weapon_3
-bounds:371,446,36,56
-rotate:90
-weapon_4
-bounds:148,192,41,62
-rotate:90
-xuying
-bounds:2,314,219,195
-offsets:1,1,221,196
-yinying
-bounds:310,484,141,25
-zui1
-bounds:166,121,29,27

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

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

Assets/arts/spines/characters/p0008/p0008.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/p0008.ab
+  assetBundleName: 
   assetBundleVariant: 

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

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

Assets/arts/spines/characters/p0008/p0008_atlas.asset.meta

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

Assets/arts/spines/characters/p0008/p0008_material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: p0008_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/p0008/p0008_material.mat.meta

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

Assets/arts/spines/characters/p0008/p0008_skeletondata.asset.meta

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

Assets/prefabs/spine/ui/characters/p0007.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