diff --git a/Assets/arts/spines/characters/m10001/m10001.atlas.txt b/Assets/arts/spines/characters/m10001/m10001.atlas.txt index 9955edbc8..871f92caa 100644 --- a/Assets/arts/spines/characters/m10001/m10001.atlas.txt +++ b/Assets/arts/spines/characters/m10001/m10001.atlas.txt @@ -1,42 +1,37 @@ m10001.png -size:256,256 +size:1024,1024 filter:Linear,Linear -clothes_1 -bounds:2,32,83,37 -rotate:90 -clothes_2 -bounds:93,58,60,30 -rotate:90 +ear_r +bounds:2,35,93,87 +offsets:2,1,97,89 +era_l +bounds:240,234,83,88 +offsets:2,1,86,90 eye -bounds:163,148,47,23 -rotate:90 -gutou -bounds:124,197,70,53 -hair -bounds:196,191,59,54 -rotate:90 -head -bounds:2,181,120,69 -hit_yan3 -bounds:2,2,28,28 -kulou -bounds:2,117,77,62 -offsets:0,1,77,63 -leg_L -bounds:93,19,33,37 -leg_R -bounds:188,152,34,37 +bounds:2,2,52,31 +offsets:1,1,54,33 +eye1 +bounds:351,480,53,53 +eye_yun +bounds:465,615,43,47 +huo +bounds:351,535,112,127 +offsets:1,1,114,129 +quan1 +bounds:325,303,11,19 +offsets:1,1,13,21 +quan2 +bounds:97,104,14,18 +offsets:1,1,16,20 +quan3 +bounds:351,459,11,19 +offsets:1,1,13,21 +quan4 +bounds:240,214,14,18 +offsets:1,1,16,20 spine -bounds:81,120,59,50 -rotate:90 -upperarm_l -bounds:133,148,28,47 -upperarm_r -bounds:133,123,23,42 -rotate:90 -weapon -bounds:41,27,88,29 -rotate:90 -yingzi -bounds:72,32,83,19 -rotate:90 +bounds:2,124,236,198 +offsets:2,2,240,202 +zhaozi +bounds:2,324,347,338 +offsets:1,2,349,341 diff --git a/Assets/arts/spines/characters/m10001/m10001.atlas.txt.meta b/Assets/arts/spines/characters/m10001/m10001.atlas.txt.meta index ac0f63efc..a96a7984a 100644 --- a/Assets/arts/spines/characters/m10001/m10001.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10001/m10001.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 085dc281434592c488fc86f25b37836b TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10001/m10001.png b/Assets/arts/spines/characters/m10001/m10001.png index b7c28fee0..28f610f4e 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.png and b/Assets/arts/spines/characters/m10001/m10001.png differ diff --git a/Assets/arts/spines/characters/m10001/m10001.png.meta b/Assets/arts/spines/characters/m10001/m10001.png.meta index 8ce2ef949..cd58224f5 100644 --- a/Assets/arts/spines/characters/m10001/m10001.png.meta +++ b/Assets/arts/spines/characters/m10001/m10001.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -101,18 +101,6 @@ TextureImporter: 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 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -125,6 +113,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10001/m10001.skel.bytes b/Assets/arts/spines/characters/m10001/m10001.skel.bytes index baeccffd8..75c25fd12 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.skel.bytes and b/Assets/arts/spines/characters/m10001/m10001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10001/m10001.skel.bytes.meta b/Assets/arts/spines/characters/m10001/m10001.skel.bytes.meta index 75321e8a8..065dc8183 100644 --- a/Assets/arts/spines/characters/m10001/m10001.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10001/m10001.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 87222f6091af4934ab7b249923462bbc TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10001/m10001_atlas.asset.meta b/Assets/arts/spines/characters/m10001/m10001_atlas.asset.meta index a0fc0de1d..02d198e01 100644 --- a/Assets/arts/spines/characters/m10001/m10001_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10001/m10001_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10001/m10001_material.mat b/Assets/arts/spines/characters/m10001/m10001_material.mat index ad5f2b2c9..e73c62eb7 100644 --- a/Assets/arts/spines/characters/m10001/m10001_material.mat +++ b/Assets/arts/spines/characters/m10001/m10001_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10001_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -29,6 +28,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -36,9 +36,10 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 1 + - _StraightAlphaInput: 0 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m10001/m10001_material.mat.meta b/Assets/arts/spines/characters/m10001/m10001_material.mat.meta index 8a66f1c16..e09e726e0 100644 --- a/Assets/arts/spines/characters/m10001/m10001_material.mat.meta +++ b/Assets/arts/spines/characters/m10001/m10001_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10001/m10001_skeletondata.asset.meta b/Assets/arts/spines/characters/m10001/m10001_skeletondata.asset.meta index 6065456a3..1433b5b41 100644 --- a/Assets/arts/spines/characters/m10001/m10001_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10001/m10001_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007_material.mat b/Assets/arts/spines/characters/p0007/p0007_material.mat index f1c9a1097..553039a01 100644 --- a/Assets/arts/spines/characters/p0007/p0007_material.mat +++ b/Assets/arts/spines/characters/p0007/p0007_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: p0007_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/p0009/p0009.atlas.txt b/Assets/arts/spines/characters/p0009/p0009.atlas.txt index 1514d4f74..5db2fa954 100644 --- a/Assets/arts/spines/characters/p0009/p0009.atlas.txt +++ b/Assets/arts/spines/characters/p0009/p0009.atlas.txt @@ -1,57 +1,82 @@ p0009.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:91,207,10,23 -offsets:1,1,12,25 -eye_R -bounds:195,324,10,23 -offsets:1,1,12,25 -eye_xuanyun -bounds:110,235,22,22 -gutou -bounds:29,93,70,53 +cy1 +bounds:2,530,444,492 +offsets:1,3,446,496 +cy2 +bounds:448,650,532,372 +offsets:1,0,534,372 +eye_l +bounds:982,982,40,40 +eye_r +bounds:982,940,40,40 +eye_yun +bounds:646,491,51,51 +guan +bounds:448,544,278,104 +offsets:2,2,282,108 +hand_l_1 +bounds:305,261,95,83 +offsets:1,2,98,87 rotate:90 -hand_L -bounds:110,259,62,52 -rotate:90 -hand_R -bounds:389,457,52,64 +hand_l_2 +bounds:172,358,126,125 +offsets:1,1,128,127 +hand_l_3 +bounds:2,4,80,94 +offsets:1,1,82,96 rotate:90 +hand_r_1 +bounds:448,466,86,76 +offsets:2,2,89,80 +hand_r_2 +bounds:728,529,120,119 +offsets:2,1,124,121 +hand_r_3 +bounds:303,165,80,94 +offsets:1,1,82,96 head -bounds:2,232,106,89 -hit_yan1 -bounds:240,393,16,18 -hit_yan2 -bounds:164,301,20,20 -kulou -bounds:161,349,77,62 -offsets:0,1,77,63 -leg_L -bounds:258,444,60,65 -leg_R -bounds:29,165,60,65 -sipne_1 -bounds:161,413,95,96 -spine_2 -bounds:2,31,56,38 +bounds:2,293,168,190 +huzi +bounds:850,512,102,42 +jia +bounds:954,541,22,13 +offsets:1,1,24,15 +jianjia_l +bounds:850,556,126,92 +offsets:2,2,130,95 +jianjia_r +bounds:300,358,125,92 +offsets:2,2,129,95 rotate:90 -spine_3 -bounds:258,404,63,38 -spine_4 -bounds:320,452,67,57 -upperarm_L_1 -bounds:455,462,46,47 -upperarm_R_1 -bounds:323,409,41,56 +leg_l_1 +bounds:172,268,88,131 rotate:90 -xuying -bounds:2,323,157,186 -yinying -bounds:2,89,141,25 +leg_l_2 +bounds:536,491,53,51 +offsets:1,1,55,53 +leg_l_3 +bounds:978,569,79,44 +offsets:1,1,81,46 rotate:90 -zui -bounds:161,323,24,32 +leg_r_1 +bounds:145,135,88,131 +leg_r_2 +bounds:591,491,53,51 +offsets:1,1,55,53 +leg_r_3 +bounds:978,488,79,44 +offsets:1,1,81,46 rotate:90 -zui1 -bounds:2,2,29,27 +spine +bounds:2,86,205,141 +rotate:90 +yao +bounds:145,78,87,55 +yao1 +bounds:235,158,108,66 +rotate:90 +yingzi +bounds:2,485,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0009/p0009.atlas.txt.meta b/Assets/arts/spines/characters/p0009/p0009.atlas.txt.meta index 224d90cd0..2083783f7 100644 --- a/Assets/arts/spines/characters/p0009/p0009.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0009/p0009.atlas.txt.meta @@ -3,5 +3,5 @@ guid: ea0cdaddc6ae5ef479c5157fd139b202 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0009/p0009.png b/Assets/arts/spines/characters/p0009/p0009.png index 002723cd5..bbb388c19 100644 Binary files a/Assets/arts/spines/characters/p0009/p0009.png and b/Assets/arts/spines/characters/p0009/p0009.png differ diff --git a/Assets/arts/spines/characters/p0009/p0009.png.meta b/Assets/arts/spines/characters/p0009/p0009.png.meta index 561da5881..023e4caa3 100644 --- a/Assets/arts/spines/characters/p0009/p0009.png.meta +++ b/Assets/arts/spines/characters/p0009/p0009.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,32 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0009/p0009.skel.bytes b/Assets/arts/spines/characters/p0009/p0009.skel.bytes index a0072862f..c0cb0b924 100644 Binary files a/Assets/arts/spines/characters/p0009/p0009.skel.bytes and b/Assets/arts/spines/characters/p0009/p0009.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0009/p0009.skel.bytes.meta b/Assets/arts/spines/characters/p0009/p0009.skel.bytes.meta index f2ebcc93b..26ac34823 100644 --- a/Assets/arts/spines/characters/p0009/p0009.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0009/p0009.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 2590bd58bc474ac4fb15ae7196647f9e TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0009/p0009_atlas.asset.meta b/Assets/arts/spines/characters/p0009/p0009_atlas.asset.meta index 8e6fb40c3..c0e106dea 100644 --- a/Assets/arts/spines/characters/p0009/p0009_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0009/p0009_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0009/p0009_material.mat b/Assets/arts/spines/characters/p0009/p0009_material.mat index fe2720922..72cc829f2 100644 --- a/Assets/arts/spines/characters/p0009/p0009_material.mat +++ b/Assets/arts/spines/characters/p0009/p0009_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0009_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/p0009/p0009_material.mat.meta b/Assets/arts/spines/characters/p0009/p0009_material.mat.meta index c945f8169..8a0cd0daa 100644 --- a/Assets/arts/spines/characters/p0009/p0009_material.mat.meta +++ b/Assets/arts/spines/characters/p0009/p0009_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0009/p0009_skeletondata.asset.meta b/Assets/arts/spines/characters/p0009/p0009_skeletondata.asset.meta index ac1714614..9328df4ce 100644 --- a/Assets/arts/spines/characters/p0009/p0009_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0009/p0009_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0009.ab + assetBundleName: assetBundleVariant: