diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt b/Assets/arts/spines/characters/p0001/p0001.atlas.txt deleted file mode 100644 index b00abf924..000000000 --- a/Assets/arts/spines/characters/p0001/p0001.atlas.txt +++ /dev/null @@ -1,56 +0,0 @@ -p0001.png -size:2048,2048 -filter:Linear,Linear -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 -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.png b/Assets/arts/spines/characters/p0001/p0001.png deleted file mode 100644 index d56820352..000000000 Binary files a/Assets/arts/spines/characters/p0001/p0001.png and /dev/null differ diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes deleted file mode 100644 index 6bead4433..000000000 Binary files a/Assets/arts/spines/characters/p0001/p0001.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/characters/p0002/p0002.png b/Assets/arts/spines/characters/p0002/p0002.png deleted file mode 100644 index 88c2089a3..000000000 Binary files a/Assets/arts/spines/characters/p0002/p0002.png and /dev/null differ diff --git a/Assets/arts/spines/characters/p0003/p0003.atlas.txt b/Assets/arts/spines/characters/p0003/p0003.atlas.txt deleted file mode 100644 index 81d653581..000000000 --- a/Assets/arts/spines/characters/p0003/p0003.atlas.txt +++ /dev/null @@ -1,57 +0,0 @@ -p0003.png -size:1024,1024 -filter:Linear,Linear -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 -hand_r_1 -bounds:923,898,117,67 -rotate:90 -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 -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:2,2,210,251 -offsets:1,2,212,255 -rotate:90 -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 deleted file mode 100644 index b93eff0bb..000000000 --- a/Assets/arts/spines/characters/p0003/p0003.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9ee6987ee3dfc7a4284c02ce783bee82 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003.png b/Assets/arts/spines/characters/p0003/p0003.png deleted file mode 100644 index 51b970116..000000000 Binary files a/Assets/arts/spines/characters/p0003/p0003.png and /dev/null differ diff --git a/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta b/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta deleted file mode 100644 index 1121407cf..000000000 --- a/Assets/arts/spines/characters/p0003/p0003.skel.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 970d36de7e83c6c409b24b89d6c38815 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta b/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta deleted file mode 100644 index 0b00eeafd..000000000 --- a/Assets/arts/spines/characters/p0003/p0003_atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9414a9c46bd7674baf38504624642f7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta b/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta deleted file mode 100644 index 5523648c8..000000000 --- a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7e79fad60ed672143851509cc068d9f5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004.atlas.txt b/Assets/arts/spines/characters/p0004/p0004.atlas.txt deleted file mode 100644 index e42824d69..000000000 --- a/Assets/arts/spines/characters/p0004/p0004.atlas.txt +++ /dev/null @@ -1,101 +0,0 @@ -p0004.png -size:1024,1024 -filter:Linear,Linear -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 -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:764,737,285,254 -offsets:2,2,289,257 -rotate:90 -leg_l -bounds:944,423,108,68 -rotate:90 -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 deleted file mode 100644 index 38dea7a2c..000000000 --- a/Assets/arts/spines/characters/p0004/p0004.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6bf3bba9658ee3c45b7586cb517fcdd8 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004.png b/Assets/arts/spines/characters/p0004/p0004.png deleted file mode 100644 index 10619c100..000000000 Binary files a/Assets/arts/spines/characters/p0004/p0004.png and /dev/null differ diff --git a/Assets/arts/spines/characters/p0004/p0004.skel.bytes b/Assets/arts/spines/characters/p0004/p0004.skel.bytes deleted file mode 100644 index b2a063732..000000000 Binary files a/Assets/arts/spines/characters/p0004/p0004.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta b/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta deleted file mode 100644 index 4443d83a5..000000000 --- a/Assets/arts/spines/characters/p0004/p0004.skel.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e30d4da4709b86c4cb41c8347140c3fa -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta b/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta deleted file mode 100644 index 7e5a2919d..000000000 --- a/Assets/arts/spines/characters/p0004/p0004_atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 73fdd949e68836447b83f91fdbff0e2e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta b/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta deleted file mode 100644 index ac875a57e..000000000 --- a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 946b79f032c464846aa86eba53ab2626 -labels: -- Al_max -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0010/p0010_material.mat b/Assets/arts/spines/characters/p0010/p0010_material.mat index 43d14852c..cb882b7a0 100644 --- a/Assets/arts/spines/characters/p0010/p0010_material.mat +++ b/Assets/arts/spines/characters/p0010/p0010_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: p0010_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/characters/p0002.meta b/Assets/arts/spines/characters/p13001.meta similarity index 100% rename from Assets/arts/spines/characters/p0002.meta rename to Assets/arts/spines/characters/p13001.meta diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt b/Assets/arts/spines/characters/p13001/p13001.atlas.txt similarity index 52% rename from Assets/arts/spines/characters/p0002/p0002.atlas.txt rename to Assets/arts/spines/characters/p13001/p13001.atlas.txt index a120c5270..7a875c192 100644 --- a/Assets/arts/spines/characters/p0002/p0002.atlas.txt +++ b/Assets/arts/spines/characters/p13001/p13001.atlas.txt @@ -1,126 +1,132 @@ -p0002.png +p13001.png size:2048,2048 filter:Linear,Linear -bing -bounds:2,1493,760,548 boom/boom_01 -bounds:249,13,84,173 +bounds:1848,1759,84,173 offsets:211,87,500,500 +rotate:90 boom/boom_03 -bounds:1751,1740,288,301 +bounds:1243,1758,288,301 offsets:107,87,500,500 +rotate:90 boom/boom_05 -bounds:2,1037,348,318 +bounds:2,1212,348,318 offsets:75,86,500,500 +rotate:90 boom/boom_07 -bounds:764,1693,334,348 +bounds:2,1562,334,348 offsets:74,64,500,500 boom/boom_09 -bounds:1100,1752,322,289 +bounds:2,888,322,289 offsets:79,123,500,500 +rotate:90 boom/boom_11 -bounds:634,940,261,215 +bounds:896,1502,261,215 offsets:94,191,500,500 +rotate:90 boom/boom_13 -bounds:2,34,245,152 +bounds:1582,1621,245,152 offsets:99,224,500,500 boom/boom_15 -bounds:1993,1647,17,91 +bounds:260,139,17,91 offsets:312,274,500,500 boom2/boom2_01 -bounds:1066,1490,197,201 +bounds:1848,1845,197,201 offsets:168,33,500,281 boom2/boom2_03 -bounds:897,915,246,239 +bounds:1113,1517,246,239 offsets:142,14,500,281 boom2/boom2_05 -bounds:2,188,312,281 +bounds:621,1765,312,281 offsets:103,0,500,281 boom2/boom2_07 -bounds:1424,1760,325,281 +bounds:2,232,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_09 +bounds:2,559,327,281 +offsets:103,0,500,281 +rotate:90 +boom2/boom2_11 +bounds:338,1587,323,281 +offsets:107,0,500,281 +rotate:90 +boom2/boom2_13 +bounds:935,1766,306,280 +offsets:118,0,500,281 boom2/boom2_15 -bounds:634,1157,273,261 +bounds:621,1502,273,261 offsets:129,0,500,281 boom2/boom2_17 -bounds:909,1156,230,262 +bounds:285,246,230,262 offsets:174,0,500,281 boom2/boom2_19 -bounds:1478,1532,226,256 +bounds:2,4,226,256 offsets:179,8,500,281 rotate:90 boom2/boom2_21 -bounds:1736,1519,219,255 +bounds:1361,1501,219,255 offsets:187,10,500,281 -rotate:90 eye_l -bounds:2,2,30,40 +bounds:2016,1604,30,40 offsets:1,1,32,42 -rotate:90 eye_r -bounds:1422,1665,30,40 +bounds:2016,1562,30,40 offsets:1,1,32,42 eye_yun -bounds:572,1367,51,51 +bounds:293,1090,51,51 hand_l_1 -bounds:1258,1375,88,83 +bounds:1931,1552,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 +hand_l_2 +bounds:1834,1510,95,130 +hand_r_1 +bounds:1974,1646,111,66 +offsets:0,1,111,67 +rotate:90 +hand_r_2 +bounds:1829,1642,143,115 +offsets:2,2,147,119 head -bounds:764,1420,300,271 +bounds:1546,1775,300,271 offsets:0,0,301,271 leg_l -bounds:1378,1449,77,64 -rotate:90 +bounds:1931,1486,77,64 leg_r -bounds:1066,1424,67,64 +bounds:293,1143,67,64 +rotate:90 lh_1 -bounds:572,1420,138,71 +bounds:1761,1481,138,71 +rotate:90 lh_2 -bounds:712,1444,47,47 +bounds:572,1999,47,47 lh_3 -bounds:1258,1346,26,27 +bounds:1834,1481,26,27 lh_4 -bounds:1141,1171,39,40 +bounds:572,1957,39,40 lh_5 -bounds:1348,1437,19,21 +bounds:293,1067,19,21 lh_6 -bounds:352,1037,10,37 +bounds:285,234,10,37 rotate:90 mei_l -bounds:331,997,38,14 +bounds:1761,1465,38,14 offsets:1,1,40,16 -rotate:90 mei_r -bounds:1238,1305,38,14 +bounds:2023,1805,38,14 offsets:1,1,40,16 rotate:90 spine -bounds:1265,1528,155,177 +bounds:1582,1464,155,177 +rotate:90 wei -bounds:2,1357,568,134 +bounds:2,1912,568,134 offsets:25,0,605,136 x1 -bounds:2012,1717,20,21 +bounds:338,1564,20,21 offsets:1,0,22,22 yinying -bounds:1100,1707,376,43 +bounds:285,510,376,43 offsets:1,1,378,45 +rotate:90 diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta b/Assets/arts/spines/characters/p13001/p13001.atlas.txt.meta similarity index 75% rename from Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta rename to Assets/arts/spines/characters/p13001/p13001.atlas.txt.meta index 17d7d6d3a..c2501ed75 100644 --- a/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta +++ b/Assets/arts/spines/characters/p13001/p13001.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0fb48e7b6a5670498079ed14a606da2 +guid: 0809df2f7274ab842a269f003e605527 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/characters/p13001/p13001.png b/Assets/arts/spines/characters/p13001/p13001.png new file mode 100644 index 000000000..2f7d4cf24 Binary files /dev/null and b/Assets/arts/spines/characters/p13001/p13001.png differ diff --git a/Assets/arts/spines/characters/p0002/p0002.png.meta b/Assets/arts/spines/characters/p13001/p13001.png.meta similarity index 98% rename from Assets/arts/spines/characters/p0002/p0002.png.meta rename to Assets/arts/spines/characters/p13001/p13001.png.meta index ad26d974d..b66ba18b7 100644 --- a/Assets/arts/spines/characters/p0002/p0002.png.meta +++ b/Assets/arts/spines/characters/p13001/p13001.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e2b6342ae1ff9b47afc8cec7e69879a +guid: 5196faeaf7ac50f49ab03301178aaaa4 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -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/p0002/p0002.skel.bytes b/Assets/arts/spines/characters/p13001/p13001.skel.bytes similarity index 91% rename from Assets/arts/spines/characters/p0002/p0002.skel.bytes rename to Assets/arts/spines/characters/p13001/p13001.skel.bytes index 4e6ef8296..949673143 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.skel.bytes and b/Assets/arts/spines/characters/p13001/p13001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta b/Assets/arts/spines/characters/p13001/p13001.skel.bytes.meta similarity index 75% rename from Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta rename to Assets/arts/spines/characters/p13001/p13001.skel.bytes.meta index 6d240fa09..fa3e0d835 100644 --- a/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta +++ b/Assets/arts/spines/characters/p13001/p13001.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c42fd9649250aa499d45c6b76009a3e +guid: 58b06d51e58024b43addbeb9155be81a TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/characters/p0001/p0001_atlas.asset b/Assets/arts/spines/characters/p13001/p13001_atlas.asset similarity index 73% rename from Assets/arts/spines/characters/p0001/p0001_atlas.asset rename to Assets/arts/spines/characters/p13001/p13001_atlas.asset index 5d0db898a..87d35e807 100644 --- a/Assets/arts/spines/characters/p0001/p0001_atlas.asset +++ b/Assets/arts/spines/characters/p13001/p13001_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: p0001_atlas + m_Name: p13001_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 4c42fd9649250aa499d45c6b76009a3e, type: 3} + atlasFile: {fileID: 4900000, guid: 0809df2f7274ab842a269f003e605527, type: 3} materials: - - {fileID: 2100000, guid: 9ed3a68a2744bbb43b94fcbaf5a4ad9b, type: 2} + - {fileID: 2100000, guid: f3b7dbbb79d9fbd4b8a82b7ed202fd79, type: 2} diff --git a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta b/Assets/arts/spines/characters/p13001/p13001_atlas.asset.meta similarity index 79% rename from Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta rename to Assets/arts/spines/characters/p13001/p13001_atlas.asset.meta index ea9f26ff2..44baa4185 100644 --- a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p13001/p13001_atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c7297de721c6b84b8cb96644f5fd288 +guid: 6b3ab93ff2f6a5b46a5eb66ec80a1606 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/characters/p0002/p0002_material.mat b/Assets/arts/spines/characters/p13001/p13001_material.mat similarity index 90% rename from Assets/arts/spines/characters/p0002/p0002_material.mat rename to Assets/arts/spines/characters/p13001/p13001_material.mat index 4972d967f..cf69cee47 100644 --- a/Assets/arts/spines/characters/p0002/p0002_material.mat +++ b/Assets/arts/spines/characters/p13001/p13001_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: p0002_material + m_Name: p13001_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT @@ -23,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 0e2b6342ae1ff9b47afc8cec7e69879a, type: 3} + m_Texture: {fileID: 2800000, guid: 5196faeaf7ac50f49ab03301178aaaa4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/arts/spines/characters/p0002/p0002_material.mat.meta b/Assets/arts/spines/characters/p13001/p13001_material.mat.meta similarity index 79% rename from Assets/arts/spines/characters/p0002/p0002_material.mat.meta rename to Assets/arts/spines/characters/p13001/p13001_material.mat.meta index df40fbb9d..6bcb2ea4a 100644 --- a/Assets/arts/spines/characters/p0002/p0002_material.mat.meta +++ b/Assets/arts/spines/characters/p13001/p13001_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dfe00899b5421c84c918b3411210e5af +guid: f3b7dbbb79d9fbd4b8a82b7ed202fd79 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset similarity index 80% rename from Assets/arts/spines/characters/p0004/p0004_skeletondata.asset rename to Assets/arts/spines/characters/p13001/p13001_skeletondata.asset index de9ff88da..71a1d09a8 100644 --- a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset +++ b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: p0004_skeletondata + m_Name: p13001_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 73fdd949e68836447b83f91fdbff0e2e, type: 2} + - {fileID: 11400000, guid: 6b3ab93ff2f6a5b46a5eb66ec80a1606, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: e30d4da4709b86c4cb41c8347140c3fa, type: 3} + skeletonJSON: {fileID: 4900000, guid: 58b06d51e58024b43addbeb9155be81a, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset.meta similarity index 79% rename from Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta rename to Assets/arts/spines/characters/p13001/p13001_skeletondata.asset.meta index e7ef3f3bb..5bc0ddaac 100644 --- a/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta +++ b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eaff2e9fec24bdb4fbb7003fefa828dd +guid: d6167405fd019304a899f753f6d47c58 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/characters/p0003.meta b/Assets/arts/spines/characters/p25002.meta similarity index 100% rename from Assets/arts/spines/characters/p0003.meta rename to Assets/arts/spines/characters/p25002.meta diff --git a/Assets/arts/spines/characters/p25002/p25002.atlas.txt b/Assets/arts/spines/characters/p25002/p25002.atlas.txt new file mode 100644 index 000000000..e5928ff24 --- /dev/null +++ b/Assets/arts/spines/characters/p25002/p25002.atlas.txt @@ -0,0 +1,48 @@ +p25002.png +size:1024,1024 +filter:Linear,Linear +eye_l +bounds:2,4,24,34 +offsets:1,1,26,36 +eye_r +bounds:340,622,24,34 +offsets:1,1,26,36 +eye_yun +bounds:47,192,51,51 +hand_l_1 +bounds:47,245,100,171 +hand_r_1 +bounds:384,695,117,67 +hand_r_2 +bounds:161,451,74,76 +offsets:2,2,78,79 +head +bounds:161,658,221,104 +offsets:2,1,224,107 +jianjia_l +bounds:545,854,155,161 +offsets:2,1,158,163 +jianjia_r +bounds:702,890,163,125 +offsets:1,1,165,128 +leg +bounds:161,529,177,127 +offsets:1,1,179,128 +maozi_1 +bounds:2,418,344,157 +offsets:1,1,346,159 +rotate:90 +maozi_2 +bounds:545,786,93,66 +offsets:1,1,95,68 +pifeng +bounds:2,764,329,251 +spine +bounds:867,878,148,137 +weapon_1 +bounds:333,764,210,251 +offsets:1,2,212,255 +yingzi +bounds:2,40,376,43 +offsets:1,1,378,45 +rotate:90 diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta b/Assets/arts/spines/characters/p25002/p25002.atlas.txt.meta similarity index 75% rename from Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta rename to Assets/arts/spines/characters/p25002/p25002.atlas.txt.meta index 13471a608..da8c17cfd 100644 --- a/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta +++ b/Assets/arts/spines/characters/p25002/p25002.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f773f49d3c1c2544a227c0130bb8ae9 +guid: f35937f42d4be7a46869c5392c380364 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/characters/p25002/p25002.png b/Assets/arts/spines/characters/p25002/p25002.png new file mode 100644 index 000000000..c192fa646 Binary files /dev/null and b/Assets/arts/spines/characters/p25002/p25002.png differ diff --git a/Assets/arts/spines/characters/p0003/p0003.png.meta b/Assets/arts/spines/characters/p25002/p25002.png.meta similarity index 98% rename from Assets/arts/spines/characters/p0003/p0003.png.meta rename to Assets/arts/spines/characters/p25002/p25002.png.meta index 91c8c916b..0bb929f69 100644 --- a/Assets/arts/spines/characters/p0003/p0003.png.meta +++ b/Assets/arts/spines/characters/p25002/p25002.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9125d3b066736854987c9cd07f2b13d9 +guid: f0ec8af57f70c8d4a8f746aa6a05f8c9 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -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/p0003/p0003.skel.bytes b/Assets/arts/spines/characters/p25002/p25002.skel.bytes similarity index 56% rename from Assets/arts/spines/characters/p0003/p0003.skel.bytes rename to Assets/arts/spines/characters/p25002/p25002.skel.bytes index 9fed6992a..908ce8e71 100644 Binary files a/Assets/arts/spines/characters/p0003/p0003.skel.bytes and b/Assets/arts/spines/characters/p25002/p25002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta b/Assets/arts/spines/characters/p25002/p25002.skel.bytes.meta similarity index 75% rename from Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta rename to Assets/arts/spines/characters/p25002/p25002.skel.bytes.meta index 7b22065b5..3281adf3c 100644 --- a/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta +++ b/Assets/arts/spines/characters/p25002/p25002.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f5de35c741a2384a952d4cf8d766f1f +guid: b28e855fe06b42945889294c59a632c9 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/characters/p0003/p0003_atlas.asset b/Assets/arts/spines/characters/p25002/p25002_atlas.asset similarity index 73% rename from Assets/arts/spines/characters/p0003/p0003_atlas.asset rename to Assets/arts/spines/characters/p25002/p25002_atlas.asset index a7d1c48a3..6a7267db6 100644 --- a/Assets/arts/spines/characters/p0003/p0003_atlas.asset +++ b/Assets/arts/spines/characters/p25002/p25002_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: p0003_atlas + m_Name: p25002_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 9ee6987ee3dfc7a4284c02ce783bee82, type: 3} + atlasFile: {fileID: 4900000, guid: f35937f42d4be7a46869c5392c380364, type: 3} materials: - - {fileID: 2100000, guid: 4ada85a8672dcfe4da7c34168abd0bff, type: 2} + - {fileID: 2100000, guid: 366dc18ee2074084299fe8189429987b, type: 2} diff --git a/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta b/Assets/arts/spines/characters/p25002/p25002_atlas.asset.meta similarity index 79% rename from Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta rename to Assets/arts/spines/characters/p25002/p25002_atlas.asset.meta index a04e33fae..9597def03 100644 --- a/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta +++ b/Assets/arts/spines/characters/p25002/p25002_atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c4e55dafaf3625341807eedc5a302738 +guid: be4ababe7ab29ca448c3a4b4bb3b8d92 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/characters/p0001/p0001_material.mat b/Assets/arts/spines/characters/p25002/p25002_material.mat similarity index 90% rename from Assets/arts/spines/characters/p0001/p0001_material.mat rename to Assets/arts/spines/characters/p25002/p25002_material.mat index ade8ceb0d..da3e76604 100644 --- a/Assets/arts/spines/characters/p0001/p0001_material.mat +++ b/Assets/arts/spines/characters/p25002/p25002_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: p0001_material + m_Name: p25002_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT @@ -23,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 63f2bea8eb8d62249a1b63b81ea4db8f, type: 3} + m_Texture: {fileID: 2800000, guid: f0ec8af57f70c8d4a8f746aa6a05f8c9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/arts/spines/characters/p0003/p0003_material.mat.meta b/Assets/arts/spines/characters/p25002/p25002_material.mat.meta similarity index 79% rename from Assets/arts/spines/characters/p0003/p0003_material.mat.meta rename to Assets/arts/spines/characters/p25002/p25002_material.mat.meta index 61986a5a6..32087a201 100644 --- a/Assets/arts/spines/characters/p0003/p0003_material.mat.meta +++ b/Assets/arts/spines/characters/p25002/p25002_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ada85a8672dcfe4da7c34168abd0bff +guid: 366dc18ee2074084299fe8189429987b NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset similarity index 78% rename from Assets/arts/spines/characters/p0003/p0003_skeletondata.asset rename to Assets/arts/spines/characters/p25002/p25002_skeletondata.asset index f2d4d8728..ec67fcb69 100644 --- a/Assets/arts/spines/characters/p0003/p0003_skeletondata.asset +++ b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: p0003_skeletondata + m_Name: p25002_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: d9414a9c46bd7674baf38504624642f7, type: 2} + - {fileID: 11400000, guid: be4ababe7ab29ca448c3a4b4bb3b8d92, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 970d36de7e83c6c409b24b89d6c38815, type: 3} + skeletonJSON: {fileID: 4900000, guid: b28e855fe06b42945889294c59a632c9, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0 + defaultMix: 0.2 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset.meta similarity index 79% rename from Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta rename to Assets/arts/spines/characters/p25002/p25002_skeletondata.asset.meta index f70efba25..c00fecf0d 100644 --- a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 172156a70a38fef4585d133365f0170c +guid: ef1f1c9199235b24ab4ccc0c7ba9f0c4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/characters/p0001.meta b/Assets/arts/spines/characters/p33001.meta similarity index 100% rename from Assets/arts/spines/characters/p0001.meta rename to Assets/arts/spines/characters/p33001.meta diff --git a/Assets/arts/spines/characters/p33001/p33001.atlas.txt b/Assets/arts/spines/characters/p33001/p33001.atlas.txt new file mode 100644 index 000000000..ad261da42 --- /dev/null +++ b/Assets/arts/spines/characters/p33001/p33001.atlas.txt @@ -0,0 +1,68 @@ +p33001.png +size:1024,1024 +filter:Linear,Linear +canying1 +bounds:444,546,533,476 +offsets:13,32,554,512 +canying2 +bounds:2,406,440,616 +offsets:0,2,440,620 +eye_death +bounds:723,301,48,42 +offsets:1,0,49,42 +eye_hit +bounds:738,345,46,63 +rotate:90 +eye_l +bounds:395,202,35,58 +offsets:1,1,37,60 +eye_r +bounds:395,202,35,58 +offsets:1,1,37,60 +eye_yun +bounds:395,92,51,51 +gutou +bounds:979,584,39,60 +hand_l +bounds:299,262,132,142 +hand_r_1 +bounds:595,233,126,112 +hand_r_2 +bounds:299,185,75,94 +offsets:1,1,77,96 +rotate:90 +head +bounds:2,171,295,233 +kulou +bounds:317,100,83,76 +rotate:90 +leg +bounds:433,238,160,107 +leg_l_2 +bounds:250,84,85,65 +rotate:90 +leg_r_2 +bounds:250,17,85,65 +mei_l +bounds:803,344,60,47 +offsets:1,1,62,49 +mei_r +bounds:395,145,55,47 +offsets:1,1,57,49 +rotate:90 +pifeng +bounds:444,347,292,197 +spine +bounds:2,15,246,154 +offsets:0,1,246,155 +wuqi +bounds:738,393,160,151 +offsets:2,2,164,155 +yaodai +bounds:900,374,170,61 +offsets:1,1,172,63 +rotate:90 +yingzi +bounds:979,646,376,43 +offsets:1,1,378,45 +rotate:90 diff --git a/Assets/arts/spines/characters/p33001/p33001.atlas.txt.meta b/Assets/arts/spines/characters/p33001/p33001.atlas.txt.meta new file mode 100644 index 000000000..34c7a7540 --- /dev/null +++ b/Assets/arts/spines/characters/p33001/p33001.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a1408d81fa8136947853d8183bbb5432 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p33001/p33001.png b/Assets/arts/spines/characters/p33001/p33001.png new file mode 100644 index 000000000..141644784 Binary files /dev/null and b/Assets/arts/spines/characters/p33001/p33001.png differ diff --git a/Assets/arts/spines/characters/p0004/p0004.png.meta b/Assets/arts/spines/characters/p33001/p33001.png.meta similarity index 98% rename from Assets/arts/spines/characters/p0004/p0004.png.meta rename to Assets/arts/spines/characters/p33001/p33001.png.meta index 89b5ad586..266617e4f 100644 --- a/Assets/arts/spines/characters/p0004/p0004.png.meta +++ b/Assets/arts/spines/characters/p33001/p33001.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a50d77477b2c3a5418eb6dbfc1456170 +guid: c459317e1c44c3e43a2717dd3dbdfa7f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -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/p33001/p33001.skel.bytes b/Assets/arts/spines/characters/p33001/p33001.skel.bytes new file mode 100644 index 000000000..4e2264eca Binary files /dev/null and b/Assets/arts/spines/characters/p33001/p33001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p33001/p33001.skel.bytes.meta b/Assets/arts/spines/characters/p33001/p33001.skel.bytes.meta new file mode 100644 index 000000000..f4eae54d5 --- /dev/null +++ b/Assets/arts/spines/characters/p33001/p33001.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ab6e7d854ec2d54085d7f6f0d2173a7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_atlas.asset b/Assets/arts/spines/characters/p33001/p33001_atlas.asset similarity index 73% rename from Assets/arts/spines/characters/p0004/p0004_atlas.asset rename to Assets/arts/spines/characters/p33001/p33001_atlas.asset index 7beab7eaa..9003b6ee1 100644 --- a/Assets/arts/spines/characters/p0004/p0004_atlas.asset +++ b/Assets/arts/spines/characters/p33001/p33001_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: p0004_atlas + m_Name: p33001_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 6bf3bba9658ee3c45b7586cb517fcdd8, type: 3} + atlasFile: {fileID: 4900000, guid: a1408d81fa8136947853d8183bbb5432, type: 3} materials: - - {fileID: 2100000, guid: d187a32b2a9da26498eecbaa1ef24c99, type: 2} + - {fileID: 2100000, guid: 338bdcb9abd4a1e4e8707c14abea7b26, type: 2} diff --git a/Assets/arts/spines/characters/p33001/p33001_atlas.asset.meta b/Assets/arts/spines/characters/p33001/p33001_atlas.asset.meta new file mode 100644 index 000000000..6326861e3 --- /dev/null +++ b/Assets/arts/spines/characters/p33001/p33001_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f5359cca2686d24f83a25f1cf1ef80b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0003/p0003_material.mat b/Assets/arts/spines/characters/p33001/p33001_material.mat similarity index 90% rename from Assets/arts/spines/characters/p0003/p0003_material.mat rename to Assets/arts/spines/characters/p33001/p33001_material.mat index 0e3c46fa8..7203c3df2 100644 --- a/Assets/arts/spines/characters/p0003/p0003_material.mat +++ b/Assets/arts/spines/characters/p33001/p33001_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: p0003_material + m_Name: p33001_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT @@ -23,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 9125d3b066736854987c9cd07f2b13d9, type: 3} + m_Texture: {fileID: 2800000, guid: c459317e1c44c3e43a2717dd3dbdfa7f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/arts/spines/characters/p0004/p0004_material.mat.meta b/Assets/arts/spines/characters/p33001/p33001_material.mat.meta similarity index 79% rename from Assets/arts/spines/characters/p0004/p0004_material.mat.meta rename to Assets/arts/spines/characters/p33001/p33001_material.mat.meta index 99fd7d650..f3e7b9d32 100644 --- a/Assets/arts/spines/characters/p0004/p0004_material.mat.meta +++ b/Assets/arts/spines/characters/p33001/p33001_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d187a32b2a9da26498eecbaa1ef24c99 +guid: 338bdcb9abd4a1e4e8707c14abea7b26 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset similarity index 78% rename from Assets/arts/spines/characters/p0002/p0002_skeletondata.asset rename to Assets/arts/spines/characters/p33001/p33001_skeletondata.asset index 7d3612bde..db4b5f646 100644 --- a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset +++ b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: p0002_skeletondata + m_Name: p33001_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: eaff2e9fec24bdb4fbb7003fefa828dd, type: 2} + - {fileID: 11400000, guid: 8f5359cca2686d24f83a25f1cf1ef80b, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 2f5de35c741a2384a952d4cf8d766f1f, type: 3} + skeletonJSON: {fileID: 4900000, guid: 9ab6e7d854ec2d54085d7f6f0d2173a7, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0 + defaultMix: 0.2 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset.meta b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset.meta new file mode 100644 index 000000000..00606ff3a --- /dev/null +++ b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cf4f4eff1d72664da8e92939cf7f16a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004.meta b/Assets/arts/spines/characters/p45002.meta similarity index 100% rename from Assets/arts/spines/characters/p0004.meta rename to Assets/arts/spines/characters/p45002.meta diff --git a/Assets/arts/spines/characters/p45002/p45002.atlas.txt b/Assets/arts/spines/characters/p45002/p45002.atlas.txt new file mode 100644 index 000000000..34a3512e9 --- /dev/null +++ b/Assets/arts/spines/characters/p45002/p45002.atlas.txt @@ -0,0 +1,113 @@ +p45002.png +size:1024,1024 +filter:Linear,Linear +canying +bounds:2,601,566,413 +offsets:5,0,582,414 +eye_death +bounds:827,517,48,42 +offsets:1,0,49,42 +eye_hit +bounds:333,162,48,66 +eye_l +bounds:262,105,37,61 +offsets:1,1,39,63 +rotate:90 +eye_r +bounds:764,241,37,61 +offsets:1,1,39,63 +eye_yun +bounds:383,177,51,51 +fx1/fx1_01 +bounds:989,955,25,59 +offsets:220,77,500,281 +fx1/fx1_03 +bounds:181,113,79,87 +offsets:195,74,500,281 +fx1/fx1_05 +bounds:880,537,121,116 +offsets:176,68,500,281 +fx1/fx1_07 +bounds:871,655,131,110 +offsets:173,75,500,281 +fx1/fx1_09 +bounds:625,190,137,112 +offsets:171,75,500,281 +fx1/fx1_11 +bounds:625,400,159,114 +offsets:166,73,500,281 +fx1/fx1_13 +bounds:2,7,169,86 +offsets:162,78,500,281 +fx1/fx1_15 +bounds:559,247,160,64 +offsets:159,74,500,281 +rotate:90 +fx1/fx1_17 +bounds:963,865,149,24 +offsets:156,73,500,281 +rotate:90 +fx1/fx1_19 +bounds:449,575,80,24 +offsets:168,77,500,281 +fx1/fx1_21 +bounds:963,837,23,26 +offsets:221,74,500,281 +fx1/fx1_23 +bounds:327,226,3,2 +offsets:231,85,500,281 +gutou +bounds:803,250,39,60 +hair_1 +bounds:2,95,177,105 +offsets:1,0,178,105 +hair_2 +bounds:327,230,174,105 +rotate:90 +hair_3 +bounds:449,409,174,105 +hair_4 +bounds:625,304,159,94 +offsets:0,1,159,95 +hair_5 +bounds:221,226,178,104 +offsets:0,1,178,105 +rotate:90 +hair_6 +bounds:857,837,177,104 +offsets:1,1,178,105 +rotate:90 +hand_l +bounds:434,266,123,141 +hand_r +bounds:262,144,80,69 +offsets:1,1,82,71 +rotate:90 +hand_r_2 +bounds:786,312,83,94 +head +bounds:570,760,285,254 +offsets:2,2,289,257 +kulou +bounds:361,415,83,76 +leg_l +bounds:857,767,108,68 +leg_r +bounds:786,408,106,66 +offsets:1,1,108,68 +rotate:90 +qunzi +bounds:570,653,299,105 +shuichi +bounds:2,406,357,85 +spine +bounds:2,202,217,202 +wuqi_1 +bounds:570,561,308,90 +offsets:2,1,312,92 +wuqi_2 +bounds:2,493,445,106 +offsets:1,1,448,109 +yingzi +bounds:449,516,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/p45002/p45002.atlas.txt.meta b/Assets/arts/spines/characters/p45002/p45002.atlas.txt.meta new file mode 100644 index 000000000..e619d1e49 --- /dev/null +++ b/Assets/arts/spines/characters/p45002/p45002.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 986c76ced0346574fba8770bebc2bbc3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p45002/p45002.png b/Assets/arts/spines/characters/p45002/p45002.png new file mode 100644 index 000000000..5ba30d670 Binary files /dev/null and b/Assets/arts/spines/characters/p45002/p45002.png differ diff --git a/Assets/arts/spines/characters/p0001/p0001.png.meta b/Assets/arts/spines/characters/p45002/p45002.png.meta similarity index 98% rename from Assets/arts/spines/characters/p0001/p0001.png.meta rename to Assets/arts/spines/characters/p45002/p45002.png.meta index ebc0589eb..a42763848 100644 --- a/Assets/arts/spines/characters/p0001/p0001.png.meta +++ b/Assets/arts/spines/characters/p45002/p45002.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63f2bea8eb8d62249a1b63b81ea4db8f +guid: 2c523eccf48274a42b1336f290c4b501 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -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/p45002/p45002.skel.bytes b/Assets/arts/spines/characters/p45002/p45002.skel.bytes new file mode 100644 index 000000000..a3bc66567 Binary files /dev/null and b/Assets/arts/spines/characters/p45002/p45002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p45002/p45002.skel.bytes.meta b/Assets/arts/spines/characters/p45002/p45002.skel.bytes.meta new file mode 100644 index 000000000..64a66966b --- /dev/null +++ b/Assets/arts/spines/characters/p45002/p45002.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a7635b47e5a90ce47900a13f5e7ebb29 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_atlas.asset b/Assets/arts/spines/characters/p45002/p45002_atlas.asset similarity index 73% rename from Assets/arts/spines/characters/p0002/p0002_atlas.asset rename to Assets/arts/spines/characters/p45002/p45002_atlas.asset index a8bbe6497..7a1de22aa 100644 --- a/Assets/arts/spines/characters/p0002/p0002_atlas.asset +++ b/Assets/arts/spines/characters/p45002/p45002_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: p0002_atlas + m_Name: p45002_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 0f773f49d3c1c2544a227c0130bb8ae9, type: 3} + atlasFile: {fileID: 4900000, guid: 986c76ced0346574fba8770bebc2bbc3, type: 3} materials: - - {fileID: 2100000, guid: dfe00899b5421c84c918b3411210e5af, type: 2} + - {fileID: 2100000, guid: ce61527caa7430343a56073a37db19a6, type: 2} diff --git a/Assets/arts/spines/characters/p45002/p45002_atlas.asset.meta b/Assets/arts/spines/characters/p45002/p45002_atlas.asset.meta new file mode 100644 index 000000000..e1662dd9f --- /dev/null +++ b/Assets/arts/spines/characters/p45002/p45002_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4de737692e6c926438960ad3136be051 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0004/p0004_material.mat b/Assets/arts/spines/characters/p45002/p45002_material.mat similarity index 90% rename from Assets/arts/spines/characters/p0004/p0004_material.mat rename to Assets/arts/spines/characters/p45002/p45002_material.mat index c4cbc2ce4..cd9f70c12 100644 --- a/Assets/arts/spines/characters/p0004/p0004_material.mat +++ b/Assets/arts/spines/characters/p45002/p45002_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: p0004_material + m_Name: p45002_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT @@ -23,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: a50d77477b2c3a5418eb6dbfc1456170, type: 3} + m_Texture: {fileID: 2800000, guid: 2c523eccf48274a42b1336f290c4b501, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/arts/spines/characters/p0001/p0001_material.mat.meta b/Assets/arts/spines/characters/p45002/p45002_material.mat.meta similarity index 79% rename from Assets/arts/spines/characters/p0001/p0001_material.mat.meta rename to Assets/arts/spines/characters/p45002/p45002_material.mat.meta index 68ea739bb..78c2c0cfe 100644 --- a/Assets/arts/spines/characters/p0001/p0001_material.mat.meta +++ b/Assets/arts/spines/characters/p45002/p45002_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ed3a68a2744bbb43b94fcbaf5a4ad9b +guid: ce61527caa7430343a56073a37db19a6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset similarity index 78% rename from Assets/arts/spines/characters/p0001/p0001_skeletondata.asset rename to Assets/arts/spines/characters/p45002/p45002_skeletondata.asset index c2a804baf..c603117e0 100644 --- a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset +++ b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: p0001_skeletondata + m_Name: p45002_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: c4e55dafaf3625341807eedc5a302738, type: 2} + - {fileID: 11400000, guid: 4de737692e6c926438960ad3136be051, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: e0fb48e7b6a5670498079ed14a606da2, type: 3} + skeletonJSON: {fileID: 4900000, guid: a7635b47e5a90ce47900a13f5e7ebb29, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0 + defaultMix: 0.2 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset.meta b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset.meta new file mode 100644 index 000000000..be8088d83 --- /dev/null +++ b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fad8dd9fbc076a04383b430849b97a82 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/p0003.prefab b/Assets/prefabs/spine/ui/characters/p13001.prefab similarity index 98% rename from Assets/prefabs/spine/ui/characters/p0003.prefab rename to Assets/prefabs/spine/ui/characters/p13001.prefab index 8d5de7d4e..c4ca632d3 100644 --- a/Assets/prefabs/spine/ui/characters/p0003.prefab +++ b/Assets/prefabs/spine/ui/characters/p13001.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2951863086470196126} - component: {fileID: -6083284349890068408} m_Layer: 5 - m_Name: p0003 + m_Name: p13001 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -159,7 +159,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 7e79fad60ed672143851509cc068d9f5, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: d6167405fd019304a899f753f6d47c58, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0002.prefab.meta b/Assets/prefabs/spine/ui/characters/p13001.prefab.meta similarity index 100% rename from Assets/prefabs/spine/ui/characters/p0002.prefab.meta rename to Assets/prefabs/spine/ui/characters/p13001.prefab.meta diff --git a/Assets/prefabs/spine/ui/characters/p0004.prefab b/Assets/prefabs/spine/ui/characters/p25002.prefab similarity index 98% rename from Assets/prefabs/spine/ui/characters/p0004.prefab rename to Assets/prefabs/spine/ui/characters/p25002.prefab index 3700a23aa..0cbc5ff08 100644 --- a/Assets/prefabs/spine/ui/characters/p0004.prefab +++ b/Assets/prefabs/spine/ui/characters/p25002.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2951863086470196126} - component: {fileID: -6083284349890068408} m_Layer: 5 - m_Name: p0004 + m_Name: p25002 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -159,7 +159,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 946b79f032c464846aa86eba53ab2626, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: ef1f1c9199235b24ab4ccc0c7ba9f0c4, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0003.prefab.meta b/Assets/prefabs/spine/ui/characters/p25002.prefab.meta similarity index 100% rename from Assets/prefabs/spine/ui/characters/p0003.prefab.meta rename to Assets/prefabs/spine/ui/characters/p25002.prefab.meta diff --git a/Assets/prefabs/spine/ui/characters/p0001.prefab b/Assets/prefabs/spine/ui/characters/p33001.prefab similarity index 89% rename from Assets/prefabs/spine/ui/characters/p0001.prefab rename to Assets/prefabs/spine/ui/characters/p33001.prefab index 3769e0717..b3ec02397 100644 --- a/Assets/prefabs/spine/ui/characters/p0001.prefab +++ b/Assets/prefabs/spine/ui/characters/p33001.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2951863086470196126} - component: {fileID: 1433468907267254477} m_Layer: 5 - m_Name: p0001 + m_Name: p33001 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -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 @@ -156,10 +159,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1cf4f4eff1d72664da8e92939cf7f16a, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -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/p0001.prefab.meta b/Assets/prefabs/spine/ui/characters/p33001.prefab.meta similarity index 100% rename from Assets/prefabs/spine/ui/characters/p0001.prefab.meta rename to Assets/prefabs/spine/ui/characters/p33001.prefab.meta diff --git a/Assets/prefabs/spine/ui/characters/p0002.prefab b/Assets/prefabs/spine/ui/characters/p45002.prefab similarity index 89% rename from Assets/prefabs/spine/ui/characters/p0002.prefab rename to Assets/prefabs/spine/ui/characters/p45002.prefab index 6b1ea7c91..e01fb4cbe 100644 --- a/Assets/prefabs/spine/ui/characters/p0002.prefab +++ b/Assets/prefabs/spine/ui/characters/p45002.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2951863086470196126} - component: {fileID: -6083284349890068408} m_Layer: 5 - m_Name: p0002 + m_Name: p45002 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -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 @@ -156,10 +159,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 172156a70a38fef4585d133365f0170c, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: fad8dd9fbc076a04383b430849b97a82, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -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.meta b/Assets/prefabs/spine/ui/characters/p45002.prefab.meta similarity index 100% rename from Assets/prefabs/spine/ui/characters/p0004.prefab.meta rename to Assets/prefabs/spine/ui/characters/p45002.prefab.meta