diff --git a/Assets/arts/spines/characters/p0004/p0004.skel.bytes b/Assets/arts/spines/characters/p0004/p0004.skel.bytes index 7b1b6d0d4..0dbf1e57e 100644 Binary files a/Assets/arts/spines/characters/p0004/p0004.skel.bytes and b/Assets/arts/spines/characters/p0004/p0004.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0006/p0006.atlas.txt b/Assets/arts/spines/characters/p0006/p0006.atlas.txt index 03294411f..46d2f0e96 100644 --- a/Assets/arts/spines/characters/p0006/p0006.atlas.txt +++ b/Assets/arts/spines/characters/p0006/p0006.atlas.txt @@ -1,59 +1,83 @@ p0006.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:408,440,13,24 -offsets:1,1,15,26 +bing +bounds:546,597,206,187 +offsets:0,2,206,189 +chi_l +bounds:583,158,184,178 +offsets:2,1,188,180 +chi_r +bounds:754,612,172,166 +offsets:2,1,176,168 rotate:90 -eye_R -bounds:487,458,13,24 -offsets:1,1,15,26 -eye_xuanyun -bounds:219,377,22,22 -gutou -bounds:60,11,70,53 +cy +bounds:2,2,418,543 +offsets:0,2,418,547 +cy2 +bounds:2,547,542,471 +offsets:1,2,544,474 +eye_l +bounds:769,291,39,46 +offsets:1,1,41,48 +eye_r +bounds:821,787,37,44 +offsets:1,1,39,46 rotate:90 -hand_L -bounds:60,83,67,57 +eye_yun +bounds:922,629,51,51 +hand_l_1 +bounds:791,514,113,96 +offsets:1,1,115,98 +hand_l_2 +bounds:703,339,109,91 +offsets:1,1,111,93 rotate:90 -hand_R -bounds:189,372,27,28 +hand_l_3 +bounds:519,100,67,62 +offsets:1,1,69,64 rotate:90 -head_1 -bounds:254,432,107,77 -head_2 -bounds:130,401,122,108 -head_3 -bounds:2,2,90,56 +hand_r_1 +bounds:796,364,92,85 +offsets:1,1,94,87 +hand_r_2 +bounds:583,98,95,58 +offsets:1,1,97,60 +hand_r_3 +bounds:922,758,72,66 +offsets:1,1,74,68 +head +bounds:546,786,273,232 +offsets:1,1,275,234 +leg_l_1 +bounds:703,450,145,86 +offsets:1,1,147,88 rotate:90 -hit_yan1 -bounds:335,412,16,18 -hit_yan2 -bounds:313,410,20,20 -huarui -bounds:408,455,43,27 -kulou -bounds:60,152,77,62 -offsets:0,1,77,63 +leg_l_2 +bounds:680,93,74,63 +leg_r_1 +bounds:422,80,137,95 +offsets:1,1,139,97 rotate:90 -spine_1 -bounds:2,231,133,119 +leg_r_2 +bounds:922,682,74,63 rotate:90 -spine_2 -bounds:2,94,135,56 +pifeng +bounds:583,338,257,118 +offsets:1,1,259,120 rotate:90 -toufa1 -bounds:130,378,21,57 +spine +bounds:821,826,176,192 +wuqi +bounds:422,219,326,114 rotate:90 -toufa2 -bounds:254,410,20,57 -rotate:90 -upperarm_R -bounds:363,433,43,49 -weapon_1 -bounds:2,366,126,143 -yinying -bounds:363,484,141,25 -zui -bounds:453,458,24,32 +xiabai_l +bounds:791,451,113,61 +offsets:1,1,115,63 +xiabai_r +bounds:422,17,98,61 +offsets:1,1,100,63 +yingzi +bounds:538,169,376,43 +offsets:1,1,378,45 rotate:90 diff --git a/Assets/arts/spines/characters/p0006/p0006.atlas.txt.meta b/Assets/arts/spines/characters/p0006/p0006.atlas.txt.meta index f26707748..316158093 100644 --- a/Assets/arts/spines/characters/p0006/p0006.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0006/p0006.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 2a2a8b5b67a83bc43ae0ca18486caeba TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0006/p0006.png b/Assets/arts/spines/characters/p0006/p0006.png index ae3221e08..3998104da 100644 Binary files a/Assets/arts/spines/characters/p0006/p0006.png and b/Assets/arts/spines/characters/p0006/p0006.png differ diff --git a/Assets/arts/spines/characters/p0006/p0006.png.meta b/Assets/arts/spines/characters/p0006/p0006.png.meta index 37841f358..25e44b3f8 100644 --- a/Assets/arts/spines/characters/p0006/p0006.png.meta +++ b/Assets/arts/spines/characters/p0006/p0006.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/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0006/p0006.skel.bytes b/Assets/arts/spines/characters/p0006/p0006.skel.bytes index 542665e34..32d6cb1f0 100644 Binary files a/Assets/arts/spines/characters/p0006/p0006.skel.bytes and b/Assets/arts/spines/characters/p0006/p0006.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0006/p0006.skel.bytes.meta b/Assets/arts/spines/characters/p0006/p0006.skel.bytes.meta index a4f43a2d9..51609bec7 100644 --- a/Assets/arts/spines/characters/p0006/p0006.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0006/p0006.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 1ead4b3be4e761949818881bdba23483 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0006/p0006_atlas.asset.meta b/Assets/arts/spines/characters/p0006/p0006_atlas.asset.meta index 379290c67..e20092822 100644 --- a/Assets/arts/spines/characters/p0006/p0006_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0006/p0006_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0006/p0006_material.mat b/Assets/arts/spines/characters/p0006/p0006_material.mat index fe2aac71a..a3a1fdaa5 100644 --- a/Assets/arts/spines/characters/p0006/p0006_material.mat +++ b/Assets/arts/spines/characters/p0006/p0006_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0006_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/p0006/p0006_material.mat.meta b/Assets/arts/spines/characters/p0006/p0006_material.mat.meta index 03f57e064..27ca10e68 100644 --- a/Assets/arts/spines/characters/p0006/p0006_material.mat.meta +++ b/Assets/arts/spines/characters/p0006/p0006_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0006/p0006_skeletondata.asset.meta b/Assets/arts/spines/characters/p0006/p0006_skeletondata.asset.meta index e141c63c3..7d64f1b72 100644 --- a/Assets/arts/spines/characters/p0006/p0006_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0006/p0006_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0006.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007.atlas.txt b/Assets/arts/spines/characters/p0007/p0007.atlas.txt index 17a3b0009..45effc6f8 100644 --- a/Assets/arts/spines/characters/p0007/p0007.atlas.txt +++ b/Assets/arts/spines/characters/p0007/p0007.atlas.txt @@ -1,69 +1,47 @@ p0007.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:2,2,10,21 -eye_R -bounds:14,2,10,21 -eye_xuanyun -bounds:77,64,22,22 -guang -bounds:324,411,66,72 -gutou -bounds:2,115,70,53 -hand_L -bounds:74,116,23,26 -rotate:90 -hand_R -bounds:77,88,23,26 +bing +bounds:533,603,206,187 +offsets:0,2,206,189 +canying +bounds:2,601,529,413 +offsets:2,0,533,415 +eye_l +bounds:2,2,40,30 +offsets:1,1,42,32 +eye_r +bounds:486,570,40,29 +offsets:1,1,42,31 +eye_yun +bounds:922,963,51,51 +hand_l_1 +bounds:347,432,73,53 +hand_l_2 +bounds:741,692,91,98 +offsets:1,1,93,100 +hand_r_2 +bounds:47,197,85,77 +offsets:1,1,87,79 +hand_r_3 +bounds:838,839,64,52 +offsets:1,1,66,54 head -bounds:2,234,91,79 -head_1 -bounds:207,408,115,102 -head_2 -bounds:102,395,103,115 -hit_yan1 -bounds:26,2,16,18 -hit_yan2 -bounds:431,417,20,20 -hit_yan3 -bounds:248,378,28,28 -kulou -bounds:2,170,77,62 -offsets:0,1,77,63 -leg_l_1 -bounds:392,439,52,44 -leg_l_2 -bounds:178,356,31,37 -leg_r_1 -bounds:31,61,52,44 +bounds:533,792,303,222 +leg +bounds:47,276,224,134 +mouth +bounds:273,320,90,41 +offsets:1,1,92,43 rotate:90 -leg_r_2 -bounds:392,406,31,37 +spine1 +bounds:347,487,137,112 +spine2 +bounds:838,893,82,121 +wuqi +bounds:2,412,343,187 +offsets:2,2,346,190 +yingzi +bounds:2,34,376,43 +offsets:1,1,378,45 rotate:90 -sheng_1 -bounds:278,379,27,29 -rotate:90 -sheng_2 -bounds:81,170,28,28 -spine_1 -bounds:102,323,74,70 -upperarm_l_01 -bounds:467,473,43,37 -upperarm_l_02 -bounds:178,318,36,36 -upperarm_r_01 -bounds:31,22,43,37 -upperarm_r_02 -bounds:211,370,35,36 -weapon_1 -bounds:2,315,98,195 -yaodai -bounds:2,25,88,27 -rotate:90 -yinying -bounds:324,485,141,25 -zui -bounds:81,200,24,32 -zui1 -bounds:74,141,29,27 diff --git a/Assets/arts/spines/characters/p0007/p0007.atlas.txt.meta b/Assets/arts/spines/characters/p0007/p0007.atlas.txt.meta index c43466687..fc8d28833 100644 --- a/Assets/arts/spines/characters/p0007/p0007.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0007/p0007.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 69a2936bba7acb84a8b821d661659302 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007.png b/Assets/arts/spines/characters/p0007/p0007.png index 1a406b267..f5e40f7c2 100644 Binary files a/Assets/arts/spines/characters/p0007/p0007.png and b/Assets/arts/spines/characters/p0007/p0007.png differ diff --git a/Assets/arts/spines/characters/p0007/p0007.png.meta b/Assets/arts/spines/characters/p0007/p0007.png.meta index 2164055a3..aab55ab84 100644 --- a/Assets/arts/spines/characters/p0007/p0007.png.meta +++ b/Assets/arts/spines/characters/p0007/p0007.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/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007.skel.bytes b/Assets/arts/spines/characters/p0007/p0007.skel.bytes index 1769844d6..a6aaa1b6c 100644 Binary files a/Assets/arts/spines/characters/p0007/p0007.skel.bytes and b/Assets/arts/spines/characters/p0007/p0007.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0007/p0007.skel.bytes.meta b/Assets/arts/spines/characters/p0007/p0007.skel.bytes.meta index 6b981ebf9..a9cbd266b 100644 --- a/Assets/arts/spines/characters/p0007/p0007.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0007/p0007.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 89415224a88caf94294fe031c28d3f79 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007_atlas.asset.meta b/Assets/arts/spines/characters/p0007/p0007_atlas.asset.meta index 494655d84..170aed494 100644 --- a/Assets/arts/spines/characters/p0007/p0007_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0007/p0007_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007_material.mat b/Assets/arts/spines/characters/p0007/p0007_material.mat index 6730ec9ce..f1c9a1097 100644 --- a/Assets/arts/spines/characters/p0007/p0007_material.mat +++ b/Assets/arts/spines/characters/p0007/p0007_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0007_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/p0007/p0007_material.mat.meta b/Assets/arts/spines/characters/p0007/p0007_material.mat.meta index efbc34e9e..b7ab6f30e 100644 --- a/Assets/arts/spines/characters/p0007/p0007_material.mat.meta +++ b/Assets/arts/spines/characters/p0007/p0007_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0007/p0007_skeletondata.asset.meta b/Assets/arts/spines/characters/p0007/p0007_skeletondata.asset.meta index 9e9662913..2a354c43c 100644 --- a/Assets/arts/spines/characters/p0007/p0007_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0007/p0007_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008.atlas.txt b/Assets/arts/spines/characters/p0008/p0008.atlas.txt index 1ca6f4f8e..4efcaf922 100644 --- a/Assets/arts/spines/characters/p0008/p0008.atlas.txt +++ b/Assets/arts/spines/characters/p0008/p0008.atlas.txt @@ -1,64 +1,79 @@ p0008.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:223,316,12,23 +bing +bounds:365,333,206,187 +offsets:0,2,206,189 +cy +bounds:2,522,681,500 +offsets:2,0,684,501 +eye_biyan +bounds:573,352,27,29 +offsets:1,1,29,30 +eye_l +bounds:685,525,32,44 +offsets:1,1,34,46 +eye_r +bounds:254,142,29,42 +offsets:1,1,31,44 +eye_yun +bounds:879,583,51,51 +hand_l_1 +bounds:934,951,71,88 +offsets:0,2,71,90 rotate:90 -eye_R -bounds:131,71,12,23 -eye_xuanyun -bounds:429,460,22,22 -gutou -bounds:2,50,70,53 -hand_L -bounds:89,128,62,53 +hand_l_2 +bounds:273,20,75,86 +offsets:1,1,77,88 rotate:90 -hand_R -bounds:310,427,59,55 +hand_r_1 +bounds:254,186,121,95 +rotate:90 +hand_r_2 +bounds:879,695,72,77 +offsets:1,1,74,79 +hand_r_3 +bounds:879,636,67,57 +offsets:1,1,69,59 head -bounds:223,330,89,76 +bounds:2,142,250,165 +offsets:1,2,252,169 +leg_l +bounds:934,826,77,123 +offsets:0,1,77,124 +leg_r +bounds:148,18,77,123 +offsets:0,1,77,124 rotate:90 -head_1 -bounds:223,421,85,88 -head_2 -bounds:2,192,144,120 -hit_yan1 -bounds:429,442,16,18 +mei_l +bounds:273,2,23,16 +offsets:1,1,25,18 +mei_r +bounds:365,317,21,14 +offsets:1,1,23,16 +spine +bounds:685,571,192,201 +wuqi1_1 +bounds:953,695,58,59 +offsets:1,2,61,62 rotate:90 -hit_yan2 -bounds:144,128,20,20 -jian_l -bounds:2,2,61,46 -jian_r -bounds:144,150,53,40 -kulou -bounds:148,235,77,62 -offsets:0,1,77,63 +wuqi1_2 +bounds:953,755,69,69 +offsets:1,1,71,71 +wuqi1_3 +bounds:573,383,137,99 +offsets:1,1,139,101 rotate:90 -leg_L -bounds:453,474,35,55 +wuqi1_4 +bounds:2,309,361,211 +offsets:1,1,363,213 +wuqi1_5 +bounds:2,30,65,144 +offsets:1,1,67,146 rotate:90 -leg_R -bounds:89,96,30,58 -rotate:90 -spine_2 -bounds:2,105,85,85 -weapon_1 -bounds:74,58,36,55 -rotate:90 -weapon_2 -bounds:371,409,35,54 -rotate:90 -weapon_3 -bounds:371,446,36,56 -rotate:90 -weapon_4 -bounds:148,192,41,62 -rotate:90 -xuying -bounds:2,314,219,195 -offsets:1,1,221,196 -yinying -bounds:310,484,141,25 -zui1 -bounds:166,121,29,27 +wuqi1_6 +bounds:685,774,247,248 +offsets:1,1,249,250 +yingzi +bounds:2,97,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0008/p0008.atlas.txt.meta b/Assets/arts/spines/characters/p0008/p0008.atlas.txt.meta index bda204e3b..41d21952d 100644 --- a/Assets/arts/spines/characters/p0008/p0008.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0008/p0008.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 4d09375c31ca7b84682bf567c4e4df63 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008.png b/Assets/arts/spines/characters/p0008/p0008.png index 58c7254ee..b821c4372 100644 Binary files a/Assets/arts/spines/characters/p0008/p0008.png and b/Assets/arts/spines/characters/p0008/p0008.png differ diff --git a/Assets/arts/spines/characters/p0008/p0008.png.meta b/Assets/arts/spines/characters/p0008/p0008.png.meta index f03a429f7..00d4d5771 100644 --- a/Assets/arts/spines/characters/p0008/p0008.png.meta +++ b/Assets/arts/spines/characters/p0008/p0008.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/p0008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008.skel.bytes b/Assets/arts/spines/characters/p0008/p0008.skel.bytes index bd128093f..7d55c38d2 100644 Binary files a/Assets/arts/spines/characters/p0008/p0008.skel.bytes and b/Assets/arts/spines/characters/p0008/p0008.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0008/p0008.skel.bytes.meta b/Assets/arts/spines/characters/p0008/p0008.skel.bytes.meta index 7291be915..331aaa3a7 100644 --- a/Assets/arts/spines/characters/p0008/p0008.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0008/p0008.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 6f07b4f5d7743be4096aca45e63414f5 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008_atlas.asset.meta b/Assets/arts/spines/characters/p0008/p0008_atlas.asset.meta index d6662ed5b..d00482de9 100644 --- a/Assets/arts/spines/characters/p0008/p0008_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0008/p0008_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008_material.mat b/Assets/arts/spines/characters/p0008/p0008_material.mat index 37e91ec4a..8da041454 100644 --- a/Assets/arts/spines/characters/p0008/p0008_material.mat +++ b/Assets/arts/spines/characters/p0008/p0008_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0008_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/p0008/p0008_material.mat.meta b/Assets/arts/spines/characters/p0008/p0008_material.mat.meta index 74b536543..c258e3e59 100644 --- a/Assets/arts/spines/characters/p0008/p0008_material.mat.meta +++ b/Assets/arts/spines/characters/p0008/p0008_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0008/p0008_skeletondata.asset.meta b/Assets/arts/spines/characters/p0008/p0008_skeletondata.asset.meta index 3ba1b507a..f2d2536da 100644 --- a/Assets/arts/spines/characters/p0008/p0008_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0008/p0008_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0008.ab + assetBundleName: assetBundleVariant: