Commit 3e88d95c authored by Li Mingzhe's avatar Li Mingzhe

feat: git status

parent 768e1b3e
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 101
}, },
{ {
"__id__": 100 "__id__": 102
}, },
{ {
"__id__": 101 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4257,6 +4257,9 @@ ...@@ -4257,6 +4257,9 @@
}, },
{ {
"__id__": 97 "__id__": 97
},
{
"__id__": 99
} }
], ],
"_active": true, "_active": true,
...@@ -4311,7 +4314,7 @@ ...@@ -4311,7 +4314,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "down", "_name": "good_job",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 88
...@@ -4369,7 +4372,7 @@ ...@@ -4369,7 +4372,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f0x5ckidJP5KWgxP+TVQyF" "_id": "0fPKnYMXNNC56vZoweMREW"
}, },
{ {
"__type__": "cc.AudioSource", "__type__": "cc.AudioSource",
...@@ -4379,6 +4382,86 @@ ...@@ -4379,6 +4382,86 @@
"__id__": 89 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_clip": {
"__uuid__": "2538c0da-c920-4b9d-b410-fbb5c25065a9"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "d4vFHBRrZKbZcEOhrGGJj6"
},
{
"__type__": "cc.Node",
"_name": "down",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_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": "f0x5ckidJP5KWgxP+TVQyF"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
},
"_enabled": true,
"_clip": { "_clip": {
"__uuid__": "78a668b5-2bbb-4e9c-a2eb-35416737679b" "__uuid__": "78a668b5-2bbb-4e9c-a2eb-35416737679b"
}, },
...@@ -4400,7 +4483,7 @@ ...@@ -4400,7 +4483,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4456,7 +4539,7 @@ ...@@ -4456,7 +4539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4480,7 +4563,7 @@ ...@@ -4480,7 +4563,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4536,7 +4619,7 @@ ...@@ -4536,7 +4619,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4560,7 +4643,7 @@ ...@@ -4560,7 +4643,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4616,7 +4699,7 @@ ...@@ -4616,7 +4699,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4640,7 +4723,7 @@ ...@@ -4640,7 +4723,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4696,7 +4779,7 @@ ...@@ -4696,7 +4779,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
......
...@@ -218,6 +218,7 @@ cc.Class({ ...@@ -218,6 +218,7 @@ cc.Class({
audioWrong: null, audioWrong: null,
audioUp: null, audioUp: null,
audioDown: null, audioDown: null,
audioGb: null,
initAudio() { initAudio() {
const audioNode = cc.find('Canvas/res/audio'); const audioNode = cc.find('Canvas/res/audio');
...@@ -229,6 +230,7 @@ cc.Class({ ...@@ -229,6 +230,7 @@ cc.Class({
this.audioWrong = getAudioByResName('wrong'); this.audioWrong = getAudioByResName('wrong');
this.audioUp = getAudioByResName('up'); this.audioUp = getAudioByResName('up');
this.audioDown = getAudioByResName('down'); this.audioDown = getAudioByResName('down');
this.audioGb = getAudioByResName('good_job');
// cc.audioEngine.play(this.audioBgm.clip, true, 0.1) // cc.audioEngine.play(this.audioBgm.clip, true, 0.1)
...@@ -242,7 +244,7 @@ cc.Class({ ...@@ -242,7 +244,7 @@ cc.Class({
this.groupIdx = 0; this.groupIdx = 0;
this.curGroup= this.data.groupArr[this.groupIdx]; this.curGroup= this.data.groupArr[this.groupIdx];
this._cantouch = true; this._cantouch = false;
this.isShowRightAnima = false; this.isShowRightAnima = false;
}, },
...@@ -378,6 +380,9 @@ cc.Class({ ...@@ -378,6 +380,9 @@ cc.Class({
const touchCircle = () => { const touchCircle = () => {
console.log('circle data: ', circle.parent.data) console.log('circle data: ', circle.parent.data)
if (!this._cantouch) {
return;
}
if (circlePosNode.isClicked || this.isShowRightAnima) { if (circlePosNode.isClicked || this.isShowRightAnima) {
return; return;
...@@ -493,7 +498,9 @@ cc.Class({ ...@@ -493,7 +498,9 @@ cc.Class({
this.curRightDragonDisplay.playAnimation(this.curRightDragonDisplay.curName, -1); this.curRightDragonDisplay.playAnimation(this.curRightDragonDisplay.curName, -1);
this.curRightDragonDisplay.timeScale = 1; this.curRightDragonDisplay.timeScale = 1;
this.showRightBubbleSound(); this.showRightBubbleSound(() => {
cc.audioEngine.play(this.audioGb.clip, false, 0.2)
});
}) })
.start(); .start();
...@@ -501,8 +508,8 @@ cc.Class({ ...@@ -501,8 +508,8 @@ cc.Class({
}, },
showRightBubbleSound() { showRightBubbleSound(cb = null) {
playAudioByUrl(this.rightBubble.data.audio_url); playAudioByUrl(this.rightBubble.data.audio_url, cb);
}, },
...@@ -844,9 +851,11 @@ cc.Class({ ...@@ -844,9 +851,11 @@ cc.Class({
}, },
resetBubble() { resetBubble() {
this.bubble.scale = 1; this.bubble.scale = 1;
this.bubbleJump(this.bubble); this.bubbleJump(this.bubble);
this._cantouch = true;
}, },
showMaskLayer(cb) { showMaskLayer(cb) {
......
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