Commit 8151b7ef authored by yu's avatar yu

6.23修改

parent d44b3bc9
{ {"ver":"1.1.2","uuid":"dc093928-4a71-4fe9-bbe2-e85e54e2404e","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
"ver": "1.1.2", \ No newline at end of file
"uuid": "0b8bef42-5045-4dc7-b5c8-04df72fa967a",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "945d5d0e-1b05-4e27-88f5-d8315f4f8955", "uuid": "b5ae3c33-8510-4eb5-ab10-3f1545d7d087",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "dbf5caaa-d303-4598-8874-54c414cae4af", "uuid": "3092124b-8023-4487-99e4-8cb545256e45",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.410612, "duration": 1.410612,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "a300ce77-2748-4d1d-a564-df739bea7653", "uuid": "939c8f68-8162-402f-ade2-8e72a2d363f6",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.130612, "duration": 0.130612,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "91cbe320-bb88-4d89-8274-4bae5a5c613c", "uuid": "16fe2581-81a8-43d6-81b7-1678bcdcc381",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.496327, "duration": 0.496327,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "326d6a8a-46b7-4a65-8987-16be449367df", "uuid": "996abacb-b041-4aa4-a238-23ac3c0858f8",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.619592, "duration": 1.619592,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "47946d92-b3e1-4eb2-b153-10f23f015214", "uuid": "06f5009f-64ab-45b5-bbe3-81f55d2b6325",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "f44daac1-2ed5-4dab-a2ce-3c99da76f32b", "uuid": "3a803da4-6637-4bf4-9aa3-9c387c0d54e0",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "0f348577-177a-47ae-80b4-4caa32c9b400", "uuid": "e0f45382-4164-4c42-8041-0c6a53f3bdcc",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e3caa708-9f74-4b92-a08f-59b5aae1034c", "uuid": "6eb40df6-4a83-44fb-99cb-018afedc2988",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"cannon_tex": { "cannon_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3de562ef-76c6-4c63-8d48-5e5616c4b9db", "uuid": "e7169094-7220-494c-ba5b-2ac33821c72a",
"rawTextureUuid": "e3caa708-9f74-4b92-a08f-59b5aae1034c", "rawTextureUuid": "6eb40df6-4a83-44fb-99cb-018afedc2988",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "ae0d6056-f9e5-48d1-99d0-11df0a913f5d", "uuid": "8ba499eb-4d0c-404c-a591-4ed881427b19",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "44b7c994-54f2-4f0f-9ac9-cf09ec2e3df6", "uuid": "63227af1-1ddd-448d-a3f4-21ce49deb0d8",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5b80eb61-2581-4584-9a9e-4da0ad4dbbb0", "uuid": "cddfb415-113d-4f62-a5ce-f7de44b0488f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"smoke_tex": { "smoke_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "480b7874-ca43-4e54-847e-76244ea8a1f4", "uuid": "78a09bd1-fb60-4a07-819b-62c06dd1eb1c",
"rawTextureUuid": "5b80eb61-2581-4584-9a9e-4da0ad4dbbb0", "rawTextureUuid": "cddfb415-113d-4f62-a5ce-f7de44b0488f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "aa7b55e1-dab4-4d30-86d8-ebc1881ce78d", "uuid": "68eb4bc8-d4a6-44db-a01f-33a68b56d227",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "001bbdda-bdb6-4b66-9129-7c023000c8c7", "uuid": "0fda1df4-b566-4f56-934d-351ba3eee1fc",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "4398de9b-3a89-4c33-919f-7d323b602208", "uuid": "695e3272-d0e3-484c-8b6a-d987276b10d1",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "0c0d1cee-c023-48b9-a550-2753eaf75633", "uuid": "f19559b1-601f-471f-84a3-c0f1c2b3f8c9",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"speak_tex": { "speak_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ca3d9ce0-c6c3-4c0d-9474-08fe4122b52a", "uuid": "39454c3e-e37d-4f5c-858f-0cc2dbb0fe2b",
"rawTextureUuid": "0c0d1cee-c023-48b9-a550-2753eaf75633", "rawTextureUuid": "f19559b1-601f-471f-84a3-c0f1c2b3f8c9",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "0285fb60-fa4a-4923-9b9c-e1da60f0cc3d", "uuid": "f90c883d-07d9-4d9a-9726-f4331880a931",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "a83e8433-286d-4232-a9d4-2a310dce4e8d", "uuid": "f5d0a070-678a-4ec1-ac67-1d1813f13c72",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "5669bf47-55dc-4e2f-8332-3d17b6170436", "uuid": "fe3b0844-4004-4617-aaf9-a27a585bb683",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "861f498a-b902-4bd4-af9a-a520620d3564", "uuid": "dac38290-0ce8-446f-8ea0-c454bdba7a3f",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "d96c76e1-bce1-42e1-8eaa-19ba3726d599", "uuid": "ab449f20-54ff-4a06-8967-b99b328fe6a4",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "89c8a795-4b6c-4715-b803-c3e2c2a613ba", "uuid": "5eba7347-e020-43bd-9b6c-172cad9d5dce",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "90f02105-42fe-4e8d-a506-e5a155a62c0c", "uuid": "f8d29213-71e0-4222-ba8d-2cdd97725a6f",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "3f846ce4-6084-4db6-9ab5-8e1d5f6f5445", "uuid": "c9602f27-41ef-4d2f-8b90-dade09911e40",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"_id": "409d19f5-2c4b-4a71-bd34-84ec0c3a3fce" "_id": "723bc44a-cb11-4b47-a176-d4962157411f"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "5669bf47-55dc-4e2f-8332-3d17b6170436" "__uuid__": "fe3b0844-4004-4617-aaf9-a27a585bb683"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7ee60292-c82a-4606-a93f-6fdbe72fbb88" "__uuid__": "1de0daeb-9695-4ce4-80cc-78bd037807f2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -771,7 +771,7 @@ ...@@ -771,7 +771,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "a300ce77-2748-4d1d-a564-df739bea7653" "__uuid__": "939c8f68-8162-402f-ade2-8e72a2d363f6"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -852,7 +852,7 @@ ...@@ -852,7 +852,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "dbf5caaa-d303-4598-8874-54c414cae4af" "__uuid__": "3092124b-8023-4487-99e4-8cb545256e45"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -933,7 +933,7 @@ ...@@ -933,7 +933,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "91cbe320-bb88-4d89-8274-4bae5a5c613c" "__uuid__": "16fe2581-81a8-43d6-81b7-1678bcdcc381"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -1014,7 +1014,7 @@ ...@@ -1014,7 +1014,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "326d6a8a-46b7-4a65-8987-16be449367df" "__uuid__": "996abacb-b041-4aa4-a238-23ac3c0858f8"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -1177,7 +1177,7 @@ ...@@ -1177,7 +1177,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9b3e85e2-3c05-4d1e-87d3-57226444ceb2" "__uuid__": "42f24278-f2a5-4f54-a2ce-a70e0f467e1e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1301,7 +1301,7 @@ ...@@ -1301,7 +1301,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4c851b90-6031-47c6-9d65-51ecdc7be283" "__uuid__": "7faa5af6-999b-480b-a721-ea3af54af00a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1425,7 +1425,7 @@ ...@@ -1425,7 +1425,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3166e3b9-ab52-4629-962a-f03cad653204" "__uuid__": "79d78ea5-badd-4d52-b0ee-1d3e5c305b4f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2184,7 +2184,7 @@ ...@@ -2184,7 +2184,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7f1177d4-1a3e-40a8-8722-0d349523afce" "__uuid__": "0c0dc4a1-ed3d-4260-ba68-ff900f727282"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2281,7 +2281,7 @@ ...@@ -2281,7 +2281,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "89c3bf5e-2dd6-4b02-92f4-f281b96e15dd" "__uuid__": "4845501e-631f-4923-8119-521e4a0e9a19"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2405,7 +2405,7 @@ ...@@ -2405,7 +2405,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f0dcc359-81b5-402f-8d35-eee76f09ac9f" "__uuid__": "ed255505-bd8a-46bd-b5db-58766adfa502"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2529,7 +2529,7 @@ ...@@ -2529,7 +2529,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ca9a3af3-8f13-4264-8eaa-552eaf9349fa" "__uuid__": "754846ce-196b-48b9-9c9d-0252c1ca81e1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2653,7 +2653,7 @@ ...@@ -2653,7 +2653,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": 1, "playTimes": 1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "f44daac1-2ed5-4dab-a2ce-3c99da76f32b#0f348577-177a-47ae-80b4-4caa32c9b400", "_armatureKey": "3a803da4-6637-4bf4-9aa3-9c387c0d54e0#e0f45382-4164-4c42-8041-0c6a53f3bdcc",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -2661,10 +2661,10 @@ ...@@ -2661,10 +2661,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "f44daac1-2ed5-4dab-a2ce-3c99da76f32b" "__uuid__": "3a803da4-6637-4bf4-9aa3-9c387c0d54e0"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "0f348577-177a-47ae-80b4-4caa32c9b400" "__uuid__": "e0f45382-4164-4c42-8041-0c6a53f3bdcc"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -2729,7 +2729,7 @@ ...@@ -2729,7 +2729,7 @@
"_id": "6d/xkK9vtPM5OWw2x5Nqun" "_id": "6d/xkK9vtPM5OWw2x5Nqun"
}, },
{ {
"__type__": "2c2028JgG1JXqBzFm9uarVv", "__type__": "0b576NkGZdEEIPdHgsjXOlQ",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2908,7 +2908,7 @@ ...@@ -2908,7 +2908,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "927259e4-4565-4869-ba6e-4be552c83719" "__uuid__": "1f322b82-f55e-4c2c-8ed7-9ce163ab64b9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3002,7 +3002,7 @@ ...@@ -3002,7 +3002,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6b936750-ba44-4291-bd3b-5ca8930e0cfc" "__uuid__": "e2c7cf44-05b9-435b-aee4-b972856cb92e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3101,7 +3101,7 @@ ...@@ -3101,7 +3101,7 @@
"_lineHeight": 70, "_lineHeight": 70,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "d96c76e1-bce1-42e1-8eaa-19ba3726d599" "__uuid__": "ab449f20-54ff-4a06-8967-b99b328fe6a4"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -3196,7 +3196,7 @@ ...@@ -3196,7 +3196,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": 1, "playTimes": 1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "ae0d6056-f9e5-48d1-99d0-11df0a913f5d#44b7c994-54f2-4f0f-9ac9-cf09ec2e3df6", "_armatureKey": "8ba499eb-4d0c-404c-a591-4ed881427b19#63227af1-1ddd-448d-a3f4-21ce49deb0d8",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -3204,10 +3204,10 @@ ...@@ -3204,10 +3204,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "ae0d6056-f9e5-48d1-99d0-11df0a913f5d" "__uuid__": "8ba499eb-4d0c-404c-a591-4ed881427b19"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "44b7c994-54f2-4f0f-9ac9-cf09ec2e3df6" "__uuid__": "63227af1-1ddd-448d-a3f4-21ce49deb0d8"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -3295,7 +3295,7 @@ ...@@ -3295,7 +3295,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f59cd3d0-91e2-4f1d-a85b-5e47f110fcaa" "__uuid__": "1e7a45e2-7b9f-496a-9a15-22c87b2ba79c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3389,7 +3389,7 @@ ...@@ -3389,7 +3389,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "dc78b1d9-264e-4119-86cd-001d95698734" "__uuid__": "91156914-91be-46d7-8c5f-23d1cd8dbb9b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3560,7 +3560,7 @@ ...@@ -3560,7 +3560,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5d0c0324-3a46-40f2-96c7-226447a3916e" "__uuid__": "78714de0-4076-4950-bb2c-035d3d1dd6a8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3654,7 +3654,7 @@ ...@@ -3654,7 +3654,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d41947b8-967e-42d4-8c27-e295b13604f9" "__uuid__": "3720fcdc-776d-4e12-bf80-94078906704a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3845,7 +3845,7 @@ ...@@ -3845,7 +3845,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": 1, "playTimes": 1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "ae0d6056-f9e5-48d1-99d0-11df0a913f5d#44b7c994-54f2-4f0f-9ac9-cf09ec2e3df6", "_armatureKey": "8ba499eb-4d0c-404c-a591-4ed881427b19#63227af1-1ddd-448d-a3f4-21ce49deb0d8",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -3853,10 +3853,10 @@ ...@@ -3853,10 +3853,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "ae0d6056-f9e5-48d1-99d0-11df0a913f5d" "__uuid__": "8ba499eb-4d0c-404c-a591-4ed881427b19"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "44b7c994-54f2-4f0f-9ac9-cf09ec2e3df6" "__uuid__": "63227af1-1ddd-448d-a3f4-21ce49deb0d8"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
...@@ -3944,7 +3944,7 @@ ...@@ -3944,7 +3944,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f59cd3d0-91e2-4f1d-a85b-5e47f110fcaa" "__uuid__": "1e7a45e2-7b9f-496a-9a15-22c87b2ba79c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4038,7 +4038,7 @@ ...@@ -4038,7 +4038,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "dc78b1d9-264e-4119-86cd-001d95698734" "__uuid__": "91156914-91be-46d7-8c5f-23d1cd8dbb9b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4303,7 +4303,7 @@ ...@@ -4303,7 +4303,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6ebbf89e-24ad-4e13-ae0b-e83ea8e05cf8" "__uuid__": "b348fe13-1598-4c41-b4d3-ddf0646cc16c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4347,7 +4347,7 @@ ...@@ -4347,7 +4347,7 @@
"_id": "606WdhjQNIXJSuBiEVT4vE" "_id": "606WdhjQNIXJSuBiEVT4vE"
}, },
{ {
"__type__": "fdb2bNEMD5H8qokNW+SDgfR", "__type__": "ad3edHeJyRF3a51wkHfCKGh",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -4629,7 +4629,7 @@ ...@@ -4629,7 +4629,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c9c93c22-8d20-43b7-8e49-150d9f2386d6" "__uuid__": "c18f7aa2-458c-4246-b9e0-ed37b42a6ed2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4728,7 +4728,7 @@ ...@@ -4728,7 +4728,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "90f02105-42fe-4e8d-a506-e5a155a62c0c" "__uuid__": "f8d29213-71e0-4222-ba8d-2cdd97725a6f"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -4823,7 +4823,7 @@ ...@@ -4823,7 +4823,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7c79d8b5-5ee8-4fa2-a75e-13a18e11f556" "__uuid__": "dc8c3186-7bcf-4854-b150-0640e580a7a1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5192,7 +5192,7 @@ ...@@ -5192,7 +5192,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a325249f-d1c5-43f1-b6e7-53e448d045c3" "__uuid__": "b81cb9d6-1734-46ff-85a9-778a9c22323c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5286,7 +5286,7 @@ ...@@ -5286,7 +5286,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0bc2825a-a665-4321-92c7-b4bc225295f6" "__uuid__": "1bed66da-4e54-415f-b652-f0d68cdb8561"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5380,7 +5380,7 @@ ...@@ -5380,7 +5380,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "71d6b0e4-9719-4d40-b7a8-80282822d140" "__uuid__": "1f2666b5-07ce-4edb-949e-3d18204140e3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5536,7 +5536,7 @@ ...@@ -5536,7 +5536,7 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "059851rqGNA4rpCN3XlWbES", "__type__": "43239VM2M9OG6zMVp0omT5r",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "409d19f5-2c4b-4a71-bd34-84ec0c3a3fce", "uuid": "723bc44a-cb11-4b47-a176-d4962157411f",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"subMetas": {} "subMetas": {}
......
...@@ -200,7 +200,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -200,7 +200,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let btn_kaba3 = this.btn_laba.getChildByName("btn_laba3"); let btn_kaba3 = this.btn_laba.getChildByName("btn_laba3");
btn_kaba2.active = true; btn_kaba2.active = true;
btn_kaba3.active = true; btn_kaba3.active = true;
cc.audioEngine.stopAllEffects();
let count = 0; let count = 0;
if (this.intervalId) clearInterval(this.intervalId); if (this.intervalId) clearInterval(this.intervalId);
let stop = false; let stop = false;
...@@ -211,7 +211,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -211,7 +211,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (stop && count % 3 == 2) clearInterval(this.intervalId); if (stop && count % 3 == 2) clearInterval(this.intervalId);
}, 150) }, 150)
pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().audio).then(() => { stop = true; }) pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().audio, () => {
stop = true;
}).then(() => { })
} }
} }
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "05985d6b-a863-40e2-ba42-3775e559b112", "uuid": "4323954c-d8cf-4e1b-accc-569d28993e6b",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "3b921bd9-8a2f-4453-895e-b5943e748d60", "uuid": "7f5618f6-1434-45e4-b2f3-0feeeaca9536",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -211,7 +211,7 @@ export default class layout_cannon extends cc.Component { ...@@ -211,7 +211,7 @@ export default class layout_cannon extends cc.Component {
cc.tween(icon_shell).to(0.5, { y: -135 }).delay(1).call(() => { cc.tween(icon_shell).to(0.5, { y: -135 }).delay(1).call(() => {
icon_shell.active = false; icon_shell.active = false;
icon_shell.y = 0; icon_shell.y = 0;
if (this.wrongNum >= 2 || (Game.getIns().getCurrentPage().checkMore && this.rightNum >= 1)) { if (this.wrongNum >= 2 ) {//|| (Game.getIns().getCurrentPage().checkMore && this.rightNum >= 1)
pg.event.emit("game_time_over"); pg.event.emit("game_time_over");
} }
this.touch = false; this.touch = false;
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "2c202f09-806d-495e-a073-166f6e6ab56f", "uuid": "0b576364-1997-4410-83dd-1e0b235ce950",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "86d713c0-8182-403d-b248-b6d89b96fc22", "uuid": "5ffa891d-2f9c-4559-b92c-c96d0ecc3a9a",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "fdb2b344-303e-47f2-aa24-356f920e07d1", "uuid": "ad3ed1de-2724-45dd-ae75-c241df08a1a1",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "23e951c7-bc8b-4b05-87f7-497f916d716f", "uuid": "392612d5-7863-45c6-9340-89ccb605e152",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
import { count } from "console";
export enum FISH_OUT { export enum FISH_OUT {
RUNNING, RUNNING,
TOUCH, TOUCH,
...@@ -196,15 +198,14 @@ export default class Game { ...@@ -196,15 +198,14 @@ export default class Game {
this.page += 1; this.page += 1;
} }
get getTotla() { get getTotla() {
// let count = 0; let count = 0;
// this.data.forEach(item => { this.data.forEach(item => {
// item.options.forEach((op) => { item.options.forEach((op) => {
// if (op.right) count++; if (op.right) count++;
// }) })
});
// }); return count;
// return this.data.length;
return this.data.length;
} }
get isOver() { get isOver() {
return this.page > this.lists.length; return this.page > this.lists.length;
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "5fbcedfa-ac7a-43c4-bfef-2b1a961a1f5b", "uuid": "39f86c1f-d863-499a-b486-d58c191cd202",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "7c23f2f5-1cc8-43d3-94ca-461229062570", "uuid": "536a2c2c-522f-4009-8b9a-1a3107ae2b36",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "8505beff-6225-4ba6-820e-d30529a5ae0e", "uuid": "4354a58f-302e-49cd-bee3-113e2a3b7b2d",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "59f2b078-f3b0-4a65-93f8-cdddfc773361", "uuid": "374f4b9c-1454-4e33-b8ab-1bfb3434585c",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "cb99e402-6724-4811-a116-b581f499fcf1", "uuid": "2ca279b3-fc7b-428d-85c4-eaa4fce76368",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "f7f1cf67-96ae-4361-93b6-5711637e2eaf", "uuid": "1671a640-fe6d-43ad-8467-1254a15f5b67",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "f680f4a3-dbc7-4d5e-ab08-07e5752a5f83", "uuid": "b38a2c93-d490-479d-8278-51026d13020d",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "ccfcd337-1b1e-412a-b118-aee99d459403", "uuid": "f3f2f760-0201-49ce-b7bb-b0f835cedcb3",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9eb89c84-1cc7-42c9-ac57-df702f77dcef", "uuid": "d01122b3-78b7-4e27-948c-7c3db83be3f2",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"1orange": { "1orange": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "17487daf-3875-48b5-9884-fb0a0bccd3d5", "uuid": "fd323ad8-460a-49b0-b4f7-0bce76e27958",
"rawTextureUuid": "9eb89c84-1cc7-42c9-ac57-df702f77dcef", "rawTextureUuid": "d01122b3-78b7-4e27-948c-7c3db83be3f2",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "75516bff-fc79-4ad2-a5a4-86ef8fb7574c", "uuid": "2ffc17e5-3ed0-4813-ac38-a9c6819acc7f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "43a14bd3-2751-408d-b517-bc43c9c1ef0f", "uuid": "67c8af96-5932-4524-a65f-aaaefe51b91e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_bg": { "bg_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4c851b90-6031-47c6-9d65-51ecdc7be283", "uuid": "7faa5af6-999b-480b-a721-ea3af54af00a",
"rawTextureUuid": "43a14bd3-2751-408d-b517-bc43c9c1ef0f", "rawTextureUuid": "67c8af96-5932-4524-a65f-aaaefe51b91e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "33f1f55f-6ec5-40d5-94b4-0b8e75add11a", "uuid": "316927cb-f4f6-47aa-9b0c-3dde222e9735",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_cannon-front": { "bg_cannon-front": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f0dcc359-81b5-402f-8d35-eee76f09ac9f", "uuid": "ed255505-bd8a-46bd-b5db-58766adfa502",
"rawTextureUuid": "33f1f55f-6ec5-40d5-94b4-0b8e75add11a", "rawTextureUuid": "316927cb-f4f6-47aa-9b0c-3dde222e9735",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "6ef4ffde-6cf6-447b-a1e9-87e9e19d0c94", "uuid": "412ec62f-c4dc-4600-a6ad-f78b580d90fe",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_cannon-left": { "bg_cannon-left": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "89c3bf5e-2dd6-4b02-92f4-f281b96e15dd", "uuid": "4845501e-631f-4923-8119-521e4a0e9a19",
"rawTextureUuid": "6ef4ffde-6cf6-447b-a1e9-87e9e19d0c94", "rawTextureUuid": "412ec62f-c4dc-4600-a6ad-f78b580d90fe",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c83fe42f-1bbc-4e74-91a1-b3d081a9ff71", "uuid": "963cc926-14a9-454a-9b57-da697c08151d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_cannon-right": { "bg_cannon-right": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ca9a3af3-8f13-4264-8eaa-552eaf9349fa", "uuid": "754846ce-196b-48b9-9c9d-0252c1ca81e1",
"rawTextureUuid": "c83fe42f-1bbc-4e74-91a1-b3d081a9ff71", "rawTextureUuid": "963cc926-14a9-454a-9b57-da697c08151d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "1140808b-49a1-4cef-93fa-90695eaeae63", "uuid": "601d7183-91cb-4e66-a7d5-a6ef48a9e014",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_di": { "bg_di": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c9c93c22-8d20-43b7-8e49-150d9f2386d6", "uuid": "c18f7aa2-458c-4246-b9e0-ed37b42a6ed2",
"rawTextureUuid": "1140808b-49a1-4cef-93fa-90695eaeae63", "rawTextureUuid": "601d7183-91cb-4e66-a7d5-a6ef48a9e014",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "def482d3-315c-4649-951e-fca9c93bb2ba", "uuid": "ea684ff8-611c-44d4-9ecf-6b2461a5b9c9",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_front": { "bg_front": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3166e3b9-ab52-4629-962a-f03cad653204", "uuid": "79d78ea5-badd-4d52-b0ee-1d3e5c305b4f",
"rawTextureUuid": "def482d3-315c-4649-951e-fca9c93bb2ba", "rawTextureUuid": "ea684ff8-611c-44d4-9ecf-6b2461a5b9c9",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8d70192f-61cb-44c1-be63-2ac601af8521", "uuid": "5bf835f7-e9c9-4e30-892f-b74dbf973cff",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_pic-right": { "bg_pic-right": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "5d0c0324-3a46-40f2-96c7-226447a3916e", "uuid": "78714de0-4076-4950-bb2c-035d3d1dd6a8",
"rawTextureUuid": "8d70192f-61cb-44c1-be63-2ac601af8521", "rawTextureUuid": "5bf835f7-e9c9-4e30-892f-b74dbf973cff",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f861632a-ccce-4004-a41a-9050a7ed4654", "uuid": "8aa357b8-35fa-424a-8882-1e7b4c2d4fee",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_pic": { "bg_pic": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d41947b8-967e-42d4-8c27-e295b13604f9", "uuid": "3720fcdc-776d-4e12-bf80-94078906704a",
"rawTextureUuid": "f861632a-ccce-4004-a41a-9050a7ed4654", "rawTextureUuid": "8aa357b8-35fa-424a-8882-1e7b4c2d4fee",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "45ea3631-4a06-43a1-ad03-45da5ea4f290", "uuid": "edeba0eb-ca42-46b9-aeac-a5a8e0d45231",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_sky": { "bg_sky": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9b3e85e2-3c05-4d1e-87d3-57226444ceb2", "uuid": "42f24278-f2a5-4f54-a2ce-a70e0f467e1e",
"rawTextureUuid": "45ea3631-4a06-43a1-ad03-45da5ea4f290", "rawTextureUuid": "edeba0eb-ca42-46b9-aeac-a5a8e0d45231",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "db2513c5-5364-4c15-a79d-edc88e5992dd", "uuid": "fbda8bf0-581c-46b0-a6f7-68b4c21dea2b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_title": { "bg_title": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6ebbf89e-24ad-4e13-ae0b-e83ea8e05cf8", "uuid": "b348fe13-1598-4c41-b4d3-ddf0646cc16c",
"rawTextureUuid": "db2513c5-5364-4c15-a79d-edc88e5992dd", "rawTextureUuid": "fbda8bf0-581c-46b0-a6f7-68b4c21dea2b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4793651d-84c6-4d7a-9358-db8cfe5a27bb", "uuid": "9dce06b9-c218-41b7-a0a7-f0c8e99d51c9",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_word-right": { "bg_word-right": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "927259e4-4565-4869-ba6e-4be552c83719", "uuid": "1f322b82-f55e-4c2c-8ed7-9ce163ab64b9",
"rawTextureUuid": "4793651d-84c6-4d7a-9358-db8cfe5a27bb", "rawTextureUuid": "9dce06b9-c218-41b7-a0a7-f0c8e99d51c9",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8ad73397-5f2f-45b2-89a3-3d5d1f6e94b4", "uuid": "3a7a8adb-34f1-44cb-97d0-d180c982cb05",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_word": { "bg_word": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6b936750-ba44-4291-bd3b-5ca8930e0cfc", "uuid": "e2c7cf44-05b9-435b-aee4-b972856cb92e",
"rawTextureUuid": "8ad73397-5f2f-45b2-89a3-3d5d1f6e94b4", "rawTextureUuid": "3a7a8adb-34f1-44cb-97d0-d180c982cb05",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f3e5918b-f9be-4169-93e5-4771e44c1478", "uuid": "302d3355-a421-429a-b587-67ce86011f02",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_laba": { "btn_laba": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a325249f-d1c5-43f1-b6e7-53e448d045c3", "uuid": "b81cb9d6-1734-46ff-85a9-778a9c22323c",
"rawTextureUuid": "f3e5918b-f9be-4169-93e5-4771e44c1478", "rawTextureUuid": "302d3355-a421-429a-b587-67ce86011f02",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "dca21148-8b55-4ffe-a4ed-d0e6567bb529", "uuid": "c038ec80-2c68-4b2d-90d9-856a389ab736",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_laba2": { "btn_laba2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0bc2825a-a665-4321-92c7-b4bc225295f6", "uuid": "1bed66da-4e54-415f-b652-f0d68cdb8561",
"rawTextureUuid": "dca21148-8b55-4ffe-a4ed-d0e6567bb529", "rawTextureUuid": "c038ec80-2c68-4b2d-90d9-856a389ab736",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "626c3f8d-0d4c-4fd9-8cf7-987d293f7414", "uuid": "56112314-8e24-460f-b3f5-8fbfdb58f582",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_laba3": { "btn_laba3": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "71d6b0e4-9719-4d40-b7a8-80282822d140", "uuid": "1f2666b5-07ce-4edb-949e-3d18204140e3",
"rawTextureUuid": "626c3f8d-0d4c-4fd9-8cf7-987d293f7414", "rawTextureUuid": "56112314-8e24-460f-b3f5-8fbfdb58f582",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4cd0c381-4adb-47cc-88d1-898499087172", "uuid": "15e4e1a5-d5de-4278-93c1-26b2a759dc79",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_restart": { "btn_restart": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "3cf25abd-faab-48b6-9128-d7030c57db67", "uuid": "4986c610-4001-4384-aa63-328485ad5283",
"rawTextureUuid": "4cd0c381-4adb-47cc-88d1-898499087172", "rawTextureUuid": "15e4e1a5-d5de-4278-93c1-26b2a759dc79",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "aa1372dc-7897-40d1-9b93-8b1b560e334e", "uuid": "a2f8f528-33de-4522-af7b-1948b4696d2f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_start": { "btn_start": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7c79d8b5-5ee8-4fa2-a75e-13a18e11f556", "uuid": "dc8c3186-7bcf-4854-b150-0640e580a7a1",
"rawTextureUuid": "aa1372dc-7897-40d1-9b93-8b1b560e334e", "rawTextureUuid": "a2f8f528-33de-4522-af7b-1948b4696d2f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "aecde87a-58b2-460b-a12c-56038562d36a", "uuid": "1d8fdf60-f8d1-42c4-b79f-02d8c17f47f8",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_arrow": { "icon_arrow": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "dc78b1d9-264e-4119-86cd-001d95698734", "uuid": "91156914-91be-46d7-8c5f-23d1cd8dbb9b",
"rawTextureUuid": "aecde87a-58b2-460b-a12c-56038562d36a", "rawTextureUuid": "1d8fdf60-f8d1-42c4-b79f-02d8c17f47f8",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4b00a42f-5bf9-48dd-a26b-d67e99e63c34", "uuid": "27ae9558-12bd-42ad-bead-5a494ed37365",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_shell-wrong": { "icon_shell-wrong": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f59cd3d0-91e2-4f1d-a85b-5e47f110fcaa", "uuid": "1e7a45e2-7b9f-496a-9a15-22c87b2ba79c",
"rawTextureUuid": "4b00a42f-5bf9-48dd-a26b-d67e99e63c34", "rawTextureUuid": "27ae9558-12bd-42ad-bead-5a494ed37365",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5a64925a-bd6f-4e9d-ad5d-498f6089c46c", "uuid": "5cbe63aa-03fd-4eec-b498-3981ab1035ca",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_shell": { "icon_shell": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7f1177d4-1a3e-40a8-8722-0d349523afce", "uuid": "0c0dc4a1-ed3d-4260-ba68-ff900f727282",
"rawTextureUuid": "5a64925a-bd6f-4e9d-ad5d-498f6089c46c", "rawTextureUuid": "5cbe63aa-03fd-4eec-b498-3981ab1035ca",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f37041cd-c3f7-4b78-8f8e-3bce4538eda7", "uuid": "98369e50-e669-445c-98e0-b126a81ea059",
"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": "057d9312-06e8-44d1-9379-6aafe1869ff0", "uuid": "5da9eb1a-9ddc-4fef-af67-06ac6b01bf73",
"rawTextureUuid": "f37041cd-c3f7-4b78-8f8e-3bce4538eda7", "rawTextureUuid": "98369e50-e669-445c-98e0-b126a81ea059",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "af5ba431-34f8-4dd7-9275-364bf1e11142", "uuid": "617be2a0-c100-44e7-bc0b-ab651b912d15",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_left": { "btn_left": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "712039b7-4413-4fad-bc38-18899d62f771", "uuid": "3efdbf0a-338b-454f-8102-6b5defd4c31b",
"rawTextureUuid": "af5ba431-34f8-4dd7-9275-364bf1e11142", "rawTextureUuid": "617be2a0-c100-44e7-bc0b-ab651b912d15",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "39c9e77b-9a0e-4db2-81e4-7edd3affe3a1", "uuid": "a12013d9-72b0-4478-a0ba-d311b64bcdcd",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_right": { "btn_right": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0b0af429-d3cb-414c-ad5c-f984d5f82b72", "uuid": "eb04d90f-d67c-49f8-a559-23d477eeeb8b",
"rawTextureUuid": "39c9e77b-9a0e-4db2-81e4-7edd3affe3a1", "rawTextureUuid": "a12013d9-72b0-4478-a0ba-d311b64bcdcd",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "2f902c4b-aa5d-41e5-9da3-2b89cf1fd828", "uuid": "159314d2-d34b-46aa-97d6-b8d6a8cc80d6",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon": { "icon": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7ee60292-c82a-4606-a93f-6fdbe72fbb88", "uuid": "1de0daeb-9695-4ce4-80cc-78bd037807f2",
"rawTextureUuid": "2f902c4b-aa5d-41e5-9da3-2b89cf1fd828", "rawTextureUuid": "159314d2-d34b-46aa-97d6-b8d6a8cc80d6",
"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:/CocosDashboard_1.1.1/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";
} }
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="word-type-title"> <div class="word-type-title">
题目{{i+1}} 题目{{i+1}}
</div> </div>
<div> <div>
<div class="word-type-option-title" style="margin-top:10px;">题目音频:</div> <div class="word-type-option-title" style="margin-top:10px;">题目音频:</div>
...@@ -178,13 +178,12 @@ ...@@ -178,13 +178,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="option-text"> <div class="option-text" *ngIf="option.type=='txt'">
<div class="word-input-title"> <div class="word-input-title">
<span style="color:red;margin-left:-15px">* </span> <!-- <span style="color:red;margin-left:-15px">* </span> -->
<span>文本: </span> <span>文本: </span>
</div> </div>
<input class="input-place-red" type="text" nz-input <input class="input-place-red" type="text" nz-input [(ngModel)]="option.text" (blur)="save()">
[(ngModel)]="option.text" (blur)="save()">
</div> </div>
<!-- <div class="option-time"> <!-- <div class="option-time">
<div class="word-input-title"> <div class="word-input-title">
...@@ -195,10 +194,10 @@ ...@@ -195,10 +194,10 @@
</div> --> </div> -->
</div> </div>
</div> </div>
<div class="option-btns" > <div class="option-btns">
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removeoption(i,j)">删除选项</button> <button class="btn-red" nz-button nzType="default" nzDanger (click)="removeoption(i,j)">删除选项</button>
<button *ngIf="question.options.length < 4" class="btn-blue" style="margin-top: 10px;" nz-button nzType="default" nzDanger <button *ngIf="question.options.length < 4" class="btn-blue" style="margin-top: 10px;" nz-button
(click)="copyoption(i,j)">复制选项</button> nzType="default" nzDanger (click)="copyoption(i,j)">复制选项</button>
</div> </div>
</div> </div>
......
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