Commit 553e3a9d authored by limingzhe's avatar limingzhe

fix: debug

parent 14fb643f
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 80 "__id__": 82
}, },
{ {
"__id__": 101 "__id__": 103
} }
], ],
"_active": false, "_active": false,
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 79
}, },
{ {
"__id__": 78 "__id__": 80
}, },
{ {
"__id__": 79 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -667,13 +667,13 @@ ...@@ -667,13 +667,13 @@
"__id__": 15 "__id__": 15
}, },
{ {
"__id__": 44 "__id__": 46
}, },
{ {
"__id__": 47 "__id__": 49
}, },
{ {
"__id__": 62 "__id__": 64
} }
], ],
"_active": false, "_active": false,
...@@ -775,6 +775,9 @@ ...@@ -775,6 +775,9 @@
}, },
{ {
"__id__": 42 "__id__": 42
},
{
"__id__": 44
} }
], ],
"_active": true, "_active": true,
...@@ -829,7 +832,7 @@ ...@@ -829,7 +832,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg", "_name": "panel",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 15
...@@ -850,6 +853,96 @@ ...@@ -850,6 +853,96 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": {
"__type__": "cc.Size",
"width": 900,
"height": 510
},
"_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": "66luSWn0NNuargOP8irFAN"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3e3af191-f7fb-4e1d-9de3-c629f1af6da3"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2fIOrc189N3YGoFj4f3URE"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 15
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1280,
...@@ -894,7 +987,7 @@ ...@@ -894,7 +987,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -928,7 +1021,7 @@ ...@@ -928,7 +1021,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -984,7 +1077,7 @@ ...@@ -984,7 +1077,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1018,7 +1111,7 @@ ...@@ -1018,7 +1111,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 23
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1074,7 +1167,7 @@ ...@@ -1074,7 +1167,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1108,7 +1201,7 @@ ...@@ -1108,7 +1201,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1164,7 +1257,7 @@ ...@@ -1164,7 +1257,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1198,7 +1291,7 @@ ...@@ -1198,7 +1291,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1254,7 +1347,7 @@ ...@@ -1254,7 +1347,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1288,7 +1381,7 @@ ...@@ -1288,7 +1381,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1344,7 +1437,7 @@ ...@@ -1344,7 +1437,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1378,7 +1471,7 @@ ...@@ -1378,7 +1471,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1434,7 +1527,7 @@ ...@@ -1434,7 +1527,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1468,7 +1561,7 @@ ...@@ -1468,7 +1561,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1524,7 +1617,7 @@ ...@@ -1524,7 +1617,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -1558,7 +1651,7 @@ ...@@ -1558,7 +1651,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1614,7 +1707,7 @@ ...@@ -1614,7 +1707,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1652,7 +1745,7 @@ ...@@ -1652,7 +1745,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1708,7 +1801,7 @@ ...@@ -1708,7 +1801,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1746,7 +1839,7 @@ ...@@ -1746,7 +1839,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1802,7 +1895,7 @@ ...@@ -1802,7 +1895,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1840,7 +1933,7 @@ ...@@ -1840,7 +1933,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1896,7 +1989,7 @@ ...@@ -1896,7 +1989,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1934,7 +2027,7 @@ ...@@ -1934,7 +2027,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1990,7 +2083,7 @@ ...@@ -1990,7 +2083,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2028,7 +2121,7 @@ ...@@ -2028,7 +2121,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2084,7 +2177,7 @@ ...@@ -2084,7 +2177,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2120,7 +2213,7 @@ ...@@ -2120,7 +2213,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 47
} }
], ],
"_active": true, "_active": true,
...@@ -2178,13 +2271,13 @@ ...@@ -2178,13 +2271,13 @@
"_name": "Berlin-Sans-FB", "_name": "Berlin-Sans-FB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 44 "__id__": 46
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2240,7 +2333,7 @@ ...@@ -2240,7 +2333,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2278,9 +2371,6 @@ ...@@ -2278,9 +2371,6 @@
"__id__": 14 "__id__": 14
}, },
"_children": [ "_children": [
{
"__id__": 48
},
{ {
"__id__": 50 "__id__": 50
}, },
...@@ -2298,6 +2388,9 @@ ...@@ -2298,6 +2388,9 @@
}, },
{ {
"__id__": 60 "__id__": 60
},
{
"__id__": 62
} }
], ],
"_active": true, "_active": true,
...@@ -2355,13 +2448,13 @@ ...@@ -2355,13 +2448,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2417,7 +2510,7 @@ ...@@ -2417,7 +2510,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2436,13 +2529,13 @@ ...@@ -2436,13 +2529,13 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2498,7 +2591,7 @@ ...@@ -2498,7 +2591,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2517,13 +2610,13 @@ ...@@ -2517,13 +2610,13 @@
"_name": "star_count", "_name": "star_count",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2579,7 +2672,7 @@ ...@@ -2579,7 +2672,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2598,13 +2691,13 @@ ...@@ -2598,13 +2691,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2660,7 +2753,7 @@ ...@@ -2660,7 +2753,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2679,13 +2772,13 @@ ...@@ -2679,13 +2772,13 @@
"_name": "big_star", "_name": "big_star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2741,7 +2834,7 @@ ...@@ -2741,7 +2834,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2760,13 +2853,13 @@ ...@@ -2760,13 +2853,13 @@
"_name": "wrong", "_name": "wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2822,7 +2915,7 @@ ...@@ -2822,7 +2915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2841,13 +2934,13 @@ ...@@ -2841,13 +2934,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 49
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2903,7 +2996,7 @@ ...@@ -2903,7 +2996,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2926,19 +3019,19 @@ ...@@ -2926,19 +3019,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 63 "__id__": 65
}, },
{ {
"__id__": 66 "__id__": 68
}, },
{ {
"__id__": 69 "__id__": 71
}, },
{ {
"__id__": 72 "__id__": 74
}, },
{ {
"__id__": 75 "__id__": 77
} }
], ],
"_active": true, "_active": true,
...@@ -2996,16 +3089,16 @@ ...@@ -2996,16 +3089,16 @@
"_name": "audio_big", "_name": "audio_big",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 66
}, },
{ {
"__id__": 65 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3061,7 +3154,7 @@ ...@@ -3061,7 +3154,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3093,7 +3186,7 @@ ...@@ -3093,7 +3186,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -3112,16 +3205,16 @@ ...@@ -3112,16 +3205,16 @@
"_name": "laba", "_name": "laba",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 69
}, },
{ {
"__id__": 68 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3177,7 +3270,7 @@ ...@@ -3177,7 +3270,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3209,7 +3302,7 @@ ...@@ -3209,7 +3302,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -3228,16 +3321,16 @@ ...@@ -3228,16 +3321,16 @@
"_name": "ques_audio", "_name": "ques_audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 72
}, },
{ {
"__id__": 71 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3293,7 +3386,7 @@ ...@@ -3293,7 +3386,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3325,7 +3418,7 @@ ...@@ -3325,7 +3418,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -3344,16 +3437,16 @@ ...@@ -3344,16 +3437,16 @@
"_name": "op_audio", "_name": "op_audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 75
}, },
{ {
"__id__": 74 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3409,7 +3502,7 @@ ...@@ -3409,7 +3502,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3441,7 +3534,7 @@ ...@@ -3441,7 +3534,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -3460,13 +3553,13 @@ ...@@ -3460,13 +3553,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3522,7 +3615,7 @@ ...@@ -3522,7 +3615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3622,19 +3715,19 @@ ...@@ -3622,19 +3715,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 81 "__id__": 83
}, },
{ {
"__id__": 85 "__id__": 87
}, },
{ {
"__id__": 89 "__id__": 91
}, },
{ {
"__id__": 93 "__id__": 95
}, },
{ {
"__id__": 97 "__id__": 99
} }
], ],
"_active": false, "_active": false,
...@@ -3692,11 +3785,11 @@ ...@@ -3692,11 +3785,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 84
} }
], ],
"_active": true, "_active": true,
...@@ -3754,11 +3847,11 @@ ...@@ -3754,11 +3847,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 83 "__id__": 85
} }
], ],
"_active": true, "_active": true,
...@@ -3816,13 +3909,13 @@ ...@@ -3816,13 +3909,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 82 "__id__": 84
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3878,7 +3971,7 @@ ...@@ -3878,7 +3971,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3910,11 +4003,11 @@ ...@@ -3910,11 +4003,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 88
} }
], ],
"_active": true, "_active": true,
...@@ -3972,11 +4065,11 @@ ...@@ -3972,11 +4065,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 87
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 89
} }
], ],
"_active": true, "_active": true,
...@@ -4034,13 +4127,13 @@ ...@@ -4034,13 +4127,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 88
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4096,7 +4189,7 @@ ...@@ -4096,7 +4189,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4128,11 +4221,11 @@ ...@@ -4128,11 +4221,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 92
} }
], ],
"_active": true, "_active": true,
...@@ -4190,11 +4283,11 @@ ...@@ -4190,11 +4283,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 91
}, },
"_children": [ "_children": [
{ {
"__id__": 91 "__id__": 93
} }
], ],
"_active": true, "_active": true,
...@@ -4252,13 +4345,13 @@ ...@@ -4252,13 +4345,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4314,7 +4407,7 @@ ...@@ -4314,7 +4407,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4346,11 +4439,11 @@ ...@@ -4346,11 +4439,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 96
} }
], ],
"_active": true, "_active": true,
...@@ -4408,11 +4501,11 @@ ...@@ -4408,11 +4501,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 95
}, },
"_children": [ "_children": [
{ {
"__id__": 95 "__id__": 97
} }
], ],
"_active": true, "_active": true,
...@@ -4470,13 +4563,13 @@ ...@@ -4470,13 +4563,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 96
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4532,7 +4625,7 @@ ...@@ -4532,7 +4625,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4564,11 +4657,11 @@ ...@@ -4564,11 +4657,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 98 "__id__": 100
} }
], ],
"_active": true, "_active": true,
...@@ -4626,11 +4719,11 @@ ...@@ -4626,11 +4719,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 99
}, },
"_children": [ "_children": [
{ {
"__id__": 99 "__id__": 101
} }
], ],
"_active": true, "_active": true,
...@@ -4688,13 +4781,13 @@ ...@@ -4688,13 +4781,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4750,7 +4843,7 @@ ...@@ -4750,7 +4843,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4785,9 +4878,6 @@ ...@@ -4785,9 +4878,6 @@
"__id__": 1 "__id__": 1
}, },
"_children": [ "_children": [
{
"__id__": 102
},
{ {
"__id__": 104 "__id__": 104
}, },
...@@ -4808,6 +4898,9 @@ ...@@ -4808,6 +4898,9 @@
}, },
{ {
"__id__": 116 "__id__": 116
},
{
"__id__": 118
} }
], ],
"_active": false, "_active": false,
...@@ -4865,13 +4958,13 @@ ...@@ -4865,13 +4958,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4927,7 +5020,7 @@ ...@@ -4927,7 +5020,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4959,13 +5052,13 @@ ...@@ -4959,13 +5052,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5021,7 +5114,7 @@ ...@@ -5021,7 +5114,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5053,13 +5146,13 @@ ...@@ -5053,13 +5146,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5115,7 +5208,7 @@ ...@@ -5115,7 +5208,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5147,13 +5240,13 @@ ...@@ -5147,13 +5240,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5209,7 +5302,7 @@ ...@@ -5209,7 +5302,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5241,13 +5334,13 @@ ...@@ -5241,13 +5334,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5303,7 +5396,7 @@ ...@@ -5303,7 +5396,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5335,13 +5428,13 @@ ...@@ -5335,13 +5428,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5397,7 +5490,7 @@ ...@@ -5397,7 +5490,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5429,13 +5522,13 @@ ...@@ -5429,13 +5522,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5491,7 +5584,7 @@ ...@@ -5491,7 +5584,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5523,13 +5616,13 @@ ...@@ -5523,13 +5616,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5585,7 +5678,7 @@ ...@@ -5585,7 +5678,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -488,7 +488,9 @@ cc.Class({ ...@@ -488,7 +488,9 @@ cc.Class({
this.playCatAudio(this.data.begin_audio_url, () => { this.playCatAudio(this.data.begin_audio_url, () => {
this.canTouch = true; this.canTouch = true;
// this.isPanelMoveEnd = true; // this.isPanelMoveEnd = true;
this.startTesting();
this.catBeginEnd = true;
this.checkStart();
}); });
this.curCatAudioUrl = this.data.idle_audio_url; this.curCatAudioUrl = this.data.idle_audio_url;
...@@ -603,7 +605,7 @@ cc.Class({ ...@@ -603,7 +605,7 @@ cc.Class({
checkStart() { checkStart() {
console.log(' in checkStart') console.log(' in checkStart')
if (this.debugBgImg && this.hzLoadEnd) { if (this.debugBgImg && this.hzLoadEnd && this.catBeginEnd) {
this.startTesting(); this.startTesting();
} }
...@@ -5762,7 +5764,7 @@ cc.Class({ ...@@ -5762,7 +5764,7 @@ cc.Class({
initBg() { initBg() {
console.log("this.data.bg_pic_url: ", this.data.bg_pic_url); console.log("this.data.bg_pic_url: ", this.data.bg_pic_url);
const bg = getSprNode('bg'); const bg = getSprNode('bg');
const scaleX = this.canvas.width / bg.width const scaleX = this.canvas.width / bg.width
const scaleY = this.canvas.height / bg.height const scaleY = this.canvas.height / bg.height
...@@ -5781,7 +5783,6 @@ cc.Class({ ...@@ -5781,7 +5783,6 @@ cc.Class({
hotZoneBg: null, hotZoneBg: null,
initHotZoneBg() { initHotZoneBg() {
this.hotZoneBg = new cc.Node(); this.hotZoneBg = new cc.Node();
this.hotZoneBg.name = 'hotZoneBg'; this.hotZoneBg.name = 'hotZoneBg';
this.hotZoneBg.parent = cc.find('Canvas'); this.hotZoneBg.parent = cc.find('Canvas');
this.hotZoneBg.zIndex = 4; this.hotZoneBg.zIndex = 4;
...@@ -5798,7 +5799,6 @@ cc.Class({ ...@@ -5798,7 +5799,6 @@ cc.Class({
this.hotZoneBg.height = img.height; this.hotZoneBg.height = img.height;
const sprNode = new cc.Node(); const sprNode = new cc.Node();
sprNode.name = 'bgItemSpr' sprNode.name = 'bgItemSpr'
var sf = new cc.SpriteFrame(img); var sf = new cc.SpriteFrame(img);
...@@ -5811,19 +5811,40 @@ cc.Class({ ...@@ -5811,19 +5811,40 @@ cc.Class({
window['bg'] =sprNode window['bg'] =sprNode
const sx = this.canvas.width / this.hotZoneBg.width; // const sx = this.canvas.width / this.hotZoneBg.width;
const sy = (this.canvas.height) / this.hotZoneBg.height; // const sy = (this.canvas.height) / this.hotZoneBg.height;
// const s = Math.min(sx, sy);
// this.hotZoneBg.scale = s;
const panel = getSprNode('panel');
panel.scale = this._mapScaleMin * 1.5;
this.canvas.addChild(panel);
panel.x = -this.canvas.width;
const parent = panel;
const sx = parent.width / this.hotZoneBg.width;
const sy = parent.height / this.hotZoneBg.height;
const s = Math.min(sx, sy); const s = Math.min(sx, sy);
this.hotZoneBg.scale = s;
this.hotZoneBg.scale = s * 0.9;
this.hotZoneBg.parent = panel;
// this.data.bgItem.isShowDebugLine = true; // this.data.bgItem.isShowDebugLine = true;
this.initHotZoneItem(); this.initHotZoneItem();
this.hzLoadEnd = true;
this.checkStart();
cc.tween(panel)
.to(1, {x: 0}, {easing: 'cubicOut'})
.call(() => {
this.hzLoadEnd = true;
this.checkStart();
})
.start();
}); });
}, },
......
...@@ -81,6 +81,7 @@ export function getSpriteFrimeByUrl(url, cb) { ...@@ -81,6 +81,7 @@ export function getSpriteFrimeByUrl(url, cb) {
} }
export function getSprNode(resName) { export function getSprNode(resName) {
console.log('getSprNode name: ', resName);
const sf = cc.find('Canvas/res/img/' + resName).getComponent(cc.Sprite).spriteFrame; const sf = cc.find('Canvas/res/img/' + resName).getComponent(cc.Sprite).spriteFrame;
const node = new cc.Node(); const node = new cc.Node();
node.addComponent(cc.Sprite).spriteFrame = sf; node.addComponent(cc.Sprite).spriteFrame = sf;
......
{
"ver": "2.3.5",
"uuid": "bb7834e2-2860-44ab-b61a-7cbb95e196eb",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 900,
"height": 510,
"platformSettings": {},
"subMetas": {
"panel": {
"ver": "1.0.4",
"uuid": "3e3af191-f7fb-4e1d-9de3-c629f1af6da3",
"rawTextureUuid": "bb7834e2-2860-44ab-b61a-7cbb95e196eb",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 900,
"height": 510,
"rawWidth": 900,
"rawHeight": 510,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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