Commit a7063e42 authored by 李维's avatar 李维

Update scene

parent c714c7db
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 47 "__id__": 45
} }
], ],
"_active": false, "_active": false,
...@@ -78,31 +78,31 @@ ...@@ -78,31 +78,31 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 14 "__id__": 12
}, },
{ {
"__id__": 20 "__id__": 18
}, },
{ {
"__id__": 25 "__id__": 23
}, },
{ {
"__id__": 29 "__id__": 27
}, },
{ {
"__id__": 37 "__id__": 35
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 42
}, },
{ {
"__id__": 45 "__id__": 43
}, },
{ {
"__id__": 46 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"array": [ "array": [
0, 0,
0, 0,
416.55821922031504, 424.352447854375,
0, 0,
0, 0,
0, 0,
...@@ -267,9 +267,6 @@ ...@@ -267,9 +267,6 @@
}, },
{ {
"__id__": 10 "__id__": 10
},
{
"__id__": 12
} }
], ],
"_active": true, "_active": true,
...@@ -324,7 +321,7 @@ ...@@ -324,7 +321,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_A", "_name": "bgColor",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -337,7 +334,7 @@ ...@@ -337,7 +334,7 @@
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 0, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
...@@ -347,8 +344,8 @@ ...@@ -347,8 +344,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 2560,
"height": 720 "height": 2560
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -382,7 +379,7 @@ ...@@ -382,7 +379,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "32MJMZ2HRGF4BOf533Avyi" "_id": "578CoVS05K5IAHeBtBSz32"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -400,7 +397,7 @@ ...@@ -400,7 +397,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8fca9173-2c3b-4a8a-a2fe-3c97908a3bd9" "__uuid__": "03fecb54-2cbe-4bb3-ba83-e4b044796be4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -414,11 +411,11 @@ ...@@ -414,11 +411,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "97/S6HDq9MeqgmV1Zwnhbb" "_id": "ff8mBl/i1PX71+K0oR79qe"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bgNew_A ", "_name": "bg_A",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -476,7 +473,7 @@ ...@@ -476,7 +473,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "578CoVS05K5IAHeBtBSz32" "_id": "32MJMZ2HRGF4BOf533Avyi"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -494,10 +491,10 @@ ...@@ -494,10 +491,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "efc7ad6f-e504-4a62-b16d-aefef18faad3" "__uuid__": "64f90f87-7032-4fce-88b0-6da5e1afe092"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -508,11 +505,11 @@ ...@@ -508,11 +505,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "ff8mBl/i1PX71+K0oR79qe" "_id": "97/S6HDq9MeqgmV1Zwnhbb"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_B", "_name": "bg_D",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -570,98 +567,6 @@ ...@@ -570,98 +567,6 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "dbml4BWuRKwJrxE+5TDhHj"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d8JNzu809IO7zeJIKpsJrM"
},
{
"__type__": "cc.Node",
"_name": "bg_C",
"_objFlags": 0,
"_parent": {
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "e8YQ2CqipP76AODeH4UgjR" "_id": "e8YQ2CqipP76AODeH4UgjR"
}, },
{ {
...@@ -669,7 +574,7 @@ ...@@ -669,7 +574,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -703,13 +608,13 @@ ...@@ -703,13 +608,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 15 "__id__": 13
}, },
{ {
"__id__": 17 "__id__": 15
}, },
{ {
"__id__": 19 "__id__": 17
} }
], ],
"_active": true, "_active": true,
...@@ -767,13 +672,13 @@ ...@@ -767,13 +672,13 @@
"_name": "video", "_name": "video",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -829,7 +734,7 @@ ...@@ -829,7 +734,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_resourceType": 1, "_resourceType": 1,
...@@ -851,13 +756,13 @@ ...@@ -851,13 +756,13 @@
"_name": "bg_A", "_name": "bg_A",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 18 "__id__": 16
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -913,7 +818,7 @@ ...@@ -913,7 +818,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -945,7 +850,7 @@ ...@@ -945,7 +850,7 @@
"_name": "bg_D", "_name": "bg_D",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1007,13 +912,13 @@ ...@@ -1007,13 +912,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 21 "__id__": 19
}, },
{ {
"__id__": 23 "__id__": 21
}, },
{ {
"__id__": 24 "__id__": 22
} }
], ],
"_active": true, "_active": true,
...@@ -1071,13 +976,13 @@ ...@@ -1071,13 +976,13 @@
"_name": "bg_A", "_name": "bg_A",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1133,7 +1038,7 @@ ...@@ -1133,7 +1038,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1165,7 +1070,7 @@ ...@@ -1165,7 +1070,7 @@
"_name": "bg_D", "_name": "bg_D",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1223,7 +1128,7 @@ ...@@ -1223,7 +1128,7 @@
"_name": "DB", "_name": "DB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1285,10 +1190,10 @@ ...@@ -1285,10 +1190,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 26 "__id__": 24
}, },
{ {
"__id__": 28 "__id__": 26
} }
], ],
"_active": true, "_active": true,
...@@ -1346,13 +1251,13 @@ ...@@ -1346,13 +1251,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1408,7 +1313,7 @@ ...@@ -1408,7 +1313,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1440,7 +1345,7 @@ ...@@ -1440,7 +1345,7 @@
"_name": "dragonBones", "_name": "dragonBones",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1502,13 +1407,13 @@ ...@@ -1502,13 +1407,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 28
}, },
{ {
"__id__": 33 "__id__": 31
}, },
{ {
"__id__": 36 "__id__": 34
} }
], ],
"_active": false, "_active": false,
...@@ -1566,11 +1471,11 @@ ...@@ -1566,11 +1471,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 29
} }
], ],
"_active": true, "_active": true,
...@@ -1628,13 +1533,13 @@ ...@@ -1628,13 +1533,13 @@
"_name": "Comic Sans MS", "_name": "Comic Sans MS",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 28
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1690,7 +1595,7 @@ ...@@ -1690,7 +1595,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1722,11 +1627,11 @@ ...@@ -1722,11 +1627,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [ "_children": [
{ {
"__id__": 34 "__id__": 32
} }
], ],
"_active": true, "_active": true,
...@@ -1784,13 +1689,13 @@ ...@@ -1784,13 +1689,13 @@
"_name": "black", "_name": "black",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1846,7 +1751,7 @@ ...@@ -1846,7 +1751,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1874,7 +1779,7 @@ ...@@ -1874,7 +1779,7 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1936,13 +1841,13 @@ ...@@ -1936,13 +1841,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 36
}, },
{ {
"__id__": 40 "__id__": 38
}, },
{ {
"__id__": 42 "__id__": 40
} }
], ],
"_active": true, "_active": true,
...@@ -2000,13 +1905,13 @@ ...@@ -2000,13 +1905,13 @@
"_name": "btn_right", "_name": "btn_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 35
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2062,7 +1967,7 @@ ...@@ -2062,7 +1967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2094,13 +1999,13 @@ ...@@ -2094,13 +1999,13 @@
"_name": "btn_left", "_name": "btn_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 35
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2156,7 +2061,7 @@ ...@@ -2156,7 +2061,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2188,13 +2093,13 @@ ...@@ -2188,13 +2093,13 @@
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 35
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2250,7 +2155,7 @@ ...@@ -2250,7 +2155,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -76,11 +76,23 @@ export default class GameLogic { ...@@ -76,11 +76,23 @@ export default class GameLogic {
} }
initBg() { initBg() {
console.log(this.g_formData.theme)
const bgNode_A = cc.find('Canvas/bgMain/bg_A'); const bgNode_A = cc.find('Canvas/bgMain/bg_A');
bgNode_A.scale = this.g_systemOption.mapScaleMax; bgNode_A.scale = this.g_systemOption.mapScaleMax;
// bgNode_A.height = cc.winSize.height; if(this.g_formData.theme == "A") {
// bgNode_A.width = cc.winSize.width; bgNode_A.active = true;
console.log(bgNode_A.height, bgNode_A.width) } else {
bgNode_A.active = false;
}
const bgNode_D = cc.find('Canvas/bgMain/bg_D');
bgNode_D.scale = this.g_systemOption.mapScaleMax;
if(this.g_formData.theme == "A") {
bgNode_D.active = true;
} else {
bgNode_D.active = false;
}
} }
resetPosition() { resetPosition() {
......
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