Commit 72ed470b authored by limingzhe's avatar limingzhe

fix: debug

parent 9f6c5c0b
......@@ -3058,7 +3058,7 @@
},
{
"__type__": "cc.Node",
"_name": "出现",
"_name": "chuxian",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3139,7 +3139,7 @@
},
{
"__type__": "cc.Node",
"_name": "正确",
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3220,7 +3220,7 @@
},
{
"__type__": "cc.Node",
"_name": "错误泡泡爆炸",
"_name": "cuowupaopao",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3301,7 +3301,7 @@
},
{
"__type__": "cc.Node",
"_name": "按钮",
"_name": "anniu",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3382,7 +3382,7 @@
},
{
"__type__": "cc.Node",
"_name": "大星",
"_name": "daxing",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3463,7 +3463,7 @@
},
{
"__type__": "cc.Node",
"_name": "题数",
"_name": "tishu",
"_objFlags": 0,
"_parent": {
"__id__": 56
......@@ -3544,7 +3544,7 @@
},
{
"__type__": "cc.Node",
"_name": "撒花",
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 56
......
......@@ -5,7 +5,7 @@
// Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import GameLogic from "../script/GameLogic"
import GameLogic from "../script/dfzx_ac2_GameLogic"
cc.Class({
......
import { getDistance } from "./util";
import { getDistance } from "./dfzx_ac2_util";
export default class Cartoon {
elements = {
......
import Cartoon from "./Cartoon"
import defaultData from "./defaultData"
import { jelly, randomSortByArr, showFireworks, RandomInt } from "./utils"
import { onHomeworkFinish } from "./util"
import Cartoon from "./dfzx_ac2_Cartoon"
import defaultData from "./dfzx_ac2_defaultData"
// import { jelly, randomSortByArr, showFireworks, RandomInt } from "./dfzx_ac2_utils"
import { onHomeworkFinish, RandomInt } from "./dfzx_ac2_util"
export default class GameLogic {
......@@ -120,7 +120,7 @@ export default class GameLogic {
if(!this.g_enableClick) {
return
}
this.g_cartoon.playAudio("按钮");
this.g_cartoon.playAudio("anniu");
this.g_cartoon.tweenChange(btn_restart.node, {scaleX: 0, scaleY: 0}, 0.2, _=>{
this.enableClick("Restart")
this.restartGame();
......@@ -132,7 +132,7 @@ export default class GameLogic {
if(!this.g_enableClick) {
return
}
this.g_cartoon.playAudio("按钮");
this.g_cartoon.playAudio("anniu");
this.g_cartoon.tweenChange(btn_start.node, {scaleX: 0, scaleY: 0}, 0.2, _=>{
this.enableClick("start")
if(this.nextQuestion()) {
......@@ -235,7 +235,7 @@ export default class GameLogic {
endGame() {
const btn_restart = this.g_cartoon.getCartoonElement("restart")
this.disableClick("EndGame")
this.g_cartoon.playAudio("撒花")
this.g_cartoon.playAudio("sahua")
this.fireworks();
this.g_cartoon.tweenChange(btn_restart.node, {scale: 1}, 0.3, _=>{
this.enableClick("EndGame");
......@@ -507,7 +507,7 @@ export default class GameLogic {
this.g_cartoon.stopAllAudio();
btn_speaker.stopAni();
if(bubble.isRight) {
this.g_cartoon.playAudio("正确")
this.g_cartoon.playAudio("right")
clickBubble.boom().then(_=>{
bubble.node.active = false;
if(item.audio_url) {
......@@ -553,7 +553,7 @@ export default class GameLogic {
this.resetSystemTick();
this.enableClick(`bubble_${i}`)
})
this.g_cartoon.playAudio("错误泡泡爆炸");
this.g_cartoon.playAudio("cuowupaopao");
}
}, true)
}
......@@ -621,7 +621,7 @@ export default class GameLogic {
bubble.move.vY = vArr[count%4].vY
count++;
this.timeIdArr.push(setTimeout(() => {
this.g_cartoon.playAudio("出现")
this.g_cartoon.playAudio("chuxian")
this.g_cartoon.tweenChange(bubble.node, {scale: this.m_maxScale, x: bubble.move.x, y: bubble.move.y}, 3, _=>{
resolve()
})
......@@ -790,7 +790,7 @@ export default class GameLogic {
return
}
this.g_cartoon.playAudio("大星");
this.g_cartoon.playAudio("daxing");
if (!currentStarIdx) {
currentStarIdx = 0;
}
......@@ -837,7 +837,7 @@ export default class GameLogic {
.to(0.8, { scale: 0 }, { easing: 'quadOut' })
.call(() => {
// this.checkGameEnd();
this.g_cartoon.playAudio("题数");
this.g_cartoon.playAudio("tishu");
if(callback) {
callback()
}
......
......@@ -11,7 +11,7 @@
"height": 275,
"platformSettings": {},
"subMetas": {
"组21": {
"xing2": {
"ver": "1.0.4",
"uuid": "0d4e8ab5-1e48-4a70-b5f3-41ac05264cbf",
"rawTextureUuid": "ad5a9b5e-56cd-4271-9a43-44afa49c9194",
......
......@@ -11,7 +11,7 @@
"height": 69,
"platformSettings": {},
"subMetas": {
"组22": {
"xing3": {
"ver": "1.0.4",
"uuid": "87136bc7-13f1-4c93-a705-396b8d9281b2",
"rawTextureUuid": "9d817392-6611-414c-9c05-64da2564376f",
......
......@@ -11,7 +11,7 @@
"height": 66,
"platformSettings": {},
"subMetas": {
"多边形1拷贝": {
"xingxing1": {
"ver": "1.0.4",
"uuid": "e3fc5cc3-7007-4f39-a4f7-854a16e06883",
"rawTextureUuid": "caebfe0f-b246-41db-9ef6-395e80d10a5c",
......
......@@ -11,7 +11,7 @@
"height": 134,
"platformSettings": {},
"subMetas": {
"组23": {
"yuan": {
"ver": "1.0.4",
"uuid": "3cea9a1b-f70d-4b61-bb07-bcefffd3fa53",
"rawTextureUuid": "a7a98849-9445-451f-bd72-ed805a8f7307",
......
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