diff --git a/Assets/arts/spines/characters/m10013/m10013.atlas.txt b/Assets/arts/spines/characters/m10013/m10013.atlas.txt index fa9a77b43..801546038 100644 --- a/Assets/arts/spines/characters/m10013/m10013.atlas.txt +++ b/Assets/arts/spines/characters/m10013/m10013.atlas.txt @@ -1,45 +1,46 @@ m10013.png size:512,512 filter:Linear,Linear -canying -bounds:2,156,113,148 -offsets:3,5,119,156 -clothes -bounds:88,57,97,58 +eye_death +bounds:87,147,16,14 +eye_hit +bounds:125,325,19,26 +eye_l +bounds:268,381,17,15 +offsets:1,1,19,17 +eye_r +bounds:317,419,17,15 +offsets:1,1,19,17 +eye_yun +bounds:2,2,22,24 +face +bounds:87,163,60,33 +offsets:1,1,62,35 rotate:90 -eye -bounds:471,447,35,59 -offsets:0,0,36,59 -eye_xuanyun -bounds:331,334,22,22 +fair_1 +bounds:2,353,143,106 +fair_2 +bounds:338,437,26,22 +offsets:1,1,28,24 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 +bounds:2,85,39,60 +hand_l_1 +bounds:43,98,47,38 +offsets:1,1,49,40 +rotate:90 +hand_l_2 +bounds:229,375,37,59 +hand_r_1 +bounds:268,398,47,36 +offsets:1,1,49,38 +hand_r_2 +bounds:2,28,32,55 head -bounds:142,332,118,107 -hit_yan3 -bounds:117,178,28,28 +bounds:147,362,80,72 +offsets:1,1,82,74 kulou -bounds:423,356,77,62 -offsets:0,1,77,63 -rotate:90 -leg_l -bounds:264,284,47,68 -rotate:90 -leg_r -bounds:117,208,47,67 +bounds:2,147,83,76 spine -bounds:2,306,138,133 -upperarm_l -bounds:2,38,84,116 -upperarm_r -bounds:262,333,67,106 -weapon -bounds:2,441,341,65 +bounds:2,225,121,126 yingzi -bounds:2,17,83,19 +bounds:147,436,189,23 diff --git a/Assets/arts/spines/characters/m10013/m10013.atlas.txt.meta b/Assets/arts/spines/characters/m10013/m10013.atlas.txt.meta index 76ad2b8fa..b3d3be004 100644 --- a/Assets/arts/spines/characters/m10013/m10013.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10013/m10013.atlas.txt.meta @@ -3,5 +3,5 @@ guid: b42e852e35257cb45a14a4782e76a140 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10013/m10013.png b/Assets/arts/spines/characters/m10013/m10013.png index 05ea57de4..7a4dc6253 100644 Binary files a/Assets/arts/spines/characters/m10013/m10013.png and b/Assets/arts/spines/characters/m10013/m10013.png differ diff --git a/Assets/arts/spines/characters/m10013/m10013.png.meta b/Assets/arts/spines/characters/m10013/m10013.png.meta index f0fd97ad7..3f61855a1 100644 --- a/Assets/arts/spines/characters/m10013/m10013.png.meta +++ b/Assets/arts/spines/characters/m10013/m10013.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/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10013/m10013.skel.bytes b/Assets/arts/spines/characters/m10013/m10013.skel.bytes index eb7367601..0a49ae514 100644 Binary files a/Assets/arts/spines/characters/m10013/m10013.skel.bytes and b/Assets/arts/spines/characters/m10013/m10013.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10013/m10013.skel.bytes.meta b/Assets/arts/spines/characters/m10013/m10013.skel.bytes.meta index c6344d287..dc57dbcdf 100644 --- a/Assets/arts/spines/characters/m10013/m10013.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10013/m10013.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 440943b07f2b0784cacde0c7d1e73faa TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10013/m10013_atlas.asset.meta b/Assets/arts/spines/characters/m10013/m10013_atlas.asset.meta index 37d91302f..645fdad11 100644 --- a/Assets/arts/spines/characters/m10013/m10013_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10013/m10013_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10013/m10013_material.mat b/Assets/arts/spines/characters/m10013/m10013_material.mat index 21f55ec3e..aa368f52e 100644 --- a/Assets/arts/spines/characters/m10013/m10013_material.mat +++ b/Assets/arts/spines/characters/m10013/m10013_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10013_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/m10013/m10013_material.mat.meta b/Assets/arts/spines/characters/m10013/m10013_material.mat.meta index 1a7e7db48..b54837fc1 100644 --- a/Assets/arts/spines/characters/m10013/m10013_material.mat.meta +++ b/Assets/arts/spines/characters/m10013/m10013_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10013/m10013_skeletondata.asset.meta b/Assets/arts/spines/characters/m10013/m10013_skeletondata.asset.meta index c1497de07..0dbf3ac19 100644 --- a/Assets/arts/spines/characters/m10013/m10013_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10013/m10013_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10013.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016.atlas.txt b/Assets/arts/spines/characters/m10016/m10016.atlas.txt index 33402bbde..d9b1c7f98 100644 --- a/Assets/arts/spines/characters/m10016/m10016.atlas.txt +++ b/Assets/arts/spines/characters/m10016/m10016.atlas.txt @@ -1,42 +1,46 @@ m10016.png -size:512,512 +size:256,256 filter:Linear,Linear -clothes -bounds:2,2,98,58 +bianfu +bounds:106,109,96,51 +chi_l +bounds:2,85,96,71 +chi_r +bounds:2,12,95,71 +offsets:1,0,96,71 +ear_l +bounds:100,74,33,69 rotate:90 -eye_xuanyun -bounds:477,394,22,22 -gutou -bounds:185,326,70,53 -hand_l -bounds:101,283,83,82 +ear_r +bounds:182,170,33,67 rotate:90 -hand_r -bounds:70,149,48,59 +eye_death +bounds:194,84,16,14 +eye_hit +bounds:171,78,21,29 +eye_l +bounds:229,124,23,18 +offsets:1,1,25,20 +eye_r +bounds:204,100,20,18 +offsets:1,1,22,20 +eye_yun +bounds:229,144,22,24 head -bounds:142,381,118,120 -hit_yan3 -bounds:70,119,28,28 -kulou -bounds:101,219,77,62 -offsets:0,1,77,63 -leg_l -bounds:185,277,47,68 +bounds:106,162,74,65 +offsets:1,1,76,67 +lizi +bounds:193,205,47,49 +offsets:1,1,50,50 rotate:90 -leg_r -bounds:180,227,48,67 +mouth +bounds:204,120,48,23 +offsets:1,1,50,25 rotate:90 spine -bounds:2,368,138,133 -upperarm_l -bounds:374,387,101,114 -upperarm_r -bounds:2,102,66,106 -weapon_1 -bounds:2,210,156,97 +bounds:99,9,63,66 rotate:90 -weapon_2 -bounds:262,384,110,117 +wei +bounds:2,158,102,69 yingzi -bounds:477,418,83,19 -rotate:90 +bounds:2,229,189,23 diff --git a/Assets/arts/spines/characters/m10016/m10016.atlas.txt.meta b/Assets/arts/spines/characters/m10016/m10016.atlas.txt.meta index 86641ff03..3a1ff06c9 100644 --- a/Assets/arts/spines/characters/m10016/m10016.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10016/m10016.atlas.txt.meta @@ -3,5 +3,5 @@ guid: c12d96711e7e72e48874e31bd7ab9591 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016.png b/Assets/arts/spines/characters/m10016/m10016.png index 3ede3fa83..b51740cbe 100644 Binary files a/Assets/arts/spines/characters/m10016/m10016.png and b/Assets/arts/spines/characters/m10016/m10016.png differ diff --git a/Assets/arts/spines/characters/m10016/m10016.png.meta b/Assets/arts/spines/characters/m10016/m10016.png.meta index 32db608eb..74720fba8 100644 --- a/Assets/arts/spines/characters/m10016/m10016.png.meta +++ b/Assets/arts/spines/characters/m10016/m10016.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/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016.skel.bytes b/Assets/arts/spines/characters/m10016/m10016.skel.bytes index 9ed575896..e3a3e32c2 100644 Binary files a/Assets/arts/spines/characters/m10016/m10016.skel.bytes and b/Assets/arts/spines/characters/m10016/m10016.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10016/m10016.skel.bytes.meta b/Assets/arts/spines/characters/m10016/m10016.skel.bytes.meta index ac7b8d9a1..34cf298f4 100644 --- a/Assets/arts/spines/characters/m10016/m10016.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10016/m10016.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 25a4617dce9d4b740a96d4a19660e648 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016_atlas.asset.meta b/Assets/arts/spines/characters/m10016/m10016_atlas.asset.meta index ed56467df..147ec59b1 100644 --- a/Assets/arts/spines/characters/m10016/m10016_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10016/m10016_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016_material.mat b/Assets/arts/spines/characters/m10016/m10016_material.mat index 74d6b39fb..1f9540139 100644 --- a/Assets/arts/spines/characters/m10016/m10016_material.mat +++ b/Assets/arts/spines/characters/m10016/m10016_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10016_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/m10016/m10016_material.mat.meta b/Assets/arts/spines/characters/m10016/m10016_material.mat.meta index d36e3fee7..3790e086c 100644 --- a/Assets/arts/spines/characters/m10016/m10016_material.mat.meta +++ b/Assets/arts/spines/characters/m10016/m10016_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10016/m10016_skeletondata.asset.meta b/Assets/arts/spines/characters/m10016/m10016_skeletondata.asset.meta index 91da09c2b..6179921af 100644 --- a/Assets/arts/spines/characters/m10016/m10016_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10016/m10016_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10016.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017.atlas.txt b/Assets/arts/spines/characters/m10017/m10017.atlas.txt index a16bae118..ab70e4194 100644 --- a/Assets/arts/spines/characters/m10017/m10017.atlas.txt +++ b/Assets/arts/spines/characters/m10017/m10017.atlas.txt @@ -1,42 +1,59 @@ m10017.png size:512,512 filter:Linear,Linear -clothes -bounds:2,2,98,58 +ci +bounds:57,257,26,80 +cy +bounds:97,347,61,58 +ding1 +bounds:310,479,48,29 +offsets:1,1,50,31 +eye_hit +bounds:57,223,24,32 +eye_l +bounds:201,342,26,25 +offsets:1,1,28,27 +eye_r +bounds:201,342,26,25 +offsets:1,1,28,27 +eye_yun +bounds:432,486,22,24 rotate:90 -eye_xuanyun -bounds:477,395,22,22 gutou -bounds:185,327,70,53 +bounds:160,345,39,60 +hair +bounds:2,418,111,65 +hair_2 +bounds:2,137,83,50 +rotate:90 hand_l -bounds:101,284,83,82 +bounds:2,61,64,74 +hand_r_1 +bounds:200,463,53,45 +hand_r_2 +bounds:360,485,23,31 +offsets:1,1,25,33 rotate:90 -hand_r -bounds:71,149,48,59 +hand_r_3 +bounds:201,369,36,37 +offsets:1,1,38,39 head -bounds:143,382,118,120 -hit_yan3 -bounds:71,119,28,28 +bounds:2,2,63,57 +offsets:1,1,65,59 kulou -bounds:101,220,77,62 -offsets:0,1,77,63 +bounds:115,407,83,76 leg_l -bounds:185,278,47,68 -rotate:90 +bounds:200,408,40,53 leg_r -bounds:180,228,48,67 +bounds:255,468,40,53 rotate:90 +mouth +bounds:393,493,37,15 +offsets:1,1,39,17 spine -bounds:2,369,139,133 -upperarm_l -bounds:375,388,100,114 -upperarm_r -bounds:2,102,67,106 -weapon_1 -bounds:2,210,157,97 +bounds:2,339,93,77 +weijin +bounds:2,222,115,53 rotate:90 -weapon_2 -bounds:263,385,110,117 yingzi -bounds:477,419,83,19 -rotate:90 +bounds:2,485,189,23 diff --git a/Assets/arts/spines/characters/m10017/m10017.atlas.txt.meta b/Assets/arts/spines/characters/m10017/m10017.atlas.txt.meta index f498e460b..72588edc0 100644 --- a/Assets/arts/spines/characters/m10017/m10017.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10017/m10017.atlas.txt.meta @@ -3,5 +3,5 @@ guid: ed1ca85dcdc53784799d27040536ba23 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017.png b/Assets/arts/spines/characters/m10017/m10017.png index 3f48bd58d..0c445fcca 100644 Binary files a/Assets/arts/spines/characters/m10017/m10017.png and b/Assets/arts/spines/characters/m10017/m10017.png differ diff --git a/Assets/arts/spines/characters/m10017/m10017.png.meta b/Assets/arts/spines/characters/m10017/m10017.png.meta index 6901f8ab8..c7828e11f 100644 --- a/Assets/arts/spines/characters/m10017/m10017.png.meta +++ b/Assets/arts/spines/characters/m10017/m10017.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/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017.skel.bytes b/Assets/arts/spines/characters/m10017/m10017.skel.bytes index 704739884..f350e2296 100644 Binary files a/Assets/arts/spines/characters/m10017/m10017.skel.bytes and b/Assets/arts/spines/characters/m10017/m10017.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10017/m10017.skel.bytes.meta b/Assets/arts/spines/characters/m10017/m10017.skel.bytes.meta index 9b9c54d97..3220199e7 100644 --- a/Assets/arts/spines/characters/m10017/m10017.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10017/m10017.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 7c54310c9c6f5174db12acadc4775d7a TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017_atlas.asset.meta b/Assets/arts/spines/characters/m10017/m10017_atlas.asset.meta index 7e1e90ae9..806b7abdf 100644 --- a/Assets/arts/spines/characters/m10017/m10017_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10017/m10017_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017_material.mat b/Assets/arts/spines/characters/m10017/m10017_material.mat index 432547c4a..ceac4ef61 100644 --- a/Assets/arts/spines/characters/m10017/m10017_material.mat +++ b/Assets/arts/spines/characters/m10017/m10017_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10017_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/m10017/m10017_material.mat.meta b/Assets/arts/spines/characters/m10017/m10017_material.mat.meta index 486d1e268..4252d9d34 100644 --- a/Assets/arts/spines/characters/m10017/m10017_material.mat.meta +++ b/Assets/arts/spines/characters/m10017/m10017_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10017/m10017_skeletondata.asset.meta b/Assets/arts/spines/characters/m10017/m10017_skeletondata.asset.meta index f57f59104..1f72965fa 100644 --- a/Assets/arts/spines/characters/m10017/m10017_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10017/m10017_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10017.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018.atlas.txt b/Assets/arts/spines/characters/m10018/m10018.atlas.txt index 7e6aae50c..5c9c539a3 100644 --- a/Assets/arts/spines/characters/m10018/m10018.atlas.txt +++ b/Assets/arts/spines/characters/m10018/m10018.atlas.txt @@ -1,42 +1,62 @@ m10018.png -size:512,512 +size:256,256 filter:Linear,Linear -clothes -bounds:2,2,97,58 +eye_death_l +bounds:184,64,16,14 +rotate:90 +eye_death_r +bounds:200,67,16,14 +eye_hit_l +bounds:231,176,23,33 +eye_hit_r +bounds:231,141,23,33 +eye_l +bounds:231,115,24,19 +offsets:1,1,26,21 +rotate:90 +eye_r +bounds:223,94,24,19 +offsets:1,1,26,21 +eye_yun +bounds:146,14,22,24 rotate:90 -eye_xuanyun -bounds:478,394,22,22 gutou -bounds:185,326,70,53 -hand_l -bounds:101,283,83,82 +bounds:2,5,39,60 +rotate:90 +hand_l_1 +bounds:91,15,53,43 +hand_l_2 +bounds:64,2,42,25 +offsets:1,1,44,27 +rotate:90 +hand_r_1 +bounds:198,211,53,43 +hand_r_2 +bounds:196,83,36,25 +offsets:1,1,38,27 rotate:90 -hand_r -bounds:70,148,48,59 head -bounds:143,381,118,120 -hit_yan3 -bounds:70,118,28,28 +bounds:2,143,116,86 +offsets:1,1,118,88 kulou -bounds:101,219,77,62 -offsets:0,1,77,63 -leg_l -bounds:185,278,46,68 -rotate:90 -leg_r -bounds:180,229,47,67 +bounds:120,146,83,76 rotate:90 +leg_l_1 +bounds:198,166,31,43 +leg_l_2 +bounds:151,60,31,20 +offsets:1,1,33,22 +leg_r_1 +bounds:198,121,31,43 +leg_r_2 +bounds:146,38,31,20 +offsets:1,1,33,22 spine -bounds:2,368,139,133 -upperarm_l -bounds:376,387,100,114 -upperarm_r -bounds:2,101,66,106 -weapon_1 -bounds:2,209,157,97 -rotate:90 -weapon_2 -bounds:263,384,111,117 +bounds:2,46,70,95 +wei1 +bounds:74,60,75,81 +wei2 +bounds:151,82,43,62 +offsets:1,1,45,64 yingzi -bounds:478,418,83,19 -rotate:90 +bounds:2,231,189,23 diff --git a/Assets/arts/spines/characters/m10018/m10018.atlas.txt.meta b/Assets/arts/spines/characters/m10018/m10018.atlas.txt.meta index 01cfba762..24df88d13 100644 --- a/Assets/arts/spines/characters/m10018/m10018.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10018/m10018.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 919b795108588c84a954e7cba0417ebd TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018.png b/Assets/arts/spines/characters/m10018/m10018.png index 453e0bcc3..e22b12a5a 100644 Binary files a/Assets/arts/spines/characters/m10018/m10018.png and b/Assets/arts/spines/characters/m10018/m10018.png differ diff --git a/Assets/arts/spines/characters/m10018/m10018.png.meta b/Assets/arts/spines/characters/m10018/m10018.png.meta index 27627d485..88049deba 100644 --- a/Assets/arts/spines/characters/m10018/m10018.png.meta +++ b/Assets/arts/spines/characters/m10018/m10018.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/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018.skel.bytes b/Assets/arts/spines/characters/m10018/m10018.skel.bytes index 765141612..e1e162409 100644 Binary files a/Assets/arts/spines/characters/m10018/m10018.skel.bytes and b/Assets/arts/spines/characters/m10018/m10018.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10018/m10018.skel.bytes.meta b/Assets/arts/spines/characters/m10018/m10018.skel.bytes.meta index 5a1ff4819..9dd818e31 100644 --- a/Assets/arts/spines/characters/m10018/m10018.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10018/m10018.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 01ca9fb4f01e85b4b8a4017ea2a80434 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018_atlas.asset.meta b/Assets/arts/spines/characters/m10018/m10018_atlas.asset.meta index b6fe3bcd2..291c1dd94 100644 --- a/Assets/arts/spines/characters/m10018/m10018_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10018/m10018_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018_material.mat b/Assets/arts/spines/characters/m10018/m10018_material.mat index cb75ab0ca..a2d77abe6 100644 --- a/Assets/arts/spines/characters/m10018/m10018_material.mat +++ b/Assets/arts/spines/characters/m10018/m10018_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10018_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/m10018/m10018_material.mat.meta b/Assets/arts/spines/characters/m10018/m10018_material.mat.meta index 59d7e9bb8..513fa468d 100644 --- a/Assets/arts/spines/characters/m10018/m10018_material.mat.meta +++ b/Assets/arts/spines/characters/m10018/m10018_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10018/m10018_skeletondata.asset.meta b/Assets/arts/spines/characters/m10018/m10018_skeletondata.asset.meta index a5aa38f42..d80e08c93 100644 --- a/Assets/arts/spines/characters/m10018/m10018_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10018/m10018_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10018.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019.atlas.txt b/Assets/arts/spines/characters/m10019/m10019.atlas.txt index 73cdfd70e..4b524d4be 100644 --- a/Assets/arts/spines/characters/m10019/m10019.atlas.txt +++ b/Assets/arts/spines/characters/m10019/m10019.atlas.txt @@ -1,42 +1,74 @@ m10019.png size:512,512 filter:Linear,Linear -clothes -bounds:2,2,98,58 +cy +bounds:2,260,170,184 +offsets:1,2,172,188 +eye_death_l +bounds:174,261,16,14 +eye_death_r +bounds:322,387,16,14 +eye_hit +bounds:223,280,22,32 +eye_l +bounds:112,186,29,28 +offsets:1,1,31,30 +eye_r +bounds:372,420,24,24 +offsets:1,1,26,26 +eye_yun +bounds:68,121,22,24 rotate:90 -eye_xuanyun -bounds:479,395,22,22 gutou -bounds:185,327,70,53 -hand_l -bounds:101,284,83,82 -rotate:90 -hand_r -bounds:70,149,49,59 -head -bounds:143,382,118,120 -hit_yan3 -bounds:70,119,28,28 +bounds:27,120,39,60 +hand_l_1 +bounds:223,314,40,29 +offsets:1,1,42,31 +hand_l_2 +bounds:174,277,47,66 +offsets:1,1,49,68 +hand_l_3 +bounds:68,145,25,35 +offsets:1,1,27,37 +hand_l_4 +bounds:2,32,21,35 +offsets:1,1,23,37 +hand_l_5 +bounds:143,196,22,27 +offsets:1,1,24,29 +hand_r_1 +bounds:27,90,38,28 +offsets:1,1,40,30 +hand_r_2 +bounds:275,381,45,63 +offsets:1,1,47,65 +hand_r_3 +bounds:143,225,23,33 +offsets:1,1,25,35 +hand_r_4 +bounds:350,411,20,33 +offsets:1,1,22,35 +hand_r_5 +bounds:2,4,21,26 +offsets:1,1,23,28 kulou -bounds:101,220,77,62 -offsets:0,1,77,63 -leg_l -bounds:185,278,47,68 -rotate:90 -leg_r -bounds:180,229,47,67 -rotate:90 +bounds:27,182,83,76 +pao1 +bounds:398,421,22,23 +offsets:1,1,24,25 +pao2 +bounds:422,421,22,23 +offsets:1,1,24,25 spine -bounds:2,369,139,133 -upperarm_l -bounds:376,388,101,114 -upperarm_r -bounds:2,102,66,106 -weapon_1 -bounds:2,210,157,97 +bounds:174,345,99,99 +offsets:1,1,101,101 +xu1 +bounds:112,216,29,42 +xu2 +bounds:275,347,32,37 rotate:90 -weapon_2 -bounds:263,385,111,117 +xu3 +bounds:322,403,26,41 yingzi -bounds:479,419,83,19 +bounds:2,69,189,23 rotate:90 diff --git a/Assets/arts/spines/characters/m10019/m10019.atlas.txt.meta b/Assets/arts/spines/characters/m10019/m10019.atlas.txt.meta index fdfa885c5..83faff0fe 100644 --- a/Assets/arts/spines/characters/m10019/m10019.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10019/m10019.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 50289fe7bef13924e9a3c8c3ee6f7d67 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019.png b/Assets/arts/spines/characters/m10019/m10019.png index 5cd8c4dad..306b9c738 100644 Binary files a/Assets/arts/spines/characters/m10019/m10019.png and b/Assets/arts/spines/characters/m10019/m10019.png differ diff --git a/Assets/arts/spines/characters/m10019/m10019.png.meta b/Assets/arts/spines/characters/m10019/m10019.png.meta index 48896b987..498acc55b 100644 --- a/Assets/arts/spines/characters/m10019/m10019.png.meta +++ b/Assets/arts/spines/characters/m10019/m10019.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/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019.skel.bytes b/Assets/arts/spines/characters/m10019/m10019.skel.bytes index a8dde1c24..729896c88 100644 Binary files a/Assets/arts/spines/characters/m10019/m10019.skel.bytes and b/Assets/arts/spines/characters/m10019/m10019.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10019/m10019.skel.bytes.meta b/Assets/arts/spines/characters/m10019/m10019.skel.bytes.meta index bb4ee4737..8b77678f5 100644 --- a/Assets/arts/spines/characters/m10019/m10019.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10019/m10019.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 987ee3e0502dced4ab7658485be1b46a TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019_atlas.asset.meta b/Assets/arts/spines/characters/m10019/m10019_atlas.asset.meta index f7ff40cd2..9e71b931a 100644 --- a/Assets/arts/spines/characters/m10019/m10019_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10019/m10019_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019_material.mat b/Assets/arts/spines/characters/m10019/m10019_material.mat index 7b45df3bc..1dfd6a7cd 100644 --- a/Assets/arts/spines/characters/m10019/m10019_material.mat +++ b/Assets/arts/spines/characters/m10019/m10019_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10019_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/m10019/m10019_material.mat.meta b/Assets/arts/spines/characters/m10019/m10019_material.mat.meta index 17e265db7..b57990276 100644 --- a/Assets/arts/spines/characters/m10019/m10019_material.mat.meta +++ b/Assets/arts/spines/characters/m10019/m10019_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10019/m10019_skeletondata.asset.meta b/Assets/arts/spines/characters/m10019/m10019_skeletondata.asset.meta index fb6a3d26b..e50f32f12 100644 --- a/Assets/arts/spines/characters/m10019/m10019_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10019/m10019_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10019.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10016.prefab b/Assets/prefabs/spine/ui/characters/m10016.prefab index a87688c30..169c0cd93 100644 --- a/Assets/prefabs/spine/ui/characters/m10016.prefab +++ b/Assets/prefabs/spine/ui/characters/m10016.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/m10017.prefab b/Assets/prefabs/spine/ui/characters/m10017.prefab index 601c74625..1bb1c4f7c 100644 --- a/Assets/prefabs/spine/ui/characters/m10017.prefab +++ b/Assets/prefabs/spine/ui/characters/m10017.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/m10018.prefab b/Assets/prefabs/spine/ui/characters/m10018.prefab index 37f79e1a3..7c5de9d89 100644 --- a/Assets/prefabs/spine/ui/characters/m10018.prefab +++ b/Assets/prefabs/spine/ui/characters/m10018.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/m10019.prefab b/Assets/prefabs/spine/ui/characters/m10019.prefab index 18087703e..0235b064b 100644 --- a/Assets/prefabs/spine/ui/characters/m10019.prefab +++ b/Assets/prefabs/spine/ui/characters/m10019.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