diff --git a/Assets/arts/spines/characters/m20001/m20001.atlas.txt b/Assets/arts/spines/characters/m20001/m20001.atlas.txt index c5167bcdb..c4c25a7ed 100644 --- a/Assets/arts/spines/characters/m20001/m20001.atlas.txt +++ b/Assets/arts/spines/characters/m20001/m20001.atlas.txt @@ -1,40 +1,115 @@ m20001.png -size:512,512 +size:1024,1024 filter:Linear,Linear -clothes_1 -bounds:364,423,110,81 -hair -bounds:2,84,62,51 +eye_death +bounds:111,457,22,17 rotate:90 -hand_L -bounds:154,186,42,44 -hand_R -bounds:2,9,73,61 +eye_hit +bounds:81,341,37,46 +eye_l +bounds:326,699,38,41 +offsets:1,1,40,43 +eye_r +bounds:247,544,34,41 +offsets:1,1,36,43 rotate:90 -head_1 -bounds:244,410,118,94 -head_2 -bounds:55,133,97,97 -hit_yan3 -bounds:476,476,28,28 -leg_L -bounds:203,294,39,54 -leg_R -bounds:130,232,38,55 +eye_yun +bounds:247,580,43,47 +guan_l +bounds:195,550,50,77 +guan_r +bounds:552,970,46,77 rotate:90 -pelvis -bounds:129,350,105,43 +hand_l_1 +bounds:631,975,41,72 +rotate:90 +hand_l_2 +bounds:380,975,84,41 +offsets:1,1,86,43 +hand_l_3 +bounds:203,696,121,93 +offsets:1,1,123,95 +hand_r_1 +bounds:705,975,41,72 +rotate:90 +hand_r_2 +bounds:466,975,84,41 +offsets:1,1,86,43 +hand_r_3 +bounds:2,389,107,90 +offsets:1,1,109,92 +hand_r_4 +bounds:779,977,66,39 +offsets:1,1,68,41 +head +bounds:2,481,127,153 +offsets:1,1,129,155 +jian_l +bounds:131,534,100,62 +offsets:1,1,102,64 +rotate:90 +jian_r +bounds:2,199,100,62 +offsets:1,1,102,64 +rotate:90 +kou_l +bounds:81,300,39,39 +offsets:1,1,41,41 +kou_r +bounds:292,603,36,36 +offsets:1,1,38,38 +leg_l_1 +bounds:2,301,77,86 +offsets:1,1,79,88 +leg_l_2 +bounds:961,971,53,45 +offsets:1,1,55,47 +leg_l_3 +bounds:847,975,55,41 +offsets:1,1,57,43 +leg_r_1 +bounds:2,111,76,86 +offsets:1,1,78,88 +leg_r_2 +bounds:286,641,53,45 +offsets:1,1,55,47 +rotate:90 +leg_r_3 +bounds:904,975,55,41 +offsets:1,1,57,43 +mei_l +bounds:326,742,47,39 +offsets:1,1,49,41 +rotate:90 +mei_r +bounds:333,657,40,36 +offsets:1,1,42,38 +rotate:90 +nengliang +bounds:131,479,53,53 +offsets:1,1,55,55 +pifeng_l_1 +bounds:2,28,81,65 +offsets:1,1,83,67 +rotate:90 +pifeng_l_2 +bounds:2,636,199,166 +offsets:1,1,201,168 +pifeng_r_1 +bounds:203,629,81,65 +offsets:1,1,83,67 +pifeng_r_2 +bounds:2,804,199,167 +offsets:1,1,201,169 spine -bounds:129,395,113,109 -upperarm_L_1 -bounds:130,272,71,76 -upperarm_R_2 -bounds:55,232,73,104 -weapon_1 -bounds:2,148,188,51 -offsets:0,0,189,51 -rotate:90 -weapon_2 -bounds:2,338,125,166 -yinying -bounds:55,109,93,22 +bounds:203,791,159,180 +offsets:1,1,161,182 +tong_l +bounds:2,2,20,24 +offsets:1,1,22,26 +tong_r +bounds:2,2,20,24 +offsets:1,1,22,26 +yingzi +bounds:2,973,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta b/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta index 9ca2e2a66..5085c5959 100644 --- a/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 411a57363366771428bde72d56b458cb TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001.png b/Assets/arts/spines/characters/m20001/m20001.png index 95476419b..eae3d7b11 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.png and b/Assets/arts/spines/characters/m20001/m20001.png differ diff --git a/Assets/arts/spines/characters/m20001/m20001.png.meta b/Assets/arts/spines/characters/m20001/m20001.png.meta index 7ca947d47..36b9c2ebd 100644 --- a/Assets/arts/spines/characters/m20001/m20001.png.meta +++ b/Assets/arts/spines/characters/m20001/m20001.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + 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/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001.skel.bytes b/Assets/arts/spines/characters/m20001/m20001.skel.bytes index 6714afef7..6378f48c5 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.skel.bytes and b/Assets/arts/spines/characters/m20001/m20001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta b/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta index 8ce3e65d3..d30ac7808 100644 --- a/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta @@ -3,5 +3,5 @@ guid: e976b037742e6034f9750ab97c5ec032 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta b/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta index 4b497668a..0f4a8f938 100644 --- a/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_material.mat b/Assets/arts/spines/characters/m20001/m20001_material.mat index 34c9844fa..c4084e72c 100644 --- a/Assets/arts/spines/characters/m20001/m20001_material.mat +++ b/Assets/arts/spines/characters/m20001/m20001_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20001_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: [] diff --git a/Assets/arts/spines/characters/m20001/m20001_material.mat.meta b/Assets/arts/spines/characters/m20001/m20001_material.mat.meta index 086f4acb4..eec19bdaa 100644 --- a/Assets/arts/spines/characters/m20001/m20001_material.mat.meta +++ b/Assets/arts/spines/characters/m20001/m20001_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta b/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta index 5452424f5..2bd531fe6 100644 --- a/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.atlas.txt b/Assets/arts/spines/characters/m20002/m20002.atlas.txt index 7f1d4718d..0aa84fe89 100644 --- a/Assets/arts/spines/characters/m20002/m20002.atlas.txt +++ b/Assets/arts/spines/characters/m20002/m20002.atlas.txt @@ -1,40 +1,101 @@ m20002.png size:512,512 filter:Linear,Linear -clothes_1 -bounds:55,228,109,81 +biao +bounds:368,248,89,53 +offsets:1,1,91,55 +cy +bounds:2,200,319,310 +eye +bounds:370,2,20,13 +offsets:1,1,22,15 rotate:90 -hair -bounds:138,234,63,51 -hand_L -bounds:77,46,42,45 -hand_R -bounds:138,287,74,62 -head_1 -bounds:245,411,117,94 -head_2 -bounds:364,409,96,97 +eye_death +bounds:370,24,21,21 +eye_yun +bounds:459,248,43,47 rotate:90 -hit_yan3 -bounds:214,321,28,28 -leg_L -bounds:77,93,38,55 -leg_R -bounds:2,2,39,55 +face1 +bounds:400,59,52,34 +offsets:1,1,54,36 rotate:90 -pelvis -bounds:129,351,105,43 +face2 +bounds:90,4,76,46 +offsets:1,1,78,48 +gaoguang +bounds:495,237,9,9 +offsets:1,1,11,11 +hand_l_1 +bounds:368,165,61,81 +offsets:1,1,63,83 +hand_l_2 +bounds:2,3,86,103 +offsets:1,1,88,105 +hand_l_3 +bounds:431,169,77,62 +offsets:1,1,79,64 +rotate:90 +hand_r_1 +bounds:168,15,35,85 +offsets:1,1,37,87 +rotate:90 +hand_r_2 +bounds:368,303,96,68 +offsets:1,1,98,70 +hand_r_3 +bounds:368,113,50,67 +offsets:1,1,52,69 +rotate:90 +jian_l +bounds:90,52,99,54 +offsets:1,1,101,56 +jian_r +bounds:191,52,83,54 +offsets:1,1,85,56 +leg_l_1 +bounds:297,12,37,32 +offsets:1,1,39,34 +leg_l_2 +bounds:400,19,38,50 +offsets:1,1,40,52 +rotate:90 +leg_l_3 +bounds:437,110,70,57 +leg_l_4 +bounds:487,61,47,21 +offsets:1,1,49,23 +rotate:90 +leg_r_1 +bounds:336,12,32,32 +offsets:1,1,34,34 +leg_r_2 +bounds:452,10,41,47 +leg_r_3 +bounds:276,46,75,60 +leg_r_4 +bounds:303,111,47,21 +offsets:1,1,49,23 spine -bounds:129,396,114,109 -upperarm_L_1 -bounds:55,150,71,76 -upperarm_R_2 -bounds:2,43,73,104 -weapon_1 -bounds:2,149,188,51 +bounds:368,373,136,137 +offsets:1,1,138,139 +tong +bounds:255,4,40,40 +offsets:1,1,42,42 +wuqi +bounds:2,108,90,299 +offsets:1,1,92,301 rotate:90 -weapon_2 -bounds:2,339,125,166 -yinying -bounds:463,412,93,22 +yao +bounds:466,293,78,41 +offsets:1,1,80,43 rotate:90 +yingzi +bounds:323,134,376,43 +offsets:1,1,378,45 +rotate:90 +zhuzi +bounds:436,59,49,49 +offsets:1,1,51,51 +zhuzixian +bounds:353,47,45,64 +offsets:1,1,47,66 diff --git a/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta b/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta index ffa846b40..0e1e8ca6f 100644 --- a/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 0fda9436b594a7c47b2e246bf17b387b TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.png b/Assets/arts/spines/characters/m20002/m20002.png index 0e81bb47c..92537390c 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.png and b/Assets/arts/spines/characters/m20002/m20002.png differ diff --git a/Assets/arts/spines/characters/m20002/m20002.png.meta b/Assets/arts/spines/characters/m20002/m20002.png.meta index 58a42ee00..b3ced10db 100644 --- a/Assets/arts/spines/characters/m20002/m20002.png.meta +++ b/Assets/arts/spines/characters/m20002/m20002.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + 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/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.skel.bytes b/Assets/arts/spines/characters/m20002/m20002.skel.bytes index 674fea920..ef5a56a88 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.skel.bytes and b/Assets/arts/spines/characters/m20002/m20002.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta b/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta index 7dbc67731..8ebf55d0b 100644 --- a/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 7516595ab56e6f34db2c1144a4135501 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta b/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta index 6e3f338f3..31d5b65ef 100644 --- a/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_material.mat b/Assets/arts/spines/characters/m20002/m20002_material.mat index 29dc9b2fa..1bd3b6cee 100644 --- a/Assets/arts/spines/characters/m20002/m20002_material.mat +++ b/Assets/arts/spines/characters/m20002/m20002_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20002_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: [] diff --git a/Assets/arts/spines/characters/m20002/m20002_material.mat.meta b/Assets/arts/spines/characters/m20002/m20002_material.mat.meta index e9bc8b44c..d015030d5 100644 --- a/Assets/arts/spines/characters/m20002/m20002_material.mat.meta +++ b/Assets/arts/spines/characters/m20002/m20002_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta b/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta index ad299437e..cf5229faa 100644 --- a/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.atlas.txt b/Assets/arts/spines/characters/m20003/m20003.atlas.txt index f2ffa24e0..d7ea09633 100644 --- a/Assets/arts/spines/characters/m20003/m20003.atlas.txt +++ b/Assets/arts/spines/characters/m20003/m20003.atlas.txt @@ -1,61 +1,67 @@ m20003.png -size:1024,1024 +size:512,512 filter:Linear,Linear -clothes -bounds:911,963,62,47 -clothes_1 -bounds:2,594,184,131 -eye_L_1 -bounds:71,239,23,20 +chilun +bounds:2,99,191,195 +offsets:1,1,193,197 +cy +bounds:2,296,302,214 +offsets:1,0,304,214 +eye_l +bounds:242,30,30,22 +offsets:1,1,32,24 rotate:90 -eye_L_2 -bounds:481,895,14,16 -eye_R_1 -bounds:104,462,29,25 -eye_R_2 -bounds:2,2,15,19 -eye_xuanyun -bounds:322,734,22,22 -gutou -bounds:409,858,70,53 -hand_L -bounds:2,88,68,66 +eye_r +bounds:467,302,30,22 +offsets:1,1,32,24 +eye_yun +bounds:288,188,22,24 +hand_l_1 +bounds:467,368,43,62 +offsets:1,1,45,64 +hand_l_2 +bounds:195,214,103,80 +offsets:1,1,105,82 +hand_l_3 +bounds:2,19,88,53 +offsets:1,1,90,55 +hand_pao +bounds:92,20,52,77 rotate:90 -hand_R -bounds:764,943,75,67 -head_1 -bounds:322,758,96,78 +hand_r_1 +bounds:273,73,38,62 +offsets:1,1,40,64 +hand_r_2 +bounds:195,137,91,75 +offsets:1,1,93,77 +hand_r_3 +bounds:461,432,78,48 +offsets:1,1,80,50 rotate:90 -head_3 -bounds:841,947,68,63 -head_R -bounds:2,23,66,63 -hit_yan3 -bounds:290,697,28,28 -leg_L -bounds:188,606,100,119 -leg_R -bounds:2,368,100,119 -mouth -bounds:2,158,104,67 +head +bounds:393,304,92,72 +offsets:1,1,94,74 rotate:90 -spine_1 -bounds:2,727,318,283 -spine_2 -bounds:2,489,133,103 -spine_3 -bounds:409,913,136,97 -upperarm_L_1 -bounds:547,919,91,117 +jianjia_l +bounds:306,307,85,89 +offsets:1,1,87,91 +jianjia_r +bounds:195,62,73,76 +offsets:1,1,75,78 rotate:90 -upperarm_L_2 -bounds:666,933,77,96 +leg_l +bounds:171,22,38,69 rotate:90 -upperarm_R_1 -bounds:322,856,85,154 -upperarm_R_2 -bounds:2,264,102,90 -rotate:90 -yinying -bounds:137,499,93,22 +leg_r +bounds:171,22,38,69 rotate:90 +spine +bounds:306,398,153,112 +xiong1 +bounds:467,326,43,40 +offsets:1,1,45,42 +xiong2 +bounds:467,326,43,40 +offsets:1,1,45,42 +yingzi +bounds:2,74,189,23 diff --git a/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta b/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta index cfa7634f1..2846b6c73 100644 --- a/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 26ee8dc73c6113847ae08a781d3e8e7d TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.png b/Assets/arts/spines/characters/m20003/m20003.png index 73f62037c..d56bc0af4 100644 Binary files a/Assets/arts/spines/characters/m20003/m20003.png and b/Assets/arts/spines/characters/m20003/m20003.png differ diff --git a/Assets/arts/spines/characters/m20003/m20003.png.meta b/Assets/arts/spines/characters/m20003/m20003.png.meta index 3dd9f77e1..80b5199cb 100644 --- a/Assets/arts/spines/characters/m20003/m20003.png.meta +++ b/Assets/arts/spines/characters/m20003/m20003.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + 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/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.skel.bytes b/Assets/arts/spines/characters/m20003/m20003.skel.bytes index f4e0db9dc..23f9e69f3 100644 Binary files a/Assets/arts/spines/characters/m20003/m20003.skel.bytes and b/Assets/arts/spines/characters/m20003/m20003.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta b/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta index 1fc259e5c..d0d084605 100644 --- a/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta @@ -3,5 +3,5 @@ guid: c7b88c3603349174dbb15d77d95eec98 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta b/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta index fc4c0de68..84ea94150 100644 --- a/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_material.mat b/Assets/arts/spines/characters/m20003/m20003_material.mat index 0d5eda1d6..7d95a8dd5 100644 --- a/Assets/arts/spines/characters/m20003/m20003_material.mat +++ b/Assets/arts/spines/characters/m20003/m20003_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20003_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: [] diff --git a/Assets/arts/spines/characters/m20003/m20003_material.mat.meta b/Assets/arts/spines/characters/m20003/m20003_material.mat.meta index f1af7d6ee..ec90814e0 100644 --- a/Assets/arts/spines/characters/m20003/m20003_material.mat.meta +++ b/Assets/arts/spines/characters/m20003/m20003_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta b/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta index dd4765a07..a43340cb8 100644 --- a/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.atlas.txt b/Assets/arts/spines/characters/m20004/m20004.atlas.txt index df9d8e5ad..059d5e37b 100644 --- a/Assets/arts/spines/characters/m20004/m20004.atlas.txt +++ b/Assets/arts/spines/characters/m20004/m20004.atlas.txt @@ -1,73 +1,97 @@ m20004.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_xuanyun -bounds:137,254,22,22 -gutou -bounds:228,324,70,53 -hand_L_1 -bounds:164,265,45,41 -offsets:1,1,47,43 -hand_L_2 -bounds:211,276,29,30 -offsets:1,1,31,32 -hand_R_1 -bounds:353,397,49,49 +ci_1 +bounds:839,932,49,49 offsets:1,1,51,51 -hand_R_2 -bounds:316,378,33,22 -offsets:1,1,35,24 -head_1 -bounds:2,291,136,80 -head_2 -bounds:316,402,45,35 -offsets:1,1,47,37 +ci_2 +bounds:145,503,54,73 +offsets:1,1,56,75 rotate:90 -hit_yan1 -bounds:137,214,16,18 +cy +bounds:2,665,354,316 +offsets:0,0,358,316 +eye_death +bounds:773,895,22,17 rotate:90 -hit_yan2 -bounds:137,232,20,20 -kulou -bounds:355,448,77,62 -offsets:0,1,77,63 -leg_L -bounds:62,154,59,72 +eye_hit +bounds:727,886,31,44 rotate:90 -leg_R -bounds:434,449,61,72 +eye_l +bounds:231,562,36,27 +offsets:1,1,38,29 +eye_r +bounds:2,46,33,24 +offsets:1,1,35,26 +eye_yun +bounds:438,703,43,47 +gutou +bounds:2,127,39,60 +hand_l_1 +bounds:643,883,82,98 +offsets:1,1,84,100 +hand_l_2 +bounds:358,813,128,168 +hand_l_3 +bounds:2,72,53,36 +offsets:1,1,55,38 rotate:90 +hand_r_1 +bounds:47,311,85,76 +offsets:1,1,87,78 +hand_r_2 +bounds:47,498,96,165 +hand_r_3 +bounds:727,919,63,62 +offsets:1,1,65,64 +hand_r_4 +bounds:294,608,46,55 +offsets:1,1,48,57 +head +bounds:488,878,153,103 +offsets:1,1,155,105 +jian_r_1 +bounds:231,591,61,72 +offsets:0,0,61,75 +jian_r_2 +bounds:438,672,30,29 +offsets:1,1,32,31 +jiao_l +bounds:47,389,86,107 +offsets:1,1,88,109 +jiao_r +bounds:145,559,84,104 +offsets:1,1,86,106 +leg_l_1 +bounds:792,925,45,56 +offsets:1,1,47,58 +leg_l_2 +bounds:438,752,59,43 +rotate:90 +leg_l_3 +bounds:943,957,38,24 +offsets:1,1,40,26 +leg_r_1 +bounds:567,824,52,64 +rotate:90 +leg_r_2 +bounds:890,936,51,45 +leg_r_3 +bounds:47,291,32,18 +offsets:1,1,34,20 mouth -bounds:2,60,90,44 -offsets:1,1,92,46 -rotate:90 -pelvis -bounds:2,152,137,58 +bounds:2,189,96,42 +offsets:1,1,98,44 rotate:90 spine -bounds:2,373,160,137 -upperarm_L_1 -bounds:164,308,62,70 -offsets:1,1,64,72 -upperarm_L_2 -bounds:2,2,56,64 -offsets:1,1,58,66 +bounds:358,670,141,78 +offsets:1,1,143,80 rotate:90 -upperarm_R_1 -bounds:237,379,68,77 -offsets:1,1,70,79 +yao +bounds:488,814,62,77 +offsets:1,1,64,79 rotate:90 -upperarm_R_2 -bounds:62,215,73,74 -offsets:1,1,75,76 -upperarm_R_3 -bounds:404,397,20,49 -offsets:1,1,22,51 -weapon_1 -bounds:237,449,116,61 -offsets:1,1,118,63 -weapon_2 -bounds:164,380,71,130 -yinying -bounds:140,278,93,22 +yingzi +bounds:2,287,376,43 +offsets:1,1,378,45 rotate:90 diff --git a/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta b/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta index 2fe16f11b..6345c2a2f 100644 --- a/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta @@ -3,5 +3,5 @@ guid: f6d09aea9e85e4641a491ee81d09e668 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.png b/Assets/arts/spines/characters/m20004/m20004.png index bec2eea84..134b8e7d0 100644 Binary files a/Assets/arts/spines/characters/m20004/m20004.png and b/Assets/arts/spines/characters/m20004/m20004.png differ diff --git a/Assets/arts/spines/characters/m20004/m20004.png.meta b/Assets/arts/spines/characters/m20004/m20004.png.meta index 3c7711bb7..2e857dc9c 100644 --- a/Assets/arts/spines/characters/m20004/m20004.png.meta +++ b/Assets/arts/spines/characters/m20004/m20004.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -89,6 +89,18 @@ TextureImporter: 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 @@ -113,18 +125,6 @@ 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 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.skel.bytes b/Assets/arts/spines/characters/m20004/m20004.skel.bytes index c724545ca..91896eeba 100644 Binary files a/Assets/arts/spines/characters/m20004/m20004.skel.bytes and b/Assets/arts/spines/characters/m20004/m20004.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta b/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta index eb488c5ae..eb80f0cba 100644 --- a/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta @@ -3,5 +3,5 @@ guid: f733cbcb9e78304408ed92d53ca46085 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta b/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta index f1c2506de..03ec771fa 100644 --- a/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_material.mat b/Assets/arts/spines/characters/m20004/m20004_material.mat index caee7b5ff..882d46a61 100644 --- a/Assets/arts/spines/characters/m20004/m20004_material.mat +++ b/Assets/arts/spines/characters/m20004/m20004_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20004_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: [] diff --git a/Assets/arts/spines/characters/m20004/m20004_material.mat.meta b/Assets/arts/spines/characters/m20004/m20004_material.mat.meta index cc85a76bd..8cf924312 100644 --- a/Assets/arts/spines/characters/m20004/m20004_material.mat.meta +++ b/Assets/arts/spines/characters/m20004/m20004_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta b/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta index 49d27a318..c7f082327 100644 --- a/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.atlas.txt b/Assets/arts/spines/characters/m20005/m20005.atlas.txt index d61d945e3..aa7c5a3bf 100644 --- a/Assets/arts/spines/characters/m20005/m20005.atlas.txt +++ b/Assets/arts/spines/characters/m20005/m20005.atlas.txt @@ -1,81 +1,73 @@ m20005.png size:512,512 filter:Linear,Linear -eye -bounds:278,372,26,18 -offsets:1,1,28,20 -eye_xuanyun -bounds:102,257,22,22 -gutou -bounds:157,197,52,58 -hand_L -bounds:117,377,98,133 -offsets:1,1,100,135 -hand_R -bounds:2,240,98,134 -offsets:1,1,100,136 -head_1 -bounds:217,392,100,118 -offsets:1,1,102,120 -head_2 -bounds:446,419,61,91 -offsets:1,1,63,93 -head_3 -bounds:2,115,98,123 -offsets:1,1,100,125 -hit_yan1 -bounds:259,318,16,18 -hit_yan2 -bounds:259,338,20,20 -kulou -bounds:126,313,77,62 -offsets:0,1,77,63 -leg_L -bounds:102,111,50,67 -offsets:1,1,52,69 -leg_R -bounds:100,41,49,68 -offsets:1,1,51,70 -pelvis -bounds:205,310,48,52 -offsets:1,1,50,54 +eye_hit +bounds:469,402,31,44 +eye_l +bounds:152,138,27,21 +offsets:1,1,29,23 +eye_r +bounds:197,187,27,21 +offsets:1,1,29,23 +eye_yun +bounds:152,161,43,47 +gua_1 +bounds:2,87,114,74 rotate:90 -pelvis_L -bounds:100,2,44,37 -offsets:1,1,46,39 -pelvis_R -bounds:204,265,52,43 -offsets:1,1,54,45 +gua_2 +bounds:241,439,109,69 +hand_l +bounds:171,243,67,82 +hand_l_2 +bounds:2,203,103,105 +offsets:1,1,105,107 +hand_r +bounds:241,370,67,82 +rotate:90 +hand_r_2 +bounds:142,408,97,100 +offsets:1,1,99,102 +head +bounds:142,327,90,79 +offsets:1,1,92,81 +jian_l_1 +bounds:234,328,76,40 +jian_l_2 +bounds:171,210,71,31 +jian_r_1 +bounds:78,82,76,40 +jian_r_2 +bounds:325,366,71,31 +rotate:90 +leg_l_1 +bounds:358,397,56,52 +leg_l_2 +bounds:2,7,72,78 +leg_r_1 +bounds:469,448,60,39 +rotate:90 +leg_r_2 +bounds:240,248,72,78 spine -bounds:2,7,106,96 -offsets:1,1,108,98 +bounds:2,310,138,198 +y1 +bounds:78,124,77,72 rotate:90 -upperarm_L_1 -bounds:416,351,66,86 -offsets:1,1,68,88 +y2 +bounds:107,216,92,62 rotate:90 -upperarm_L_2 -bounds:319,426,84,125 -offsets:1,1,86,127 -rotate:90 -upperarm_L_3 -bounds:217,360,30,59 -offsets:1,1,32,61 -rotate:90 -upperarm_L_4 -bounds:102,180,53,75 -offsets:1,1,55,77 -upperarm_R_1 -bounds:319,356,68,95 -offsets:1,1,70,97 -rotate:90 -upperarm_R_2 -bounds:2,376,113,134 -offsets:1,1,115,136 -upperarm_R_3 -bounds:126,257,54,76 -offsets:1,1,56,78 -rotate:90 -yingzi -bounds:102,281,93,22 +y3 +bounds:416,403,46,51 rotate:90 +ya1 +bounds:244,212,67,34 +offsets:1,1,69,36 +ya2 +bounds:352,451,115,57 +offsets:1,1,117,59 +zhi1 +bounds:76,20,60,60 +offsets:1,1,62,62 +zhi2 +bounds:358,364,54,31 +offsets:1,1,56,33 diff --git a/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta b/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta index 50de82e28..8b166f6b6 100644 --- a/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 2beb9d35be70dde408113ab777c358aa TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.png b/Assets/arts/spines/characters/m20005/m20005.png index 07a951975..43253e7bc 100644 Binary files a/Assets/arts/spines/characters/m20005/m20005.png and b/Assets/arts/spines/characters/m20005/m20005.png differ diff --git a/Assets/arts/spines/characters/m20005/m20005.png.meta b/Assets/arts/spines/characters/m20005/m20005.png.meta index 30e06e4c3..d37d7c1b4 100644 --- a/Assets/arts/spines/characters/m20005/m20005.png.meta +++ b/Assets/arts/spines/characters/m20005/m20005.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -89,6 +89,18 @@ TextureImporter: 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 @@ -113,18 +125,6 @@ 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 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.skel.bytes b/Assets/arts/spines/characters/m20005/m20005.skel.bytes index 8ceae6049..c0c399094 100644 Binary files a/Assets/arts/spines/characters/m20005/m20005.skel.bytes and b/Assets/arts/spines/characters/m20005/m20005.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta b/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta index dd2879e5d..dbe70b62f 100644 --- a/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 87e1cbc3f9be6a24fb995d3ef90cf715 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta b/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta index b6a2bf30b..55b663056 100644 --- a/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_material.mat b/Assets/arts/spines/characters/m20005/m20005_material.mat index 8e5ade3d0..6bacb7499 100644 --- a/Assets/arts/spines/characters/m20005/m20005_material.mat +++ b/Assets/arts/spines/characters/m20005/m20005_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20005_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: [] diff --git a/Assets/arts/spines/characters/m20005/m20005_material.mat.meta b/Assets/arts/spines/characters/m20005/m20005_material.mat.meta index 13f37bb91..9c9720f1d 100644 --- a/Assets/arts/spines/characters/m20005/m20005_material.mat.meta +++ b/Assets/arts/spines/characters/m20005/m20005_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta b/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta index 7e3143c73..6c756f64f 100644 --- a/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m20001.prefab b/Assets/prefabs/spine/ui/characters/m20001.prefab index 57e09c58b..d50fde0c9 100644 --- a/Assets/prefabs/spine/ui/characters/m20001.prefab +++ b/Assets/prefabs/spine/ui/characters/m20001.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 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20002.prefab b/Assets/prefabs/spine/ui/characters/m20002.prefab index 9725dc7d7..2e2b982e1 100644 --- a/Assets/prefabs/spine/ui/characters/m20002.prefab +++ b/Assets/prefabs/spine/ui/characters/m20002.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 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20003.prefab b/Assets/prefabs/spine/ui/characters/m20003.prefab index 48e07aae2..cef376512 100644 --- a/Assets/prefabs/spine/ui/characters/m20003.prefab +++ b/Assets/prefabs/spine/ui/characters/m20003.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 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20004.prefab b/Assets/prefabs/spine/ui/characters/m20004.prefab index a0a311efb..f0612c688 100644 --- a/Assets/prefabs/spine/ui/characters/m20004.prefab +++ b/Assets/prefabs/spine/ui/characters/m20004.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 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0