Commit a1a36d2c authored by huoshizhe's avatar huoshizhe

feat:

parent c6bd0821
...@@ -75,25 +75,28 @@ ...@@ -75,25 +75,28 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 7 "__id__": 30
}, },
{ {
"__id__": 32 "__id__": 32
}, },
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 37
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 39
}, },
{ {
"__id__": 37 "__id__": 40
}, },
{ {
"__id__": 38 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -225,108 +228,6 @@ ...@@ -225,108 +228,6 @@
"preload": false, "preload": false,
"_id": "19P8tmuB5BGIJjAHoTmRSd" "_id": "19P8tmuB5BGIJjAHoTmRSd"
}, },
{
"__type__": "cc.Node",
"_name": "wellDown",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 6
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 616,
"height": 663
},
"_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": "2057Ag7ApGNaQpCSidw4Ia"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"premultipliedAlpha": false,
"_armatureKey": "242ac10e-291e-4017-aec6-f3e64af24536#5be32bbd-0fd2-47e8-94fb-0827153bdec2",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "242ac10e-291e-4017-aec6-f3e64af24536"
},
"_N$dragonAtlasAsset": {
"__uuid__": "5be32bbd-0fd2-47e8-94fb-0827153bdec2"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "5bfEvEFepO5KRLc7rJds7c"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Main Camera", "_name": "Main Camera",
...@@ -335,6 +236,9 @@ ...@@ -335,6 +236,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 6
},
{ {
"__id__": 8 "__id__": 8
}, },
...@@ -342,7 +246,7 @@ ...@@ -342,7 +246,7 @@
"__id__": 10 "__id__": 10
}, },
{ {
"__id__": 12 "__id__": 13
}, },
{ {
"__id__": 15 "__id__": 15
...@@ -364,15 +268,12 @@ ...@@ -364,15 +268,12 @@
}, },
{ {
"__id__": 27 "__id__": 27
},
{
"__id__": 29
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -428,13 +329,13 @@ ...@@ -428,13 +329,13 @@
"_name": "audio_areyouready", "_name": "audio_areyouready",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 9 "__id__": 7
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -490,7 +391,7 @@ ...@@ -490,7 +391,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 8 "__id__": 6
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -509,13 +410,13 @@ ...@@ -509,13 +410,13 @@
"_name": "audio_ready", "_name": "audio_ready",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 11 "__id__": 9
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -571,7 +472,7 @@ ...@@ -571,7 +472,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 10 "__id__": 8
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -590,16 +491,16 @@ ...@@ -590,16 +491,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 13 "__id__": 11
}, },
{ {
"__id__": 14 "__id__": 12
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -655,7 +556,7 @@ ...@@ -655,7 +556,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -687,7 +588,7 @@ ...@@ -687,7 +588,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -716,13 +617,13 @@ ...@@ -716,13 +617,13 @@
"_name": "light_left", "_name": "light_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -778,7 +679,7 @@ ...@@ -778,7 +679,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -810,13 +711,13 @@ ...@@ -810,13 +711,13 @@
"_name": "light_right", "_name": "light_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 18 "__id__": 16
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -872,7 +773,7 @@ ...@@ -872,7 +773,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -904,13 +805,13 @@ ...@@ -904,13 +805,13 @@
"_name": "1", "_name": "1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -966,7 +867,7 @@ ...@@ -966,7 +867,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -998,13 +899,13 @@ ...@@ -998,13 +899,13 @@
"_name": "2", "_name": "2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1060,7 +961,7 @@ ...@@ -1060,7 +961,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1092,13 +993,13 @@ ...@@ -1092,13 +993,13 @@
"_name": "3", "_name": "3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1154,7 +1055,7 @@ ...@@ -1154,7 +1055,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1186,13 +1087,13 @@ ...@@ -1186,13 +1087,13 @@
"_name": "areyouready", "_name": "areyouready",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1248,7 +1149,7 @@ ...@@ -1248,7 +1149,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1280,13 +1181,13 @@ ...@@ -1280,13 +1181,13 @@
"_name": "go", "_name": "go",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1342,7 +1243,7 @@ ...@@ -1342,7 +1243,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1374,13 +1275,13 @@ ...@@ -1374,13 +1275,13 @@
"_name": "ranbow", "_name": "ranbow",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 5
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1436,7 +1337,7 @@ ...@@ -1436,7 +1337,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1468,7 +1369,7 @@ ...@@ -1468,7 +1369,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 7 "__id__": 5
}, },
"_enabled": true, "_enabled": true,
"_cullingMask": -3, "_cullingMask": -3,
...@@ -1510,7 +1411,7 @@ ...@@ -1510,7 +1411,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1566,7 +1467,7 @@ ...@@ -1566,7 +1467,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_cullingMask": 2, "_cullingMask": 2,
...@@ -1608,7 +1509,7 @@ ...@@ -1608,7 +1509,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1664,7 +1565,7 @@ ...@@ -1664,7 +1565,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1691,6 +1592,234 @@ ...@@ -1691,6 +1592,234 @@
"_atlas": null, "_atlas": null,
"_id": "e5nPeRiq5DYqCnKhSTbYM+" "_id": "e5nPeRiq5DYqCnKhSTbYM+"
}, },
{
"__type__": "cc.Node",
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 35
},
{
"__id__": 36
}
],
"_prefab": null,
"_opacity": 100,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2048,
"height": 1152
},
"_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": "c3DY8HIOtLZpiRP4Gw9oMU"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a5wS76TdtAQ4bub3iAtYSY"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"alignMode": 2,
"_target": {
"__id__": 2
},
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "c7F18vVPxFZog+7rbnM7wy"
},
{
"__type__": "cc.Node",
"_name": "wellDown",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 38
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 616,
"height": 663
},
"_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": "2057Ag7ApGNaQpCSidw4Ia"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"premultipliedAlpha": false,
"_armatureKey": "242ac10e-291e-4017-aec6-f3e64af24536#5be32bbd-0fd2-47e8-94fb-0827153bdec2",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "242ac10e-291e-4017-aec6-f3e64af24536"
},
"_N$dragonAtlasAsset": {
"__uuid__": "5be32bbd-0fd2-47e8-94fb-0827153bdec2"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "5bfEvEFepO5KRLc7rJds7c"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -1776,7 +1905,7 @@ ...@@ -1776,7 +1905,7 @@
"__uuid__": "bbe59649-2666-4712-a5a2-fcfcf15c24ab" "__uuid__": "bbe59649-2666-4712-a5a2-fcfcf15c24ab"
}, },
"carema": { "carema": {
"__id__": 7 "__id__": 5
}, },
"_id": "08pRGJb9RMHJ0EZUopr/2i" "_id": "08pRGJb9RMHJ0EZUopr/2i"
} }
......
...@@ -251,7 +251,7 @@ export default class PS_001_scene1 extends cc.Component { ...@@ -251,7 +251,7 @@ export default class PS_001_scene1 extends cc.Component {
this.rightrabbit.getComponent(dragonBones.ArmatureDisplay).playAnimation('question', 0) this.rightrabbit.getComponent(dragonBones.ArmatureDisplay).playAnimation('question', 0)
this.tweenary.push(cc.tween(this.camera).delay(2).call(() => { this.tweenary.push(cc.tween(this.camera).delay(2).call(() => {
console.log('进入') console.log('进入')
this.parent.toNext(7) this.parent.toNext(1)
this.node.destroy() this.node.destroy()
}).start()) }).start())
......
...@@ -120,10 +120,10 @@ export default class PS_001_scene8 extends cc.Component { ...@@ -120,10 +120,10 @@ export default class PS_001_scene8 extends cc.Component {
} else if (PS_001_Ctrl.getIns().time == 1) { } else if (PS_001_Ctrl.getIns().time == 1) {
this.onFinishLast(); this.onFinishLast();
} else { } else {
const bg = cc.find('Canvas/Main Camera/bg'); const mask = cc.find('Canvas/mask');
bg.active = true; mask.active = true;
bg.zIndex = 1; mask.zIndex = 1;
cc.tween(bg).to(1, { opacity: 255 }).start(); cc.tween(mask).to(1, { opacity: 255 }).start();
const wellDown = cc.find('Canvas/wellDown'); const wellDown = cc.find('Canvas/wellDown');
wellDown.zIndex = 1; wellDown.zIndex = 1;
wellDown.active = true; wellDown.active = true;
......
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