diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt b/Assets/arts/spines/characters/p0001/p0001.atlas.txt index b3de76aa1..b00abf924 100644 --- a/Assets/arts/spines/characters/p0001/p0001.atlas.txt +++ b/Assets/arts/spines/characters/p0001/p0001.atlas.txt @@ -1,47 +1,56 @@ p0001.png -size:512,512 +size:2048,2048 filter:Linear,Linear -canying -bounds:311,417,98,93 -offsets:0,0,99,93 -eye -bounds:87,402,125,108 -eye_xuanyun -bounds:47,121,22,22 -gutou -bounds:151,330,70,53 +bing +bounds:2,1169,760,548 +canying1 +bounds:764,1241,533,476 +offsets:13,32,554,512 +canying2 +bounds:2,551,440,616 +offsets:0,2,440,620 +eye_l +bounds:1142,1204,35,58 +offsets:1,1,37,60 rotate:90 -hand_L -bounds:2,2,28,29 -rotate:90 -hand_R -bounds:47,145,25,26 -hit_yan1 -bounds:490,492,16,18 -kulou -bounds:411,448,77,62 -offsets:0,1,77,63 -leg_L -bounds:29,173,44,61 -leg_R -bounds:2,110,43,61 -spine_1 -bounds:29,236,78,51 -rotate:90 -spine_2 -bounds:214,411,95,99 -upperarm_L_1 -bounds:411,419,32,27 -upperarm_L_2 -bounds:2,71,37,37 -upperarm_R_1 -bounds:445,419,32,27 -upperarm_R_2 -bounds:2,32,37,37 -weapon_1 -bounds:2,316,83,194 -weapon_2 -bounds:87,317,62,83 -yinying -bounds:2,173,141,25 +eye_r +bounds:1142,1204,35,58 +offsets:1,1,37,60 rotate:90 +eye_yun +bounds:606,917,51,51 +hand_l +bounds:299,407,132,142 +hand_r_1 +bounds:1299,1449,126,112 +hand_r_2 +bounds:2,67,75,94 +offsets:1,1,77,96 +head +bounds:2,316,295,233 +leg +bounds:444,861,160,107 +leg_l_2 +bounds:164,249,85,65 +leg_r_2 +bounds:299,340,85,65 +mei_l +bounds:444,812,60,47 +offsets:1,1,62,49 +mei_r +bounds:1299,1400,55,47 +offsets:1,1,57,49 +pifeng +bounds:444,970,292,197 +spine +bounds:1299,1563,246,154 +offsets:0,1,246,155 +wuqi +bounds:2,163,160,151 +offsets:2,2,164,155 +yaodai +bounds:1547,1656,170,61 +offsets:1,1,172,63 +yingzi +bounds:764,1196,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta b/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta index 18b30cfb0..6d240fa09 100644 --- a/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 4c42fd9649250aa499d45c6b76009a3e TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001.png b/Assets/arts/spines/characters/p0001/p0001.png index 82d117aae..d56820352 100644 Binary files a/Assets/arts/spines/characters/p0001/p0001.png and b/Assets/arts/spines/characters/p0001/p0001.png differ diff --git a/Assets/arts/spines/characters/p0001/p0001.png.meta b/Assets/arts/spines/characters/p0001/p0001.png.meta index 00194ade2..ebc0589eb 100644 --- a/Assets/arts/spines/characters/p0001/p0001.png.meta +++ b/Assets/arts/spines/characters/p0001/p0001.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/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes index 8423ae27f..e7a53fd81 100644 Binary files a/Assets/arts/spines/characters/p0001/p0001.skel.bytes and b/Assets/arts/spines/characters/p0001/p0001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta b/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta index fc3447b59..17d7d6d3a 100644 --- a/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta @@ -3,5 +3,5 @@ guid: e0fb48e7b6a5670498079ed14a606da2 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta b/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta index f56c5d8c3..a04e33fae 100644 --- a/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_material.mat b/Assets/arts/spines/characters/p0001/p0001_material.mat index 55f70a20b..ade8ceb0d 100644 --- a/Assets/arts/spines/characters/p0001/p0001_material.mat +++ b/Assets/arts/spines/characters/p0001/p0001_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0001_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/p0001/p0001_material.mat.meta b/Assets/arts/spines/characters/p0001/p0001_material.mat.meta index 39e57d6f4..68ea739bb 100644 --- a/Assets/arts/spines/characters/p0001/p0001_material.mat.meta +++ b/Assets/arts/spines/characters/p0001/p0001_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset index 1cee9b3f8..c2a804baf 100644 --- a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset +++ b/Assets/arts/spines/characters/p0001/p0001_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/p0001/p0001_skeletondata.asset.meta b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta index 7adb92179..ea9f26ff2 100644 --- a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt b/Assets/arts/spines/characters/p0002/p0002.atlas.txt index c68661e1f..a120c5270 100644 --- a/Assets/arts/spines/characters/p0002/p0002.atlas.txt +++ b/Assets/arts/spines/characters/p0002/p0002.atlas.txt @@ -1,64 +1,126 @@ p0002.png -size:512,512 +size:2048,2048 filter:Linear,Linear -canying -bounds:147,380,92,124 -offsets:1,4,94,133 -canying1 -bounds:2,230,144,91 -offsets:6,0,156,91 +bing +bounds:2,1493,760,548 +boom/boom_01 +bounds:249,13,84,173 +offsets:211,87,500,500 +boom/boom_03 +bounds:1751,1740,288,301 +offsets:107,87,500,500 +boom/boom_05 +bounds:2,1037,348,318 +offsets:75,86,500,500 +boom/boom_07 +bounds:764,1693,334,348 +offsets:74,64,500,500 +boom/boom_09 +bounds:1100,1752,322,289 +offsets:79,123,500,500 +boom/boom_11 +bounds:634,940,261,215 +offsets:94,191,500,500 +boom/boom_13 +bounds:2,34,245,152 +offsets:99,224,500,500 +boom/boom_15 +bounds:1993,1647,17,91 +offsets:312,274,500,500 +boom2/boom2_01 +bounds:1066,1490,197,201 +offsets:168,33,500,281 +boom2/boom2_03 +bounds:897,915,246,239 +offsets:142,14,500,281 +boom2/boom2_05 +bounds:2,188,312,281 +offsets:103,0,500,281 +boom2/boom2_07 +bounds:1424,1760,325,281 +offsets:99,0,500,281 +boom2/boom2_09 +bounds:2,754,327,281 +offsets:103,0,500,281 +boom2/boom2_11 +bounds:2,471,323,281 +offsets:107,0,500,281 +boom2/boom2_13 +bounds:352,1049,306,280 +offsets:118,0,500,281 +rotate:90 +boom2/boom2_15 +bounds:634,1157,273,261 +offsets:129,0,500,281 +boom2/boom2_17 +bounds:909,1156,230,262 +offsets:174,0,500,281 +boom2/boom2_19 +bounds:1478,1532,226,256 +offsets:179,8,500,281 +rotate:90 +boom2/boom2_21 +bounds:1736,1519,219,255 +offsets:187,10,500,281 rotate:90 eye_l -bounds:2,2,13,25 +bounds:2,2,30,40 +offsets:1,1,32,42 rotate:90 eye_r -bounds:385,396,13,25 -eye_xuanyun -bounds:344,365,22,22 -gutou -bounds:177,308,70,53 +bounds:1422,1665,30,40 +offsets:1,1,32,42 +eye_yun +bounds:572,1367,51,51 +hand_l_1 +bounds:1258,1375,88,83 +offsets:1,1,90,86 +hand_l_2 +bounds:1141,1213,95,130 +hand_r_1 +bounds:1265,1460,111,66 +offsets:0,1,111,67 +hand_r_2 +bounds:1141,1345,143,115 +offsets:2,2,147,119 rotate:90 -hair_1 -bounds:2,376,143,128 -hair_2 -bounds:422,419,21,66 +head +bounds:764,1420,300,271 +offsets:0,0,301,271 +leg_l +bounds:1378,1449,77,64 rotate:90 -hand -bounds:241,422,96,82 -hand _l_01 -bounds:330,389,27,31 -hand _r_01 -bounds:279,293,41,24 +leg_r +bounds:1066,1424,67,64 +lh_1 +bounds:572,1420,138,71 +lh_2 +bounds:712,1444,47,47 +lh_3 +bounds:1258,1346,26,27 +lh_4 +bounds:1141,1171,39,40 +lh_5 +bounds:1348,1437,19,21 +lh_6 +bounds:352,1037,10,37 rotate:90 -hit_yan1 -bounds:344,345,16,18 -kulou -bounds:422,442,77,62 -offsets:0,1,77,63 -leg_l_01 -bounds:122,233,63,52 +mei_l +bounds:331,997,38,14 +offsets:1,1,40,16 +rotate:90 +mei_r +bounds:1238,1305,38,14 +offsets:1,1,40,16 rotate:90 -leg_r_01 -bounds:241,336,63,51 -pifeng_l -bounds:2,17,84,80 -pifeng_r -bounds:122,298,53,76 spine -bounds:339,423,81,81 -upperarm_l_01 -bounds:306,340,47,36 -rotate:90 -upperarm_r_01 -bounds:232,297,37,45 -rotate:90 -weapon_1 -bounds:2,99,129,85 -rotate:90 -weapon_2 -bounds:241,389,87,31 +bounds:1265,1528,155,177 +wei +bounds:2,1357,568,134 +offsets:25,0,605,136 +x1 +bounds:2012,1717,20,21 +offsets:1,0,22,22 yinying -bounds:95,233,141,25 -rotate:90 -zui -bounds:359,389,24,32 +bounds:1100,1707,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta b/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta index 039cdc7e0..13471a608 100644 --- a/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 0f773f49d3c1c2544a227c0130bb8ae9 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.png b/Assets/arts/spines/characters/p0002/p0002.png index 8979a1e80..88c2089a3 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.png and b/Assets/arts/spines/characters/p0002/p0002.png differ diff --git a/Assets/arts/spines/characters/p0002/p0002.png.meta b/Assets/arts/spines/characters/p0002/p0002.png.meta index 7122831e4..ad26d974d 100644 --- a/Assets/arts/spines/characters/p0002/p0002.png.meta +++ b/Assets/arts/spines/characters/p0002/p0002.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/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes b/Assets/arts/spines/characters/p0002/p0002.skel.bytes index 5fe4e3c59..72bcdca9f 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.skel.bytes and b/Assets/arts/spines/characters/p0002/p0002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta b/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta index 1e45f050e..7b22065b5 100644 --- a/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 2f5de35c741a2384a952d4cf8d766f1f TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta b/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta index cb52eba67..e7ef3f3bb 100644 --- a/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_material.mat b/Assets/arts/spines/characters/p0002/p0002_material.mat index c3f6ffff7..4972d967f 100644 --- a/Assets/arts/spines/characters/p0002/p0002_material.mat +++ b/Assets/arts/spines/characters/p0002/p0002_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0002_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/p0002/p0002_material.mat.meta b/Assets/arts/spines/characters/p0002/p0002_material.mat.meta index 1c6cbe08c..df40fbb9d 100644 --- a/Assets/arts/spines/characters/p0002/p0002_material.mat.meta +++ b/Assets/arts/spines/characters/p0002/p0002_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset index 76c9b3a1f..7d3612bde 100644 --- a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset +++ b/Assets/arts/spines/characters/p0002/p0002_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/p0002/p0002_skeletondata.asset.meta b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta index e317c1e74..f70efba25 100644 --- a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003.atlas.txt b/Assets/arts/spines/characters/p0003/p0003.atlas.txt index c4cba8ba9..81d653581 100644 --- a/Assets/arts/spines/characters/p0003/p0003.atlas.txt +++ b/Assets/arts/spines/characters/p0003/p0003.atlas.txt @@ -1,48 +1,57 @@ p0003.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:117,256,12,22 -eye_R -bounds:29,137,12,22 +bing +bounds:2,467,760,548 +eye_l +bounds:764,472,24,34 +offsets:1,1,26,36 +eye_r +bounds:711,431,24,34 +offsets:1,1,26,36 +eye_yun +bounds:923,750,51,51 +hand_l_1 +bounds:512,193,100,171 rotate:90 -eye_xuanyun -bounds:2,79,22,22 -gutou -bounds:29,151,70,53 -hand_L_2 -bounds:146,384,43,45 +hand_r_1 +bounds:923,898,117,67 rotate:90 -hand_R -bounds:240,389,45,38 -hand_R_1 -bounds:139,319,26,23 -head_1 -bounds:2,280,135,106 -head_2 -bounds:293,430,89,76 -hit_yan1 -bounds:28,117,16,18 -kulou -bounds:384,444,77,62 -offsets:0,1,77,63 -leg_L -bounds:193,388,39,45 +hand_r_2 +bounds:531,115,74,76 +offsets:2,2,78,79 +head +bounds:333,316,221,104 +offsets:2,1,224,107 +jianjia_l +bounds:764,508,155,161 +offsets:2,1,158,163 +jianjia_r +bounds:556,295,163,125 +offsets:1,1,165,128 +leg +bounds:333,187,177,127 +offsets:1,1,179,128 +maozi_1 +bounds:764,671,344,157 +offsets:1,1,346,159 rotate:90 -leg_R -bounds:139,344,36,38 -spine_1 -bounds:29,206,86,72 -spine_2 -bounds:2,388,142,118 -spine_3 -bounds:463,441,65,43 +maozi_2 +bounds:923,803,93,66 +offsets:1,1,95,68 +rotate:90 +pifeng +bounds:2,214,329,251 +sd +bounds:255,32,135,153 +offsets:1,1,138,156 +spine +bounds:392,37,148,137 rotate:90 weapon_1 -bounds:146,429,77,145 +bounds:2,2,210,251 +offsets:1,2,212,255 rotate:90 -yinying -bounds:2,137,141,25 -rotate:90 -zui -bounds:2,103,24,32 +yingzi +bounds:333,422,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0003/p0003.atlas.txt.meta b/Assets/arts/spines/characters/p0003/p0003.atlas.txt.meta index 4ff90b3c3..b93eff0bb 100644 --- a/Assets/arts/spines/characters/p0003/p0003.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0003/p0003.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 9ee6987ee3dfc7a4284c02ce783bee82 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003.png b/Assets/arts/spines/characters/p0003/p0003.png index 8c51d1adc..51b970116 100644 Binary files a/Assets/arts/spines/characters/p0003/p0003.png and b/Assets/arts/spines/characters/p0003/p0003.png differ diff --git a/Assets/arts/spines/characters/p0003/p0003.png.meta b/Assets/arts/spines/characters/p0003/p0003.png.meta index 4f0f3ffe4..91c8c916b 100644 --- a/Assets/arts/spines/characters/p0003/p0003.png.meta +++ b/Assets/arts/spines/characters/p0003/p0003.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/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003.skel.bytes b/Assets/arts/spines/characters/p0003/p0003.skel.bytes index c91500a65..d6ad0972f 100644 Binary files a/Assets/arts/spines/characters/p0003/p0003.skel.bytes and b/Assets/arts/spines/characters/p0003/p0003.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta b/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta index cf63580d9..1121407cf 100644 --- a/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 970d36de7e83c6c409b24b89d6c38815 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta b/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta index cfce2b227..0b00eeafd 100644 --- a/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_material.mat b/Assets/arts/spines/characters/p0003/p0003_material.mat index 84ea7fb44..0e3c46fa8 100644 --- a/Assets/arts/spines/characters/p0003/p0003_material.mat +++ b/Assets/arts/spines/characters/p0003/p0003_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0003_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/p0003/p0003_material.mat.meta b/Assets/arts/spines/characters/p0003/p0003_material.mat.meta index a87294a77..61986a5a6 100644 --- a/Assets/arts/spines/characters/p0003/p0003_material.mat.meta +++ b/Assets/arts/spines/characters/p0003/p0003_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset b/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset index 85ed2ef9a..f2d4d8728 100644 --- a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset +++ b/Assets/arts/spines/characters/p0003/p0003_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/p0003/p0003_skeletondata.asset.meta b/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta index 8f217df86..5523648c8 100644 --- a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004.atlas.txt b/Assets/arts/spines/characters/p0004/p0004.atlas.txt index 77fcd4ac7..e42824d69 100644 --- a/Assets/arts/spines/characters/p0004/p0004.atlas.txt +++ b/Assets/arts/spines/characters/p0004/p0004.atlas.txt @@ -1,58 +1,101 @@ p0004.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_L -bounds:2,2,9,18 +bing +bounds:2,474,760,548 +eye_l +bounds:926,252,37,61 +offsets:1,1,39,63 +eye_r +bounds:965,252,37,61 +offsets:1,1,39,63 +eye_yun +bounds:361,313,51,51 +fx1/fx1_01 +bounds:997,362,25,59 +offsets:220,77,500,281 +fx1/fx1_03 +bounds:312,145,79,87 +offsets:195,74,500,281 +fx1/fx1_05 +bounds:625,106,121,116 +offsets:176,68,500,281 +fx1/fx1_07 +bounds:181,30,131,110 +offsets:173,75,500,281 +fx1/fx1_09 +bounds:910,75,137,112 +offsets:171,75,500,281 rotate:90 -eye_R -bounds:502,491,8,19 -eye_xuanyun -bounds:114,28,22,22 -gutou -bounds:181,186,70,53 -hand_L -bounds:331,327,30,45 -hand_R -bounds:366,381,30,45 +fx1/fx1_11 +bounds:393,144,159,114 +offsets:166,73,500,281 +fx1/fx1_13 +bounds:314,56,169,86 +offsets:162,78,500,281 +fx1/fx1_15 +bounds:748,52,160,64 +offsets:159,74,500,281 +fx1/fx1_17 +bounds:983,586,149,24 +offsets:156,73,500,281 rotate:90 +fx1/fx1_19 +bounds:2,9,80,24 +offsets:168,77,500,281 +fx1/fx1_21 +bounds:554,150,23,26 +offsets:221,74,500,281 +fx1/fx1_23 +bounds:929,423,3,2 +offsets:231,85,500,281 +hair_1 +bounds:2,35,177,105 +offsets:1,0,178,105 +hair_2 +bounds:449,260,174,105 +hair_3 +bounds:750,214,174,105 +hair_4 +bounds:748,118,159,94 +offsets:0,1,159,95 +hair_5 +bounds:764,427,178,104 +offsets:0,1,178,105 +hair_6 +bounds:750,321,177,104 +offsets:1,1,178,105 +hand_l +bounds:625,224,123,141 +hand_r +bounds:554,178,80,69 +offsets:1,1,82,71 +rotate:90 +hand_r_2 +bounds:485,48,83,94 head -bounds:2,50,109,111 -hit_yan1 -bounds:306,247,16,18 +bounds:764,737,285,254 +offsets:2,2,289,257 rotate:90 -kulou -bounds:189,310,77,62 -offsets:0,1,77,63 -leg_L_1 -bounds:113,107,54,53 +leg_l +bounds:944,423,108,68 rotate:90 -leg_L_2 -bounds:86,6,26,42 -leg_R_1 -bounds:113,52,53,53 -leg_R_2 -bounds:306,265,27,43 -spine_1 -bounds:2,13,82,35 -spine_2 -bounds:181,241,74,67 -spine_3 -bounds:257,247,47,61 -spine_4 -bounds:268,310,61,62 -spine_5 -bounds:427,402,108,73 -rotate:90 -weapon_1 -bounds:327,374,37,37 -weapon_2 -bounds:327,413,98,97 -yan01 -bounds:2,315,185,195 -yan02 -bounds:189,374,136,136 -yan03 -bounds:2,163,150,150 -yinying -bounds:154,172,141,25 +leg_r +bounds:929,315,106,66 +offsets:1,1,108,68 rotate:90 +qunzi +bounds:449,367,299,105 +shuichi +bounds:2,279,357,85 +spine +bounds:764,533,217,202 +wuqi_1 +bounds:2,142,308,90 +offsets:2,1,312,92 +wuqi_2 +bounds:2,366,445,106 +offsets:1,1,448,109 +yingzi +bounds:2,234,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p0004/p0004.atlas.txt.meta b/Assets/arts/spines/characters/p0004/p0004.atlas.txt.meta index a2da9bb20..38dea7a2c 100644 --- a/Assets/arts/spines/characters/p0004/p0004.atlas.txt.meta +++ b/Assets/arts/spines/characters/p0004/p0004.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 6bf3bba9658ee3c45b7586cb517fcdd8 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004.png b/Assets/arts/spines/characters/p0004/p0004.png index 243377763..10619c100 100644 Binary files a/Assets/arts/spines/characters/p0004/p0004.png and b/Assets/arts/spines/characters/p0004/p0004.png differ diff --git a/Assets/arts/spines/characters/p0004/p0004.png.meta b/Assets/arts/spines/characters/p0004/p0004.png.meta index e776f0a45..89b5ad586 100644 --- a/Assets/arts/spines/characters/p0004/p0004.png.meta +++ b/Assets/arts/spines/characters/p0004/p0004.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/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004.skel.bytes b/Assets/arts/spines/characters/p0004/p0004.skel.bytes index 194ebbc56..84aa0b8fc 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/p0004/p0004.skel.bytes.meta b/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta index 15b9bd80e..4443d83a5 100644 --- a/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta +++ b/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta @@ -3,5 +3,5 @@ guid: e30d4da4709b86c4cb41c8347140c3fa TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta b/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta index a60f483c0..7e5a2919d 100644 --- a/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta +++ b/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_material.mat b/Assets/arts/spines/characters/p0004/p0004_material.mat index 2a7a263c1..6034b039c 100644 --- a/Assets/arts/spines/characters/p0004/p0004_material.mat +++ b/Assets/arts/spines/characters/p0004/p0004_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: p0004_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/p0004/p0004_material.mat.meta b/Assets/arts/spines/characters/p0004/p0004_material.mat.meta index 0040fa97c..99fd7d650 100644 --- a/Assets/arts/spines/characters/p0004/p0004_material.mat.meta +++ b/Assets/arts/spines/characters/p0004/p0004_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta b/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta index 3660ad117..790780e10 100644 --- a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/p0004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/p0003.prefab b/Assets/prefabs/spine/ui/characters/p0003.prefab index a9023f015..8d5de7d4e 100644 --- a/Assets/prefabs/spine/ui/characters/p0003.prefab +++ b/Assets/prefabs/spine/ui/characters/p0003.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/p0004.prefab b/Assets/prefabs/spine/ui/characters/p0004.prefab index 2b945196d..3700a23aa 100644 --- a/Assets/prefabs/spine/ui/characters/p0004.prefab +++ b/Assets/prefabs/spine/ui/characters/p0004.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