Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero

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

@@ -1,45 +1,48 @@
 m10015.png
-size:512,512
+size:256,256
 filter:Linear,Linear
-canying
+cy2
-bounds:2,156,113,148
+bounds:2,107,136,144
-offsets:3,5,119,156
+offsets:1,1,138,146
-clothes
+ding_l
-bounds:88,56,98,58
+bounds:84,54,51,54
+offsets:1,1,53,56
+rotate:90
+ding_r
+bounds:165,200,49,51
+offsets:1,1,51,53
+eye_l
+bounds:2,2,15,14
+offsets:1,1,17,16
+eye_r
+bounds:2,2,15,14
+offsets:1,1,17,16
+eye_yun
+bounds:165,53,22,24
 rotate:90
-eye
-bounds:471,447,35,59
-offsets:0,0,36,59
-eye_xuanyun
-bounds:331,334,22,22
-gutou
-bounds:142,277,70,53
-hair
-bounds:345,435,124,71
-hand_l
-bounds:331,358,90,75
-hand_r
-bounds:214,270,48,60
 head
-bounds:142,332,118,107
+bounds:2,59,80,46
-hit_yan3
+offsets:1,1,82,48
-bounds:117,178,28,28
+leg1_l_1
-kulou
+bounds:202,111,37,26
-bounds:423,356,77,62
+offsets:1,1,39,28
-offsets:0,1,77,63
+leg1_l_2
+bounds:2,18,39,59
+offsets:1,1,41,61
 rotate:90
-leg_l
+leg1_r_1
-bounds:264,284,47,68
+bounds:202,83,37,26
-rotate:90
+offsets:1,1,39,28
-leg_r
+leg1_r_2
-bounds:117,208,47,67
+bounds:165,139,39,59
+offsets:1,1,41,61
+leg2_l_1
+bounds:165,77,35,60
+leg2_r_1
+bounds:216,191,35,60
 spine
-bounds:2,306,138,133
+bounds:206,139,45,50
-upperarm_l
+offsets:1,1,47,52
-bounds:2,38,84,116
-upperarm_r
-bounds:262,333,67,106
-weapon
-bounds:2,441,341,65
 yingzi
-bounds:2,17,83,19
+bounds:140,62,189,23
+rotate:90

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

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

Assets/arts/spines/characters/m10015/m10015.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,44 @@ 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: 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: Android
     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/m10015.ab
+  assetBundleName: 
   assetBundleVariant: 

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

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

Assets/arts/spines/characters/m10015/m10015_atlas.asset.meta

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

Assets/arts/spines/characters/m10015/m10015_material.mat

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

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

Assets/arts/spines/characters/m10015/m10015_skeletondata.asset.meta

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