diff --git a/Assets/arts/spines/characters/m10008/m10008_material.mat b/Assets/arts/spines/characters/m10008/m10008_material.mat index 44fb03198..c7dfa299d 100644 --- a/Assets/arts/spines/characters/m10008/m10008_material.mat +++ b/Assets/arts/spines/characters/m10008/m10008_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: m10008_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/characters/m10009/m10009.atlas.txt b/Assets/arts/spines/characters/m10009/m10009.atlas.txt index df7503fc7..d40a4c552 100644 --- a/Assets/arts/spines/characters/m10009/m10009.atlas.txt +++ b/Assets/arts/spines/characters/m10009/m10009.atlas.txt @@ -1,50 +1,40 @@ m10009.png size:256,256 filter:Linear,Linear -clothes -bounds:2,7,45,33 -rotate:90 -eye_xuanyun -bounds:71,9,20,20 -gutou -bounds:40,97,70,53 -rotate:90 -hand_l -bounds:101,17,30,34 -offsets:0,0,31,34 -rotate:90 -hand_r -bounds:153,135,31,34 -offsets:0,1,31,35 -head -bounds:2,169,98,85 -hit_yan1 -bounds:139,114,16,18 -jianjia -bounds:95,97,42,35 -kulou -bounds:170,192,77,62 -offsets:0,1,77,63 -leg_l -bounds:101,49,42,46 -leg_r -bounds:102,134,42,49 -rotate:90 +eye_yun +bounds:144,53,22,24 +hua +bounds:2,142,115,112 +mouth +bounds:144,204,52,50 +offsets:1,1,54,52 spine -bounds:40,31,59,64 -upperarm_l_01 -bounds:186,139,29,30 -upperarm_l_02 -bounds:217,140,18,29 -upperarm_r_01 -bounds:37,3,26,32 -rotate:90 -upperarm_r_02 -bounds:237,139,17,30 -weapon_1 -bounds:2,54,113,36 -rotate:90 -weapon_2 -bounds:102,178,66,76 +bounds:2,46,48,94 +y_1 +bounds:144,107,29,19 +offsets:1,1,31,21 +y_2 +bounds:144,148,36,17 +y_3 +bounds:144,128,32,18 +y_4 +bounds:52,49,37,13 +offsets:1,1,39,15 +y_5 +bounds:144,79,22,26 +offsets:1,1,24,28 +y_6 +bounds:52,101,60,39 +y_7 +bounds:2,20,45,24 +y_8 +bounds:198,209,56,45 +ya1 +bounds:144,167,51,35 +offsets:1,1,53,37 +ya2 +bounds:52,64,51,35 +offsets:1,1,53,37 yingzi -bounds:170,171,83,19 +bounds:119,65,189,23 +rotate:90 diff --git a/Assets/arts/spines/characters/m10009/m10009.atlas.txt.meta b/Assets/arts/spines/characters/m10009/m10009.atlas.txt.meta index e46f3fbff..0900a5787 100644 --- a/Assets/arts/spines/characters/m10009/m10009.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10009/m10009.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 71c780c4c309caa49ac17e0c657b1c7b TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10009/m10009.png b/Assets/arts/spines/characters/m10009/m10009.png index d0f797ff1..f8679be59 100644 Binary files a/Assets/arts/spines/characters/m10009/m10009.png and b/Assets/arts/spines/characters/m10009/m10009.png differ diff --git a/Assets/arts/spines/characters/m10009/m10009.png.meta b/Assets/arts/spines/characters/m10009/m10009.png.meta index 709e8bd16..eea56a58e 100644 --- a/Assets/arts/spines/characters/m10009/m10009.png.meta +++ b/Assets/arts/spines/characters/m10009/m10009.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/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10009/m10009.skel.bytes b/Assets/arts/spines/characters/m10009/m10009.skel.bytes index 9913a5aec..3089457c6 100644 Binary files a/Assets/arts/spines/characters/m10009/m10009.skel.bytes and b/Assets/arts/spines/characters/m10009/m10009.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10009/m10009.skel.bytes.meta b/Assets/arts/spines/characters/m10009/m10009.skel.bytes.meta index 71228cdd5..377e385a7 100644 --- a/Assets/arts/spines/characters/m10009/m10009.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10009/m10009.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 5268755c3bd3105439c105c14762e311 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10009/m10009_atlas.asset.meta b/Assets/arts/spines/characters/m10009/m10009_atlas.asset.meta index 0fcc780e5..32ae698c8 100644 --- a/Assets/arts/spines/characters/m10009/m10009_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10009/m10009_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10009/m10009_material.mat b/Assets/arts/spines/characters/m10009/m10009_material.mat index a803e72ad..190e6c321 100644 --- a/Assets/arts/spines/characters/m10009/m10009_material.mat +++ b/Assets/arts/spines/characters/m10009/m10009_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10009_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/m10009/m10009_material.mat.meta b/Assets/arts/spines/characters/m10009/m10009_material.mat.meta index 8d2f8a662..2029d7ede 100644 --- a/Assets/arts/spines/characters/m10009/m10009_material.mat.meta +++ b/Assets/arts/spines/characters/m10009/m10009_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset b/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset index 3b8ad1ddd..505d71a62 100644 --- a/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset +++ b/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset.meta b/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset.meta index f29abebd4..9cd1ba257 100644 --- a/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10009/m10009_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010.atlas.txt b/Assets/arts/spines/characters/m10010/m10010.atlas.txt index 42d91627b..f231c23e9 100644 --- a/Assets/arts/spines/characters/m10010/m10010.atlas.txt +++ b/Assets/arts/spines/characters/m10010/m10010.atlas.txt @@ -1,43 +1,56 @@ m10010.png size:256,256 filter:Linear,Linear -clothes -bounds:81,55,45,33 -eye_xuanyun -bounds:81,96,20,20 +chi_l_1 +bounds:132,202,71,52 +offsets:1,1,73,54 +chi_l_2 +bounds:132,160,61,40 +offsets:2,1,64,42 +chi_r_1 +bounds:2,24,68,50 +offsets:1,1,70,52 +chi_r_2 +bounds:195,157,58,38 +offsets:1,1,60,40 +ci1 +bounds:2,3,18,19 +offsets:1,1,20,21 +ci2 +bounds:238,135,20,16 +offsets:1,1,22,18 +rotate:90 +ci3 +bounds:22,3,18,19 +offsets:1,1,20,21 +eye_hit +bounds:176,85,21,29 +eye_l +bounds:82,111,26,23 +offsets:1,1,28,25 +rotate:90 +eye_r +bounds:82,88,23,21 +offsets:1,1,25,24 +eye_yun +bounds:199,90,22,24 gutou -bounds:103,150,70,53 -hand_l -bounds:220,172,31,34 +bounds:176,116,39,60 rotate:90 -hand_r -bounds:128,53,37,35 head -bounds:2,118,99,85 -hit_yan1 -bounds:87,35,16,18 -kulou -bounds:2,54,77,62 -offsets:0,1,77,63 -leg_l -bounds:175,157,43,46 -leg_r -bounds:198,205,42,49 +bounds:2,76,78,61 +offsets:1,1,80,63 +jiao_l +bounds:132,99,42,59 +offsets:1,1,44,61 +jiao_r +bounds:205,197,41,57 +offsets:1,1,43,59 spine -bounds:103,90,58,64 -rotate:90 -upperarm_l_01 -bounds:2,2,29,30 -rotate:90 -upperarm_l_02 -bounds:34,2,19,29 -upperarm_r_01 -bounds:55,5,26,32 -rotate:90 -upperarm_r_02 -bounds:220,147,23,26 -rotate:90 -weapon -bounds:2,205,194,49 +bounds:2,139,103,115 +ya +bounds:132,75,42,22 +offsets:1,1,44,24 yingzi -bounds:2,33,83,19 +bounds:107,65,189,23 +rotate:90 diff --git a/Assets/arts/spines/characters/m10010/m10010.atlas.txt.meta b/Assets/arts/spines/characters/m10010/m10010.atlas.txt.meta index eb6607f38..37eb30430 100644 --- a/Assets/arts/spines/characters/m10010/m10010.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10010/m10010.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 957f1748e432f4641a6ebaca5535d3ab TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010.png b/Assets/arts/spines/characters/m10010/m10010.png index 59c362e4d..3ed998cf3 100644 Binary files a/Assets/arts/spines/characters/m10010/m10010.png and b/Assets/arts/spines/characters/m10010/m10010.png differ diff --git a/Assets/arts/spines/characters/m10010/m10010.png.meta b/Assets/arts/spines/characters/m10010/m10010.png.meta index 8d47b0ae8..df0d8df79 100644 --- a/Assets/arts/spines/characters/m10010/m10010.png.meta +++ b/Assets/arts/spines/characters/m10010/m10010.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/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010.skel.bytes b/Assets/arts/spines/characters/m10010/m10010.skel.bytes index 0982cd963..8522887a4 100644 Binary files a/Assets/arts/spines/characters/m10010/m10010.skel.bytes and b/Assets/arts/spines/characters/m10010/m10010.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10010/m10010.skel.bytes.meta b/Assets/arts/spines/characters/m10010/m10010.skel.bytes.meta index 3321d512f..9faba12ae 100644 --- a/Assets/arts/spines/characters/m10010/m10010.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10010/m10010.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 8b968f00ef7e308449cc3dec6124c4c6 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010_atlas.asset.meta b/Assets/arts/spines/characters/m10010/m10010_atlas.asset.meta index f1267f9b6..a2d17eb6c 100644 --- a/Assets/arts/spines/characters/m10010/m10010_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10010/m10010_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010_material.mat b/Assets/arts/spines/characters/m10010/m10010_material.mat index 63658bc05..4f103b309 100644 --- a/Assets/arts/spines/characters/m10010/m10010_material.mat +++ b/Assets/arts/spines/characters/m10010/m10010_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10010_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/m10010/m10010_material.mat.meta b/Assets/arts/spines/characters/m10010/m10010_material.mat.meta index 6f6087f8f..d883d0997 100644 --- a/Assets/arts/spines/characters/m10010/m10010_material.mat.meta +++ b/Assets/arts/spines/characters/m10010/m10010_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset b/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset index 8bf46d592..5872ce30a 100644 --- a/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset +++ b/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset.meta b/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset.meta index 9af642779..c32f52191 100644 --- a/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10010/m10010_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10010.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014.atlas.txt b/Assets/arts/spines/characters/m10014/m10014.atlas.txt index 27148c693..98e5276f6 100644 --- a/Assets/arts/spines/characters/m10014/m10014.atlas.txt +++ b/Assets/arts/spines/characters/m10014/m10014.atlas.txt @@ -1,45 +1,32 @@ m10014.png -size:512,512 +size:256,256 filter:Linear,Linear -canying -bounds:2,160,113,148 -offsets:3,5,119,156 -clothes -bounds:87,60,98,58 +eye_hit +bounds:87,85,24,34 +eye_l +bounds:64,12,29,20 +offsets:1,1,31,22 rotate:90 -eye -bounds:471,451,35,59 -offsets:0,0,36,59 -eye_xuanyun -bounds:488,427,22,22 +eye_r +bounds:212,231,24,20 +offsets:1,1,26,22 +eye_xx +bounds:113,98,17,21 +eye_yun +bounds:157,189,22,24 gutou -bounds:87,5,70,53 -hair -bounds:345,439,124,71 -hand_l -bounds:331,362,91,75 -hand_r -bounds:331,312,48,60 +bounds:2,2,39,60 rotate:90 -head -bounds:143,336,118,107 -hit_yan3 -bounds:393,332,28,28 kulou -bounds:424,360,77,62 -offsets:0,1,77,63 -rotate:90 -leg_l -bounds:117,240,46,68 -leg_r -bounds:117,171,48,67 +bounds:2,43,83,76 +mouth +bounds:157,215,53,36 +offsets:1,1,55,38 +qipao +bounds:87,60,21,23 +offsets:1,1,23,25 spine -bounds:2,310,139,133 -upperarm_l -bounds:2,42,83,116 -upperarm_r -bounds:263,337,66,106 -weapon -bounds:2,445,341,65 +bounds:2,121,128,130 yingzi -bounds:2,21,83,19 +bounds:132,62,189,23 +rotate:90 diff --git a/Assets/arts/spines/characters/m10014/m10014.atlas.txt.meta b/Assets/arts/spines/characters/m10014/m10014.atlas.txt.meta index d3e125d81..1aab8a83f 100644 --- a/Assets/arts/spines/characters/m10014/m10014.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10014/m10014.atlas.txt.meta @@ -3,5 +3,5 @@ guid: e61dc5ffcdc8e7e48a7b41bf29c18640 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014.png b/Assets/arts/spines/characters/m10014/m10014.png index 32017661d..0ab5b310f 100644 Binary files a/Assets/arts/spines/characters/m10014/m10014.png and b/Assets/arts/spines/characters/m10014/m10014.png differ diff --git a/Assets/arts/spines/characters/m10014/m10014.png.meta b/Assets/arts/spines/characters/m10014/m10014.png.meta index a1a801034..4c0b1ed1e 100644 --- a/Assets/arts/spines/characters/m10014/m10014.png.meta +++ b/Assets/arts/spines/characters/m10014/m10014.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/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014.skel.bytes b/Assets/arts/spines/characters/m10014/m10014.skel.bytes index ba6ee7648..aaf2ff438 100644 Binary files a/Assets/arts/spines/characters/m10014/m10014.skel.bytes and b/Assets/arts/spines/characters/m10014/m10014.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10014/m10014.skel.bytes.meta b/Assets/arts/spines/characters/m10014/m10014.skel.bytes.meta index 5b4b193c4..cddcf3ebf 100644 --- a/Assets/arts/spines/characters/m10014/m10014.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10014/m10014.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 48e490707a760a24f9e9226b97992409 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014_atlas.asset.meta b/Assets/arts/spines/characters/m10014/m10014_atlas.asset.meta index ea64e1165..e990e1ea3 100644 --- a/Assets/arts/spines/characters/m10014/m10014_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10014/m10014_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014_material.mat b/Assets/arts/spines/characters/m10014/m10014_material.mat index 672a6e9af..9b7e14b76 100644 --- a/Assets/arts/spines/characters/m10014/m10014_material.mat +++ b/Assets/arts/spines/characters/m10014/m10014_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10014_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/m10014/m10014_material.mat.meta b/Assets/arts/spines/characters/m10014/m10014_material.mat.meta index bff9ef728..e0717dbb0 100644 --- a/Assets/arts/spines/characters/m10014/m10014_material.mat.meta +++ b/Assets/arts/spines/characters/m10014/m10014_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset b/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset index 9446dea3d..5b2fef001 100644 --- a/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset +++ b/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset.meta b/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset.meta index f17c75752..32212292d 100644 --- a/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10014/m10014_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10014.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001.meta b/Assets/arts/spines/characters/p53001.meta new file mode 100644 index 000000000..b0bdb2fb3 --- /dev/null +++ b/Assets/arts/spines/characters/p53001.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 563dac3c6c7707b48adb9ec566ae434d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001.atlas.txt b/Assets/arts/spines/characters/p53001/p53001.atlas.txt new file mode 100644 index 000000000..ab9de9625 --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001.atlas.txt @@ -0,0 +1,115 @@ +p53001.png +size:2048,2048 +filter:Linear,Linear +beidai +bounds:694,1598,140,99 +rotate:90 +cy +bounds:2,1540,493,504 +offsets:1,0,497,505 +dun +bounds:88,778,208,276 +offsets:1,2,210,279 +eye_death +bounds:497,1540,48,42 +offsets:1,0,49,42 +eye_hit +bounds:1037,1746,46,63 +eye_l +bounds:486,1518,26,20 +offsets:1,1,28,22 +eye_r +bounds:1470,1918,25,19 +offsets:1,1,27,21 +eye_yun +bounds:184,560,51,51 +face_1 +bounds:88,613,153,163 +face_2 +bounds:1337,1939,167,105 +hair_1 +bounds:1090,1812,245,232 +hand_l_1 +bounds:401,895,77,77 +offsets:1,1,79,79 +hand_l_2 +bounds:1802,1968,76,78 +offsets:1,1,78,80 +rotate:90 +hand_l_3 +bounds:970,1746,65,63 +offsets:1,1,67,65 +hand_r_1 +bounds:401,974,81,80 +offsets:1,1,83,82 +hand_r_2 +bounds:807,1751,83,58 +offsets:1,1,85,60 +hand_r_3 +bounds:892,1746,63,76 +offsets:1,1,65,78 +rotate:90 +head +bounds:298,859,195,101 +offsets:1,1,197,103 +rotate:90 +jianjia_l +bounds:1506,1959,101,85 +offsets:1,1,103,87 +jianjia_r +bounds:1609,1959,101,85 +offsets:1,1,103,87 +jiao +bounds:243,636,69,43 +offsets:1,1,71,45 +rotate:90 +jiao_ +bounds:2,279,69,43 +offsets:1,1,71,45 +rotate:90 +leg_l_1 +bounds:298,786,71,88 +rotate:90 +leg_l_2 +bounds:243,707,69,50 +offsets:1,1,71,52 +rotate:90 +leg_r_1 +bounds:1712,1973,71,88 +rotate:90 +leg_r_2 +bounds:2,350,69,49 +offsets:1,1,71,51 +rotate:90 +pifeng +bounds:807,1811,281,233 +qibo +bounds:2,1056,482,482 +offsets:59,59,600,600 +quan +bounds:497,1584,195,154 +offsets:8,0,205,154 +quan2 +bounds:497,1740,308,304 +offsets:0,0,308,308 +spine +bounds:1337,1811,131,126 +wuqi +bounds:2,550,84,504 +offsets:1,1,86,506 +xiabai_1 +bounds:1962,1986,58,82 +rotate:90 +xiabai_2 +bounds:1882,1974,78,70 +yao_1 +bounds:2,213,64,46 +offsets:1,1,66,48 +rotate:90 +yao_2 +bounds:88,564,94,47 +offsets:1,1,96,49 +yaodai +bounds:2,421,127,50 +offsets:1,1,129,52 +rotate:90 diff --git a/Assets/arts/spines/characters/p53001/p53001.atlas.txt.meta b/Assets/arts/spines/characters/p53001/p53001.atlas.txt.meta new file mode 100644 index 000000000..4e822cb1b --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: acbf038934f97ad43901c24105e9a379 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001.png b/Assets/arts/spines/characters/p53001/p53001.png new file mode 100644 index 000000000..037cc4e83 Binary files /dev/null and b/Assets/arts/spines/characters/p53001/p53001.png differ diff --git a/Assets/arts/spines/characters/p53001/p53001.png.meta b/Assets/arts/spines/characters/p53001/p53001.png.meta new file mode 100644 index 000000000..25c99500b --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 1654093a46a4ee042bc3c3ddaec69b87 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: 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 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001.skel.bytes b/Assets/arts/spines/characters/p53001/p53001.skel.bytes new file mode 100644 index 000000000..cc823c3d8 Binary files /dev/null and b/Assets/arts/spines/characters/p53001/p53001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p53001/p53001.skel.bytes.meta b/Assets/arts/spines/characters/p53001/p53001.skel.bytes.meta new file mode 100644 index 000000000..43c2d5bc1 --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd67909b814d6bb469b954ca27398832 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001_atlas.asset b/Assets/arts/spines/characters/p53001/p53001_atlas.asset new file mode 100644 index 000000000..1379ac82e --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: p53001_atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: acbf038934f97ad43901c24105e9a379, type: 3} + materials: + - {fileID: 2100000, guid: edb5b868b12ac4746a2096c02f723831, type: 2} diff --git a/Assets/arts/spines/characters/p53001/p53001_atlas.asset.meta b/Assets/arts/spines/characters/p53001/p53001_atlas.asset.meta new file mode 100644 index 000000000..fc91bc5f7 --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3d17611604b27c43b52d03c8da124bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001_material.mat b/Assets/arts/spines/characters/p53001/p53001_material.mat new file mode 100644 index 000000000..c0e24c9b0 --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: p53001_material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1654093a46a4ee042bc3c3ddaec69b87, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _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/p53001/p53001_material.mat.meta b/Assets/arts/spines/characters/p53001/p53001_material.mat.meta new file mode 100644 index 000000000..176e8d16c --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edb5b868b12ac4746a2096c02f723831 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset b/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset new file mode 100644 index 000000000..68aeee2cd --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: p53001_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: e3d17611604b27c43b52d03c8da124bd, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: fd67909b814d6bb469b954ca27398832, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0 + controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset.meta b/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset.meta new file mode 100644 index 000000000..98a0f99ef --- /dev/null +++ b/Assets/arts/spines/characters/p53001/p53001_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0297107b6aa145644adfdb07655b4531 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10009.prefab b/Assets/prefabs/spine/ui/characters/m10009.prefab index 264692b37..6c16fee97 100644 --- a/Assets/prefabs/spine/ui/characters/m10009.prefab +++ b/Assets/prefabs/spine/ui/characters/m10009.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/m10010.prefab b/Assets/prefabs/spine/ui/characters/m10010.prefab index 15bfbac6d..9bd50eb34 100644 --- a/Assets/prefabs/spine/ui/characters/m10010.prefab +++ b/Assets/prefabs/spine/ui/characters/m10010.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/m10014.prefab b/Assets/prefabs/spine/ui/characters/m10014.prefab index 01e63fabe..76a7843ea 100644 --- a/Assets/prefabs/spine/ui/characters/m10014.prefab +++ b/Assets/prefabs/spine/ui/characters/m10014.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/p53001.prefab b/Assets/prefabs/spine/ui/characters/p53001.prefab new file mode 100644 index 000000000..fd330d3a1 --- /dev/null +++ b/Assets/prefabs/spine/ui/characters/p53001.prefab @@ -0,0 +1,204 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1991971382385470840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2951863086470196126} + - component: {fileID: 1433468907267254477} + m_Layer: 5 + m_Name: p53001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2951863086470196126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991971382385470840} + 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} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1433468907267254477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991971382385470840} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 490f47ff5874f0347bc783903bad2e72, type: 3} + m_Name: + m_EditorClassIdentifier: + SpineObject: {fileID: 8900387906475466617} + ObjectList: + - hashName: 3029410 + gameObject: {fileID: 4116628536935411962} + - hashName: 3506402 + gameObject: {fileID: 8900387906475466617} +--- !u!1 &4116628536935411962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2663275627370592771} + m_Layer: 5 + m_Name: body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2663275627370592771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4116628536935411962} + 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} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8900387906475466617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 110436067314948100} + - component: {fileID: 9067112022599556684} + - component: {fileID: 1061563659970274733} + m_Layer: 5 + m_Name: root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &110436067314948100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9067112022599556684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + m_CullTransparentMesh: 1 +--- !u!114 &1061563659970274733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 11400000, guid: 0297107b6aa145644adfdb07655b4531, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + 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: [] + separatorSlotNames: [] + 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 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/p53001.prefab.meta b/Assets/prefabs/spine/ui/characters/p53001.prefab.meta new file mode 100644 index 000000000..694d60e53 --- /dev/null +++ b/Assets/prefabs/spine/ui/characters/p53001.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 55a10662fb6db7149aacb97c579d5a00 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: prefabs/spine/ui/characters/p0001.prefab.ab + assetBundleVariant: