Commit 7021d7af authored by 李维's avatar 李维

dev commit

parent 67230368
{
"ver": "2.0.1",
"uuid": "0228048b-0aa2-4e5d-90bd-2e6296ae4419",
"downloadMode": 0,
"duration": 1.236583,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "c1346441-63d2-4096-b5a1-0cecc042ab61",
"downloadMode": 0,
"duration": 1.854694,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "234809b3-87b1-4db0-a1bb-b4327e90de89",
"downloadMode": 0,
"duration": 1.044898,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "03402378-9ad2-4144-8d41-cf3bd78190a9",
"downloadMode": 0,
"duration": 0.84,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "29f5220e-ff20-4b01-baf2-ebc27321ce7b",
"downloadMode": 0,
"duration": 1.688,
"subMetas": {}
}
\ No newline at end of file
...@@ -129,13 +129,13 @@ ...@@ -129,13 +129,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 204 "__id__": 214
}, },
{ {
"__id__": 205 "__id__": 215
}, },
{ {
"__id__": 206 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -906,6 +906,9 @@ ...@@ -906,6 +906,9 @@
"_children": [ "_children": [
{ {
"__id__": 18 "__id__": 18
},
{
"__id__": 20
} }
], ],
"_active": true, "_active": true,
...@@ -921,8 +924,8 @@ ...@@ -921,8 +924,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 174,
"height": 0 "height": 164
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -960,20 +963,16 @@ ...@@ -960,20 +963,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "play", "_name": "pause",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 17
}, },
"_children": [ "_children": [],
{
"__id__": 19
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 19
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -987,8 +986,8 @@ ...@@ -987,8 +986,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 174,
"height": 36 "height": 164
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1022,20 +1021,52 @@ ...@@ -1022,20 +1021,52 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "5djyRGoyJH37N72RnVeNae" "_id": "7cUfIpEnxEDJ8oF5TqxSJA"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "9616fbc0-1fbe-4db7-ac7b-cfcc07d2031c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a6190C50pKhpamn6ICL8si"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bird_audio", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 17
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1091,7 +1122,7 @@ ...@@ -1091,7 +1122,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1118,38 +1149,6 @@ ...@@ -1118,38 +1149,6 @@
"_atlas": null, "_atlas": null,
"_id": "a5lXnyr1lNV7fIfP3AC7vF" "_id": "a5lXnyr1lNV7fIfP3AC7vF"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "43vovy1qNAZL0H5Xm8LLbc"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "shuicao", "_name": "shuicao",
...@@ -1272,8 +1271,8 @@ ...@@ -1272,8 +1271,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 670,
"height": 0 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10053,6 +10052,21 @@ ...@@ -10053,6 +10052,21 @@
"_children": [ "_children": [
{ {
"__id__": 202 "__id__": 202
},
{
"__id__": 204
},
{
"__id__": 206
},
{
"__id__": 208
},
{
"__id__": 210
},
{
"__id__": 212
} }
], ],
"_active": true, "_active": true,
...@@ -10185,6 +10199,406 @@ ...@@ -10185,6 +10199,406 @@
"preload": false, "preload": false,
"_id": "d6bBcX6GNJ9K0o1szmVe8f" "_id": "d6bBcX6GNJ9K0o1szmVe8f"
}, },
{
"__type__": "cc.Node",
"_name": "star_boom",
"_objFlags": 0,
"_parent": {
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 205
}
],
"_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": "8cMYL2qzpKjY23291prcse"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 204
},
"_enabled": true,
"_clip": {
"__uuid__": "03402378-9ad2-4144-8d41-cf3bd78190a9"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "c03Fk49dFIpJle//sCSA/O"
},
{
"__type__": "cc.Node",
"_name": "good_job",
"_objFlags": 0,
"_parent": {
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 207
}
],
"_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": "90jvpYiuxL9rAWAfKsrwXt"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
},
"_enabled": true,
"_clip": {
"__uuid__": "234809b3-87b1-4db0-a1bb-b4327e90de89"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "14OSAfnYpEdIMtUs7GX2H2"
},
{
"__type__": "cc.Node",
"_name": "bird_fly",
"_objFlags": 0,
"_parent": {
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 209
}
],
"_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": "78CAjmPmZN77H3KmtiEb38"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
},
"_enabled": true,
"_clip": {
"__uuid__": "0228048b-0aa2-4e5d-90bd-2e6296ae4419"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "6bvueElNhGrbw7twqeWk+U"
},
{
"__type__": "cc.Node",
"_name": "try_again",
"_objFlags": 0,
"_parent": {
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 211
}
],
"_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": "30vs7wofVBJ7umL97086Z9"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
},
"_enabled": true,
"_clip": {
"__uuid__": "29f5220e-ff20-4b01-baf2-ebc27321ce7b"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "0fGybE6mBKhq7PA76Mexc+"
},
{
"__type__": "cc.Node",
"_name": "enter",
"_objFlags": 0,
"_parent": {
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
}
],
"_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": "2aNXaMMoRLW7/oHC80Ni7H"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
},
"_enabled": true,
"_clip": {
"__uuid__": "c1346441-63d2-4096-b5a1-0cecc042ab61"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "3ePvxHPkVCma80GO1wHbiG"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
......
...@@ -140,9 +140,7 @@ export default class Cartoon { ...@@ -140,9 +140,7 @@ export default class Cartoon {
// Audio // Audio
playAudio(audio_url, cb = null) { playAudio(audio_url, cb = null) {
// return new Promise((res, rej) => { return new Promise((resolve, reject)=>{
// })
if (audio_url) { if (audio_url) {
var urlreg=/^(?=^.{3,255}$)(http(s)?:\/\/)?(www\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\d+)*(\/\w+\.\w+)*([\?&]\w+=\w*)*$/ var urlreg=/^(?=^.{3,255}$)(http(s)?:\/\/)?(www\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\d+)*(\/\w+\.\w+)*([\?&]\w+=\w*)*$/
if(urlreg.test(audio_url)) { if(urlreg.test(audio_url)) {
...@@ -150,28 +148,29 @@ export default class Cartoon { ...@@ -150,28 +148,29 @@ export default class Cartoon {
if(cb) { if(cb) {
this.audioCallback[audio_url] = cb this.audioCallback[audio_url] = cb
} }
const audio = cc.audioEngine.play(audioClip, false, 1); const audioId = cc.audioEngine.play(audioClip, false, 1);
if (cb) { if (cb) {
cc.audioEngine.setFinishCallback(audio, () => { cc.audioEngine.setFinishCallback(audioId, () => {
delete this.audioCallback[audio_url] delete this.audioCallback[audio_url]
cb(); cb();
}); });
} }
// res(audio) resolve(audioId)
}); });
} else { } else {
const audioNode = cc.find('Canvas/res/audio').getChildByName(audio_url).getComponent(cc.AudioSource); const audioNode = cc.find('Canvas/res/audio').getChildByName(audio_url).getComponent(cc.AudioSource);
const audio = cc.audioEngine.play(audioNode.clip, false, 1) let audioId = cc.audioEngine.play(audioNode.clip, false, 1)
if (cb) { if (cb) {
this.audioCallback[audio_url] = cb this.audioCallback[audio_url] = cb
cc.audioEngine.setFinishCallback(audio, () => { cc.audioEngine.setFinishCallback(audioId, () => {
delete this.audioCallback[audio_url] delete this.audioCallback[audio_url]
cb(); cb();
}); });
} }
// res(audio) resolve(audioId)
} }
} }
})
} }
stopAllAudio(exceptUrls = []) { stopAllAudio(exceptUrls = []) {
...@@ -292,9 +291,9 @@ class DragonBones { ...@@ -292,9 +291,9 @@ class DragonBones {
const ske = dragonBonesConfig.skeJsonData.url const ske = dragonBonesConfig.skeJsonData.url
const atlas = dragonBonesConfig.texJsonData.url const atlas = dragonBonesConfig.texJsonData.url
cc.loader.load(image, (error, texture) => { cc.assetManager.loadRemote(image, (error, texture) => {
cc.loader.load({url: atlas, type: 'txt'}, (error, atlasJson) => { cc.assetManager.loadRemote(atlas, (error, atlasJson) => {
cc.loader.load({url: ske, type: 'txt'}, (error, dragonBonesJson) => { cc.assetManager.loadRemote(url, (error, dragonBonesJson) => {
const atlas = new dragonBones.DragonBonesAtlasAsset(); const atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson; atlas.atlasJson = atlasJson;
atlas.texture = texture; atlas.texture = texture;
......
...@@ -31,36 +31,36 @@ export default class GameLogic { ...@@ -31,36 +31,36 @@ export default class GameLogic {
} }
this.g_cartoon.initLocalAudios([ this.g_cartoon.initLocalAudios([
"test_audio" "test_audio",
"bird_fly",
"enter",
"good_job",
"star_boom",
"try_again"
]) ])
this.g_cartoon.playAudio("enter", ()=>{
if(this.g_formData.questionAudio_url) {
this.g_cartoon.playAudio(this.g_formData.questionAudio_url, ()=>{
this.initBGMusic(); this.initBGMusic();
this.loadQuestion();
})
} else {
this.initBGMusic();
this.loadQuestion();
}
})
this.initBg() this.initBg()
this.initNodes(); this.initNodes();
this.resetPosition(); this.resetPosition();
this.initBottomButtons(); this.initBottomButtons();
this.initBirds(); this.initBirds();
this.initImageCards(); this.initImageCards();
this.initTitle(); this.initTitle();
this.loadQuestion();
this.initMaskLayer();
// this.initQuestionPannel();
// this.initButtons();
// this.initMaskLayer();
// this.initDragonBonesContainer();
// this.checkButtonStatus()
// // Load quesiton
// this.initSelectedCards();
// this.initText();
// this.initCenterImage();
// this.g_enableClick = false; this.initMaskLayer();
// this.resetAllSelectedCards();
// this.playQuestion(()=>{
// this.g_enableClick = true;
// })
} }
initNodes() { initNodes() {
...@@ -92,6 +92,8 @@ export default class GameLogic { ...@@ -92,6 +92,8 @@ export default class GameLogic {
this.g_cartoon.initCartoonElement(`bird_1`, this.g_cartoon.getNodeByPath(`Canvas/bird_1`)); this.g_cartoon.initCartoonElement(`bird_1`, this.g_cartoon.getNodeByPath(`Canvas/bird_1`));
this.g_cartoon.initCartoonElement(`bird_2`, this.g_cartoon.getNodeByPath(`Canvas/bird_2`)); this.g_cartoon.initCartoonElement(`bird_2`, this.g_cartoon.getNodeByPath(`Canvas/bird_2`));
this.g_cartoon.initCartoonElement(`birdAudio`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bird_audio`));
} }
initBg() { initBg() {
...@@ -110,12 +112,10 @@ export default class GameLogic { ...@@ -110,12 +112,10 @@ export default class GameLogic {
initBGMusic() { initBGMusic() {
if(this.g_formData.bgMusic) { if(this.g_formData.bgMusic) {
this.g_cartoon.playAudio(this.g_formData.bgMusic) this.g_cartoon.playAudio(this.g_formData.bgMusic).then(audioID => {
// .then(bgMusic => { cc.audioEngine.setLoop(audioID, true);
// console.log(bgMusic) cc.audioEngine.setVolume(audioID, 0.3);
// bgMusic.isLoop = true; })
// bgMusic.setVolume(0.3)
// })
} }
} }
...@@ -140,7 +140,14 @@ export default class GameLogic { ...@@ -140,7 +140,14 @@ export default class GameLogic {
initImageCards() { initImageCards() {
let dataLength = this.g_formData.dataArray.length; let dataLength = this.g_formData.dataArray.length;
let newIndex = this.getRandomArray(dataLength) if(dataLength == 0) {
return
}
let newIndex = [0];
if(dataLength!=1) {
newIndex = this.getRandomArray(dataLength)
}
this.m_currentQuestionArray = [] this.m_currentQuestionArray = []
for(let index=0; index<dataLength; index++) { for(let index=0; index<dataLength; index++) {
this.m_currentQuestionArray.push(index) this.m_currentQuestionArray.push(index)
...@@ -162,6 +169,20 @@ export default class GameLogic { ...@@ -162,6 +169,20 @@ export default class GameLogic {
bellText.node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("Comic Sans MS") bellText.node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("Comic Sans MS")
bellText.node.getComponent(cc.Label).fontSize = 20 bellText.node.getComponent(cc.Label).fontSize = 20
card.playAudio = (callback) => {
if(dataItem.audio_url) {
this.g_cartoon.playAudio(dataItem.audio_url, ()=>{
if(callback) {
callback()
}
})
} else {
if(callback) {
callback()
}
}
}
if(this.g_useDefaultData || !dataItem) { if(this.g_useDefaultData || !dataItem) {
let fr = this.getSpriteFrimeByResName("card_demo") let fr = this.getSpriteFrimeByResName("card_demo")
imageContainer.node.setScale(1) imageContainer.node.setScale(1)
...@@ -180,22 +201,28 @@ export default class GameLogic { ...@@ -180,22 +201,28 @@ export default class GameLogic {
bellOutline.node.setScale(0); bellOutline.node.setScale(0);
this.g_cartoon.subscribeTouchEvent(`card_${index+1}_image_container`, ()=>{ this.g_cartoon.subscribeTouchEvent(`card_${index+1}_image_container`, ()=>{
if(card.open || this.m_gameEnd) { if(card.open || this.m_gameEnd || !this.g_enableClick) {
return; return;
} }
this.g_enableClick = false;
if(this.m_currentQuestion == imageContainer.correctIndex ) { if(this.m_currentQuestion == imageContainer.correctIndex ) {
this.g_cartoon.playAudio("good_job")
card.open = true; card.open = true;
this.g_cartoon.getCartoonElement(`card_${imageContainer.cardIndex+1}_normal`).node.opacity = 0; this.g_cartoon.getCartoonElement(`card_${imageContainer.cardIndex+1}_normal`).node.opacity = 0;
this.g_cartoon.getCartoonElement(`card_${imageContainer.cardIndex+1}_selected`).node.opacity = 255; this.g_cartoon.getCartoonElement(`card_${imageContainer.cardIndex+1}_selected`).node.opacity = 255;
this.g_cartoon.getCartoonElement("bird_2").flyTo(imageContainer.cardIndex, ()=>{ this.g_cartoon.getCartoonElement("bird_2").flyTo(imageContainer.cardIndex, ()=>{
setTimeout(()=>{
this.switchCard(this.m_currentQuestion, imageContainer.cardIndex, ()=>{ this.switchCard(this.m_currentQuestion, imageContainer.cardIndex, ()=>{
this.g_enableClick = true;
this.loadQuestion() this.loadQuestion()
}) })
}, 500)
}) })
} else {
this.g_cartoon.playAudio("try_again", ()=>{
setTimeout(()=>{
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].audio_url)
this.g_enableClick = true;
}, 1000)
})
} }
}) })
...@@ -218,11 +245,13 @@ export default class GameLogic { ...@@ -218,11 +245,13 @@ export default class GameLogic {
} }
this.g_cartoon.subscribeTouchEvent(`card_${index+1}_bell`, ()=>{ this.g_cartoon.subscribeTouchEvent(`card_${index+1}_bell`, ()=>{
if(dataItem.audio_url) {
this.g_cartoon.stopAllAudio() this.g_cartoon.stopAllAudio()
this.g_cartoon.playAudio("test_audio", ()=>{ card.playAudio(()=>{
stopBell() stopBell()
}) })
runBell() runBell()
}
}) })
} }
} }
...@@ -280,9 +309,28 @@ export default class GameLogic { ...@@ -280,9 +309,28 @@ export default class GameLogic {
} }
initTitle() { initTitle() {
this.g_cartoon.getCartoonElement("title_text").node.getComponent(cc.Label).string = "It's My Day" let textNode = this.g_cartoon.getCartoonElement("title_text")
this.g_cartoon.getCartoonElement("title_text").node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("Comic Sans MS") let fontSize = 36
this.g_cartoon.getCartoonElement("title_text").node.getComponent(cc.Label).fontSize = 32 if(this.g_formData.titleText.length>=32 && this.g_formData.titleText.length<48) {
fontSize = 26
} else if(this.g_formData.titleText.length>=48) {
fontSize = 20
}
console.log("fontSize", fontSize)
textNode.node.getComponent(cc.Label).string = this.g_formData.titleText;
textNode.node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("Comic Sans MS")
textNode.node.getComponent(cc.Label).fontSize = fontSize
textNode.audioID = null
this.g_cartoon.subscribeTouchEvent(textNode.key, ()=>{
if(textNode.audioID) {
cc.audioEngine.stop(textNode.audioID);
textNode.audioID = null
}
this.g_cartoon.playAudio(this.g_formData.questionAudio_url).then((audio_id) =>{
textNode.audioID = audio_id
})
})
} }
getRandomArray(length) { getRandomArray(length) {
...@@ -362,7 +410,9 @@ export default class GameLogic { ...@@ -362,7 +410,9 @@ export default class GameLogic {
this.endGame() this.endGame()
} else { } else {
index = this.m_currentQuestionArray[this.m_currentQuestion] index = this.m_currentQuestionArray[this.m_currentQuestion]
this.g_cartoon.getCartoonElement("bird_1").flyTo(index) this.g_cartoon.getCartoonElement("bird_1").flyTo(index, ()=>{
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].audio_url)
})
this.g_cartoon.getCartoonElement(`card_${index+1}_normal`).node.opacity = 0; this.g_cartoon.getCartoonElement(`card_${index+1}_normal`).node.opacity = 0;
this.g_cartoon.getCartoonElement(`card_${index+1}_selected`).node.opacity = 255; this.g_cartoon.getCartoonElement(`card_${index+1}_selected`).node.opacity = 255;
} }
...@@ -415,8 +465,9 @@ export default class GameLogic { ...@@ -415,8 +465,9 @@ export default class GameLogic {
} }
initBirds() { initBirds() {
let bird_1 = this.g_cartoon.getCartoonElement("bird_1") let bird_1 = this.g_cartoon.getCartoonElement("bird_1");
let bird_2 = this.g_cartoon.getCartoonElement("bird_2") let bird_2 = this.g_cartoon.getCartoonElement("bird_2");
let birdAudio = this.g_cartoon.getCartoonElement("birdAudio");
bird_1.flyTo = (cardIndex, callback)=>{ bird_1.flyTo = (cardIndex, callback)=>{
let card = this.g_cartoon.getCartoonElement(`card_${cardIndex+1}`) let card = this.g_cartoon.getCartoonElement(`card_${cardIndex+1}`)
...@@ -443,7 +494,7 @@ export default class GameLogic { ...@@ -443,7 +494,7 @@ export default class GameLogic {
bird_1.node.y = localPos.y; bird_1.node.y = localPos.y;
bird_1.node.parent = cc.find("Canvas"); bird_1.node.parent = cc.find("Canvas");
this.g_cartoon.tweenChange(bird_1.node, {x: -100, y: -270}, 0.5, ()=>{ this.g_cartoon.tweenChange(bird_1.node, {x: -100, y: -cc.winSize.height / 2 + bird_2.node.height + 10}, 0.5, ()=>{
if(callback) { if(callback) {
callback() callback()
} }
...@@ -475,13 +526,36 @@ export default class GameLogic { ...@@ -475,13 +526,36 @@ export default class GameLogic {
bird_2.node.y = localPos.y; bird_2.node.y = localPos.y;
bird_2.node.parent = cc.find("Canvas"); bird_2.node.parent = cc.find("Canvas");
this.g_cartoon.tweenChange(bird_2.node, {x: 105, y: -280}, 0.5, ()=>{ this.g_cartoon.tweenChange(bird_2.node, {x: 105, y: -cc.winSize.height / 2 + bird_2.node.height}, 0.5, ()=>{
if(callback) { if(callback) {
callback() callback()
} }
}) })
} }
bird_1.node.y = -cc.winSize.height / 2 + bird_1.node.height + 10
bird_2.node.y = -cc.winSize.height / 2 + bird_2.node.height
birdAudio.node.y = -cc.winSize.height / 2 + bird_2.node.height + 20
birdAudio.audioID = null
bird_1.node.setSiblingIndex(20);
bird_2.node.setSiblingIndex(20);
this.g_cartoon.subscribeTouchEvent(birdAudio.key, ()=>{
if(birdAudio.audioID) {
cc.audioEngine.stop(birdAudio.audioID);
birdAudio.audioID = null;
birdAudio.node.getChildByName("play").opacity = 255;
}
if(this.g_formData.dataArray[this.m_currentQuestion].audio_url) {
birdAudio.node.getChildByName("play").opacity = 0;
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].audio_url, ()=>{
birdAudio.node.getChildByName("play").opacity = 255;
}).then(audio_id=>{
birdAudio.audioID = audio_id
})
}
})
} }
...@@ -518,7 +592,6 @@ export default class GameLogic { ...@@ -518,7 +592,6 @@ export default class GameLogic {
let body = this.g_cartoon.getCartoonElement("question_body_pannel") let body = this.g_cartoon.getCartoonElement("question_body_pannel")
let bodyText = this.g_cartoon.getCartoonElement("question_body_pannel_text") let bodyText = this.g_cartoon.getCartoonElement("question_body_pannel_text")
// title.node.y = cc.winSize.height - this.g_cartoon.getCartoonElement("question_title_pannel_background").node.height / 2
this.g_cartoon.subscribeTouchEvent(title.key, ()=>{ this.g_cartoon.subscribeTouchEvent(title.key, ()=>{
if(!this.g_enableClick) { if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!") console.warn("g_enableClick disabeld!")
...@@ -834,18 +907,6 @@ export default class GameLogic { ...@@ -834,18 +907,6 @@ export default class GameLogic {
this.g_cartoon.getCartoonElement("question_body_pannel_text").node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("BRLNSR_1") this.g_cartoon.getCartoonElement("question_body_pannel_text").node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("BRLNSR_1")
this.g_cartoon.getCartoonElement("question_body_pannel_text").node.getComponent(cc.Label).fontSize = 42; this.g_cartoon.getCartoonElement("question_body_pannel_text").node.getComponent(cc.Label).fontSize = 42;
// if( this.g_formData.dataArray[this.m_currentQuestion].textDragonBones &&
// this.g_formData.dataArray[this.m_currentQuestion].textDragonBones.skeJsonData.url &&
// this.g_formData.dataArray[this.m_currentQuestion].textDragonBones.texJsonData.url &&
// this.g_formData.dataArray[this.m_currentQuestion].textDragonBones.texPngData.url) {
// this.g_cartoon.getCartoonElement("Text_DragonBones").dragonBones.setDragonBones(this.g_formData.dataArray[this.m_currentQuestion].textDragonBones, (handle)=>{
// this.g_cartoon.getCartoonElement("question_body_pannel_text").node.active = false;
// handle.showDragonBones(1);
// })
// } else {
// this.g_cartoon.getCartoonElement("question_body_pannel_text").node.active = true;
// }
this.g_cartoon.getCartoonElement("question_body_pannel_text").node.active = true; this.g_cartoon.getCartoonElement("question_body_pannel_text").node.active = true;
} }
...@@ -1003,7 +1064,7 @@ export default class GameLogic { ...@@ -1003,7 +1064,7 @@ export default class GameLogic {
// Common API // Common API
getSpriteFrimeByUrl(url, cb) { getSpriteFrimeByUrl(url, cb) {
cc.loader.load({ url }, (err, img) => { cc.assetManager.loadRemote(url, (err, img) => {
const spriteFrame = new cc.SpriteFrame(img) const spriteFrame = new cc.SpriteFrame(img)
if (cb) { if (cb) {
cb(spriteFrame); cb(spriteFrame);
......
...@@ -82,13 +82,19 @@ cc.Class({ ...@@ -82,13 +82,19 @@ cc.Class({
}) })
}, },
onDestory() {
cc.audioEngine.stopAll()
},
getData(cb) { getData(cb) {
cb(this.getDefaultData()); cb(this.getDefaultData());
}, },
getDefaultData() { getDefaultData() {
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","dataArray":[]}}'
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
}, },
...@@ -191,7 +197,7 @@ cc.Class({ ...@@ -191,7 +197,7 @@ cc.Class({
getSpriteFrimeByUrl(url, cb) { getSpriteFrimeByUrl(url, cb) {
cc.loader.load({ url }, (err, img) => { cc.assetManager.loadRemote(url, (err, img) => {
const spriteFrame = new cc.SpriteFrame(img) const spriteFrame = new cc.SpriteFrame(img)
if (cb) { if (cb) {
cb(spriteFrame); cb(spriteFrame);
......
export default { export default {
default: true, "default": true,
dataArray: [ "version":"1.0",
"key":"DataKey_Sbox_FT_08",
"bgMusic":"",
"titleText":"It's My Day",
"questionAudio_url":"",
"dataArray":[
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am walking.",
question_audio_url: "whatamidoing",
body_audio_url: "imwalking"
}, },
selectCards: [ {
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: false }, "image_url":"card_demo",
{ image_url: "fly", audio_url: "iamflying", stage_image_url: "", isAnswer: false }, "audio_url":""
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false },
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false },
{ image_url: "roll", audio_url: "iamrolling", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: true }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am dancing.",
question_audio_url: "",
body_audio_url: "imdancing"
}, },
selectCards: [ {
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: true }, "image_url":"card_demo",
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false }, "audio_url":""
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: false }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am sleeping.",
question_audio_url: "",
body_audio_url: "imsleeping"
}, },
selectCards: [ {
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false }, "image_url":"card_demo",
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: false }, "audio_url":""
{ image_url: "fly", audio_url: "iamflying", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: true },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: false }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am eatting.", },
question_audio_url: "", {
body_audio_url: "imeatting" "image_url":"card_demo",
"audio_url":""
},
{
"image_url":"card_demo",
"audio_url":""
},
{
"image_url":"card_demo",
"audio_url":""
}, },
selectCards: [
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "fly", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false },
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: true },
{ image_url: "roll", audio_url: "iamrolling", stage_image_url: "", isAnswer: false },
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
]
}
] ]
} }
\ No newline at end of file
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