diff --git a/Assets/arts/spines/characters/m10005/m10005.atlas.txt b/Assets/arts/spines/characters/m10005/m10005.atlas.txt index 5db5ecbb4..0f5a3623b 100644 --- a/Assets/arts/spines/characters/m10005/m10005.atlas.txt +++ b/Assets/arts/spines/characters/m10005/m10005.atlas.txt @@ -1,66 +1,139 @@ m10005.png -size:1024,1024 +size:761,269 filter:Linear,Linear -FX1/FX1_00000 -bounds:2,463,300,169 -rotate:90 -FX1/FX1_00001 -bounds:250,846,300,169 -FX1/FX1_00002 -bounds:2,161,300,169 -rotate:90 -FX1/FX1_00003 -bounds:552,846,300,169 -FX1/FX1_00004 -bounds:250,675,300,169 -FX2/FX2_00000 -bounds:218,655,26,18 -offsets:22,15,150,84 -FX2/FX2_00001 -bounds:67,16,49,39 -offsets:27,15,150,84 -FX2/FX2_00002 -bounds:855,781,74,63 -offsets:31,13,150,84 -FX2/FX2_00003 -bounds:854,846,84,65 -offsets:32,12,150,84 -FX2/FX2_00004 -bounds:2,2,53,63 -offsets:62,14,150,84 -rotate:90 +pma:true ear_l -bounds:679,761,86,83 -offsets:1,2,88,86 +bounds:526,32,54,53 +offsets:1,1,56,55 ear_r -bounds:767,761,86,83 -offsets:1,1,88,85 +bounds:307,81,52,51 +offsets:1,1,54,53 eye -bounds:552,739,125,105 -offsets:1,1,127,107 +bounds:736,65,23,16 +offsets:1,1,25,18 +eye_death +bounds:745,20,16,14 +rotate:90 +eye_hit +bounds:505,4,20,26 +rotate:90 eye_yun -bounds:552,690,43,47 +bounds:479,2,22,24 +rotate:90 +fx/fx1 +bounds:352,134,106,37 +offsets:8,8,200,113 +fx/fx10 +bounds:2,170,157,97 +offsets:17,13,200,113 +fx/fx11 +bounds:462,182,151,85 +offsets:21,23,200,113 +fx/fx12 +bounds:159,81,146,65 +offsets:21,44,200,113 +fx/fx2 +bounds:2,2,87,69 +offsets:49,4,200,113 +fx/fx3 +bounds:173,2,102,77 +offsets:41,2,200,113 +fx/fx4 +bounds:595,90,114,80 +offsets:34,2,200,113 +fx/fx5 +bounds:462,87,131,93 +offsets:25,0,200,113 +fx/fx6 +bounds:615,172,138,95 +offsets:24,0,200,113 +fx/fx7 +bounds:314,173,146,94 +offsets:22,4,200,113 +fx/fx8 +bounds:161,173,151,94 +offsets:20,8,200,113 +fx/fx9 +bounds:2,73,155,95 +offsets:18,11,200,113 +gutou +bounds:361,93,39,60 +rotate:90 hand_l_1 -bounds:940,847,64,64 -offsets:1,1,66,66 +bounds:700,51,30,34 +offsets:1,1,32,36 +rotate:90 hand_l_2 -bounds:2,57,154,102 -offsets:1,2,156,105 -hand_r -bounds:854,913,154,102 -offsets:1,2,156,105 -shanzi1 -bounds:173,276,109,26 -offsets:1,1,111,28 +bounds:582,26,36,18 +offsets:1,1,38,20 +hand_l_3 +bounds:663,25,32,27 +offsets:1,1,34,29 +hand_l_4 +bounds:533,3,33,27 +offsets:1,1,35,29 +hand_r_1 +bounds:711,83,40,51 +hand_r_2 +bounds:446,2,22,31 +offsets:1,1,24,33 rotate:90 -shanzi2 -bounds:218,675,88,26 -offsets:1,1,90,28 +hand_r_3 +bounds:663,54,35,34 +offsets:1,1,37,36 +hand_r_4 +bounds:697,20,30,29 +offsets:1,1,32,31 +head +bounds:446,26,78,59 +offsets:1,1,80,61 +huan +bounds:711,136,34,48 rotate:90 +jian_l +bounds:582,46,38,39 +offsets:1,1,40,41 +kulou +bounds:277,3,83,76 +leg_l_1 +bounds:594,4,17,20 +offsets:1,1,19,22 +leg_l_2 +bounds:745,38,25,14 +offsets:1,1,27,16 +rotate:90 +leg_r_1 +bounds:423,90,34,42 +offsets:1,1,36,44 +leg_r_2 +bounds:568,4,24,20 +offsets:1,1,26,22 +leg_r_3 +bounds:729,17,32,14 +offsets:1,1,34,16 +rotate:90 +lei_1 +bounds:622,49,39,39 +offsets:1,1,41,41 +lei_2 +bounds:307,134,12,14 +offsets:1,1,14,16 +rotate:90 +lei_3 +bounds:643,32,15,15 +offsets:1,1,17,17 spine -bounds:2,765,246,250 -offsets:2,2,250,254 -yingzi -bounds:173,387,376,43 -offsets:1,1,378,45 +bounds:91,2,69,80 rotate:90 +wei +bounds:362,2,83,82 +rotate:90 +xigai_l +bounds:613,5,19,17 +offsets:1,1,21,19 +rotate:90 +xigai_r +bounds:622,30,19,17 +offsets:1,1,21,19 +yingzi +bounds:161,148,189,23 diff --git a/Assets/arts/spines/characters/m10005/m10005.png b/Assets/arts/spines/characters/m10005/m10005.png index 9a4e00557..1fbcf10dc 100644 Binary files a/Assets/arts/spines/characters/m10005/m10005.png and b/Assets/arts/spines/characters/m10005/m10005.png differ diff --git a/Assets/arts/spines/characters/m10005/m10005.skel.bytes b/Assets/arts/spines/characters/m10005/m10005.skel.bytes index 15f586366..f2106f2f6 100644 Binary files a/Assets/arts/spines/characters/m10005/m10005.skel.bytes and b/Assets/arts/spines/characters/m10005/m10005.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10006/m10006.atlas.txt b/Assets/arts/spines/characters/m10006/m10006.atlas.txt index 5d458018b..9f26957d1 100644 --- a/Assets/arts/spines/characters/m10006/m10006.atlas.txt +++ b/Assets/arts/spines/characters/m10006/m10006.atlas.txt @@ -1,66 +1,75 @@ m10006.png -size:1024,1024 +size:567,94 filter:Linear,Linear -FX1/FX1_00000 -bounds:2,463,300,169 +pma:true +eye_death +bounds:355,6,16,14 rotate:90 -FX1/FX1_00001 -bounds:250,846,300,169 -FX1/FX1_00002 -bounds:2,161,300,169 +eye_hit +bounds:285,2,20,26 rotate:90 -FX1/FX1_00003 -bounds:552,846,300,169 -FX1/FX1_00004 -bounds:250,675,300,169 -FX2/FX2_00000 -bounds:218,655,26,18 -offsets:22,15,150,84 -FX2/FX2_00001 -bounds:67,16,49,39 -offsets:27,15,150,84 -FX2/FX2_00002 -bounds:855,781,74,63 -offsets:31,13,150,84 -FX2/FX2_00003 -bounds:854,846,84,65 -offsets:32,12,150,84 -FX2/FX2_00004 -bounds:2,2,53,63 -offsets:62,14,150,84 -rotate:90 -ear_l -bounds:679,761,86,83 -offsets:1,2,88,86 -ear_r -bounds:767,761,86,83 -offsets:1,1,88,85 -eye -bounds:552,739,125,105 -offsets:1,1,127,107 +eye_l +bounds:313,2,19,20 +offsets:1,1,21,22 +eye_r +bounds:334,2,19,20 +offsets:1,1,21,22 eye_yun -bounds:552,690,43,47 +bounds:426,70,22,24 +rotate:90 +fair_1 +bounds:80,9,83,59 +offsets:1,1,85,61 +rotate:90 +fair_2 +bounds:424,30,35,37 +offsets:1,1,37,39 +fair_3 +bounds:538,34,26,27 +offsets:1,1,28,29 +gutou +bounds:362,28,39,60 +rotate:90 hand_l_1 -bounds:940,847,64,64 -offsets:1,1,66,66 +bounds:420,5,41,21 hand_l_2 -bounds:2,57,154,102 -offsets:1,2,156,105 -hand_r -bounds:854,913,154,102 -offsets:1,2,156,105 -shanzi1 -bounds:173,276,109,26 -offsets:1,1,111,28 +bounds:506,63,29,29 +offsets:1,1,31,31 +hand_l_3 +bounds:505,4,31,32 +offsets:1,1,33,34 +hand_r_1 +bounds:463,9,40,27 +hand_r_2 +bounds:537,63,28,29 +offsets:1,1,30,31 +hand_r_3 +bounds:538,5,25,27 +offsets:1,1,27,29 +head +bounds:141,7,74,60 +offsets:1,1,76,62 +huo +bounds:461,38,43,54 +offsets:1,1,45,56 +kulou +bounds:2,9,83,76 rotate:90 -shanzi2 -bounds:218,675,88,26 -offsets:1,1,90,28 +leg_l +bounds:332,69,23,45 +offsets:1,1,25,47 rotate:90 +leg_r +bounds:379,69,23,45 +offsets:1,1,25,47 +rotate:90 +lian +bounds:371,2,47,24 spine -bounds:2,765,246,250 -offsets:2,2,250,254 -yingzi -bounds:173,387,376,43 -offsets:1,1,378,45 +bounds:217,3,66,64 +wuqi +bounds:285,24,43,75 +offsets:1,1,45,77 rotate:90 +yingzi +bounds:141,69,189,23 diff --git a/Assets/arts/spines/characters/m10006/m10006.png b/Assets/arts/spines/characters/m10006/m10006.png index 9a4e00557..ca864b205 100644 Binary files a/Assets/arts/spines/characters/m10006/m10006.png and b/Assets/arts/spines/characters/m10006/m10006.png differ diff --git a/Assets/arts/spines/characters/m10006/m10006.png.meta b/Assets/arts/spines/characters/m10006/m10006.png.meta index 017385d36..a4b028ac2 100644 --- a/Assets/arts/spines/characters/m10006/m10006.png.meta +++ b/Assets/arts/spines/characters/m10006/m10006.png.meta @@ -89,18 +89,6 @@ TextureImporter: 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: Server maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: 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 diff --git a/Assets/arts/spines/characters/m10006/m10006.skel.bytes b/Assets/arts/spines/characters/m10006/m10006.skel.bytes index 15f586366..b552ad2ef 100644 Binary files a/Assets/arts/spines/characters/m10006/m10006.skel.bytes and b/Assets/arts/spines/characters/m10006/m10006.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10007/m10007.atlas.txt b/Assets/arts/spines/characters/m10007/m10007.atlas.txt index 7c96bb63d..bac3e93bf 100644 --- a/Assets/arts/spines/characters/m10007/m10007.atlas.txt +++ b/Assets/arts/spines/characters/m10007/m10007.atlas.txt @@ -1,100 +1,70 @@ m10007.png -size:512,512 +size:128,462 filter:Linear,Linear -FX/FX1 -bounds:95,359,25,37 -offsets:21,31,68,100 +pma:true +eye_hit +bounds:51,60,22,29 rotate:90 -FX/FX10 -bounds:362,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX11 -bounds:404,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX12 -bounds:446,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX13 -bounds:95,386,26,40 -offsets:21,30,68,100 -FX/FX14 -bounds:2,2,26,36 -offsets:21,30,68,96 -FX/FX15 -bounds:137,319,26,38 -offsets:21,29,68,96 -FX/FX16 -bounds:30,2,26,36 -offsets:21,30,68,96 -FX/FX2 -bounds:105,250,25,38 -offsets:22,31,68,100 -FX/FX3 -bounds:208,447,25,40 -offsets:22,30,68,100 -rotate:90 -FX/FX4 -bounds:81,317,26,40 -offsets:21,30,68,100 -FX/FX5 -bounds:109,317,26,40 -offsets:21,30,68,100 -FX/FX6 -bounds:81,290,25,40 -offsets:22,30,68,100 -rotate:90 -FX/FX7 -bounds:77,248,26,40 -offsets:21,30,68,100 -FX/FX8 -bounds:123,396,28,40 -offsets:20,30,68,100 -FX/FX9 -bounds:153,396,28,40 -offsets:20,30,68,100 -clothes_1 -bounds:208,474,66,36 -clothes_3 -bounds:2,169,66,60 -clothes_4 -bounds:2,359,91,67 -ear_l -bounds:276,473,37,38 -rotate:90 -ear_r -bounds:217,413,32,31 +eye_l +bounds:51,41,23,17 +offsets:1,1,25,19 +eye_r +bounds:51,24,20,15 +offsets:1,1,22,17 +eye_yun +bounds:61,275,22,24 rotate:90 gutou -bounds:2,97,70,53 +bounds:87,315,39,60 +hand_l_1 +bounds:86,102,35,47 +offsets:1,1,37,49 +hand_l_2 +bounds:76,7,44,45 +offsets:1,1,46,47 rotate:90 -hand_r -bounds:250,450,20,22 -head_1 -bounds:2,428,108,82 -head_2 -bounds:2,231,73,62 -head_3 -bounds:112,459,94,51 -hit_yan3 -bounds:250,420,28,28 +hand_l_3 +bounds:2,2,43,47 +offsets:1,1,45,49 +rotate:90 +hand_r_1 +bounds:86,53,35,47 +offsets:1,1,37,49 +hand_r_2 +bounds:86,212,42,38 +offsets:1,1,44,40 +rotate:90 +hand_r_3 +bounds:86,168,38,42 +offsets:1,1,40,44 +jianjia_l +bounds:2,194,47,52 +offsets:1,1,49,54 +rotate:90 +jianjia_r +bounds:2,47,47,47 +offsets:1,1,49,49 kulou -bounds:2,295,77,62 -offsets:0,1,77,63 -leg_l -bounds:166,360,30,34 -leg_r -bounds:183,402,32,34 -nose -bounds:488,480,22,30 -upperarm_l -bounds:316,484,26,44 +bounds:2,299,83,76 +leg_l_1 +bounds:2,141,51,51 +leg_l_2 +bounds:86,151,36,15 +offsets:1,1,38,17 +leg_r_2 +bounds:86,151,36,15 +offsets:1,1,38,17 +leg_r_1 +bounds:87,256,39,57 +shitou +bounds:2,243,54,57 +rotate:90 +shoubei +bounds:2,96,43,49 +rotate:90 +spine +bounds:2,377,83,123 rotate:90 -upperarm_r -bounds:134,359,30,35 -weapon -bounds:2,40,44,55 yingzi -bounds:112,438,83,19 +bounds:61,84,189,23 +rotate:90 diff --git a/Assets/arts/spines/characters/m10007/m10007.atlas.txt.meta b/Assets/arts/spines/characters/m10007/m10007.atlas.txt.meta index 7056b4149..58711c1b9 100644 --- a/Assets/arts/spines/characters/m10007/m10007.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10007/m10007.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 7134cd993b48557409dd795889a992ac TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10007/m10007.png b/Assets/arts/spines/characters/m10007/m10007.png index 31f10b629..0c77d10f7 100644 Binary files a/Assets/arts/spines/characters/m10007/m10007.png and b/Assets/arts/spines/characters/m10007/m10007.png differ diff --git a/Assets/arts/spines/characters/m10007/m10007.png.meta b/Assets/arts/spines/characters/m10007/m10007.png.meta index 3e7f1f6a0..af60e0175 100644 --- a/Assets/arts/spines/characters/m10007/m10007.png.meta +++ b/Assets/arts/spines/characters/m10007/m10007.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -89,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,18 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10007/m10007.skel.bytes b/Assets/arts/spines/characters/m10007/m10007.skel.bytes index f38c71557..9ac1f708c 100644 Binary files a/Assets/arts/spines/characters/m10007/m10007.skel.bytes and b/Assets/arts/spines/characters/m10007/m10007.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10007/m10007.skel.bytes.meta b/Assets/arts/spines/characters/m10007/m10007.skel.bytes.meta index cbc83ee38..e293c8f1a 100644 --- a/Assets/arts/spines/characters/m10007/m10007.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10007/m10007.skel.bytes.meta @@ -3,5 +3,5 @@ guid: aea1661e0e8584c4a9a537e2a07e98f3 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10007/m10007_atlas.asset.meta b/Assets/arts/spines/characters/m10007/m10007_atlas.asset.meta index c17c8e583..bdba93460 100644 --- a/Assets/arts/spines/characters/m10007/m10007_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10007/m10007_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10007/m10007_material.mat b/Assets/arts/spines/characters/m10007/m10007_material.mat index 435d3ea82..34b0818d0 100644 --- a/Assets/arts/spines/characters/m10007/m10007_material.mat +++ b/Assets/arts/spines/characters/m10007/m10007_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10007_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/m10007/m10007_material.mat.meta b/Assets/arts/spines/characters/m10007/m10007_material.mat.meta index da15a69ba..ab7a7d114 100644 --- a/Assets/arts/spines/characters/m10007/m10007_material.mat.meta +++ b/Assets/arts/spines/characters/m10007/m10007_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10007/m10007_skeletondata.asset.meta b/Assets/arts/spines/characters/m10007/m10007_skeletondata.asset.meta index 95f610806..a6e0eaad2 100644 --- a/Assets/arts/spines/characters/m10007/m10007_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10007/m10007_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10007.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008.atlas.txt b/Assets/arts/spines/characters/m10008/m10008.atlas.txt index c4b324f9c..59b6cd3ec 100644 --- a/Assets/arts/spines/characters/m10008/m10008.atlas.txt +++ b/Assets/arts/spines/characters/m10008/m10008.atlas.txt @@ -1,101 +1,77 @@ m10008.png -size:512,512 +size:205,360 filter:Linear,Linear -FX/FX1 -bounds:95,359,25,37 -offsets:21,31,68,100 -rotate:90 -FX/FX10 -bounds:321,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX11 -bounds:363,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX12 -bounds:405,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX13 -bounds:95,386,26,40 -offsets:21,30,68,100 -FX/FX14 -bounds:41,2,26,36 -offsets:21,30,68,96 -FX/FX15 -bounds:108,319,26,38 -offsets:21,29,68,96 -FX/FX16 -bounds:249,436,26,36 -offsets:21,30,68,96 -FX/FX2 -bounds:136,319,25,38 -offsets:22,31,68,100 -FX/FX3 -bounds:207,447,25,40 -offsets:22,30,68,100 -rotate:90 -FX/FX4 -bounds:153,396,26,40 -offsets:21,30,68,100 -FX/FX5 -bounds:181,396,26,40 -offsets:21,30,68,100 -FX/FX6 -bounds:81,317,25,40 -offsets:22,30,68,100 -FX/FX7 -bounds:209,405,26,40 -offsets:21,30,68,100 -FX/FX8 -bounds:447,482,28,40 -offsets:20,30,68,100 -rotate:90 -FX/FX9 -bounds:123,396,28,40 -offsets:20,30,68,100 -clothes_1 -bounds:207,474,66,36 -clothes_3 -bounds:2,169,66,60 -clothes_4 -bounds:2,359,91,67 +pma:true ear_l -bounds:2,2,36,37 +bounds:135,82,31,67 rotate:90 ear_r -bounds:165,361,31,33 +bounds:2,26,31,67 +rotate:90 +eye_death +bounds:189,115,16,14 +rotate:90 +eye_hit +bounds:2,2,22,28 +rotate:90 +eye_l +bounds:58,3,21,17 +offsets:1,1,23,19 +eye_r +bounds:101,29,19,16 +offsets:1,1,21,18 +rotate:90 +eye_yun +bounds:32,2,22,24 +rotate:90 gutou -bounds:2,97,70,53 +bounds:142,170,39,60 +rotate:90 +hair +bounds:2,205,128,138 +rotate:90 +hand_l_1 +bounds:119,15,65,77 +rotate:90 +hand_l_2 +bounds:142,273,61,60 +offsets:1,1,63,62 +hand_r_1 +bounds:2,59,66,77 +rotate:90 +hand_r_2 +bounds:142,211,61,60 +offsets:1,1,63,62 +head +bounds:87,140,63,52 +offsets:1,1,65,54 rotate:90 -hand_r -bounds:489,488,21,22 -head_1 -bounds:2,428,107,82 -head_2 -bounds:2,231,73,62 -head_3 -bounds:111,459,94,51 -hit_yan3 -bounds:345,452,28,28 kulou -bounds:2,295,77,62 -offsets:0,1,77,63 -leg_l -bounds:277,448,30,34 -leg_r -bounds:309,450,30,34 +bounds:2,127,83,76 +leg_l_1 +bounds:141,128,40,46 rotate:90 -nose -bounds:375,458,22,30 +leg_l_2 +bounds:71,22,26,28 rotate:90 -upperarm_l -bounds:275,484,26,44 +leg_r_2 +bounds:71,22,26,28 rotate:90 -upperarm_r -bounds:134,359,29,35 -weapon -bounds:2,40,45,55 +leg_l_3 +bounds:81,50,32,19 +offsets:1,1,34,21 +leg_r_3 +bounds:81,50,32,19 +offsets:1,1,34,21 +leg_r_1 +bounds:87,98,40,46 +rotate:90 +mouth_1 +bounds:189,133,35,14 +offsets:1,1,37,16 +rotate:90 +mouth_2 +bounds:81,71,36,25 +offsets:1,1,38,27 yingzi -bounds:111,438,83,19 +bounds:2,335,189,23 diff --git a/Assets/arts/spines/characters/m10008/m10008.atlas.txt.meta b/Assets/arts/spines/characters/m10008/m10008.atlas.txt.meta index b56192e45..2c2b3ed73 100644 --- a/Assets/arts/spines/characters/m10008/m10008.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10008/m10008.atlas.txt.meta @@ -3,5 +3,5 @@ guid: a17802fdeb668af48a6c3c5146ab0feb TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008.png b/Assets/arts/spines/characters/m10008/m10008.png index 59d2de98b..ba74d03d4 100644 Binary files a/Assets/arts/spines/characters/m10008/m10008.png and b/Assets/arts/spines/characters/m10008/m10008.png differ diff --git a/Assets/arts/spines/characters/m10008/m10008.png.meta b/Assets/arts/spines/characters/m10008/m10008.png.meta index dd8a3e27a..db16a1ee4 100644 --- a/Assets/arts/spines/characters/m10008/m10008.png.meta +++ b/Assets/arts/spines/characters/m10008/m10008.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/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008.skel.bytes b/Assets/arts/spines/characters/m10008/m10008.skel.bytes index 007a7f18a..ae19ce25f 100644 Binary files a/Assets/arts/spines/characters/m10008/m10008.skel.bytes and b/Assets/arts/spines/characters/m10008/m10008.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10008/m10008.skel.bytes.meta b/Assets/arts/spines/characters/m10008/m10008.skel.bytes.meta index 8dfa93505..cf288840b 100644 --- a/Assets/arts/spines/characters/m10008/m10008.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10008/m10008.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 77934f4993acb284abfb2fc030f7d029 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008_atlas.asset.meta b/Assets/arts/spines/characters/m10008/m10008_atlas.asset.meta index 8197daf89..f27c0b8bd 100644 --- a/Assets/arts/spines/characters/m10008/m10008_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10008/m10008_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008_material.mat b/Assets/arts/spines/characters/m10008/m10008_material.mat index 9561c5a06..44fb03198 100644 --- a/Assets/arts/spines/characters/m10008/m10008_material.mat +++ b/Assets/arts/spines/characters/m10008/m10008_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m10008_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/m10008/m10008_material.mat.meta b/Assets/arts/spines/characters/m10008/m10008_material.mat.meta index 2a2de20d1..8c9a0d0e6 100644 --- a/Assets/arts/spines/characters/m10008/m10008_material.mat.meta +++ b/Assets/arts/spines/characters/m10008/m10008_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10008/m10008_skeletondata.asset.meta b/Assets/arts/spines/characters/m10008/m10008_skeletondata.asset.meta index af5ef10b4..39debf7b5 100644 --- a/Assets/arts/spines/characters/m10008/m10008_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10008/m10008_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10008.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10007.prefab b/Assets/prefabs/spine/ui/characters/m10007.prefab index e2470624d..11fae8ec9 100644 --- a/Assets/prefabs/spine/ui/characters/m10007.prefab +++ b/Assets/prefabs/spine/ui/characters/m10007.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