Commit e4918fad authored by 李维's avatar 李维

Bug fix

parent 970d4343
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 49 "__id__": 51
} }
], ],
"_active": false, "_active": false,
...@@ -81,28 +81,28 @@ ...@@ -81,28 +81,28 @@
"__id__": 12 "__id__": 12
}, },
{ {
"__id__": 18 "__id__": 19
}, },
{ {
"__id__": 23 "__id__": 25
}, },
{ {
"__id__": 27 "__id__": 29
}, },
{ {
"__id__": 39 "__id__": 41
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 48
}, },
{ {
"__id__": 47 "__id__": 49
}, },
{ {
"__id__": 48 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -491,7 +491,7 @@ ...@@ -491,7 +491,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "64f90f87-7032-4fce-88b0-6da5e1afe092" "__uuid__": "cace58ac-a3bc-44bc-8ef3-b5125a8d5155"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -586,7 +586,7 @@ ...@@ -586,7 +586,7 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": null, "_spriteFrame": null,
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -705,7 +705,7 @@ ...@@ -705,7 +705,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
30, 30,
-2, -8,
0, 0,
0, 0,
0, 0,
...@@ -852,7 +852,11 @@ ...@@ -852,7 +852,11 @@
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 18
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -901,6 +905,38 @@ ...@@ -901,6 +905,38 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "7dlwtZVwFGLoDb7p7Q9Bzx" "_id": "7dlwtZVwFGLoDb7p7Q9Bzx"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1519107e-2f68-4aeb-bb2e-d47e9e8785d9"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "80bUeRLspBR7GFI9Stadlf"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "text_container", "_name": "text_container",
...@@ -910,13 +946,13 @@ ...@@ -910,13 +946,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 19 "__id__": 20
}, },
{ {
"__id__": 21 "__id__": 22
}, },
{ {
"__id__": 22 "__id__": 24
} }
], ],
"_active": true, "_active": true,
...@@ -974,13 +1010,13 @@ ...@@ -974,13 +1010,13 @@
"_name": "bg_A", "_name": "bg_A",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1036,7 +1072,7 @@ ...@@ -1036,7 +1072,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1068,11 +1104,15 @@ ...@@ -1068,11 +1104,15 @@
"_name": "bg_D", "_name": "bg_D",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 23
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1121,12 +1161,44 @@ ...@@ -1121,12 +1161,44 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "64n2FQM9pNYpt0F56an/DX" "_id": "64n2FQM9pNYpt0F56an/DX"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "24c5be88-f09f-42aa-bf3c-e0248a81c629"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "17n1HKNaJF4YhMJJrpDx/s"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "DB", "_name": "DB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1188,10 +1260,10 @@ ...@@ -1188,10 +1260,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 24 "__id__": 26
}, },
{ {
"__id__": 26 "__id__": 28
} }
], ],
"_active": true, "_active": true,
...@@ -1249,13 +1321,13 @@ ...@@ -1249,13 +1321,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 23 "__id__": 25
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1311,7 +1383,7 @@ ...@@ -1311,7 +1383,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1343,7 +1415,7 @@ ...@@ -1343,7 +1415,7 @@
"_name": "dragonBones", "_name": "dragonBones",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 23 "__id__": 25
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1359,8 +1431,8 @@ ...@@ -1359,8 +1431,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 388, "width": 430,
"height": 397 "height": 550
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1405,13 +1477,13 @@ ...@@ -1405,13 +1477,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 28 "__id__": 30
}, },
{ {
"__id__": 31 "__id__": 33
}, },
{ {
"__id__": 34 "__id__": 36
} }
], ],
"_active": false, "_active": false,
...@@ -1469,11 +1541,11 @@ ...@@ -1469,11 +1541,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 29
}, },
"_children": [ "_children": [
{ {
"__id__": 29 "__id__": 31
} }
], ],
"_active": true, "_active": true,
...@@ -1531,13 +1603,13 @@ ...@@ -1531,13 +1603,13 @@
"_name": "Comic Sans MS", "_name": "Comic Sans MS",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 30
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1593,7 +1665,7 @@ ...@@ -1593,7 +1665,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1625,11 +1697,11 @@ ...@@ -1625,11 +1697,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 29
}, },
"_children": [ "_children": [
{ {
"__id__": 32 "__id__": 34
} }
], ],
"_active": true, "_active": true,
...@@ -1687,13 +1759,13 @@ ...@@ -1687,13 +1759,13 @@
"_name": "black", "_name": "black",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1749,7 +1821,7 @@ ...@@ -1749,7 +1821,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1777,14 +1849,14 @@ ...@@ -1777,14 +1849,14 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 29
}, },
"_children": [ "_children": [
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_active": true, "_active": true,
...@@ -1842,13 +1914,13 @@ ...@@ -1842,13 +1914,13 @@
"_name": "sm_btn", "_name": "sm_btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1904,7 +1976,7 @@ ...@@ -1904,7 +1976,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -1922,13 +1994,13 @@ ...@@ -1922,13 +1994,13 @@
"_name": "sm_join", "_name": "sm_join",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1984,7 +2056,7 @@ ...@@ -1984,7 +2056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2005,14 +2077,14 @@ ...@@ -2005,14 +2077,14 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 40
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 44 "__id__": 44
},
{
"__id__": 46
} }
], ],
"_active": true, "_active": true,
...@@ -2070,13 +2142,13 @@ ...@@ -2070,13 +2142,13 @@
"_name": "btn_right", "_name": "btn_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2132,7 +2204,7 @@ ...@@ -2132,7 +2204,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2164,13 +2236,13 @@ ...@@ -2164,13 +2236,13 @@
"_name": "btn_left", "_name": "btn_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2226,7 +2298,7 @@ ...@@ -2226,7 +2298,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2258,13 +2330,13 @@ ...@@ -2258,13 +2330,13 @@
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2320,7 +2392,7 @@ ...@@ -2320,7 +2392,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -71,14 +71,19 @@ export default class GameLogic { ...@@ -71,14 +71,19 @@ export default class GameLogic {
this.g_cartoon.initCartoonElement(`btn_restart`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/btn_restart`)); this.g_cartoon.initCartoonElement(`btn_restart`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/btn_restart`));
this.g_cartoon.initCartoonElement(`btn_right`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/btn_right`)); this.g_cartoon.initCartoonElement(`btn_right`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/btn_right`));
this.g_cartoon.initCartoonElement(`borderTheme_A`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bg_A`));
// this.g_cartoon.initCartoonElement(`borderTheme_B`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bg_B`));
// this.g_cartoon.initCartoonElement(`borderTheme_C`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bg_C`));
this.g_cartoon.initCartoonElement(`borderTheme_D`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bg_D`));
this.g_cartoon.initCartoonElement(`videoTheme_A`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_A`)); this.g_cartoon.initCartoonElement(`videoTheme_A`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_A`));
// this.g_cartoon.initCartoonElement(`videoTheme_B`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_D`)); // this.g_cartoon.initCartoonElement(`videoTheme_B`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_B`));
// this.g_cartoon.initCartoonElement(`videoTheme_C`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_D`)); // this.g_cartoon.initCartoonElement(`videoTheme_C`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_C`));
this.g_cartoon.initCartoonElement(`videoTheme_D`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_D`)); this.g_cartoon.initCartoonElement(`videoTheme_D`, this.g_cartoon.getNodeByPath(`Canvas/video_container/bg_D`));
this.g_cartoon.initCartoonElement(`textTheme_A`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_A`)); this.g_cartoon.initCartoonElement(`textTheme_A`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_A`));
// this.g_cartoon.initCartoonElement(`textTheme_B`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_D`)); // this.g_cartoon.initCartoonElement(`textTheme_B`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_B`));
// this.g_cartoon.initCartoonElement(`textTheme_C`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_D`)); // this.g_cartoon.initCartoonElement(`textTheme_C`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_C`));
this.g_cartoon.initCartoonElement(`textTheme_D`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_D`)); this.g_cartoon.initCartoonElement(`textTheme_D`, this.g_cartoon.getNodeByPath(`Canvas/text_container/bg_D`));
} }
...@@ -134,6 +139,12 @@ export default class GameLogic { ...@@ -134,6 +139,12 @@ export default class GameLogic {
// let textTheme_C = this.g_cartoon.getCartoonElement("textTheme_C") // let textTheme_C = this.g_cartoon.getCartoonElement("textTheme_C")
let textTheme_D = this.g_cartoon.getCartoonElement("textTheme_D") let textTheme_D = this.g_cartoon.getCartoonElement("textTheme_D")
let borderTheme_A = this.g_cartoon.getCartoonElement("borderTheme_A")
// let borderTheme_B = this.g_cartoon.getCartoonElement("borderTheme_B")
// let borderTheme_C = this.g_cartoon.getCartoonElement("borderTheme_C")
let borderTheme_D = this.g_cartoon.getCartoonElement("borderTheme_D")
switch(themeType) { switch(themeType) {
case "A": case "A":
videoTheme_A.node.active = true; videoTheme_A.node.active = true;
...@@ -145,6 +156,11 @@ export default class GameLogic { ...@@ -145,6 +156,11 @@ export default class GameLogic {
// textTheme_B.node.active = false; // textTheme_B.node.active = false;
// textTheme_C.node.active = false; // textTheme_C.node.active = false;
textTheme_D.node.active = false; textTheme_D.node.active = false;
borderTheme_A.node.active = true;
// borderTheme_B.node.active = false;
// borderTheme_C.node.active = false;
borderTheme_D.node.active = false;
break; break;
case "B": case "B":
videoTheme_A.node.active = false; videoTheme_A.node.active = false;
...@@ -156,6 +172,12 @@ export default class GameLogic { ...@@ -156,6 +172,12 @@ export default class GameLogic {
// textTheme_B.node.active = true; // textTheme_B.node.active = true;
// textTheme_C.node.active = false; // textTheme_C.node.active = false;
textTheme_D.node.active = false; textTheme_D.node.active = false;
borderTheme_A.node.active = false;
// borderTheme_B.node.active = true;
// borderTheme_C.node.active = false;
borderTheme_D.node.active = false;
break; break;
case "C": case "C":
videoTheme_A.node.active = false; videoTheme_A.node.active = false;
...@@ -167,41 +189,55 @@ export default class GameLogic { ...@@ -167,41 +189,55 @@ export default class GameLogic {
// textTheme_B.node.active = false; // textTheme_B.node.active = false;
// textTheme_C.node.active = true; // textTheme_C.node.active = true;
textTheme_D.node.active = false; textTheme_D.node.active = false;
borderTheme_A.node.active = false;
// borderTheme_B.node.active = false;
// borderTheme_C.node.active = true;
borderTheme_D.node.active = false;
break; break;
case "D": case "D":
videoTheme_A.node.active = false;
// videoTheme_B.node.active = false;
// videoTheme_C.node.active = false;
videoTheme_D.node.active = false;
textTheme_A.node.active = false;
// textTheme_B.node.active = false;
// textTheme_C.node.active = false;
textTheme_D.node.active = false;
borderTheme_A.node.active = false;
// borderTheme_B.node.active = false;
// borderTheme_C.node.active = false;
borderTheme_D.node.active = false;
this.getSpriteFrimeByUrl(this.g_formData.border_image_url).then(sf=>{
sf.width = cc.winSize.width;
sf.height = cc.winSize.height;
borderTheme_D.node.getComponent(cc.Sprite).spriteFrame = sf;
borderTheme_D.node.active = true;
}).catch(err=>{
borderTheme_A.node.active = true;
})
this.getSpriteFrimeByUrl(this.g_formData.video_image_url).then(sf=>{ this.getSpriteFrimeByUrl(this.g_formData.video_image_url).then(sf=>{
if(videoTheme_D.node.getComponent(cc.Sprite)) { sf.width = 688;
videoTheme_D.node.removeComponent(cc.Sprite) sf.height = 353;
}
videoTheme_D.node.getComponent(cc.Sprite).spriteFrame = sf; videoTheme_D.node.getComponent(cc.Sprite).spriteFrame = sf;
videoTheme_D.node.active = true; videoTheme_D.node.active = true;
}).catch(err=>{ }).catch(err=>{
console.log(err)
videoTheme_A.node.active = true; videoTheme_A.node.active = true;
videoTheme_D.node.active = false;
}) })
this.getSpriteFrimeByUrl(this.g_formData.text_image_url).then(sf=>{ this.getSpriteFrimeByUrl(this.g_formData.text_image_url).then(sf=>{
if(textTheme_D.node.getComponent(cc.Sprite)) { sf.width = 602;
textTheme_D.node.removeComponent(cc.Sprite) sf.height = 164;
}
textTheme_D.node.getComponent(cc.Sprite).spriteFrame = sf; textTheme_D.node.getComponent(cc.Sprite).spriteFrame = sf;
textTheme_D.node.active = true; textTheme_D.node.active = true;
}).catch(err=>{ }).catch(err=>{
console.log(err)
textTheme_A.node.active = true; textTheme_A.node.active = true;
textTheme_D.node.active = false; })
})
videoTheme_A.node.active = false;
// videoTheme_B.node.active = false;
// videoTheme_C.node.active = false;
videoTheme_D.node.active = false;
textTheme_A.node.active = false;
// textTheme_B.node.active = false;
// textTheme_C.node.active = false;
textTheme_D.node.active = false;
default:; default:;
} }
} }
...@@ -495,8 +531,6 @@ export default class GameLogic { ...@@ -495,8 +531,6 @@ export default class GameLogic {
// Common API // Common API
getSpriteFrimeByUrl(url) { getSpriteFrimeByUrl(url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
......
...@@ -104,7 +104,7 @@ cc.Class({ ...@@ -104,7 +104,7 @@ cc.Class({
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","bgMusic":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"}]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","birdDragonBones_1":{},"birdDragonBones_2":{},"birdDragonBones_audio":{},"dataArray":[{"video_url":"http://staging-teach.cdn.ireadabc.com/f8476aa86cfb6ea4d1fbb69578f606d7.mp4","textDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/b095932007653f7aa4514570af991342.png","name":"word_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/4e2458f5632fbfdf6c5a1c66f8c77fe3.json","name":"word_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/c83f14aeee5b533cb582887f5122bcef.json","name":"word_ske.json"}},"rightDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ccc42a2a6830dd5bddc67e727ebf717b.png","name":"dragon_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/830c92d3d3c73353cf43f03a0051123f.json","name":"dragon_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e1f26dedb60960b07f90bd42e5478ba6.json","name":"dragon_ske.json"}},"audio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3"}],"theme":"A"},"border_image_url":"http://staging-teach.cdn.ireadabc.com/e9ce15bcb9165a8416799df5597f01e6.jpg","video_image_url":"http://staging-teach.cdn.ireadabc.com/308cc7a44debd884b12508a7fcad83ab.jpg","text_image_url":"http://staging-teach.cdn.ireadabc.com/389033602b7468ceb2a34845b0063ea1.jpg"}' const dataJson = '{ "contentObj": { "version": "1.0", "key": "DataKey_Sbx_Pronunciation", "theme": "D", "border_image_url": "http://staging-teach.cdn.ireadabc.com/c3e8520418444ad2ee7689510f98de9b.png", "video_image_url": "http://staging-teach.cdn.ireadabc.com/06bb65fb7a3a03d095587b5cc2efc65f.png", "text_image_url": "http://staging-teach.cdn.ireadabc.com/08a2a49e8e1e8e1dc53fb57ad8a4cb44.png", "dataArray": [ { "video_url": "http://staging-teach.cdn.ireadabc.com/f25bb33cdb266345667a1bec58818175.mp4", "textDragonBones": { "skeJsonData": { "url": "", "name": "" }, "texJsonData": { "url": "", "name": "" }, "texPngData": { "url": "", "name": "" } }, "rightDragonBones": { "skeJsonData": { "url": "", "name": "" }, "texJsonData": { "url": "", "name": "" }, "texPngData": { "url": "", "name": "" } } }, { "video_url": "http://staging-teach.cdn.ireadabc.com/82438e44e9e106cfa43d1fd62a24d61b.mp4", "textDragonBones": { "skeJsonData": { "url": "", "name": "" }, "texJsonData": { "url": "", "name": "" }, "texPngData": { "url": "", "name": "" } }, "rightDragonBones": { "skeJsonData": { "url": "", "name": "" }, "texJsonData": { "url": "", "name": "" }, "texPngData": { "url": "", "name": "" } } } ] } }'
// const dataJson = '{ "contentObj": { "version": "1.0", "key": "DataKey_Sbx_Pronunciation", "bgMusic": "", "titleText": "", "questionAudio_url": "", "birdDragonBones_1": {}, "birdDragonBones_2": {}, "birdDragonBones_audio": {}, "dataArray": [], "theme": "A" }, "border_image_url": "", "video_image_url": "", "text_image_url": "" }' // const dataJson = '{ "contentObj": { "version": "1.0", "key": "DataKey_Sbx_Pronunciation", "bgMusic": "", "titleText": "", "questionAudio_url": "", "birdDragonBones_1": {}, "birdDragonBones_2": {}, "birdDragonBones_audio": {}, "dataArray": [], "theme": "A" }, "border_image_url": "", "video_image_url": "", "text_image_url": "" }'
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
......
play/assets/tmpGame/textures/bg_A.png

51.4 KB | W: | H:

play/assets/tmpGame/textures/bg_A.png

13.1 KB | W: | H:

play/assets/tmpGame/textures/bg_A.png
play/assets/tmpGame/textures/bg_A.png
play/assets/tmpGame/textures/bg_A.png
play/assets/tmpGame/textures/bg_A.png
  • 2-up
  • Swipe
  • Onion skin
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "a374be4f-54b8-4c60-9f78-c476c2a3f12b", "uuid": "762f287f-8615-4ced-be24-9cf9c069f7b1",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
"subMetas": { "subMetas": {
"bg_A": { "bg_A": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "64f90f87-7032-4fce-88b0-6da5e1afe092", "uuid": "cace58ac-a3bc-44bc-8ef3-b5125a8d5155",
"rawTextureUuid": "a374be4f-54b8-4c60-9f78-c476c2a3f12b", "rawTextureUuid": "762f287f-8615-4ced-be24-9cf9c069f7b1",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": 0,
"trimX": 7, "trimX": 4,
"trimY": 0, "trimY": 0,
"width": 1266, "width": 1272,
"height": 720, "height": 720,
"rawWidth": 1280, "rawWidth": 1280,
"rawHeight": 720, "rawHeight": 720,
......
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