Commit 615d8cb7 authored by linzhiguo's avatar linzhiguo

- 标题表单项

- 标题自动播放
- 321计时
+ 点击开始功能
parent ec11ef81
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<nz-divider nzText="主题" nzOrientation="left"></nz-divider> <nz-divider nzText="主题" nzOrientation="left"></nz-divider>
<div nz-row style="width: 800;"> <div nz-row style="width: 800;">
<div style="display: flex; margin-bottom: 10px;"> <!-- <div style="display: flex; margin-bottom: 10px;">
<div style="flex:1;margin-left: 10px;"> <div style="flex:1;margin-left: 10px;">
标题 标题
</div> </div>
<div style="flex:5"> <div style="flex:5">
<input type="text" nz-input placeholder="" [(ngModel)]="item.title" (blur)="saveItem()" style="width: 160px;"/> <input type="text" nz-input placeholder="" [(ngModel)]="item.title" (blur)="saveItem()" style="width: 160px;"/>
</div> </div>
</div> </div> -->
<div style="display: flex; margin-bottom: 10px;"> <div style="display: flex; margin-bottom: 10px;">
<div style="flex:1;margin-left: 10px;"> <div style="flex:1;margin-left: 10px;">
......
This diff is collapsed.
...@@ -162,15 +162,6 @@ cc.Class({ ...@@ -162,15 +162,6 @@ cc.Class({
this.initView(); this.initView();
}, },
startAudio(){
let audio_url = this.data.audio_url;
if (audio_url && audio_url!=""){
playAudioByUrl(audio_url, ()=>{
this.playGame();
});
}
},
initView() { initView() {
window.WL = this; window.WL = this;
this.shuffle(this.data.mouses); this.shuffle(this.data.mouses);
...@@ -183,15 +174,20 @@ cc.Class({ ...@@ -183,15 +174,20 @@ cc.Class({
this.title.string = this.data.title; this.title.string = this.data.title;
if (window && window.courseware) {
window.courseware.onEvent("course-in-screen", (data, next) => { this._start = cc.find('Canvas/start');
this.startAudio(); this._start.on('click',()=>{
next(); this._start.active = false;
// let audio_url = this.data.audio_url;
// if (audio_url && audio_url!=""){
// playAudioByUrl(audio_url, ()=>{
// this.playGame();
// });
// }
// else{
this.playGame();
// }
}); });
}
else{
this.startAudio();
}
...@@ -252,10 +248,10 @@ cc.Class({ ...@@ -252,10 +248,10 @@ cc.Class({
playGame(){ playGame(){
this.updateFlagArea(()=>{ this.updateFlagArea(()=>{
this.playAudioByName('time321'); //this.playAudioByName('time321');
this.playTimer(()=>{ //this.playTimer(()=>{
this.nextMouse(); this.nextMouse();
}) //})
}); });
}, },
...@@ -394,7 +390,9 @@ cc.Class({ ...@@ -394,7 +390,9 @@ cc.Class({
if (this.allWrong() == true){ if (this.allWrong() == true){
this.playAudioByName('lose'); this.playAudioByName('lose');
this._comeon.active = true; this._comeon.active = true;
playDragonBoneAnimation(this._comeon, 'newAnimation'); playDragonBoneAnimation(this._comeon, 'newAnimation', 1, ()=>{
this._comeon.active = false;
});
} }
else{ else{
this.playAudioByName('victory'); this.playAudioByName('victory');
......
{
"ver": "2.3.5",
"uuid": "b46e49c9-e06e-4eda-bd45-d6853dc66681",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 456,
"height": 102,
"platformSettings": {},
"subMetas": {
"start": {
"ver": "1.0.4",
"uuid": "48da20e9-d4e5-4907-8f4d-c054da231b2f",
"rawTextureUuid": "b46e49c9-e06e-4eda-bd45-d6853dc66681",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 456,
"height": 102,
"rawWidth": 456,
"rawHeight": 102,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ 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