Commit 8da7b49f authored by Tt's avatar Tt

Merge branch 'master' of http://120.27.1.210:43210/huiwan/l3_boardgame1_rainforest into master

parents a113da5a 5bf2d44e
...@@ -8650,7 +8650,7 @@ ...@@ -8650,7 +8650,7 @@
} }
], ],
"_armatureName": "Armature", "_armatureName": "Armature",
"_animationName": "normal", "_animationName": "begin",
"_preCacheMode": 0, "_preCacheMode": 0,
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
...@@ -8669,7 +8669,7 @@ ...@@ -8669,7 +8669,7 @@
"__uuid__": "df8441b6-eba9-4202-a90b-67e7c89dee7b" "__uuid__": "df8441b6-eba9-4202-a90b-67e7c89dee7b"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 3, "_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0, "_N$_defaultCacheMode": 0,
"_N$timeScale": 1, "_N$timeScale": 1,
"_N$debugBones": false, "_N$debugBones": false,
......
...@@ -900,7 +900,7 @@ export default class L2_boardgame2_SceneComponent extends MyCocosSceneComponent ...@@ -900,7 +900,7 @@ export default class L2_boardgame2_SceneComponent extends MyCocosSceneComponent
let pos = sps.indexOf(item.data.letter); let pos = sps.indexOf(item.data.letter);
let isSuccess let isSuccess
if (pos > -1) { if (pos > -1) {
isSuccess = this.playAmiSpecial(item.data.letter); isSuccess = await this.playAmiSpecial(item.data.letter);
} else { } else {
isSuccess = await this.showVoice(rightBlock); isSuccess = await this.showVoice(rightBlock);
} }
......
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