Commit 615d8cb7 authored by linzhiguo's avatar linzhiguo

- 标题表单项

- 标题自动播放
- 321计时
+ 点击开始功能
parent ec11ef81
......@@ -2,14 +2,14 @@
<nz-divider nzText="主题" nzOrientation="left"></nz-divider>
<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>
<div style="flex:5">
<input type="text" nz-input placeholder="" [(ngModel)]="item.title" (blur)="saveItem()" style="width: 160px;"/>
</div>
</div>
</div> -->
<div style="display: flex; margin-bottom: 10px;">
<div style="flex:1;margin-left: 10px;">
......
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 245
"__id__": 251
}
],
"_active": false,
......@@ -127,18 +127,21 @@
},
{
"__id__": 239
},
{
"__id__": 242
}
],
"_active": true,
"_components": [
{
"__id__": 242
"__id__": 248
},
{
"__id__": 243
"__id__": 249
},
{
"__id__": 244
"__id__": 250
}
],
"_prefab": null,
......@@ -13150,6 +13153,306 @@
"_originalHeight": 0,
"_id": "7dXRGWhgJH258ElrfYD+8y"
},
{
"__type__": "cc.Node",
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 243
}
],
"_active": true,
"_components": [
{
"__id__": 246
},
{
"__id__": 247
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "27wd2xL5tPfpmY+vMjLqqP"
},
{
"__type__": "cc.Node",
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 242
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 244
},
{
"__id__": 245
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 456,
"height": 102
},
"_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": "82Ls4VyANPTI8+oVrQ08OR"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 243
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "48da20e9-d4e5-4907-8f4d-c054da231b2f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8dGavDdrZMT7ae7M3UjJrP"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 243
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 18,
"_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": 0,
"_originalHeight": 0,
"_id": "f6YlMwiF5Ijqyvvp0jVz19"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 2,
"transition": 2,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 120,
"g": 120,
"b": 120,
"a": 200
},
"_N$normalSprite": null,
"_N$pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"_N$hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$disabledSprite": {
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 242
},
"_id": "e8/uaTqCBDTbiDoKmOjxdR"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
},
"_enabled": true,
"alignMode": 1,
"_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": 1280,
"_originalHeight": 720,
"_id": "12gJ1+9T9IFpW6KFJOANRF"
},
{
"__type__": "cc.Canvas",
"_name": "",
......@@ -13242,10 +13545,10 @@
},
"_children": [
{
"__id__": 246
"__id__": 252
},
{
"__id__": 251
"__id__": 257
}
],
"_active": true,
......@@ -13303,11 +13606,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 245
"__id__": 251
},
"_children": [
{
"__id__": 247
"__id__": 253
}
],
"_active": true,
......@@ -13365,17 +13668,17 @@
"_name": "icon_0",
"_objFlags": 0,
"_parent": {
"__id__": 246
"__id__": 252
},
"_children": [
{
"__id__": 248
"__id__": 254
}
],
"_active": true,
"_components": [
{
"__id__": 250
"__id__": 256
}
],
"_prefab": null,
......@@ -13431,13 +13734,13 @@
"_name": "icon_1",
"_objFlags": 0,
"_parent": {
"__id__": 247
"__id__": 253
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 249
"__id__": 255
}
],
"_prefab": null,
......@@ -13493,7 +13796,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 248
"__id__": 254
},
"_enabled": true,
"_materials": [
......@@ -13525,7 +13828,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 247
"__id__": 253
},
"_enabled": true,
"_materials": [
......@@ -13557,29 +13860,29 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 245
"__id__": 251
},
"_children": [
{
"__id__": 252
"__id__": 258
},
{
"__id__": 254
"__id__": 260
},
{
"__id__": 256
"__id__": 262
},
{
"__id__": 258
"__id__": 264
},
{
"__id__": 260
"__id__": 266
},
{
"__id__": 262
"__id__": 268
},
{
"__id__": 264
"__id__": 270
}
],
"_active": true,
......@@ -13637,13 +13940,13 @@
"_name": "correct",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 253
"__id__": 259
}
],
"_prefab": null,
......@@ -13699,7 +14002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 252
"__id__": 258
},
"_enabled": true,
"_clip": {
......@@ -13718,13 +14021,13 @@
"_name": "incorrect",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 255
"__id__": 261
}
],
"_prefab": null,
......@@ -13780,7 +14083,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 254
"__id__": 260
},
"_enabled": true,
"_clip": {
......@@ -13799,13 +14102,13 @@
"_name": "time321",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 257
"__id__": 263
}
],
"_prefab": null,
......@@ -13861,7 +14164,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 256
"__id__": 262
},
"_enabled": true,
"_clip": {
......@@ -13880,13 +14183,13 @@
"_name": "victory",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 259
"__id__": 265
}
],
"_prefab": null,
......@@ -13942,7 +14245,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 258
"__id__": 264
},
"_enabled": true,
"_clip": {
......@@ -13961,13 +14264,13 @@
"_name": "dizzy",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 261
"__id__": 267
}
],
"_prefab": null,
......@@ -14023,7 +14326,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 260
"__id__": 266
},
"_enabled": true,
"_clip": {
......@@ -14042,13 +14345,13 @@
"_name": "laugh",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 263
"__id__": 269
}
],
"_prefab": null,
......@@ -14104,7 +14407,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 262
"__id__": 268
},
"_enabled": true,
"_clip": {
......@@ -14123,13 +14426,13 @@
"_name": "lose",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 257
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 265
"__id__": 271
}
],
"_prefab": null,
......@@ -14185,7 +14488,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 264
"__id__": 270
},
"_enabled": true,
"_clip": {
......
......@@ -162,15 +162,6 @@ cc.Class({
this.initView();
},
startAudio(){
let audio_url = this.data.audio_url;
if (audio_url && audio_url!=""){
playAudioByUrl(audio_url, ()=>{
this.playGame();
});
}
},
initView() {
window.WL = this;
this.shuffle(this.data.mouses);
......@@ -183,15 +174,20 @@ cc.Class({
this.title.string = this.data.title;
if (window && window.courseware) {
window.courseware.onEvent("course-in-screen", (data, next) => {
this.startAudio();
next();
this._start = cc.find('Canvas/start');
this._start.on('click',()=>{
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({
playGame(){
this.updateFlagArea(()=>{
this.playAudioByName('time321');
this.playTimer(()=>{
//this.playAudioByName('time321');
//this.playTimer(()=>{
this.nextMouse();
})
//})
});
},
......@@ -394,7 +390,9 @@ cc.Class({
if (this.allWrong() == true){
this.playAudioByName('lose');
this._comeon.active = true;
playDragonBoneAnimation(this._comeon, 'newAnimation');
playDragonBoneAnimation(this._comeon, 'newAnimation', 1, ()=>{
this._comeon.active = false;
});
}
else{
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