Commit 8a232f22 authored by 章红平's avatar 章红平

提交

parent 63aa9365
......@@ -19,22 +19,16 @@
"_children": [
{
"__id__": 2
},
{
"__id__": 30
},
{
"__id__": 39
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 53
}
],
"_prefab": {
"__id__": 51
"__id__": 54
},
"_opacity": 255,
"_color": {
......@@ -105,12 +99,18 @@
},
{
"__id__": 18
},
{
"__id__": 29
},
{
"__id__": 41
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 29
"__id__": 52
},
"_opacity": 255,
"_color": {
......@@ -1130,40 +1130,95 @@
"fileId": "d4Kv2wUZJFTLmcAae9Ch7c",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "91Q8ta16tPfYNnewRrj3HT",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "block",
"_objFlags": 0,
"_parent": {
"__id__": 1
"__id__": 2
},
"_children": [
{
"__id__": 31
"__id__": 30
},
{
"__id__": 34
},
{
"__id__": 37
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 40
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2000,
"height": 1500
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
249.38,
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": ""
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 31
},
{
"__id__": 32
}
],
"_prefab": {
"__id__": 38
"__id__": 33
},
"_opacity": 255,
"_color": {
......@@ -1175,8 +1230,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2000,
"height": 1500
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1212,22 +1267,88 @@
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "6c77564b-7a1f-4cd6-8959-e8cda1b2dd33"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_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": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "45NS3xPalObqm3m0EbfyVO",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 35
}
],
"_prefab": {
"__id__": 33
"__id__": 36
},
"_opacity": 255,
"_color": {
......@@ -1281,7 +1402,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1316,7 +1437,7 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "f7ICHPXTRH7oY+fBSkF1s1",
"fileId": "fc6d12R5xK3LUWGOdZTsn4",
"sync": false
},
{
......@@ -1324,17 +1445,17 @@
"_name": " dragon1",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 38
}
],
"_prefab": {
"__id__": 36
"__id__": 39
},
"_opacity": 255,
"_color": {
......@@ -1388,7 +1509,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1431,41 +1552,9 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "d2IvJVDI5FB66yTJbLxDTq",
"fileId": "87Ejs1a/hAH7584YM+5pm1",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "6c77564b-7a1f-4cd6-8959-e8cda1b2dd33"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
......@@ -1474,7 +1563,7 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "65hSrDEqtOtoOX42rBxT2G",
"fileId": "53o64MrfpGk6jvC1SaO+5I",
"sync": false
},
{
......@@ -1482,23 +1571,23 @@
"_name": "over",
"_objFlags": 0,
"_parent": {
"__id__": 1
"__id__": 2
},
"_children": [
{
"__id__": 40
"__id__": 42
},
{
"__id__": 43
"__id__": 45
},
{
"__id__": 46
"__id__": 48
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 49
"__id__": 51
},
"_opacity": 255,
"_color": {
......@@ -1523,7 +1612,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
249.38,
0,
0,
0,
......@@ -1552,17 +1641,17 @@
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 43
}
],
"_prefab": {
"__id__": 42
"__id__": 44
},
"_opacity": 255,
"_color": {
......@@ -1616,7 +1705,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -1651,7 +1740,7 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "421Rl9mUVB8p4qgvEp4WXR",
"fileId": "2crIkElRJCF5OXLDJGi0WZ",
"sync": false
},
{
......@@ -1659,17 +1748,17 @@
"_name": "comeon",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 46
}
],
"_prefab": {
"__id__": 45
"__id__": 47
},
"_opacity": 255,
"_color": {
......@@ -1723,7 +1812,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -1758,7 +1847,7 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "f5JPSjwZ1EqriwPXOAYi16",
"fileId": "faW6mDJLdG9Z7/gm3KXTd4",
"sync": false
},
{
......@@ -1766,17 +1855,17 @@
"_name": " dragon2",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 47
"__id__": 49
}
],
"_prefab": {
"__id__": 48
"__id__": 50
},
"_opacity": 255,
"_color": {
......@@ -1830,7 +1919,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -1873,7 +1962,7 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "35lPXGkIBL+boKEU0nZySj",
"fileId": "bcuj4cQRpJH7W9OE9mwsfq",
"sync": false
},
{
......@@ -1884,7 +1973,18 @@
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "31SANQWfZGhIG3UrrGcOeU",
"fileId": "03g0NanvhID7cX4zn4qGck",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
},
"fileId": "91Q8ta16tPfYNnewRrj3HT",
"sync": false
},
{
......@@ -1901,10 +2001,10 @@
"__id__": 13
},
"dragon1": {
"__id__": 35
"__id__": 38
},
"dragon2": {
"__id__": 47
"__id__": 49
},
"cakeN": {
"__id__": 2
......
......@@ -3034,7 +3034,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2000,
"width": 2500,
"height": 35
},
"_anchorPoint": {
......@@ -3216,8 +3216,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2000,
"height": 2000
"width": 4000,
"height": 4000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......
......@@ -70,7 +70,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
}
initCandle1() {
this.candle1.x = -850
this.candle1.x = -cc.winSize.width/2-200
let candleS = this.candle1.getComponent("candle")
let maskNode = this.candle1.getChildByName("mask");
candleS.dragon1.node.active = true;
......@@ -78,7 +78,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
candleS.dragon3.node.active = false;
}
initCandle2() {
this.candle2.x = -850
this.candle2.x = -cc.winSize.width/2-200
let maskNode = this.candle2.getChildByName("mask");
maskNode.height = this.candle2.height = 333
let candleS = this.candle2.getComponent("candle")
......@@ -89,19 +89,19 @@ export default class cake_class_1 extends MyCocosSceneComponent {
this.initCandle2();
this.playLocalAudio("in")
cc.tween(this.candle2)
.to(0.3, { x: -550 })
.to(0.3, { x: -cc.winSize.width/2+150 })
.start();
}
moveInCandle1() {
this.initCandle1();
this.playLocalAudio("in")
cc.tween(this.candle1)
.to(0.3, { x: -550 })
.to(0.3, { x: -cc.winSize.width/2+150 })
.start();
}
moveOutCandle1(cb = null) {
cc.tween(this.candle1)
.to(0.3, { x: -850 })
.to(0.3, { x: -cc.winSize.width/2-200 })
.call(() => {
if (cb) cb();
})
......@@ -109,15 +109,15 @@ export default class cake_class_1 extends MyCocosSceneComponent {
}
moveOutCandle2() {
cc.tween(this.candle2)
.to(0.3, { x: -850 })
.to(0.3, { x: -cc.winSize.width/2-200 })
.start();
}
initMusicBtn() {
this.musicBtn.node.x = 850;
this.musicBtn.node.x = cc.winSize.width/2+200;
this.musicBtn.interactable = true;
}
initRedBtn() {
this.redBtnN.x = 850;
this.redBtnN.x = cc.winSize.width/2+200;
}
startGame() {
this.answerList[this.questionIndex] = 0;
......@@ -137,7 +137,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
}, this.data.questions[this.questionIndex].choosewaitTime * 1000)
this.initMusicBtn();
cc.tween(this.musicBtn.node)
.to(0.3, { x: 550 })
.to(0.3, { x: cc.winSize.width/2-150 })
.start()
})
this.moveInCandle1();
......@@ -200,6 +200,11 @@ export default class cake_class_1 extends MyCocosSceneComponent {
this.initListener();
}
start(): void {
super.start()
this.initCandle1();
this.initCandle2();
this.initRedBtn();
this.initMusicBtn();
let bgNode=cc.find("bg/bg",this.node);
let scaleX=cc.winSize.width/bgNode.width;
let scaleY=cc.winSize.height /bgNode.height;
......@@ -208,8 +213,9 @@ export default class cake_class_1 extends MyCocosSceneComponent {
}else{
bgNode.scale=scaleY;
}
}
initNodePos(){
super.start();
}
dataCallBack() {
super.dataCallBack();
......@@ -259,7 +265,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
this.clearTimeouts()
if (isSuc) {
cc.tween(this.musicBtn.node)
.to(0.3, { x: 850 })
.to(0.3, { x: cc.winSize.width/2+200 })
.call(() => {
})
......
......@@ -51,7 +51,7 @@ export default class panel extends cc.Component {
// }, "waitTime": 12, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "d", "wrongLetter": "b"
// }, }
initPanel(data, mainCtil) {
this.frameN.y = 1000;
this.frameN.y = cc.winSize.height+400;
this.frameN.off("click");
this.frameN.on("click", () => {
this.playDragon();
......@@ -87,8 +87,8 @@ export default class panel extends cc.Component {
rightPice.zIndex = 10 - index;
rightPice.parent = picesN;
wrongPice.parent = picesN;
rightPice.x = 450
wrongPice.x = 450
rightPice.x = cc.winSize.width/2-200
wrongPice.x =cc.winSize.width/2-200
wrongPice.name = "wrongPice"
rightPice.name = "rightPice"
rightPice.getComponentInChildren(cc.Label).string = data.rightLetter;
......@@ -172,13 +172,13 @@ export default class panel extends cc.Component {
}
)
cc.tween(this.mainCtil.musicBtn.node)
.to(0.3, { x: 900 })
.to(0.3, { x: cc.winSize.width/2+200 })
.start();
} else {
rightPice.active = false;
this.mainCtil.moveOutCandle1()
cc.tween(this.mainCtil.musicBtn.node)
.to(0.3, { x: 900 })
.to(0.3, { x: cc.winSize.width/2+200 })
.start();
this.mainCtil.playLocalAudio("err");
cc.tween(wrongPice)
......@@ -198,7 +198,7 @@ export default class panel extends cc.Component {
outPice() {
let wrongPice = cc.find("cake/picesP", this.node).getChildByName("wrongPice")
cc.tween(wrongPice)
.to(0.3, { x: 1100 })
.to(0.3, { x: cc.winSize.width/2+400 })
.call(() => {
wrongPice.destroy();
cc.tween(this.frameN)
......@@ -211,7 +211,7 @@ export default class panel extends cc.Component {
this.mainCtil.moveInCandle2();
this.mainCtil.initRedBtn();
cc.tween(this.mainCtil.redBtnN)
.to(0.3, { x: 550 })
.to(0.3, { x: cc.winSize.width/2-150 })
.start();
// guideAudio
})
......@@ -232,8 +232,9 @@ export default class panel extends cc.Component {
}
}
showBlock(){
let block = this.node.getChildByName("block");
let block = cc.find("cake/block",this.node);
block.active = true;
block.getChildByName("bg").getComponent(cc.Widget).target=cc.find("Canvas");
block.opacity = 0;
cc.tween(block)
.to(0.5, { opacity: 255 })
......@@ -245,10 +246,14 @@ export default class panel extends cc.Component {
}
showResult(isSuc) {
// this.dragon.node.active=false;
let block = this.node.getChildByName("block");
let block = cc.find("cake/block",this.node);
block.getChildByName("bg").getComponent(cc.Widget).target=cc.find("Canvas");
let nicetry = block.getChildByName("nicetry");
this.dragon1.node.active=true;
this.dragon1.node.active=false;
nicetry.active=false;
if (isSuc) {
this.dragon1.node.active=true;
this.mainCtil.playLocalAudio("excellent")
this.dragon1.playAnimation("newAnimation", 1)
this.dragon1.on(dragonBones.EventObject.COMPLETE, () => {
......@@ -259,6 +264,7 @@ export default class panel extends cc.Component {
})
} else {
nicetry.active=true;
this.mainCtil.playLocalAudio("talkerr")
this.dragon1.node.active = false;
cc.tween(nicetry)
......@@ -281,10 +287,12 @@ export default class panel extends cc.Component {
this.dragon.node.active = false;
let length=answerList.length;
let sucTime=0;
let over=cc.find("over",this.node);
let over=cc.find("cake/over",this.node);
over.active=true;
let nicetry=cc.find("over/nicetry",this.node);
let comeon=cc.find("over/comeon",this.node)
let nicetry=cc.find("cake/over/nicetry",this.node);
let comeon=cc.find("cake/over/comeon",this.node)
nicetry.active=false;
comeon.active=false;
for(let i=0;i<length;i++){
if(answerList[i]==1){
sucTime++
......@@ -298,6 +306,7 @@ export default class panel extends cc.Component {
this.dragon2.playAnimation("normal", 1)
this.mainCtil.playLocalAudio("allRigtht")
}else if((sucTime/length)>=0.6){
nicetry.active=true;
this.mainCtil.playLocalAudio("nicetry");
cc.tween(nicetry)
.to(0.3, { y: -50 })
......@@ -306,6 +315,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -700 })
.start();
}else{
comeon.active=true;
this.mainCtil.playLocalAudio("comeon")
cc.tween(comeon)
.to(0.3, { y: -50 })
......
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