Commit a19e7c55 authored by Tt's avatar Tt

修改冲突

parent 25a23735
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "cee6c4c5-014d-49f2-821e-082f9291ab7e", "uuid": "228809a4-1d3c-418e-a9a2-b82dbeacf113",
"isBundle": true, "isBundle": true,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "63a8fdce-f854-4e6c-bf2b-10244b815aec", "uuid": "09277557-23b0-49d9-ad61-cf122776e316",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "ca9966c3-1530-46c2-a813-e56afaf7b957", "uuid": "ec925776-742b-4ba4-8375-1e2208cd8e9d",
"downloadMode": 0, "downloadMode": 0,
"duration": 3.448163, "duration": 3.448163,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "f8fe14b7-324c-4a8e-a985-a9fdec9c9316", "uuid": "a5ff4ad1-df8b-4b40-a9cc-31ea778c79db",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.873878, "duration": 0.873878,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "194f445d-2c6f-4750-81d5-59071fce91d8", "uuid": "9925546b-a1eb-4952-bb94-ac2c40c29f7c",
"downloadMode": 0, "downloadMode": 0,
"duration": 3.474286, "duration": 3.474286,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "df87cef5-4613-4f63-9161-7db1498fbc25", "uuid": "a1b648d5-4967-4a0b-a038-141154c364ac",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.372875, "duration": 0.372875,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "a3f01713-95e7-4f98-92cb-100a06c666e5", "uuid": "8fb4751f-142d-4db6-8f5b-d8d957aaa23e",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.45102, "duration": 0.45102,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "0636b803-a089-44a8-b740-b60963816c5d", "uuid": "b9ebcf1b-1ed0-4777-854d-e58b4ac505a0",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.808583, "duration": 1.808583,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "db824b17-c51b-4f4d-ae73-fc15213e648c", "uuid": "e48de654-84b0-450d-88ee-37dc58ee3ab0",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.6818, "duration": 0.6818,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "997c9132-b92c-4be3-91e2-98d705fc81fb", "uuid": "b5c87437-fda6-4154-b08b-36c9ca630c1c",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "073da1c1-f7ef-4532-8e60-30d9c8d3accb", "uuid": "fd49a141-f242-4ee4-9e64-d670f315fbc5",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "e1a3c12d-d779-43db-b8f2-961d2d115125", "uuid": "d1f4c60a-035a-49cd-9f70-27df430f3cf9",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "446d8cb8-09c8-4798-a8c4-1b24a3cb7719", "uuid": "7071fa59-b4c7-4eba-abf3-654cb611379e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"L2BG2-下雪动效_tex": { "L2BG2-下雪动效_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c0224fdd-b8cc-4181-90dd-4c7ad2538865", "uuid": "be0c61eb-9b94-44d6-84ba-9f973bc9707b",
"rawTextureUuid": "446d8cb8-09c8-4798-a8c4-1b24a3cb7719", "rawTextureUuid": "7071fa59-b4c7-4eba-abf3-654cb611379e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "7667e9ab-ab7f-4f6e-a83b-2c788925a0ed", "uuid": "22416249-4181-453c-bf16-0ebdcc80ecc5",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "6a506b7e-9a1c-4a8d-b9d1-c56f6eb4851f", "uuid": "3ab0524d-d211-469f-8c64-b73049400279",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3faa591f-be05-49ab-b2f6-58d859d5626f", "uuid": "287de13d-5988-439f-b02a-eb2c6bb1402b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"grow_tex": { "grow_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "366da315-c9b8-423b-8df0-f75f40ca75fb", "uuid": "a9fd012d-71c6-45f9-84d3-42ae9338ab60",
"rawTextureUuid": "3faa591f-be05-49ab-b2f6-58d859d5626f", "rawTextureUuid": "287de13d-5988-439f-b02a-eb2c6bb1402b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "579a169b-f7f1-45a4-8de5-b43f6984c9a5", "uuid": "669b4dc6-7a03-47ee-974e-8488612ae509",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "55b00f01-364d-4d29-bb61-169959cbcfb8", "uuid": "df8441b6-eba9-4202-a90b-67e7c89dee7b",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "986d7550-9deb-44d9-b292-62ffe6264f0b", "uuid": "c5973b0e-0f71-479c-8989-06c59aeb4820",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"mao_tex": { "mao_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6b42c3ac-b088-48cd-9b53-b805fdf20203", "uuid": "88c022b7-88c8-4301-aae2-880680ad6777",
"rawTextureUuid": "986d7550-9deb-44d9-b292-62ffe6264f0b", "rawTextureUuid": "c5973b0e-0f71-479c-8989-06c59aeb4820",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "4bac9a5e-4031-41c7-baa8-431d6a263e65", "uuid": "cfe391eb-471c-4cdb-af6c-42a6557d2695",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "7ebb55f1-b9c2-465d-ba52-6d9b5a7281db", "uuid": "d4b612e2-59f2-4ca4-834b-7523de1cb48b",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "0a7d63f6-46cb-4606-b5b9-eb99b114a07c", "uuid": "18fbab5d-b452-4696-a57b-2c176053ea6c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"vs_tex": { "vs_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a821da46-cfbe-42e5-928f-2aa82c85b657", "uuid": "eca3d7f9-d3b0-4324-b576-c053793b5f67",
"rawTextureUuid": "0a7d63f6-46cb-4606-b5b9-eb99b114a07c", "rawTextureUuid": "18fbab5d-b452-4696-a57b-2c176053ea6c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "63d2d6ae-a7e7-459e-9379-9786f587bc3c", "uuid": "9ff8f690-b49c-4fd9-9e23-96995d20e59c",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "21721fc7-c54f-4a6b-9e7f-171e2152cd74", "uuid": "9d124dc6-23b6-450d-9ce2-f0c49256409f",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "752a2b52-9a55-462b-aff0-274ca0e9bd9d", "uuid": "144d8eb1-a6fd-4853-905d-5ba9eaaf3e9a",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.0", "ver": "2.0.0",
"uuid": "6c37116a-30f7-49ab-abf5-5f8f1ce404fc", "uuid": "1505b076-66a3-4cf1-a0df-71aae58788a0",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "88cf6697-5a18-466b-ab8a-00775d895bb4", "uuid": "9f327975-ab92-456a-8380-90a108810397",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "ac87638b-722f-4a79-be06-7a14a95f9bd1", "uuid": "c4efa419-ac4c-425f-913d-d59d87bcacd5",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "5056a87a-ac4e-4a27-9dbf-5679d19b1f0c", "uuid": "8a51fa6d-5483-4f99-ac79-d20a308f07c8",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ce7d90df-744a-402e-84dd-5053b571fcd6" "__uuid__": "3348977e-8702-4b5e-9cb5-7b2c7df49fa4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "a1GjpGzJdD65Biy/y88Sq8", "fileId": "a1GjpGzJdD65Biy/y88Sq8",
"sync": false "sync": false
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "afaLDsGNdF8rTS2GfZ3h3s", "fileId": "afaLDsGNdF8rTS2GfZ3h3s",
"sync": false "sync": false
...@@ -546,7 +546,7 @@ ...@@ -546,7 +546,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "24ejo0WoZJxpoRK40tkCN+", "fileId": "24ejo0WoZJxpoRK40tkCN+",
"sync": false "sync": false
...@@ -648,7 +648,7 @@ ...@@ -648,7 +648,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "42DCsVISJGIKgyDyhKrDpv", "fileId": "42DCsVISJGIKgyDyhKrDpv",
"sync": false "sync": false
...@@ -766,7 +766,7 @@ ...@@ -766,7 +766,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": 1, "playTimes": 1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "4bac9a5e-4031-41c7-baa8-431d6a263e65#7ebb55f1-b9c2-465d-ba52-6d9b5a7281db", "_armatureKey": "cfe391eb-471c-4cdb-af6c-42a6557d2695#d4b612e2-59f2-4ca4-834b-7523de1cb48b",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -774,10 +774,10 @@ ...@@ -774,10 +774,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "4bac9a5e-4031-41c7-baa8-431d6a263e65" "__uuid__": "cfe391eb-471c-4cdb-af6c-42a6557d2695"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "7ebb55f1-b9c2-465d-ba52-6d9b5a7281db" "__uuid__": "d4b612e2-59f2-4ca4-834b-7523de1cb48b"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 0, "_N$_animationIndex": 0,
...@@ -793,7 +793,7 @@ ...@@ -793,7 +793,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "4cZmgdmo1Az6QuveaZ6W/3", "fileId": "4cZmgdmo1Az6QuveaZ6W/3",
"sync": false "sync": false
...@@ -886,7 +886,7 @@ ...@@ -886,7 +886,7 @@
"_lineHeight": 50, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "e4c91b4e-ec85-4b21-bb00-5e44719dcef4" "__uuid__": "e8b88158-fc26-4724-b082-62771920ccf4"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "8bJSQRyJRA0Jkcc+8GY5Do", "fileId": "8bJSQRyJRA0Jkcc+8GY5Do",
"sync": false "sync": false
...@@ -1095,7 +1095,7 @@ ...@@ -1095,7 +1095,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "840cda8e-5d45-4eaa-b37d-e512bd9485e5" "__uuid__": "65b86b52-ca5a-4e89-a87d-1e31a1e8b123"
}, },
"_type": 2, "_type": 2,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -1144,7 +1144,7 @@ ...@@ -1144,7 +1144,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "1coIwLNVZGEZEzF3dItpuK", "fileId": "1coIwLNVZGEZEzF3dItpuK",
"sync": false "sync": false
...@@ -1165,7 +1165,7 @@ ...@@ -1165,7 +1165,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7cd6ffcd-7a72-4a3e-b6df-93b8277993a1" "__uuid__": "742c33d7-9358-4bf2-93bc-d6ff51e967c2"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "55nJZ9Uk5CArtjDKXyL9xa", "fileId": "55nJZ9Uk5CArtjDKXyL9xa",
"sync": false "sync": false
...@@ -1392,7 +1392,7 @@ ...@@ -1392,7 +1392,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "87257cb1-40a2-49fe-8d53-9dbbaf79870f" "__uuid__": "5c0145b5-16e4-4428-a1c3-0fad018fbfac"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1414,7 +1414,7 @@ ...@@ -1414,7 +1414,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "eauguU1wtOrbhO0xPWGhAt", "fileId": "eauguU1wtOrbhO0xPWGhAt",
"sync": false "sync": false
...@@ -1589,7 +1589,7 @@ ...@@ -1589,7 +1589,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "60BI1U1b9OoZRIDunWHW0a", "fileId": "60BI1U1b9OoZRIDunWHW0a",
"sync": false "sync": false
...@@ -1608,7 +1608,7 @@ ...@@ -1608,7 +1608,7 @@
} }
], ],
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "87257cb1-40a2-49fe-8d53-9dbbaf79870f" "__uuid__": "5c0145b5-16e4-4428-a1c3-0fad018fbfac"
}, },
"_type": 2, "_type": 2,
"_segments": 64, "_segments": 64,
...@@ -1622,7 +1622,7 @@ ...@@ -1622,7 +1622,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "5cd2Jos1dOS46NiARvN6qg", "fileId": "5cd2Jos1dOS46NiARvN6qg",
"sync": false "sync": false
...@@ -1707,7 +1707,7 @@ ...@@ -1707,7 +1707,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "56e441da-31f3-47ea-a529-77b184be3e32" "__uuid__": "2660f78d-42c9-427e-a0cc-6012bac4588e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1729,7 +1729,7 @@ ...@@ -1729,7 +1729,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "8aSOlD3bNAYbWZEGUBpU7X", "fileId": "8aSOlD3bNAYbWZEGUBpU7X",
"sync": false "sync": false
...@@ -1814,7 +1814,7 @@ ...@@ -1814,7 +1814,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "56797ad9-2e0b-47e8-b982-831b0426ea19" "__uuid__": "23836427-abee-459a-ae4e-fb0cc693dfbd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1836,7 +1836,7 @@ ...@@ -1836,7 +1836,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "ddBCn3FshPQ4V9KDNSlBfr", "fileId": "ddBCn3FshPQ4V9KDNSlBfr",
"sync": false "sync": false
...@@ -1926,7 +1926,7 @@ ...@@ -1926,7 +1926,7 @@
"_lineHeight": 50, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "9aee506f-52ff-4c58-8d35-67255dd92a5f" "__uuid__": "e3aca1fc-d31d-41a7-903a-d8fdf7573a2b"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -1946,7 +1946,7 @@ ...@@ -1946,7 +1946,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "6anh4wjaRPMqyS2LhXSx4j", "fileId": "6anh4wjaRPMqyS2LhXSx4j",
"sync": false "sync": false
...@@ -1957,7 +1957,7 @@ ...@@ -1957,7 +1957,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "f9qrJyDh5P1oErn3FfsNL7", "fileId": "f9qrJyDh5P1oErn3FfsNL7",
"sync": false "sync": false
...@@ -2099,7 +2099,7 @@ ...@@ -2099,7 +2099,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "194f445d-2c6f-4750-81d5-59071fce91d8" "__uuid__": "9925546b-a1eb-4952-bb94-ac2c40c29f7c"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2115,7 +2115,7 @@ ...@@ -2115,7 +2115,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "24pM39t0xAcpeV3Rbf7iK5", "fileId": "24pM39t0xAcpeV3Rbf7iK5",
"sync": false "sync": false
...@@ -2126,7 +2126,7 @@ ...@@ -2126,7 +2126,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "28B+az6rRACpZT/KUohVaz", "fileId": "28B+az6rRACpZT/KUohVaz",
"sync": false "sync": false
...@@ -2159,7 +2159,7 @@ ...@@ -2159,7 +2159,7 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "d0131TzQtRBD7bKBPLf/Tag", "__type__": "34bbeVzOM1I+6k+WN82GN0o",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2174,7 +2174,7 @@ ...@@ -2174,7 +2174,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "dde9221e-a10b-43dc-b877-33a75f573937", "uuid": "3f008425-b43a-486c-9504-33b637883127",
"optimizationPolicy": "SINGLE_INSTANCE", "optimizationPolicy": "SINGLE_INSTANCE",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"readonly": false, "readonly": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "2e175d41-b1d0-4e5f-9263-b7603ad26803", "uuid": "55ea830c-65b9-4a9c-a492-e789b787c9c3",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "9aee506f-52ff-4c58-8d35-67255dd92a5f", "uuid": "e3aca1fc-d31d-41a7-903a-d8fdf7573a2b",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f63c7d11-db57-443d-ae93-32cc700bc686", "uuid": "cee455f1-0288-4bf3-a2b9-0b58cf26850c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ce7d90df-744a-402e-84dd-5053b571fcd6", "uuid": "3348977e-8702-4b5e-9cb5-7b2c7df49fa4",
"rawTextureUuid": "f63c7d11-db57-443d-ae93-32cc700bc686", "rawTextureUuid": "cee455f1-0288-4bf3-a2b9-0b58cf26850c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "e4c91b4e-ec85-4b21-bb00-5e44719dcef4", "uuid": "e8b88158-fc26-4724-b082-62771920ccf4",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "ae550ee6-f60a-46e7-bc1a-45db146fb9b5", "uuid": "c2eb6841-e93d-4e49-a2cc-1a2fd1fd0786",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "point", "filterMode": "point",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_bar": { "progress_bar": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "840cda8e-5d45-4eaa-b37d-e512bd9485e5", "uuid": "65b86b52-ca5a-4e89-a87d-1e31a1e8b123",
"rawTextureUuid": "ae550ee6-f60a-46e7-bc1a-45db146fb9b5", "rawTextureUuid": "c2eb6841-e93d-4e49-a2cc-1a2fd1fd0786",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c67134c1-3e86-4c60-9dec-3230d9bc4cf0", "uuid": "dd81caa9-f935-4589-9ca8-c02726259803",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "point", "filterMode": "point",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_bg": { "progress_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7cd6ffcd-7a72-4a3e-b6df-93b8277993a1", "uuid": "742c33d7-9358-4bf2-93bc-d6ff51e967c2",
"rawTextureUuid": "c67134c1-3e86-4c60-9dec-3230d9bc4cf0", "rawTextureUuid": "dd81caa9-f935-4589-9ca8-c02726259803",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "02e3f8fe-2df9-49f0-a35b-34cbb1f1dcd0", "uuid": "bbea7681-18d0-43a6-81f2-1d2a6ad49fb4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_01": { "tx_01": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "56e441da-31f3-47ea-a529-77b184be3e32", "uuid": "2660f78d-42c9-427e-a0cc-6012bac4588e",
"rawTextureUuid": "02e3f8fe-2df9-49f0-a35b-34cbb1f1dcd0", "rawTextureUuid": "bbea7681-18d0-43a6-81f2-1d2a6ad49fb4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "6d4d49e2-8beb-4227-95b4-4d98083c2910", "uuid": "061018f1-cb26-4ceb-a2f0-8413729b0978",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_01zw": { "tx_01zw": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "87257cb1-40a2-49fe-8d53-9dbbaf79870f", "uuid": "5c0145b5-16e4-4428-a1c3-0fad018fbfac",
"rawTextureUuid": "6d4d49e2-8beb-4227-95b4-4d98083c2910", "rawTextureUuid": "061018f1-cb26-4ceb-a2f0-8413729b0978",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "45f69622-66c4-4d80-855f-66628d273452", "uuid": "8683b41f-b9f4-4cd5-b0d5-156954451a5c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tx_xuanzhong": { "tx_xuanzhong": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "56797ad9-2e0b-47e8-b982-831b0426ea19", "uuid": "23836427-abee-459a-ae4e-fb0cc693dfbd",
"rawTextureUuid": "45f69622-66c4-4d80-855f-66628d273452", "rawTextureUuid": "8683b41f-b9f4-4cd5-b0d5-156954451a5c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "53d8b1d7-87a1-486a-b05d-301adafed6c7", "uuid": "054b4ba3-51b0-4968-a19a-8bfb27dbab7e",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "b927710d-52cd-4de1-919a-6ea22f5cf96a", "uuid": "f4c83ae7-1942-4ef7-84c2-e9c5bb232676",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "a2lcBX6axJcYgWizPAwXJQ", "fileId": "a2lcBX6axJcYgWizPAwXJQ",
"sync": false "sync": false
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "57563523-c8bc-4217-9cd5-d480d95686f9" "__uuid__": "86b28aed-c015-429e-b692-07d9ebe70199"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "2dFg2BRxNDIbzNQUJzInwD", "fileId": "2dFg2BRxNDIbzNQUJzInwD",
"sync": false "sync": false
...@@ -656,7 +656,7 @@ ...@@ -656,7 +656,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "55af890f-7f50-4d5e-bf59-6243d450e592" "__uuid__": "12815c0e-709a-45c0-82fa-b47598152c14"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "426YGeaQ1GSqxAl0es/FZ5", "fileId": "426YGeaQ1GSqxAl0es/FZ5",
"sync": false "sync": false
...@@ -794,7 +794,7 @@ ...@@ -794,7 +794,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "682aea9b-d4e8-4707-80c1-ecd7f6ca5158" "__uuid__": "af0a9183-6728-4cb3-a89b-69f7098b578e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -816,7 +816,7 @@ ...@@ -816,7 +816,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "1bsWjap9JK84XN2hkYfXDb", "fileId": "1bsWjap9JK84XN2hkYfXDb",
"sync": false "sync": false
...@@ -849,7 +849,7 @@ ...@@ -849,7 +849,7 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "b9277ENUs1N4ZGabqIvXPlq", "__type__": "f4c83rnGUJO94TC6cW7IyZ2",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "ee46dc13-c702-4d0e-855f-f299d4f7502b", "uuid": "8531c3cc-2785-4481-8215-5286c62232b9",
"optimizationPolicy": "AUTO", "optimizationPolicy": "AUTO",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"readonly": false, "readonly": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "83a41537-c515-451d-9f7a-6725c8778eb0", "uuid": "c510a3b7-b1cb-4d24-be4d-e64a89013b1b",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2919304d-a02f-4bd0-bfa2-d848943e9ea8", "uuid": "d04f0fd7-4b30-472f-a84e-db6bcfe5fbf1",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnExit": { "BtnExit": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "57563523-c8bc-4217-9cd5-d480d95686f9", "uuid": "86b28aed-c015-429e-b692-07d9ebe70199",
"rawTextureUuid": "2919304d-a02f-4bd0-bfa2-d848943e9ea8", "rawTextureUuid": "d04f0fd7-4b30-472f-a84e-db6bcfe5fbf1",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f2d23d98-f40b-4e69-9446-37f18a37411a", "uuid": "049c1654-1bd9-48d9-bfdd-9a0bd0fb6158",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnFrame": { "BtnFrame": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "682aea9b-d4e8-4707-80c1-ecd7f6ca5158", "uuid": "af0a9183-6728-4cb3-a89b-69f7098b578e",
"rawTextureUuid": "f2d23d98-f40b-4e69-9446-37f18a37411a", "rawTextureUuid": "049c1654-1bd9-48d9-bfdd-9a0bd0fb6158",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "58d43af8-ea66-41ea-a214-4946a9c5a39c", "uuid": "ec01b313-ddfb-46ed-b356-d8cf57e083da",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"BtnPlayAgain": { "BtnPlayAgain": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "55af890f-7f50-4d5e-bf59-6243d450e592", "uuid": "12815c0e-709a-45c0-82fa-b47598152c14",
"rawTextureUuid": "58d43af8-ea66-41ea-a214-4946a9c5a39c", "rawTextureUuid": "ec01b313-ddfb-46ed-b356-d8cf57e083da",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "ce0d826c-2a32-4a51-b63b-e6025cef3930", "uuid": "8ac4d010-715c-4c05-b712-180f6073b43b",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "7c4a1df4-f7f9-423e-9395-d4600d829096", "uuid": "15c454a3-0938-448f-ad61-cc0272df782d",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"_id": "fe38acfb-0680-4236-9819-ffdbfffa5e20" "_id": "79bb6ed8-b4f1-48f2-96e8-24c935a5c1ab"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "31a5b3dc-a4ef-41f0-9552-186ac0f6a24a" "__uuid__": "7516a95a-396f-4ff8-9764-295984c4d5c9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2b15c9a7-36cc-4fa4-96b1-ac9e41765c11" "__uuid__": "66571d96-2ccd-4a7f-a76a-64f2f86b980d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "71edec6b-ea93-4104-9fce-1e5a1e46ee0c" "__uuid__": "310893ec-f787-4094-9d69-ef7d1ebf4fcb"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -689,7 +689,7 @@ ...@@ -689,7 +689,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a0b59bec-0c56-480e-831d-01eb91cd5dcf" "__uuid__": "5d55ea22-9373-497e-92da-7c17ed0779c3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -783,7 +783,7 @@ ...@@ -783,7 +783,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "035dca5f-0680-43a7-9184-062e78ffc847" "__uuid__": "bf868bed-514c-4bce-b356-bbe7323b822a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f5bb9b79-5064-47d2-aff4-994d602c405f" "__uuid__": "77d53aaf-5c75-4f41-92bd-57d7d4a9ed5f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -971,7 +971,7 @@ ...@@ -971,7 +971,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "83cbd90f-4aa7-4ca1-8fe5-5b2945cd4153" "__uuid__": "24c2b54f-9063-44bc-9c1f-429c7140469c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1003,7 +1003,7 @@ ...@@ -1003,7 +1003,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4566f3ea-8e09-4b07-999b-e582c2453fb6" "__uuid__": "feeeeba0-ae39-4a3c-a470-d2cfe9403feb"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1334,7 +1334,7 @@ ...@@ -1334,7 +1334,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "579a169b-f7f1-45a4-8de5-b43f6984c9a5#55b00f01-364d-4d29-bb61-169959cbcfb8", "_armatureKey": "669b4dc6-7a03-47ee-974e-8488612ae509#df8441b6-eba9-4202-a90b-67e7c89dee7b",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -1342,10 +1342,10 @@ ...@@ -1342,10 +1342,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "579a169b-f7f1-45a4-8de5-b43f6984c9a5" "__uuid__": "669b4dc6-7a03-47ee-974e-8488612ae509"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "55b00f01-364d-4d29-bb61-169959cbcfb8" "__uuid__": "df8441b6-eba9-4202-a90b-67e7c89dee7b"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 3, "_N$_animationIndex": 3,
...@@ -1528,7 +1528,7 @@ ...@@ -1528,7 +1528,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b8768a21-c4b7-4aed-aba4-7e072e40a167" "__uuid__": "a7145287-add2-42b5-b2d4-f004e830c95c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1649,7 +1649,7 @@ ...@@ -1649,7 +1649,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "97c8c2a7-b2b2-4a6d-bd95-27fff1b697dd" "__uuid__": "68abb800-9e57-4403-bb7f-07f15ffcbf04"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1817,7 +1817,7 @@ ...@@ -1817,7 +1817,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "941ac860-68b9-462b-bad7-872bc6f27e2d" "__uuid__": "11e8bfbd-6c1c-483c-8e28-db4572851423"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1985,7 +1985,7 @@ ...@@ -1985,7 +1985,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "e3231203-a109-485d-89a9-1c2841042c4d" "__uuid__": "35ba8945-a48c-4b40-a934-7f9314c6d17a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2147,7 +2147,7 @@ ...@@ -2147,7 +2147,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "bc241a17-b002-4089-bfeb-66ad64432bad" "__uuid__": "f1c12517-0209-4af1-bb50-e60ae70bf12b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2241,7 +2241,7 @@ ...@@ -2241,7 +2241,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "feb82954-b762-4bdf-baf3-9eea798fd155" "__uuid__": "ea52d746-5e8f-4361-a1d6-bb6788984cd6"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2335,7 +2335,7 @@ ...@@ -2335,7 +2335,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "feb82954-b762-4bdf-baf3-9eea798fd155" "__uuid__": "ea52d746-5e8f-4361-a1d6-bb6788984cd6"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2542,7 +2542,7 @@ ...@@ -2542,7 +2542,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "e0ff5e53-10ba-458d-85c7-409f175ec32c" "__uuid__": "3788fcc2-c884-4eb1-83d1-e563f62437e0"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2636,7 +2636,7 @@ ...@@ -2636,7 +2636,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7cc4db2d-ef55-4d2c-af91-c9de944414cf" "__uuid__": "7d392809-482e-423a-9eb2-2856d0e809c2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2730,7 +2730,7 @@ ...@@ -2730,7 +2730,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "18b153ba-6583-4b32-a01a-4175aacc0128" "__uuid__": "64639f9e-9247-404e-9b2e-6d911d958c97"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2824,7 +2824,7 @@ ...@@ -2824,7 +2824,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3e3bcee3-050b-4a54-a280-a3b54524f319" "__uuid__": "a1bd5385-5c04-4f87-9f3e-7ba7cdf16edd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2918,7 +2918,7 @@ ...@@ -2918,7 +2918,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "84762310-7b12-482c-b4f8-5c41fa9b076f" "__uuid__": "ad9d79d2-aeed-4bc0-b48b-8b7b5a2aa088"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3012,7 +3012,7 @@ ...@@ -3012,7 +3012,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "830ba975-af8f-445a-9df3-13b1933c6665" "__uuid__": "8fdb3f8e-f4e5-4df0-8df9-0859e271e337"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3106,7 +3106,7 @@ ...@@ -3106,7 +3106,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d9cf308e-5d1e-4aa9-9979-802d783fd052" "__uuid__": "5d7a9c6c-34ef-4756-986c-145c946008d9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3200,7 +3200,7 @@ ...@@ -3200,7 +3200,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "89b43fb2-1318-46ca-8fb6-0cb30507c38b" "__uuid__": "0e094720-51fa-4aa5-b08b-cd81aff4e3cd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3294,7 +3294,7 @@ ...@@ -3294,7 +3294,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b867111d-721f-460e-af0d-ca9def772496" "__uuid__": "5daa5873-419c-4a91-a878-32098dbe5956"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3388,7 +3388,7 @@ ...@@ -3388,7 +3388,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0838a405-cc25-4a6c-94e8-7f1478691967" "__uuid__": "bf7e76a2-dcce-4793-97ad-8cf5e70e8034"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3482,7 +3482,7 @@ ...@@ -3482,7 +3482,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "1856a7ad-7a9e-4d40-918b-ea6e4b82698d" "__uuid__": "89db58e0-8603-42b2-bec9-e3f787518fea"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3576,7 +3576,7 @@ ...@@ -3576,7 +3576,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c8e50efe-026c-449a-8b4a-efa866176d94" "__uuid__": "8f03ff2b-ffad-4855-81bf-7d5f5a2dcc3a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3670,7 +3670,7 @@ ...@@ -3670,7 +3670,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3992b266-de10-472c-9f0c-2548dd57f8a5" "__uuid__": "d2220d82-64f7-4fcc-9e59-cf8c97f7d790"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3764,7 +3764,7 @@ ...@@ -3764,7 +3764,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d6844549-442c-4f7c-b3ab-0f930c5f3e1b" "__uuid__": "00d145c3-7f56-416f-95b7-61e77fcc9c53"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3858,7 +3858,7 @@ ...@@ -3858,7 +3858,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "486d70e5-6010-43ec-a04c-e4910c8a82bd" "__uuid__": "42422d9a-2f21-4fba-8f3c-3092b4a1a8bf"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3952,7 +3952,7 @@ ...@@ -3952,7 +3952,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a1d4a4d6-a90d-49d5-a163-169abbaf6573" "__uuid__": "e44a9c09-79d4-495f-80de-73b418dbaa26"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4046,7 +4046,7 @@ ...@@ -4046,7 +4046,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d229d040-73eb-4a37-90a7-fc83b3315d38" "__uuid__": "968df0e7-389f-4b9d-96e4-c94000735bad"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4140,7 +4140,7 @@ ...@@ -4140,7 +4140,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "760e63a4-c6b3-4cbf-854a-d797994d1450" "__uuid__": "66ff39ea-b4f0-4529-b4d2-4722468397fd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4234,7 +4234,7 @@ ...@@ -4234,7 +4234,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6d63be6e-7b96-478f-b646-6f25416a3ada" "__uuid__": "cf309477-efa7-49ba-be07-3dcb8ef12d4b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4328,7 +4328,7 @@ ...@@ -4328,7 +4328,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a7bdcfac-4cab-4d4f-b19a-958198a4760e" "__uuid__": "4ed1d87b-b24c-4d18-8828-449a71f42a0a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4631,7 +4631,7 @@ ...@@ -4631,7 +4631,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "68c99200-88b2-4fc5-9764-3e570728b8db" "__uuid__": "6bd6af99-1d7e-4bf7-b96e-63fd2c953a06"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4683,7 +4683,7 @@ ...@@ -4683,7 +4683,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a1ee72e4-f764-4530-949b-939aa99d4d1f" "__uuid__": "d3fb2c91-b9db-4703-a4be-b6207ecf1e98"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4777,7 +4777,7 @@ ...@@ -4777,7 +4777,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3db35003-5c7b-4fb0-9fa7-fb61262c0740" "__uuid__": "7287e22b-7a76-4bb0-b206-d3550c9b7077"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4871,7 +4871,7 @@ ...@@ -4871,7 +4871,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a7bdcfac-4cab-4d4f-b19a-958198a4760e" "__uuid__": "4ed1d87b-b24c-4d18-8828-449a71f42a0a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5145,7 +5145,7 @@ ...@@ -5145,7 +5145,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3436847c-ca1a-4a84-b625-097dac6f155a" "__uuid__": "0ce63327-6337-483a-8ce5-4f0243524055"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5242,7 +5242,7 @@ ...@@ -5242,7 +5242,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "7667e9ab-ab7f-4f6e-a83b-2c788925a0ed#6a506b7e-9a1c-4a8d-b9d1-c56f6eb4851f", "_armatureKey": "22416249-4181-453c-bf16-0ebdcc80ecc5#3ab0524d-d211-469f-8c64-b73049400279",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -5250,10 +5250,10 @@ ...@@ -5250,10 +5250,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "7667e9ab-ab7f-4f6e-a83b-2c788925a0ed" "__uuid__": "22416249-4181-453c-bf16-0ebdcc80ecc5"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "6a506b7e-9a1c-4a8d-b9d1-c56f6eb4851f" "__uuid__": "3ab0524d-d211-469f-8c64-b73049400279"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -5550,7 +5550,7 @@ ...@@ -5550,7 +5550,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "74919549-8118-467e-b388-759ed5b61efc" "__uuid__": "ef467797-5054-435b-a20c-e84959175b53"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5602,7 +5602,7 @@ ...@@ -5602,7 +5602,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a1ee72e4-f764-4530-949b-939aa99d4d1f" "__uuid__": "d3fb2c91-b9db-4703-a4be-b6207ecf1e98"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5696,7 +5696,7 @@ ...@@ -5696,7 +5696,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3db35003-5c7b-4fb0-9fa7-fb61262c0740" "__uuid__": "7287e22b-7a76-4bb0-b206-d3550c9b7077"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5790,7 +5790,7 @@ ...@@ -5790,7 +5790,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6d63be6e-7b96-478f-b646-6f25416a3ada" "__uuid__": "cf309477-efa7-49ba-be07-3dcb8ef12d4b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6064,7 +6064,7 @@ ...@@ -6064,7 +6064,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "08c78aed-b4ab-428f-9f2c-98e255b28a83" "__uuid__": "2c83b215-9295-4881-9c18-4f67ced307c2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6161,7 +6161,7 @@ ...@@ -6161,7 +6161,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "7667e9ab-ab7f-4f6e-a83b-2c788925a0ed#6a506b7e-9a1c-4a8d-b9d1-c56f6eb4851f", "_armatureKey": "22416249-4181-453c-bf16-0ebdcc80ecc5#3ab0524d-d211-469f-8c64-b73049400279",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -6169,10 +6169,10 @@ ...@@ -6169,10 +6169,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "7667e9ab-ab7f-4f6e-a83b-2c788925a0ed" "__uuid__": "22416249-4181-453c-bf16-0ebdcc80ecc5"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "6a506b7e-9a1c-4a8d-b9d1-c56f6eb4851f" "__uuid__": "3ab0524d-d211-469f-8c64-b73049400279"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -6325,7 +6325,7 @@ ...@@ -6325,7 +6325,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": 0, "playTimes": 0,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "073da1c1-f7ef-4532-8e60-30d9c8d3accb#e1a3c12d-d779-43db-b8f2-961d2d115125", "_armatureKey": "fd49a141-f242-4ee4-9e64-d670f315fbc5#d1f4c60a-035a-49cd-9f70-27df430f3cf9",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -6333,10 +6333,10 @@ ...@@ -6333,10 +6333,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "073da1c1-f7ef-4532-8e60-30d9c8d3accb" "__uuid__": "fd49a141-f242-4ee4-9e64-d670f315fbc5"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "e1a3c12d-d779-43db-b8f2-961d2d115125" "__uuid__": "d1f4c60a-035a-49cd-9f70-27df430f3cf9"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -6976,7 +6976,7 @@ ...@@ -6976,7 +6976,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "90a12ade-ceb0-403a-9964-a414b89ca3fb" "__uuid__": "0b18510a-54a2-4daf-a9bc-2de3cd70fa99"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7139,7 +7139,7 @@ ...@@ -7139,7 +7139,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "579a169b-f7f1-45a4-8de5-b43f6984c9a5#55b00f01-364d-4d29-bb61-169959cbcfb8", "_armatureKey": "669b4dc6-7a03-47ee-974e-8488612ae509#df8441b6-eba9-4202-a90b-67e7c89dee7b",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -7147,10 +7147,10 @@ ...@@ -7147,10 +7147,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "579a169b-f7f1-45a4-8de5-b43f6984c9a5" "__uuid__": "669b4dc6-7a03-47ee-974e-8488612ae509"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "55b00f01-364d-4d29-bb61-169959cbcfb8" "__uuid__": "df8441b6-eba9-4202-a90b-67e7c89dee7b"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 3, "_N$_animationIndex": 3,
...@@ -7392,7 +7392,7 @@ ...@@ -7392,7 +7392,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c9c77d66-8a44-4dd6-a4c7-48e168359a78" "__uuid__": "c9d2ff59-1d9d-400f-9ba3-1504c962a066"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -7424,7 +7424,7 @@ ...@@ -7424,7 +7424,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9c03272a-6997-48d2-874c-b5a43eefdc70" "__uuid__": "6fcd516a-6cee-42a6-bb50-b954fc0cf1a5"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -7535,7 +7535,7 @@ ...@@ -7535,7 +7535,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d06715bc-8dca-4ee7-94df-98e51224a5ff" "__uuid__": "18408242-d37d-4b4c-be39-895ca636c7fa"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7629,7 +7629,7 @@ ...@@ -7629,7 +7629,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "41d003d6-535f-4f5e-881e-18c82445c4d8" "__uuid__": "addcf027-9d73-4f01-a00b-b78573d873bf"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7723,7 +7723,7 @@ ...@@ -7723,7 +7723,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a0e8d330-1989-49dd-afcd-87eb606cbac5" "__uuid__": "1938c812-9a09-41d2-9213-dbfc4ae43eb3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7933,7 +7933,7 @@ ...@@ -7933,7 +7933,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "45e81ecf-e44f-462a-9ec5-9d5ef9edfda2" "__uuid__": "0e885166-8261-4f78-96eb-979187718e2c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8226,7 +8226,7 @@ ...@@ -8226,7 +8226,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "a2lcBX6axJcYgWizPAwXJQ", "fileId": "a2lcBX6axJcYgWizPAwXJQ",
"sync": false "sync": false
...@@ -8388,7 +8388,7 @@ ...@@ -8388,7 +8388,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "57563523-c8bc-4217-9cd5-d480d95686f9" "__uuid__": "86b28aed-c015-429e-b692-07d9ebe70199"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8505,7 +8505,7 @@ ...@@ -8505,7 +8505,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "2dFg2BRxNDIbzNQUJzInwD", "fileId": "2dFg2BRxNDIbzNQUJzInwD",
"sync": false "sync": false
...@@ -8596,7 +8596,7 @@ ...@@ -8596,7 +8596,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "55af890f-7f50-4d5e-bf59-6243d450e592" "__uuid__": "12815c0e-709a-45c0-82fa-b47598152c14"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8713,7 +8713,7 @@ ...@@ -8713,7 +8713,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "426YGeaQ1GSqxAl0es/FZ5", "fileId": "426YGeaQ1GSqxAl0es/FZ5",
"sync": false "sync": false
...@@ -8734,7 +8734,7 @@ ...@@ -8734,7 +8734,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "682aea9b-d4e8-4707-80c1-ecd7f6ca5158" "__uuid__": "af0a9183-6728-4cb3-a89b-69f7098b578e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8756,7 +8756,7 @@ ...@@ -8756,7 +8756,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "1bsWjap9JK84XN2hkYfXDb", "fileId": "1bsWjap9JK84XN2hkYfXDb",
"sync": false "sync": false
...@@ -8789,7 +8789,7 @@ ...@@ -8789,7 +8789,7 @@
"_id": "0bRMt2vnZPnpd9xunK+k1T" "_id": "0bRMt2vnZPnpd9xunK+k1T"
}, },
{ {
"__type__": "b9277ENUs1N4ZGabqIvXPlq", "__type__": "f4c83rnGUJO94TC6cW7IyZ2",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -8804,7 +8804,7 @@ ...@@ -8804,7 +8804,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "ee46dc13-c702-4d0e-855f-f299d4f7502b" "__uuid__": "8531c3cc-2785-4481-8215-5286c62232b9"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
...@@ -9185,7 +9185,7 @@ ...@@ -9185,7 +9185,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c97ed1ad-945d-4414-aad1-0d35b4c81a54" "__uuid__": "58e21ac9-ff26-48a0-b494-7e23adb0062a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -9309,7 +9309,7 @@ ...@@ -9309,7 +9309,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "92581ee0-28e2-4eaa-a2c4-9100ec684f15" "__uuid__": "46778d30-e683-4f23-b4e9-ec428976257b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -9368,7 +9368,7 @@ ...@@ -9368,7 +9368,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "62518ee9-825f-4cf7-817d-3ca205040992" "__uuid__": "87c71c67-09de-4a2e-bd95-537105ab821f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -9551,7 +9551,7 @@ ...@@ -9551,7 +9551,7 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "5a508SMyCxL5bVONr/kW8Ut", "__type__": "6455dJrGGpONJ9dFQy1VHGq",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -9559,7 +9559,7 @@ ...@@ -9559,7 +9559,7 @@
}, },
"_enabled": true, "_enabled": true,
"loadingLayerPrefab": { "loadingLayerPrefab": {
"__uuid__": "dde9221e-a10b-43dc-b877-33a75f573937" "__uuid__": "3f008425-b43a-486c-9504-33b637883127"
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
}, },
...@@ -9711,7 +9711,7 @@ ...@@ -9711,7 +9711,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "df87cef5-4613-4f63-9161-7db1498fbc25" "__uuid__": "a1b648d5-4967-4a0b-a038-141154c364ac"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -9792,7 +9792,7 @@ ...@@ -9792,7 +9792,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "a3f01713-95e7-4f98-92cb-100a06c666e5" "__uuid__": "8fb4751f-142d-4db6-8f5b-d8d957aaa23e"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -9873,7 +9873,7 @@ ...@@ -9873,7 +9873,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "f8fe14b7-324c-4a8e-a985-a9fdec9c9316" "__uuid__": "a5ff4ad1-df8b-4b40-a9cc-31ea778c79db"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -9954,7 +9954,7 @@ ...@@ -9954,7 +9954,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "db824b17-c51b-4f4d-ae73-fc15213e648c" "__uuid__": "e48de654-84b0-450d-88ee-37dc58ee3ab0"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -10035,7 +10035,7 @@ ...@@ -10035,7 +10035,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "ca9966c3-1530-46c2-a813-e56afaf7b957" "__uuid__": "ec925776-742b-4ba4-8375-1e2208cd8e9d"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -10116,7 +10116,7 @@ ...@@ -10116,7 +10116,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "0636b803-a089-44a8-b740-b60963816c5d" "__uuid__": "b9ebcf1b-1ed0-4777-854d-e58b4ac505a0"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -10269,7 +10269,7 @@ ...@@ -10269,7 +10269,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "1b47faa7-c422-46d4-9527-5e44236c08b0" "__uuid__": "e6625480-2bee-4e00-a81e-e9231e7dea77"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -10363,7 +10363,7 @@ ...@@ -10363,7 +10363,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ee30fe25-3341-4fe8-9a60-8d28a0b776f4" "__uuid__": "6e541ee0-758c-4777-a88f-3a2cd256a687"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "fe38acfb-0680-4236-9819-ffdbfffa5e20", "uuid": "79bb6ed8-b4f1-48f2-96e8-24c935a5c1ab",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"subMetas": {} "subMetas": {}
......
...@@ -305,143 +305,144 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -305,143 +305,144 @@ export default class SceneComponent extends MyCocosSceneComponent {
private audioId: any; private audioId: any;
addPieceTouchEventListener(node: cc.Node, color) { addPieceTouchEventListener(node: cc.Node, color) {
node.on(cc.Node.EventType.TOUCH_START, (event: cc.Event.EventTouch) => { return;
const playerMe = this.allPlayerList.find( // node.on(cc.Node.EventType.TOUCH_START, (event: cc.Event.EventTouch) => {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
if (playerMe.color != this._status.current) { // );
this.blinkPiece(node); // if (playerMe.color != this._status.current) {
return; // this.blinkPiece(node);
} // return;
if (this._status.current != color) { // }
this.blinkPiece(node); // if (this._status.current != color) {
return; // this.blinkPiece(node);
} // return;
if (this._status.letter == "") { // }
this.blinkPiece(node); // if (this._status.letter == "") {
return; // this.blinkPiece(node);
} // return;
if (node["cantMove"]) { // }
this.blinkPiece(node); // if (node["cantMove"]) {
return; // this.blinkPiece(node);
} // return;
this.stopRollPiece(node); // }
node["touchStartPos"] = { // this.stopRollPiece(node);
nodeX: node.x, // node["touchStartPos"] = {
nodeY: node.y, // nodeX: node.x,
touchX: event.getLocation().x, // nodeY: node.y,
touchY: event.getLocation().y, // touchX: event.getLocation().x,
}; // touchY: event.getLocation().y,
node.zIndex = 1; // };
this.showStars(node); // node.zIndex = 1;
}); // this.showStars(node);
node.on(cc.Node.EventType.TOUCH_MOVE, (event: cc.Event.EventTouch) => { // });
const playerMe = this.allPlayerList.find( // node.on(cc.Node.EventType.TOUCH_MOVE, (event: cc.Event.EventTouch) => {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
if (playerMe.color != this._status.current) { // );
return; // if (playerMe.color != this._status.current) {
} // return;
if (this._status.current != color) { // }
return; // if (this._status.current != color) {
} // return;
if (this._status.letter == "") { // }
return; // if (this._status.letter == "") {
} // return;
if (node["cantMove"]) { // }
return; // if (node["cantMove"]) {
} // return;
const pos = event.getLocation(); // }
const touchStartPos = node["touchStartPos"]; // const pos = event.getLocation();
const worldNodePos = node.parent.convertToWorldSpaceAR( // const touchStartPos = node["touchStartPos"];
cc.v2(touchStartPos.nodeX, touchStartPos.nodeY) // const worldNodePos = node.parent.convertToWorldSpaceAR(
); // cc.v2(touchStartPos.nodeX, touchStartPos.nodeY)
const nodePos = node.parent.convertToNodeSpaceAR( // );
cc.v2( // const nodePos = node.parent.convertToNodeSpaceAR(
worldNodePos.x + pos.x - touchStartPos.touchX, // cc.v2(
worldNodePos.y + pos.y - touchStartPos.touchY // worldNodePos.x + pos.x - touchStartPos.touchX,
) // worldNodePos.y + pos.y - touchStartPos.touchY
); // )
node.setPosition(nodePos); // );
}); // node.setPosition(nodePos);
node.on(cc.Node.EventType.TOUCH_END, async (event: cc.Event.EventTouch) => { // });
const playerMe = this.allPlayerList.find( // node.on(cc.Node.EventType.TOUCH_END, async (event: cc.Event.EventTouch) => {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
if (playerMe.color != this._status.current) { // );
return; // if (playerMe.color != this._status.current) {
} // return;
if (this._status.current != color) { // }
return; // if (this._status.current != color) {
} // return;
if (this._status.letter == "") { // }
return; // if (this._status.letter == "") {
} // return;
if (node["cantMove"]) { // }
return; // if (node["cantMove"]) {
} // return;
node["cantMove"] = true; // }
if (this.checkNodeInRightBlock(node, color)) { // node["cantMove"] = true;
const idx = this.getNextRightIdx(); // if (this.checkNodeInRightBlock(node, color)) {
const playerMe = this.allPlayerList.find( // const idx = this.getNextRightIdx();
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
this.networkHelper.sendFrame({ // );
type: "right", // this.networkHelper.sendFrame({
idx: idx, // type: "right",
uuid: playerMe.uuid, // idx: idx,
color: playerMe.color, // uuid: playerMe.uuid,
}); // color: playerMe.color,
} else { // });
const playerMe = this.allPlayerList.find( // } else {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
this.networkHelper.sendFrame({ // );
type: "wrong", // this.networkHelper.sendFrame({
uuid: playerMe.uuid, // type: "wrong",
color: playerMe.color, // uuid: playerMe.uuid,
}); // color: playerMe.color,
} // });
}); // }
node.on(cc.Node.EventType.TOUCH_CANCEL, async (event: cc.Event.EventTouch) => { // });
const playerMe = this.allPlayerList.find( // node.on(cc.Node.EventType.TOUCH_CANCEL, async (event: cc.Event.EventTouch) => {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
if (playerMe.color != this._status.current) { // );
return; // if (playerMe.color != this._status.current) {
} // return;
if (this._status.current != color) { // }
return; // if (this._status.current != color) {
} // return;
if (this._status.letter == "") { // }
return; // if (this._status.letter == "") {
} // return;
if (node["cantMove"]) { // }
return; // if (node["cantMove"]) {
} // return;
node["cantMove"] = true; // }
if (this.checkNodeInRightBlock(node, color)) { // node["cantMove"] = true;
const idx = this.getNextRightIdx(); // if (this.checkNodeInRightBlock(node, color)) {
const playerMe = this.allPlayerList.find( // const idx = this.getNextRightIdx();
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
this.networkHelper.sendFrame({ // );
type: "right", // this.networkHelper.sendFrame({
idx: idx, // type: "right",
uuid: playerMe.uuid, // idx: idx,
color: playerMe.color, // uuid: playerMe.uuid,
}); // color: playerMe.color,
} else { // });
const playerMe = this.allPlayerList.find( // } else {
(player) => player.uuid == this.playerId // const playerMe = this.allPlayerList.find(
); // (player) => player.uuid == this.playerId
this.networkHelper.sendFrame({ // );
type: "wrong", // this.networkHelper.sendFrame({
uuid: playerMe.uuid, // type: "wrong",
color: playerMe.color, // uuid: playerMe.uuid,
}); // color: playerMe.color,
} // });
}); // }
// });
} }
blinkPiece(node) { blinkPiece(node) {
...@@ -583,18 +584,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -583,18 +584,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async pieceFindRightBlock(rightBlock, idx) { async pieceFindRightBlock(rightBlock, idx) {
const board = cc.find("Canvas/bg/chessBoard/boardItems");
const color = this._status.current; const color = this._status.current;
const piece = cc.find(`Canvas/bg/chessBoard/piece${color}`); const piece = cc.find(`Canvas/bg/chessBoard/piece${color}`);
const prograssbar = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
);
const mask = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
);
let targetHeight =
(idx / (board.children.length - 2)) * prograssbar.height;
// console.log(idx + "_进度条高:" + targetHeight); // console.log(idx + "_进度条高:" + targetHeight);
const offsetX = { Red: -45, Blue: 45 }; const offsetX = { Red: -45, Blue: 45 };
const offsetY = { Red: -90, Blue: -90 }; const offsetY = { Red: -90, Blue: -90 };
...@@ -639,12 +630,27 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -639,12 +630,27 @@ export default class SceneComponent extends MyCocosSceneComponent {
await this.playLocalAudio("落子"); await this.playLocalAudio("落子");
piece.zIndex = 0; piece.zIndex = 0;
const effectNode = cc.find(`Canvas/bg/Life${color.toLowerCase()}/effect`); }
effectNode.active = true; updateProgress(idx) {
asyncTweenTo(mask, 1, { height: targetHeight }, { easing: "cubicInOut" }); const color = this._status.current;
this.playLocalAudio("进度条升高"); return new Promise(async (resolve, reject) => {
await asyncPlayDragonBoneAnimation(effectNode, "normal", 1); const board = cc.find("Canvas/bg/chessBoard/boardItems");
effectNode.active = false; const prograssbar = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
);
const mask = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
);
let targetHeight =
(idx / (board.children.length - 2)) * prograssbar.height;
const effectNode = cc.find(`Canvas/bg/Life${color.toLowerCase()}/effect`);
effectNode.active = true;
asyncTweenTo(mask, 1, { height: targetHeight }, { easing: "cubicInOut" });
this.playLocalAudio("进度条升高");
await asyncPlayDragonBoneAnimation(effectNode, "normal", 1);
effectNode.active = false;
resolve('');
});
} }
updateStatus(status = null) { updateStatus(status = null) {
...@@ -836,7 +842,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -836,7 +842,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.updateStatus(item.data.status); this.updateStatus(item.data.status);
} else if (item.data.type == "SERVER_playerRoll") { } else if (item.data.type == "SERVER_playerRoll") {
// console.log("SERVER_playerRoll: " + JSON.stringify(item.data)); // console.log("SERVER_playerRoll: " + JSON.stringify(item.data));
const status = this._status; const status = JSON.parse(JSON.stringify(this._status));
status.letter = item.data.letter; status.letter = item.data.letter;
console.log("status.letter = " + status.letter); console.log("status.letter = " + status.letter);
// console.log("item.data.letter = " + item.data.letter); // console.log("item.data.letter = " + item.data.letter);
...@@ -846,7 +852,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -846,7 +852,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (idx == -1) { if (idx == -1) {
console.log("error") console.log("error")
} }
const startIdx = this._status[this._status.current]; const startIdx = status[status.current];
let nextIdx = startIdx + idx + 1; let nextIdx = startIdx + idx + 1;
// const idx = ["G", "H", "I", "J", "K", "L"].findIndex( // const idx = ["G", "H", "I", "J", "K", "L"].findIndex(
// (letter) => letter == status.letter // (letter) => letter == status.letter
...@@ -870,13 +876,13 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -870,13 +876,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
// const idx = this.getNextRightIdx(); // const idx = this.getNextRightIdx();
const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId); const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId);
// console.log("idx->" + idx); // console.log("idx->" + idx);
if (this._status.current == playerMe.color) { if (status.current == playerMe.color) {
let rightBlock = this.getRightBlock(); let rightBlock = this.getRightBlock();
let idx = this.getNextRightIdx(); let idx = this.getNextRightIdx();
const pieceRed = cc.find("Canvas/bg/chessBoard/pieceRed"); const pieceRed = cc.find("Canvas/bg/chessBoard/pieceRed");
const pieceBlue = cc.find("Canvas/bg/chessBoard/pieceBlue"); const pieceBlue = cc.find("Canvas/bg/chessBoard/pieceBlue");
const node = cc.find( const node = cc.find(
`Canvas/bg/chessBoard/piece${this._status.current}` `Canvas/bg/chessBoard/piece${status.current}`
); );
node["touchStartPos"] = { node["touchStartPos"] = {
nodeX: node.x, nodeX: node.x,
...@@ -884,7 +890,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -884,7 +890,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
touchX: node.x, touchX: node.x,
touchY: node.y, touchY: node.y,
}; };
let lastIdx = this._status[playerMe.color]; let lastIdx = status[playerMe.color];
pieceRed["cantMove"] = false; pieceRed["cantMove"] = false;
pieceBlue["cantMove"] = false; pieceBlue["cantMove"] = false;
await this.pieceFindRightBlock(rightBlock, idx); await this.pieceFindRightBlock(rightBlock, idx);
...@@ -893,6 +899,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -893,6 +899,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let isSuccess = await this.showVoice(rightBlock); let isSuccess = await this.showVoice(rightBlock);
this.hideVoice(); this.hideVoice();
if (isSuccess) { if (isSuccess) {
this.updateProgress(idx);
this.networkHelper.sendFrame({ this.networkHelper.sendFrame({
type: "right", type: "right",
idx: nextIdx, idx: nextIdx,
...@@ -911,6 +918,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -911,6 +918,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} else if (item.data.type == "SERVER_playerRight") { } else if (item.data.type == "SERVER_playerRight") {
const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId); const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId);
if (this._status.current == playerMe.color) { if (this._status.current == playerMe.color) {
this._status.letter = ""; this._status.letter = "";
this.changeSide(); this.changeSide();
this.updateStatus(); this.updateStatus();
...@@ -1031,7 +1039,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -1031,7 +1039,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
"fluency": 60, "fluency": 60,
"rhythm": 90, "rhythm": 90,
"kernel_version": "5.2.4", "kernel_version": "5.2.4",
"overall": 25,//75 "overall": 75,//75
"integrity": 100, "integrity": 100,
"duration": "6.779", "duration": "6.779",
"rear_tone": "fall", "rear_tone": "fall",
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "5a50848c-c82c-4be5-b54e-36bfe45bc52d", "uuid": "6455d26b-186a-4e34-9f5d-150cb55471aa",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "559b749b-c187-4bf6-b40a-5984bc873eeb", "uuid": "77873a48-b8f3-477d-a6dd-9ede1a11c05b",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -47,7 +47,7 @@ export class AI { ...@@ -47,7 +47,7 @@ export class AI {
}); });
} else { } else {
//调试加速 2 Math.random() * 3 + 4 //调试加速 2 Math.random() * 3 + 4
await asyncDelay(Math.random() * 3 + 4); await asyncDelay(Math.random() * 1 + 10);
const idx = this.getNextRightIdx(); const idx = this.getNextRightIdx();
if (Math.random() < 0.8) { if (Math.random() < 0.8) {
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "fc3a8943-cac1-4428-94e3-46d6e15f3756", "uuid": "b10281ba-cf2c-48ad-949e-9689d13cdf19",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "d01314f3-42d4-410f-b6ca-04f2dffd36a0", "uuid": "34bbe573-38cd-48fb-a93e-58df3618dd28",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "76bd9373-a817-464a-8821-e426a60d2842", "uuid": "48ce8c61-f2f6-4eb9-8063-4b902a4f55e9",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "659dd691-50ba-4ce6-9d27-73822cb19e66", "uuid": "31806871-cfc5-4048-a347-4e969b89bd04",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "137eafa0-25e5-433a-afcd-7731dde4d72c", "uuid": "2497465a-814c-47f7-93ef-c0dbae6b3474",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "4703197e-4bdf-4d78-9a57-f40586fdd14b", "uuid": "369b3057-1a40-40a9-8bb1-df09f091c125",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "aac6ee1f-13b7-4e9a-a29d-8789e29d74d1", "uuid": "877335ff-2b42-4c9d-8ca7-ed5c8221342b",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "6e4dc084-8c4a-4033-88fc-9f6809a42403", "uuid": "eff4d584-571b-4f86-be6a-fc5316a58a1b",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "c64a5bce-10e7-4dad-b431-60fa642a0746", "uuid": "d5b664d4-066c-4ec6-b139-6d287dfa1f0f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3c757bf2-0ecd-4ca0-bde2-9947e767ba08", "uuid": "b927957f-0395-4b9b-8c92-c83bc3486c27",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4566f3ea-8e09-4b07-999b-e582c2453fb6", "uuid": "feeeeba0-ae39-4a3c-a470-d2cfe9403feb",
"rawTextureUuid": "3c757bf2-0ecd-4ca0-bde2-9947e767ba08", "rawTextureUuid": "b927957f-0395-4b9b-8c92-c83bc3486c27",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d93ee735-f56b-4c67-91a3-77813df17bc0", "uuid": "e7436b8e-1679-4c5f-b455-425b8576e2a4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"chessBoard": { "chessBoard": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "941ac860-68b9-462b-bad7-872bc6f27e2d", "uuid": "11e8bfbd-6c1c-483c-8e28-db4572851423",
"rawTextureUuid": "d93ee735-f56b-4c67-91a3-77813df17bc0", "rawTextureUuid": "e7436b8e-1679-4c5f-b455-425b8576e2a4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d2ac44fb-a7d7-4090-bd3c-0a2d38f2182a", "uuid": "bc57ce90-21eb-46d8-88aa-3665bec7af2e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"dice": { "dice": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e3231203-a109-485d-89a9-1c2841042c4d", "uuid": "35ba8945-a48c-4b40-a934-7f9314c6d17a",
"rawTextureUuid": "d2ac44fb-a7d7-4090-bd3c-0a2d38f2182a", "rawTextureUuid": "bc57ce90-21eb-46d8-88aa-3665bec7af2e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e274f3ee-f4dd-4deb-b7d9-20b579d33094", "uuid": "84bd1b51-89bf-45f8-87e0-711080a74d34",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"dice_bg": { "dice_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3db35003-5c7b-4fb0-9fa7-fb61262c0740", "uuid": "7287e22b-7a76-4bb0-b206-d3550c9b7077",
"rawTextureUuid": "e274f3ee-f4dd-4deb-b7d9-20b579d33094", "rawTextureUuid": "84bd1b51-89bf-45f8-87e0-711080a74d34",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "02eae013-03f5-4689-9a87-deaba3782b2c", "uuid": "e068ea48-6b81-4b74-bd63-b57e6a2d6070",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "ae11ef6c-b1ce-4d01-87f8-061ceb41763f", "uuid": "292b2c9e-5965-4f8d-ae9d-4ade9edb59a6",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "62518ee9-825f-4cf7-817d-3ca205040992", "uuid": "87c71c67-09de-4a2e-bd95-537105ab821f",
"rawTextureUuid": "ae11ef6c-b1ce-4d01-87f8-061ceb41763f", "rawTextureUuid": "292b2c9e-5965-4f8d-ae9d-4ade9edb59a6",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e0390cfa-8733-4f9e-af25-2b1e81a76a88", "uuid": "d247865c-79ec-4148-88e6-389dc2bab045",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"frameBlue": { "frameBlue": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3436847c-ca1a-4a84-b625-097dac6f155a", "uuid": "0ce63327-6337-483a-8ce5-4f0243524055",
"rawTextureUuid": "e0390cfa-8733-4f9e-af25-2b1e81a76a88", "rawTextureUuid": "d247865c-79ec-4148-88e6-389dc2bab045",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "98c856f7-0f3e-485f-a9a5-6a21f12f5c90", "uuid": "e07eef1d-8488-4173-aaae-39cf0ce4f2bc",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"frameRed": { "frameRed": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "08c78aed-b4ab-428f-9f2c-98e255b28a83", "uuid": "2c83b215-9295-4881-9c18-4f67ced307c2",
"rawTextureUuid": "98c856f7-0f3e-485f-a9a5-6a21f12f5c90", "rawTextureUuid": "e07eef1d-8488-4173-aaae-39cf0ce4f2bc",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b412834a-a1e8-4a50-87d1-cdfe78e99edc", "uuid": "7928aab2-519d-4e47-8b5f-30942298832b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"labelLoss": { "labelLoss": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c97ed1ad-945d-4414-aad1-0d35b4c81a54", "uuid": "58e21ac9-ff26-48a0-b494-7e23adb0062a",
"rawTextureUuid": "b412834a-a1e8-4a50-87d1-cdfe78e99edc", "rawTextureUuid": "7928aab2-519d-4e47-8b5f-30942298832b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "aaaed95b-ec34-4b6e-8e8d-8af300acd3c0", "uuid": "b19abc23-9703-4554-b052-b971e42f3d07",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"labelWin": { "labelWin": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "92581ee0-28e2-4eaa-a2c4-9100ec684f15", "uuid": "46778d30-e683-4f23-b4e9-ec428976257b",
"rawTextureUuid": "aaaed95b-ec34-4b6e-8e8d-8af300acd3c0", "rawTextureUuid": "b19abc23-9703-4554-b052-b971e42f3d07",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9a5141cd-b198-42cd-b75e-250487ecb173", "uuid": "7e0f694b-dccc-4891-ba31-daa30e7aa2ff",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"hat": { "hat": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "feb82954-b762-4bdf-baf3-9eea798fd155", "uuid": "ea52d746-5e8f-4361-a1d6-bb6788984cd6",
"rawTextureUuid": "9a5141cd-b198-42cd-b75e-250487ecb173", "rawTextureUuid": "7e0f694b-dccc-4891-ba31-daa30e7aa2ff",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4c4240eb-9936-49e2-95c8-a95a22a92ec2", "uuid": "97016a00-25ee-44d8-8597-2c84a836dd6d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"life": { "life": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a1ee72e4-f764-4530-949b-939aa99d4d1f", "uuid": "d3fb2c91-b9db-4703-a4be-b6207ecf1e98",
"rawTextureUuid": "4c4240eb-9936-49e2-95c8-a95a22a92ec2", "rawTextureUuid": "97016a00-25ee-44d8-8597-2c84a836dd6d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "ccf70080-a30f-4c99-9170-9a46790f283a", "uuid": "4fd77748-9daf-4ec9-a060-93bce9500efc",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5312d162-7431-4ef6-bbeb-56e643a62d2c", "uuid": "6be7765a-77a9-45be-a758-0e771eb445a7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"prograssbar_light": { "prograssbar_light": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "1b47faa7-c422-46d4-9527-5e44236c08b0", "uuid": "e6625480-2bee-4e00-a81e-e9231e7dea77",
"rawTextureUuid": "5312d162-7431-4ef6-bbeb-56e643a62d2c", "rawTextureUuid": "6be7765a-77a9-45be-a758-0e771eb445a7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5c724ec3-8784-4df6-b72f-522648313947", "uuid": "7e9057ea-589d-4370-85b9-dd0b945e4ea7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"star_01": { "star_01": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ee30fe25-3341-4fe8-9a60-8d28a0b776f4", "uuid": "6e541ee0-758c-4777-a88f-3a2cd256a687",
"rawTextureUuid": "5c724ec3-8784-4df6-b72f-522648313947", "rawTextureUuid": "7e9057ea-589d-4370-85b9-dd0b945e4ea7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b64566dd-18f8-4d22-90a3-6ab308d02f8a", "uuid": "849da063-9161-4bb9-a39f-f1b30a13a01e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"pieceBlue": { "pieceBlue": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a7bdcfac-4cab-4d4f-b19a-958198a4760e", "uuid": "4ed1d87b-b24c-4d18-8828-449a71f42a0a",
"rawTextureUuid": "b64566dd-18f8-4d22-90a3-6ab308d02f8a", "rawTextureUuid": "849da063-9161-4bb9-a39f-f1b30a13a01e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3e47604a-f31a-4aa7-ba00-8246204cfbe6", "uuid": "3679478f-1e06-4bcd-afae-875d1640a457",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"pieceRed": { "pieceRed": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6d63be6e-7b96-478f-b646-6f25416a3ada", "uuid": "cf309477-efa7-49ba-be07-3dcb8ef12d4b",
"rawTextureUuid": "3e47604a-f31a-4aa7-ba00-8246204cfbe6", "rawTextureUuid": "3679478f-1e06-4bcd-afae-875d1640a457",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "72266731-5306-4e76-8c8e-35c8c06b6bf8", "uuid": "40ad39fc-70c0-4d24-8473-1b28586d5bc8",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"point": { "point": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "bc241a17-b002-4089-bfeb-66ad64432bad", "uuid": "f1c12517-0209-4af1-bb50-e60ae70bf12b",
"rawTextureUuid": "72266731-5306-4e76-8c8e-35c8c06b6bf8", "rawTextureUuid": "40ad39fc-70c0-4d24-8473-1b28586d5bc8",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2fd6db68-95c6-4a8e-a159-5b2a25586f62", "uuid": "67b20d78-496a-4dbe-aa09-7b92a99b84a7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"prograssbar": { "prograssbar": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "74919549-8118-467e-b388-759ed5b61efc", "uuid": "ef467797-5054-435b-a20c-e84959175b53",
"rawTextureUuid": "2fd6db68-95c6-4a8e-a159-5b2a25586f62", "rawTextureUuid": "67b20d78-496a-4dbe-aa09-7b92a99b84a7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "6b3d13c9-b524-4dc1-a922-f8222571b304", "uuid": "f2192b09-6fbe-49de-9c65-9c11a4143c14",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"prograssbar2": { "prograssbar2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "68c99200-88b2-4fc5-9764-3e570728b8db", "uuid": "6bd6af99-1d7e-4bf7-b96e-63fd2c953a06",
"rawTextureUuid": "6b3d13c9-b524-4dc1-a922-f8222571b304", "rawTextureUuid": "f2192b09-6fbe-49de-9c65-9c11a4143c14",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "39d21daa-f9dd-4fa2-a922-b4fc0d1b4b4f", "uuid": "f5dbd26a-00e2-40dd-bfde-f4e2f34cc035",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "923f2fc1-da1b-48e7-a706-d50efe1ff3e7", "uuid": "15e36dad-890b-4f6c-aa9a-75126a46b6da",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_1": { "bg_1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "2b15c9a7-36cc-4fa4-96b1-ac9e41765c11", "uuid": "66571d96-2ccd-4a7f-a76a-64f2f86b980d",
"rawTextureUuid": "923f2fc1-da1b-48e7-a706-d50efe1ff3e7", "rawTextureUuid": "15e36dad-890b-4f6c-aa9a-75126a46b6da",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e6a20779-adab-45f1-b3bd-43050368d0db", "uuid": "ee9a340a-7541-4752-9b37-4cde4c668f8e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_2": { "bg_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "71edec6b-ea93-4104-9fce-1e5a1e46ee0c", "uuid": "310893ec-f787-4094-9d69-ef7d1ebf4fcb",
"rawTextureUuid": "e6a20779-adab-45f1-b3bd-43050368d0db", "rawTextureUuid": "ee9a340a-7541-4752-9b37-4cde4c668f8e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4ff14c03-775a-491a-9ca8-81e6174606d3", "uuid": "3977c408-898e-46b7-b793-fc511907ebcf",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_3": { "bg_3": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "97c8c2a7-b2b2-4a6d-bd95-27fff1b697dd", "uuid": "68abb800-9e57-4403-bb7f-07f15ffcbf04",
"rawTextureUuid": "4ff14c03-775a-491a-9ca8-81e6174606d3", "rawTextureUuid": "3977c408-898e-46b7-b793-fc511907ebcf",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "a2e22c8c-d117-4499-9d94-581ecfe32e01", "uuid": "7646a134-f9c8-43d5-a2e7-db9338e77470",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "1a6fc14c-3b10-46e3-be51-6c18fb12f41c", "uuid": "e56001b6-32d6-4b9d-a671-c0189ade16d0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"cloud_1": { "cloud_1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a0b59bec-0c56-480e-831d-01eb91cd5dcf", "uuid": "5d55ea22-9373-497e-92da-7c17ed0779c3",
"rawTextureUuid": "1a6fc14c-3b10-46e3-be51-6c18fb12f41c", "rawTextureUuid": "e56001b6-32d6-4b9d-a671-c0189ade16d0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "181c09dd-286c-4f13-83e0-bac541ff6c97", "uuid": "556e3cbb-ae1b-43cb-9a53-aca2afc66fc9",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"cloud_2": { "cloud_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "035dca5f-0680-43a7-9184-062e78ffc847", "uuid": "bf868bed-514c-4bce-b356-bbe7323b822a",
"rawTextureUuid": "181c09dd-286c-4f13-83e0-bac541ff6c97", "rawTextureUuid": "556e3cbb-ae1b-43cb-9a53-aca2afc66fc9",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c45095ec-60af-4ffd-b439-7942bf273f37", "uuid": "00743a75-c86e-4560-81fc-119be7b50c93",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"cloud_3": { "cloud_3": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f5bb9b79-5064-47d2-aff4-994d602c405f", "uuid": "77d53aaf-5c75-4f41-92bd-57d7d4a9ed5f",
"rawTextureUuid": "c45095ec-60af-4ffd-b439-7942bf273f37", "rawTextureUuid": "00743a75-c86e-4560-81fc-119be7b50c93",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "a4dcab3b-fe9f-4ed1-a735-6302386feea8", "uuid": "d05cc9c9-52e2-4db0-8dae-a1d723a6dfda",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"cloud_4": { "cloud_4": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "83cbd90f-4aa7-4ca1-8fe5-5b2945cd4153", "uuid": "24c2b54f-9063-44bc-9c1f-429c7140469c",
"rawTextureUuid": "a4dcab3b-fe9f-4ed1-a735-6302386feea8", "rawTextureUuid": "d05cc9c9-52e2-4db0-8dae-a1d723a6dfda",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "483cd46a-3bed-4d65-b1c2-4e538e847cc3", "uuid": "16f1e33b-b271-4d42-b01e-59b32c36fd5f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "96542a55-a378-4f3a-9daf-cec32aa2bd88", "uuid": "33a51552-8dbc-460f-a16a-dd159ac253d2",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"10_pet": { "10_pet": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "1856a7ad-7a9e-4d40-918b-ea6e4b82698d", "uuid": "89db58e0-8603-42b2-bec9-e3f787518fea",
"rawTextureUuid": "96542a55-a378-4f3a-9daf-cec32aa2bd88", "rawTextureUuid": "33a51552-8dbc-460f-a16a-dd159ac253d2",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4b56ecdd-895d-4858-b2d4-1034852ac26c", "uuid": "61750096-4765-4862-b41d-6123fbd9684f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"11_kid": { "11_kid": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c8e50efe-026c-449a-8b4a-efa866176d94", "uuid": "8f03ff2b-ffad-4855-81bf-7d5f5a2dcc3a",
"rawTextureUuid": "4b56ecdd-895d-4858-b2d4-1034852ac26c", "rawTextureUuid": "61750096-4765-4862-b41d-6123fbd9684f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b1506282-7a6c-4ace-815a-7ce3752da9a3", "uuid": "9643d25d-cb9f-4910-9d47-ba5104a5717d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"12_jef": { "12_jef": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3992b266-de10-472c-9f0c-2548dd57f8a5", "uuid": "d2220d82-64f7-4fcc-9e59-cf8c97f7d790",
"rawTextureUuid": "b1506282-7a6c-4ace-815a-7ce3752da9a3", "rawTextureUuid": "9643d25d-cb9f-4910-9d47-ba5104a5717d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "fbc86163-d23f-468e-b813-d5ee14276aba", "uuid": "871a19b7-b58c-4b29-a9ce-c216d34fa478",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"13_hip": { "13_hip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d6844549-442c-4f7c-b3ab-0f930c5f3e1b", "uuid": "00d145c3-7f56-416f-95b7-61e77fcc9c53",
"rawTextureUuid": "fbc86163-d23f-468e-b813-d5ee14276aba", "rawTextureUuid": "871a19b7-b58c-4b29-a9ce-c216d34fa478",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "23c7a884-6231-4327-9a53-944b5586c79b", "uuid": "7b202f18-b933-44fe-930b-b371483d238e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"14_tip": { "14_tip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "486d70e5-6010-43ec-a04c-e4910c8a82bd", "uuid": "42422d9a-2f21-4fba-8f3c-3092b4a1a8bf",
"rawTextureUuid": "23c7a884-6231-4327-9a53-944b5586c79b", "rawTextureUuid": "7b202f18-b933-44fe-930b-b371483d238e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "df9cf17c-018c-4731-8544-41cfd2dc5172", "uuid": "9b1b0a57-c07f-49e3-affb-d60e1acd1e80",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"15_pen": { "15_pen": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a1d4a4d6-a90d-49d5-a163-169abbaf6573", "uuid": "e44a9c09-79d4-495f-80de-73b418dbaa26",
"rawTextureUuid": "df9cf17c-018c-4731-8544-41cfd2dc5172", "rawTextureUuid": "9b1b0a57-c07f-49e3-affb-d60e1acd1e80",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d9d14fce-4a70-4216-895c-6987f8092150", "uuid": "71539dc4-5905-43d9-8343-0edc6d7ccdea",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"16_bed": { "16_bed": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d229d040-73eb-4a37-90a7-fc83b3315d38", "uuid": "968df0e7-389f-4b9d-96e4-c94000735bad",
"rawTextureUuid": "d9d14fce-4a70-4216-895c-6987f8092150", "rawTextureUuid": "71539dc4-5905-43d9-8343-0edc6d7ccdea",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "1676f784-80e9-472a-8a4e-81e3975e7680", "uuid": "ac91e5c3-cd29-4a0e-b3b0-70e02f36070f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"1_rip": { "1_rip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7cc4db2d-ef55-4d2c-af91-c9de944414cf", "uuid": "7d392809-482e-423a-9eb2-2856d0e809c2",
"rawTextureUuid": "1676f784-80e9-472a-8a4e-81e3975e7680", "rawTextureUuid": "ac91e5c3-cd29-4a0e-b3b0-70e02f36070f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "cae284b2-c7c9-4de0-bcc9-e7d3cf9a5027", "uuid": "e50e6f6c-8c4a-4425-a7b2-859fa7f33156",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"2_egg": { "2_egg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "18b153ba-6583-4b32-a01a-4175aacc0128", "uuid": "64639f9e-9247-404e-9b2e-6d911d958c97",
"rawTextureUuid": "cae284b2-c7c9-4de0-bcc9-e7d3cf9a5027", "rawTextureUuid": "e50e6f6c-8c4a-4425-a7b2-859fa7f33156",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "58330ad0-39e6-4746-9234-92ca245f744c", "uuid": "7d5dac4e-ed09-48f5-8453-c70a705e8691",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"3_ink": { "3_ink": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3e3bcee3-050b-4a54-a280-a3b54524f319", "uuid": "a1bd5385-5c04-4f87-9f3e-7ba7cdf16edd",
"rawTextureUuid": "58330ad0-39e6-4746-9234-92ca245f744c", "rawTextureUuid": "7d5dac4e-ed09-48f5-8453-c70a705e8691",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "aa2897ca-0da8-433e-9d1b-a7f37956db6d", "uuid": "2a78e683-31c3-46bb-bbd2-eb99a2dbe8cd",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"4_web": { "4_web": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "84762310-7b12-482c-b4f8-5c41fa9b076f", "uuid": "ad9d79d2-aeed-4bc0-b48b-8b7b5a2aa088",
"rawTextureUuid": "aa2897ca-0da8-433e-9d1b-a7f37956db6d", "rawTextureUuid": "2a78e683-31c3-46bb-bbd2-eb99a2dbe8cd",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9f17b68e-bb61-4e3b-ba82-8508c42ce02f", "uuid": "36a9f673-00b8-49ac-b6d5-ef01d36ba502",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"5_wet": { "5_wet": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "830ba975-af8f-445a-9df3-13b1933c6665", "uuid": "8fdb3f8e-f4e5-4df0-8df9-0859e271e337",
"rawTextureUuid": "9f17b68e-bb61-4e3b-ba82-8508c42ce02f", "rawTextureUuid": "36a9f673-00b8-49ac-b6d5-ef01d36ba502",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5ed097b3-a861-48ec-91eb-17a9431faf43", "uuid": "cc8352cc-bfbc-46ab-86d2-0167fb37b163",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"6_ten": { "6_ten": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d9cf308e-5d1e-4aa9-9979-802d783fd052", "uuid": "5d7a9c6c-34ef-4756-986c-145c946008d9",
"rawTextureUuid": "5ed097b3-a861-48ec-91eb-17a9431faf43", "rawTextureUuid": "cc8352cc-bfbc-46ab-86d2-0167fb37b163",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c6727f00-ca22-4e06-9db7-345caeec696a", "uuid": "a9620e22-318b-41b2-93d5-85f38e2e4000",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"7_lip": { "7_lip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "89b43fb2-1318-46ca-8fb6-0cb30507c38b", "uuid": "0e094720-51fa-4aa5-b08b-cd81aff4e3cd",
"rawTextureUuid": "c6727f00-ca22-4e06-9db7-345caeec696a", "rawTextureUuid": "a9620e22-318b-41b2-93d5-85f38e2e4000",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "68cea3a6-d0e8-44fa-b873-0366fc60e354", "uuid": "8d6abf4f-0510-44f4-9398-7d5d53f2fcf2",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"8_rib": { "8_rib": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b867111d-721f-460e-af0d-ca9def772496", "uuid": "5daa5873-419c-4a91-a878-32098dbe5956",
"rawTextureUuid": "68cea3a6-d0e8-44fa-b873-0366fc60e354", "rawTextureUuid": "8d6abf4f-0510-44f4-9398-7d5d53f2fcf2",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b1a0c1c2-b95b-4dd5-be27-fdb69efac019", "uuid": "511daf8e-13b5-40dd-88d4-6d1df7df9169",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"9_zip": { "9_zip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0838a405-cc25-4a6c-94e8-7f1478691967", "uuid": "bf7e76a2-dcce-4793-97ad-8cf5e70e8034",
"rawTextureUuid": "b1a0c1c2-b95b-4dd5-be27-fdb69efac019", "rawTextureUuid": "511daf8e-13b5-40dd-88d4-6d1df7df9169",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "aff12e4f-b86b-43ad-a5f0-e31fae3b0a8c", "uuid": "eb8fecd4-fd10-40a1-a5c3-c0d52ff3b744",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"end": { "end": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "760e63a4-c6b3-4cbf-854a-d797994d1450", "uuid": "66ff39ea-b4f0-4529-b4d2-4722468397fd",
"rawTextureUuid": "aff12e4f-b86b-43ad-a5f0-e31fae3b0a8c", "rawTextureUuid": "eb8fecd4-fd10-40a1-a5c3-c0d52ff3b744",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8e44e009-c443-4789-91fd-1731d24098c0", "uuid": "7f9cc84b-37ca-4737-b8e4-3d9f4d285024",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"start": { "start": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e0ff5e53-10ba-458d-85c7-409f175ec32c", "uuid": "3788fcc2-c884-4eb1-83d1-e563f62437e0",
"rawTextureUuid": "8e44e009-c443-4789-91fd-1731d24098c0", "rawTextureUuid": "7f9cc84b-37ca-4737-b8e4-3d9f4d285024",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e6256914-9d2f-47bd-9de2-58c7b112605c", "uuid": "9915ab0b-ede6-4f28-8f48-4b76b4adf870",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"view": { "view": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "31a5b3dc-a4ef-41f0-9552-186ac0f6a24a", "uuid": "7516a95a-396f-4ff8-9764-295984c4d5c9",
"rawTextureUuid": "e6256914-9d2f-47bd-9de2-58c7b112605c", "rawTextureUuid": "9915ab0b-ede6-4f28-8f48-4b76b4adf870",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "5e35bc32-90d7-41c5-8f3c-7441ea807f0d", "uuid": "98ac6eba-9626-48c9-b846-29589492f190",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "7490dc55-49d5-496c-849e-eadba2bbae16", "uuid": "3df05601-9356-4f99-8bd1-ec3af022d63b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_good-job": { "bg_good-job": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "41d003d6-535f-4f5e-881e-18c82445c4d8", "uuid": "addcf027-9d73-4f01-a00b-b78573d873bf",
"rawTextureUuid": "7490dc55-49d5-496c-849e-eadba2bbae16", "rawTextureUuid": "3df05601-9356-4f99-8bd1-ec3af022d63b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "de641746-931c-428e-b64b-f9d5f208dd8d", "uuid": "2d5877be-b4c0-42cb-bcf1-3fc25c9bd717",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_light": { "bg_light": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d06715bc-8dca-4ee7-94df-98e51224a5ff", "uuid": "18408242-d37d-4b4c-be39-895ca636c7fa",
"rawTextureUuid": "de641746-931c-428e-b64b-f9d5f208dd8d", "rawTextureUuid": "2d5877be-b4c0-42cb-bcf1-3fc25c9bd717",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2b12d162-7470-426a-b31d-72fb25bd24a0", "uuid": "54ea4b44-e39f-4fd4-8db0-8a2cb9f8a811",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_nice-try": { "bg_nice-try": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a0e8d330-1989-49dd-afcd-87eb606cbac5", "uuid": "1938c812-9a09-41d2-9213-dbfc4ae43eb3",
"rawTextureUuid": "2b12d162-7470-426a-b31d-72fb25bd24a0", "rawTextureUuid": "54ea4b44-e39f-4fd4-8db0-8a2cb9f8a811",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "7df4f25f-8ae8-4b25-a701-19553f8b0c22", "uuid": "eb09675b-ae5c-4e1a-a56b-9f55c1fef985",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_0": { "progress_0": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9c03272a-6997-48d2-874c-b5a43eefdc70", "uuid": "6fcd516a-6cee-42a6-bb50-b954fc0cf1a5",
"rawTextureUuid": "7df4f25f-8ae8-4b25-a701-19553f8b0c22", "rawTextureUuid": "eb09675b-ae5c-4e1a-a56b-9f55c1fef985",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "107d60f1-5d54-4ef5-b35a-016aa73ad5eb", "uuid": "722398ba-0296-4e65-a890-d8fe3f43b706",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"progress_1": { "progress_1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c9c77d66-8a44-4dd6-a4c7-48e168359a78", "uuid": "c9d2ff59-1d9d-400f-9ba3-1504c962a066",
"rawTextureUuid": "107d60f1-5d54-4ef5-b35a-016aa73ad5eb", "rawTextureUuid": "722398ba-0296-4e65-a890-d8fe3f43b706",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "56e90473-5c87-4dee-ae12-e35bba4235f2", "uuid": "44e58e2a-b785-4ccc-b03b-8982266c5146",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"view_voice": { "view_voice": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "67348881-6dd9-4937-946e-6e6cf4d4067f", "uuid": "4b208868-8bdc-4aaa-87bf-8d692bf09845",
"rawTextureUuid": "56e90473-5c87-4dee-ae12-e35bba4235f2", "rawTextureUuid": "44e58e2a-b785-4ccc-b03b-8982266c5146",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "40a2c5b9-2f6a-4560-abc2-41b31ff91f32", "uuid": "fcff87a7-0609-4651-b383-22fc0f64a4e4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"voice_bg": { "voice_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "90a12ade-ceb0-403a-9964-a414b89ca3fb", "uuid": "0b18510a-54a2-4daf-a9bc-2de3cd70fa99",
"rawTextureUuid": "40a2c5b9-2f6a-4560-abc2-41b31ff91f32", "rawTextureUuid": "fcff87a7-0609-4651-b383-22fc0f64a4e4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "093b9e73-f06d-4dd7-8709-7d0c72155665", "uuid": "914da50b-6360-4193-ae1c-223892076da5",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"tree": { "tree": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b8768a21-c4b7-4aed-aba4-7e072e40a167", "uuid": "a7145287-add2-42b5-b2d4-f004e830c95c",
"rawTextureUuid": "093b9e73-f06d-4dd7-8709-7d0c72155665", "rawTextureUuid": "914da50b-6360-4193-ae1c-223892076da5",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "a2285636-0dcf-485b-a391-a9363a02996b", "uuid": "22a53201-bdea-4dee-a95d-d3c586893541",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"yourturn": { "yourturn": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "45e81ecf-e44f-462a-9ec5-9d5ef9edfda2", "uuid": "0e885166-8261-4f78-96eb-979187718e2c",
"rawTextureUuid": "a2285636-0dcf-485b-a391-a9363a02996b", "rawTextureUuid": "22a53201-bdea-4dee-a95d-d3c586893541",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) { ...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) {
} }
let creatorBasePath = 'CocosCreator'; let creatorBasePath = 'D:\\work\\CocosDashboard_1.0.9\\resources\\.editors\\Creator\\2.4.5\\CocosCreator.exe';
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator"; creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator";
} }
...@@ -349,56 +349,56 @@ module.exports = { ...@@ -349,56 +349,56 @@ module.exports = {
// 清理旧文件 // 清理旧文件
// 构建form // 构建form
await removeDir('dist/form'); // await removeDir('dist/form');
await buildForm(); // await buildForm();
// 替换uuid // 替换uuid
await replaceUuids(); await replaceUuids();
// 改设置为非bundle // 改设置为非bundle
changeSettingToWebDesktop(); // changeSettingToWebDesktop();
// 构建play // // 构建play
await removeDir('dist/play'); // await removeDir('dist/play');
await buildWebDesktop(); // await buildWebDesktop();
await copyDir('build/web-desktop', 'dist/play'); // await copyDir('build/web-desktop', 'dist/play');
replaceIndexHtml(); // replaceIndexHtml();
console.log('构建 web desktop 成功!'); // console.log('构建 web desktop 成功!');
// 改设置为bundle // // 改设置为bundle
changeSettingsToBundle(); // changeSettingsToBundle();
await removeDir('dist/android'); // await removeDir('dist/android');
await buildAndroidBundle(); // await buildAndroidBundle();
await copyDir('build_android/jsb-link/remote', 'dist/android'); // await copyDir('build_android/jsb-link/remote', 'dist/android');
console.log('构建 android bundle 成功!'); // console.log('构建 android bundle 成功!');
await removeDir('dist/ios'); // await removeDir('dist/ios');
await buildIosBundle(); // await buildIosBundle();
await copyDir('build_ios/jsb-link/remote', 'dist/ios'); // await copyDir('build_ios/jsb-link/remote', 'dist/ios');
console.log('构建 ios bundle 成功!'); // console.log('构建 ios bundle 成功!');
await removeDir('dist/web_desktop'); // await removeDir('dist/web_desktop');
await buildWebBundle(); // await buildWebBundle();
await copyDir(`build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop'); // await copyDir(`build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop');
console.log('构建 web bundle 成功!'); // console.log('构建 web bundle 成功!');
// 改设置为非bundle // // 改设置为非bundle
changeSettingToWebDesktop(); // changeSettingToWebDesktop();
createConfigFile(projectName); // createConfigFile(projectName);
compressAll(projectName); // compressAll(projectName);
await removeDir('build'); // await removeDir('build');
await removeDir('build_android'); // await removeDir('build_android');
await removeDir('build_ios'); // await removeDir('build_ios');
await removeDir('build_web_desktop'); // await removeDir('build_web_desktop');
const endTime = new Date().getTime(); // const endTime = new Date().getTime();
const duration = new Date(endTime - startTime); // const duration = new Date(endTime - startTime);
console.log(`打包完成!`); // console.log(`打包完成!`);
console.log(`用时${duration.getMinutes()}分${duration.getSeconds()}秒。`); // console.log(`用时${duration.getMinutes()}分${duration.getSeconds()}秒。`);
}, },
buildAndroid: async function () { buildAndroid: async function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment