Commit 04872986 authored by huoshizhe's avatar huoshizhe

fix: fixbugs

parent 1dcc0f9c
佳鑫、雪寒和明哲都是傻屌
\ No newline at end of file
...@@ -8,18 +8,22 @@ ...@@ -8,18 +8,22 @@
<div class="border" style="width: 520px;"> <div class="border" style="width: 520px;">
<span style="height: 30px; font-size: 18px;">正确字母:</span> <span style="height: 30px; font-size: 18px;">正确字母:</span>
<div> <div>
<div *ngFor="let rightWord of rightWordList; let i = index"> <div *ngFor="let rightWord of item.rightWordList; let i = index">
<div style="padding: 2px;"> <div style="padding: 2px;">
<input style="width: 150px;" type="text" nz-input [(ngModel)]="rightWord.word" (blur)="saveWordList()"> <input style="width: 150px;float: left;" type="text" nz-input [(ngModel)]="rightWord.word" (blur)="save()">
<button style="margin-left: 10px; height: 32px; color: red;" nz-button nzType="dashed" class="add-btn" <app-audio-recorder style="float: left;" [audioUrl]="rightWord.audio"
(click)="removeRightWord(i)"> (audioUploaded)="onRightAudioUploadSuccess($event, i)">
</app-audio-recorder>
<button style="float: right; margin-left: 10px; height: 32px; color: red;" nz-button nzType="dashed"
class="add-btn" (click)="removeRightWord(i)">
<i nz-icon nzType="minus-circle" nzTheme="outline"></i> <i nz-icon nzType="minus-circle" nzTheme="outline"></i>
删除字母 删除字母
</button> </button>
</div> </div>
<br> <br>
</div> </div>
</div> </div>
<div *ngIf="(rightWordList.length + wrongWordList.length < 5)"> <div *ngIf="(item.rightWordList.length +item.wrongWordList.length < 5)">
<button style="margin-left: 2px; margin-top: 2px; height: 32px;" nz-button nzType="dashed" class="add-btn" <button style="margin-left: 2px; margin-top: 2px; height: 32px;" nz-button nzType="dashed" class="add-btn"
(click)="addRightWord()"> (click)="addRightWord()">
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
...@@ -31,18 +35,22 @@ ...@@ -31,18 +35,22 @@
<div class="border" style="width: 520px;"> <div class="border" style="width: 520px;">
<span style="height: 30px; font-size: 18px;">错误字母:</span> <span style="height: 30px; font-size: 18px;">错误字母:</span>
<div> <div>
<div *ngFor="let wrongWord of wrongWordList; let i = index"> <div *ngFor="let wrongWord of item.wrongWordList; let i = index">
<div style="padding: 2px;"> <div style="padding: 2px;">
<input style="width: 150px;" type="text" nz-input [(ngModel)]="wrongWord.word" (blur)="saveWordList()"> <input style="width: 150px;float: left;" type="text" nz-input [(ngModel)]="wrongWord.word" (blur)="save()">
<button style="margin-left: 10px; height: 32px; color: red;" nz-button nzType="dashed" class="add-btn" <app-audio-recorder style="float: left;" [audioUrl]="wrongWord.audio"
(click)="removeWrongWord(i)"> (audioUploaded)="onWrongAudioUploadSuccess($event, i)">
</app-audio-recorder>
<button style="float: right; margin-left: 10px; height: 32px; color: red;" nz-button nzType="dashed"
class="add-btn" (click)="removeWrongWord(i)">
<i nz-icon nzType="minus-circle" nzTheme="outline"></i> <i nz-icon nzType="minus-circle" nzTheme="outline"></i>
删除字母 删除字母
</button> </button>
</div> </div>
<br> <br>
</div> </div>
</div> </div>
<div *ngIf="(rightWordList.length + wrongWordList.length < 5)"> <div *ngIf="(item.rightWordList.length +item.wrongWordList.length < 5)">
<button style="margin-left: 2px; margin-top: 2px; height: 32px;" nz-button nzType="dashed" class="add-btn" <button style="margin-left: 2px; margin-top: 2px; height: 32px;" nz-button nzType="dashed" class="add-btn"
(click)="addWrongWord()"> (click)="addWrongWord()">
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
......
...@@ -14,34 +14,27 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -14,34 +14,27 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
// 储存对象 // 储存对象
item; item;
rightWordList = [];
wrongWordList = [];
constructor(private appRef: ApplicationRef, private changeDetectorRef: ChangeDetectorRef) { constructor(private appRef: ApplicationRef, private changeDetectorRef: ChangeDetectorRef) {
} }
addRightWord() { addRightWord() {
this.item.rightWordList.push(''); this.item.rightWordList.push({ word: '', audio: '' });
this.loadWordList();
this.save(); this.save();
} }
removeRightWord(idx) { removeRightWord(idx) {
this.item.rightWordList.splice(idx, 1); this.item.rightWordList.splice(idx, 1);
this.loadWordList();
this.save(); this.save();
} }
addWrongWord() { addWrongWord() {
this.item.wrongWordList.push(''); this.item.wrongWordList.push({ word: '', audio: '' });
this.loadWordList();
this.save(); this.save();
} }
removeWrongWord(idx) { removeWrongWord(idx) {
this.item.wrongWordList.splice(idx, 1); this.item.wrongWordList.splice(idx, 1);
this.loadWordList();
this.save(); this.save();
} }
...@@ -60,8 +53,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -60,8 +53,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.item = data; this.item = data;
} }
this.loadWordList();
this.init(); this.init();
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
...@@ -70,37 +61,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -70,37 +61,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}, this.saveKey); }, this.saveKey);
} }
loadWordList() {
this.rightWordList = [];
this.wrongWordList = [];
if (this.item.rightWordList.length > 0) {
this.rightWordList = this.item.rightWordList.map(data => { return { word: data } });
}
if (this.item.wrongWordList.length > 0) {
this.wrongWordList = this.item.wrongWordList.map(data => { return { word: data } });
}
}
saveWordList() {
this.item.rightWordList = [];
this.item.wrongWordList = [];
if (this.rightWordList.length > 0) {
this.item.rightWordList = this.rightWordList.map(data => data.word);
}
if (this.wrongWordList.length > 0) {
this.item.wrongWordList = this.wrongWordList.map(data => data.word);
}
this.save();
}
ngOnChanges() { ngOnChanges() {
} }
ngOnDestroy() { ngOnDestroy() {
} }
init() { init() {
} }
...@@ -125,12 +91,23 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -125,12 +91,23 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save(); this.save();
} }
onRightAudioUploadSuccess(e, idx) {
this.item.rightWordList[idx].audio = e.url;
this.save();
}
onWrongAudioUploadSuccess(e, idx) {
this.item.wrongWordList[idx].audio = e.url;
this.save();
}
/** /**
* 储存数据 * 储存数据
*/ */
save() { save() {
(<any>window).courseware.setData(this.item, null, this.saveKey); (<any>window).courseware.setData(this.item, null, this.saveKey);
this.refresh(); this.refresh();
console.log('this.item = ' + JSON.stringify(this.item));
} }
/** /**
......
...@@ -78,55 +78,52 @@ ...@@ -78,55 +78,52 @@
"__id__": 7 "__id__": 7
}, },
{ {
"__id__": 9 "__id__": 16
},
{
"__id__": 11
}, },
{ {
"__id__": 13 "__id__": 18
}, },
{ {
"__id__": 15 "__id__": 27
}, },
{ {
"__id__": 18 "__id__": 38
}, },
{ {
"__id__": 29 "__id__": 40
}, },
{ {
"__id__": 31 "__id__": 42
}, },
{ {
"__id__": 33 "__id__": 48
}, },
{ {
"__id__": 36 "__id__": 51
}, },
{ {
"__id__": 42 "__id__": 54
}, },
{ {
"__id__": 45 "__id__": 57
}, },
{ {
"__id__": 48 "__id__": 64
}, },
{ {
"__id__": 55 "__id__": 75
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 77
}, },
{ {
"__id__": 67 "__id__": 78
}, },
{ {
"__id__": 68 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -370,16 +367,91 @@ ...@@ -370,16 +367,91 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeDoor", "_name": "NodeBg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [
{
"__id__": 8
},
{
"__id__": 11
}
],
"_active": true,
"_components": [
{
"__id__": 14
},
{
"__id__": 15
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 1036
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-640,
-360,
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": "88aOZOpAFKSI4/4cLqQ2bF"
},
{
"__type__": "cc.Node",
"_name": "bg_qiu",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 8 "__id__": 9
},
{
"__id__": 10
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -393,8 +465,8 @@ ...@@ -393,8 +465,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 335, "width": 426,
"height": 263 "height": 376
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -405,8 +477,8 @@ ...@@ -405,8 +477,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 138,
384.562, 973,
0, 0,
0, 0,
0, 0,
...@@ -428,15 +500,139 @@ ...@@ -428,15 +500,139 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f4v9eKzy5Bz5X7GkFG5iX9" "_id": "7el+7YRo1DRqQVJMXQWGNb"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 8
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "113f307c-93e3-4149-9262-a958f01cef85"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "90/xdB6JNIqKmuzbD0hsRJ"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": -75,
"_right": 0,
"_top": -125,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ffJME1nAhA54H7JcU+IIX2"
},
{
"__type__": "cc.Node",
"_name": "bg_you",
"_objFlags": 0,
"_parent": {
"__id__": 7 "__id__": 7
}, },
"_children": [],
"_active": true,
"_components": [
{
"__id__": 12
},
{
"__id__": 13
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 679,
"height": 257
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
940.5,
907.5,
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": "72Zm2FDjNNFItZvdBYpuWs"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
{ {
...@@ -446,7 +642,7 @@ ...@@ -446,7 +642,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6d51f49a-fa69-47fd-9322-94661e3167ac" "__uuid__": "ea5e846f-5d69-457b-8246-292ab598ed44"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -460,11 +656,97 @@ ...@@ -460,11 +656,97 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "560oW/h6hA/LaN3OX2jKKx" "_id": "efXjjEP7hBrb8OsAsE0ycV"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_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": "e5tI1FY5dPybK1SnEq9TkM"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f4c4ae47-c805-43de-8dda-07c899c1836a"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d91H9Qd6FApJ0GrW5qR5B+"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": -316,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1280,
"_originalHeight": 1036,
"_id": "22Dg3gitNN3oGhwQytA/Be"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeWheel3", "_name": "NodeDoor",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -473,7 +755,7 @@ ...@@ -473,7 +755,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 10 "__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -487,8 +769,8 @@ ...@@ -487,8 +769,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 335,
"height": 293 "height": 263
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -500,7 +782,7 @@ ...@@ -500,7 +782,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
372.607, 400.523,
0, 0,
0, 0,
0, 0,
...@@ -522,14 +804,14 @@ ...@@ -522,14 +804,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "3eTkHVtcdIXqGAPXIEe2Xr" "_id": "f4v9eKzy5Bz5X7GkFG5iX9"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -540,10 +822,10 @@ ...@@ -540,10 +822,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4f91f71e-fca4-44a6-b569-2cd52587c71d" "__uuid__": "6d51f49a-fa69-47fd-9322-94661e3167ac"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -552,22 +834,97 @@ ...@@ -552,22 +834,97 @@
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": false, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a1ek9aw9NOBrFNqEX8B2JZ" "_id": "560oW/h6hA/LaN3OX2jKKx"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeWheel2", "_name": "NodeDoorMask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [
{
"__id__": 19
},
{
"__id__": 21
},
{
"__id__": 23
}
],
"_active": true,
"_components": [
{
"__id__": 25
},
{
"__id__": 26
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 1036
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-344.039,
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": "20fu3izRpPVorgcar5/sPm"
},
{
"__type__": "cc.Node",
"_name": "NodeWheel3",
"_objFlags": 0,
"_parent": {
"__id__": 18
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 12 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -594,7 +951,7 @@ ...@@ -594,7 +951,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
372.607, 707.966,
0, 0,
0, 0,
0, 0,
...@@ -616,14 +973,14 @@ ...@@ -616,14 +973,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a4fQXOh/tFSaed7t2gOVOR" "_id": "3eTkHVtcdIXqGAPXIEe2Xr"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 11 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -634,7 +991,7 @@ ...@@ -634,7 +991,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0b206cd4-d278-48a6-acba-3605aaae737b" "__uuid__": "4f91f71e-fca4-44a6-b569-2cd52587c71d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -648,20 +1005,20 @@ ...@@ -648,20 +1005,20 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": false, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "08GNW+WvBHip102B9Yy7ij" "_id": "a1ek9aw9NOBrFNqEX8B2JZ"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeWheel1", "_name": "NodeWheel2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 14 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -688,7 +1045,7 @@ ...@@ -688,7 +1045,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
372.607, 707.966,
0, 0,
0, 0,
0, 0,
...@@ -710,14 +1067,14 @@ ...@@ -710,14 +1067,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "03WOcxK4ZASo0p3x+plHZY" "_id": "a4fQXOh/tFSaed7t2gOVOR"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 13 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -728,7 +1085,7 @@ ...@@ -728,7 +1085,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "64dd34ec-2196-4eab-ab74-ff6d0c78419a" "__uuid__": "0b206cd4-d278-48a6-acba-3605aaae737b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -742,23 +1099,20 @@ ...@@ -742,23 +1099,20 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": false, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "d5vi/ujuRAP4LJuj9ciYXI" "_id": "08GNW+WvBHip102B9Yy7ij"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeBg", "_name": "NodeWheel1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 24
},
{
"__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -772,20 +1126,20 @@ ...@@ -772,20 +1126,20 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 300,
"height": 1036 "height": 293
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0, "x": 0.5,
"y": 0 "y": 0.5
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-640, 0,
-360, 707.966,
0, 0,
0, 0,
0, 0,
...@@ -807,14 +1161,14 @@ ...@@ -807,14 +1161,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "88aOZOpAFKSI4/4cLqQ2bF" "_id": "03WOcxK4ZASo0p3x+plHZY"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -825,10 +1179,10 @@ ...@@ -825,10 +1179,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f4c4ae47-c805-43de-8dda-07c899c1836a" "__uuid__": "64dd34ec-2196-4eab-ab74-ff6d0c78419a"
}, },
"_type": 1, "_type": 0,
"_sizeMode": 0, "_sizeMode": 2,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -837,25 +1191,47 @@ ...@@ -837,25 +1191,47 @@
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "d91H9Qd6FApJ0GrW5qR5B+" "_id": "d5vi/ujuRAP4LJuj9ciYXI"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": {
"__uuid__": "6d51f49a-fa69-47fd-9322-94661e3167ac"
},
"_type": 2,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "5fzXoVzw9Bg7yA2tELm16n"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 44, "_alignFlags": 4,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 15.961000000000013,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -864,9 +1240,9 @@ ...@@ -864,9 +1240,9 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 1280, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "22Dg3gitNN3oGhwQytA/Be" "_id": "39q5BkFLZJ367fKXAx6dfv"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -877,19 +1253,19 @@ ...@@ -877,19 +1253,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 19 "__id__": 28
}, },
{ {
"__id__": 21 "__id__": 30
}, },
{ {
"__id__": 23 "__id__": 32
}, },
{ {
"__id__": 25 "__id__": 34
}, },
{ {
"__id__": 27 "__id__": 36
} }
], ],
"_active": true, "_active": true,
...@@ -947,13 +1323,13 @@ ...@@ -947,13 +1323,13 @@
"_name": "NodeCharacterUp", "_name": "NodeCharacterUp",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1009,7 +1385,7 @@ ...@@ -1009,7 +1385,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1049,13 +1425,13 @@ ...@@ -1049,13 +1425,13 @@
"_name": "NodeCharacterDown", "_name": "NodeCharacterDown",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1111,7 +1487,7 @@ ...@@ -1111,7 +1487,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1151,13 +1527,13 @@ ...@@ -1151,13 +1527,13 @@
"_name": "NodeCharacterLeft", "_name": "NodeCharacterLeft",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1213,7 +1589,7 @@ ...@@ -1213,7 +1589,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1253,13 +1629,13 @@ ...@@ -1253,13 +1629,13 @@
"_name": "NodeCharacterRight", "_name": "NodeCharacterRight",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1315,7 +1691,7 @@ ...@@ -1315,7 +1691,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1355,13 +1731,13 @@ ...@@ -1355,13 +1731,13 @@
"_name": "NodeCharacterFront", "_name": "NodeCharacterFront",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 18 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1417,7 +1793,7 @@ ...@@ -1417,7 +1793,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1463,7 +1839,7 @@ ...@@ -1463,7 +1839,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1519,7 +1895,7 @@ ...@@ -1519,7 +1895,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1557,7 +1933,7 @@ ...@@ -1557,7 +1933,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1613,7 +1989,7 @@ ...@@ -1613,7 +1989,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1642,19 +2018,88 @@ ...@@ -1642,19 +2018,88 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeDesk", "_name": "NodeDeskMask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [
{
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 46
},
{
"__id__": 47
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 360
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-180,
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": "d3WEKxx1xDOrwGZ93SuPIy"
},
{
"__type__": "cc.Node",
"_name": "NodeDeskFront",
"_objFlags": 0,
"_parent": {
"__id__": 42
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 34 "__id__": 44
}, },
{ {
"__id__": 35 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1681,7 +2126,7 @@ ...@@ -1681,7 +2126,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-32, 148,
0, 0,
0, 0,
0, 0,
...@@ -1703,14 +2148,14 @@ ...@@ -1703,14 +2148,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "d64fruZZpAaZ4xrWkc+77A" "_id": "4ac5OIepdLDLBGvpLHaejM"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 33 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1735,14 +2180,14 @@ ...@@ -1735,14 +2180,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "f5WbrOhjNJrpW3pb3xtunc" "_id": "165m6Gd4FM0pE8IWzjppl5"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 33 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1762,92 +2207,70 @@ ...@@ -1762,92 +2207,70 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 1280, "_originalWidth": 1280,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "53+rlQIzVPjoED5lTG4CWm" "_id": "30DUMNmE9AyoKxABMVDgWg"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Mask",
"_name": "NodeDeskMask", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "node": {
"__id__": 2 "__id__": 42
},
"_children": [
{
"__id__": 37
}
],
"_active": true,
"_components": [
{
"__id__": 40
},
{
"__id__": 41
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 360
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-180,
0,
0,
0,
0,
1,
1,
1,
1
]
}, },
"_eulerAngles": { "_enabled": true,
"__type__": "cc.Vec3", "_materials": [
"x": 0, {
"y": 0, "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"z": 0 }
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "e9Vyh8x/hFN4cUna1makpx"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
}, },
"_skewX": 0, "_enabled": true,
"_skewY": 0, "alignMode": 1,
"_is3DNode": false, "_target": null,
"_groupIndex": 0, "_alignFlags": 4,
"groupIndex": 0, "_left": 0,
"_id": "d3WEKxx1xDOrwGZ93SuPIy" "_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": 0,
"_id": "224N2kOg1CFpZrO1NctJ6Q"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodeDeskFront", "_name": "NodeDesk",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 49
}, },
{ {
"__id__": 39 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1874,7 +2297,7 @@ ...@@ -1874,7 +2297,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
148, -32,
0, 0,
0, 0,
0, 0,
...@@ -1896,14 +2319,14 @@ ...@@ -1896,14 +2319,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "4ac5OIepdLDLBGvpLHaejM" "_id": "d64fruZZpAaZ4xrWkc+77A"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1928,66 +2351,19 @@ ...@@ -1928,66 +2351,19 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "165m6Gd4FM0pE8IWzjppl5" "_id": "f5WbrOhjNJrpW3pb3xtunc"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_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": 0,
"_id": "30DUMNmE9AyoKxABMVDgWg"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "e9Vyh8x/hFN4cUna1makpx"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 44, "_alignFlags": 4,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
...@@ -2002,7 +2378,7 @@ ...@@ -2002,7 +2378,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 1280, "_originalWidth": 1280,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "224N2kOg1CFpZrO1NctJ6Q" "_id": "53+rlQIzVPjoED5lTG4CWm"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -2015,10 +2391,10 @@ ...@@ -2015,10 +2391,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 52
}, },
{ {
"__id__": 44 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2074,7 +2450,7 @@ ...@@ -2074,7 +2450,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2106,7 +2482,7 @@ ...@@ -2106,7 +2482,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2180,10 +2556,10 @@ ...@@ -2180,10 +2556,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 55
}, },
{ {
"__id__": 47 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2239,7 +2615,7 @@ ...@@ -2239,7 +2615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2271,7 +2647,7 @@ ...@@ -2271,7 +2647,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2343,13 +2719,13 @@ ...@@ -2343,13 +2719,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 49 "__id__": 58
}, },
{ {
"__id__": 51 "__id__": 60
}, },
{ {
"__id__": 53 "__id__": 62
} }
], ],
"_active": true, "_active": true,
...@@ -2407,13 +2783,13 @@ ...@@ -2407,13 +2783,13 @@
"_name": "NodeNpcNormal", "_name": "NodeNpcNormal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 48 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2469,7 +2845,7 @@ ...@@ -2469,7 +2845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2509,13 +2885,13 @@ ...@@ -2509,13 +2885,13 @@
"_name": "NodeNpcWrong", "_name": "NodeNpcWrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 48 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2571,7 +2947,7 @@ ...@@ -2571,7 +2947,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2611,13 +2987,13 @@ ...@@ -2611,13 +2987,13 @@
"_name": "NodeNpcRight", "_name": "NodeNpcRight",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 48 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2673,7 +3049,7 @@ ...@@ -2673,7 +3049,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2717,19 +3093,19 @@ ...@@ -2717,19 +3093,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 56 "__id__": 65
}, },
{ {
"__id__": 58 "__id__": 67
}, },
{ {
"__id__": 60 "__id__": 69
}, },
{ {
"__id__": 62 "__id__": 71
}, },
{ {
"__id__": 64 "__id__": 73
} }
], ],
"_active": true, "_active": true,
...@@ -2787,13 +3163,13 @@ ...@@ -2787,13 +3163,13 @@
"_name": "CakePosNode_0", "_name": "CakePosNode_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2849,7 +3225,7 @@ ...@@ -2849,7 +3225,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2881,13 +3257,13 @@ ...@@ -2881,13 +3257,13 @@
"_name": "CakePosNode_1", "_name": "CakePosNode_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2943,7 +3319,7 @@ ...@@ -2943,7 +3319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2975,13 +3351,13 @@ ...@@ -2975,13 +3351,13 @@
"_name": "CakePosNode_2", "_name": "CakePosNode_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3037,7 +3413,7 @@ ...@@ -3037,7 +3413,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3069,13 +3445,13 @@ ...@@ -3069,13 +3445,13 @@
"_name": "CakePosNode_3", "_name": "CakePosNode_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3131,7 +3507,7 @@ ...@@ -3131,7 +3507,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3163,13 +3539,13 @@ ...@@ -3163,13 +3539,13 @@
"_name": "CakePosNode_4", "_name": "CakePosNode_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3225,7 +3601,7 @@ ...@@ -3225,7 +3601,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3252,6 +3628,100 @@ ...@@ -3252,6 +3628,100 @@
"_atlas": null, "_atlas": null,
"_id": "bcdDDjSzZLtaebcHJ7sCFK" "_id": "bcdDDjSzZLtaebcHJ7sCFK"
}, },
{
"__type__": "cc.Node",
"_name": "NodeDoorFront",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 0,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 335,
"height": 263
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
400.523,
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": "d2eitDHfpAy50mt2xhdERD"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "6d51f49a-fa69-47fd-9322-94661e3167ac"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c3r8OAmHFAMLIWQxLn0gon"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -3279,10 +3749,10 @@ ...@@ -3279,10 +3749,10 @@
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 18, "_alignFlags": 45,
"_left": 640, "_left": 0,
"_right": 0, "_right": 0,
"_top": 360, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -3292,8 +3762,8 @@ ...@@ -3292,8 +3762,8 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 1280,
"_originalHeight": 0, "_originalHeight": 720,
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
......
...@@ -38,6 +38,9 @@ cc.Class({ ...@@ -38,6 +38,9 @@ cc.Class({
}, },
start() { start() {
let winSize = cc.director.getWinSize();
console.log('winSize = ' + JSON.stringify(winSize));
this.data = defaultData; this.data = defaultData;
this.getData((data) => { this.getData((data) => {
if (data) { if (data) {
...@@ -68,6 +71,8 @@ cc.Class({ ...@@ -68,6 +71,8 @@ cc.Class({
addPreloadAudio() { addPreloadAudio() {
this._audioResList.push({ url: this.data.audio }); this._audioResList.push({ url: this.data.audio });
this._audioResList.push(...this.data.rightWordList.map(data => ({ url: data.audio })));
this._audioResList.push(...this.data.wrongWordList.map(data => ({ url: data.audio })));
}, },
preload() { preload() {
...@@ -125,7 +130,7 @@ cc.Class({ ...@@ -125,7 +130,7 @@ cc.Class({
} }
}, },
characterWalk(pos, speed = 1) { characterWalk(pos, speed = 1, changeActive = false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const nodeCharacter = cc.find('Canvas/NodeCharacter'); const nodeCharacter = cc.find('Canvas/NodeCharacter');
nodeCharacter.stopAllActions(); nodeCharacter.stopAllActions();
...@@ -165,12 +170,14 @@ cc.Class({ ...@@ -165,12 +170,14 @@ cc.Class({
cc.tween(nodeCharacter) cc.tween(nodeCharacter)
.to(time * speed, { x: pos.x, y: pos.y }) .to(time * speed, { x: pos.x, y: pos.y })
.call(() => { .call(() => {
nodeCharacterUp.active = false; if (!changeActive) {
nodeCharacterLeft.active = false; nodeCharacterUp.active = false;
nodeCharacterRight.active = false; nodeCharacterLeft.active = false;
nodeCharacterDown.active = false nodeCharacterRight.active = false;
nodeCharacterDown.active = false
nodeCharacterFront.active = true; nodeCharacterFront.active = true;
}
resolve(); resolve();
}) })
...@@ -194,7 +201,7 @@ cc.Class({ ...@@ -194,7 +201,7 @@ cc.Class({
async showCakes() { async showCakes() {
const { rightWordList, wrongWordList } = this.data; const { rightWordList, wrongWordList } = this.data;
let wordList = randomSortByArr([...rightWordList, ...wrongWordList]); let wordList = randomSortByArr([...rightWordList.map(data => data.word), ...wrongWordList.map(data => data.word)]);
wordList.forEach((data, idx) => { wordList.forEach((data, idx) => {
let cakeNode = cc.instantiate(this.cakePrefab); let cakeNode = cc.instantiate(this.cakePrefab);
...@@ -215,6 +222,9 @@ cc.Class({ ...@@ -215,6 +222,9 @@ cc.Class({
cc.tween(cakeNode) cc.tween(cakeNode)
.to(0.1 * idx, { opacity: 255 }) .to(0.1 * idx, { opacity: 255 })
.to(0.5, { x: targetPos.x, y: targetPos.y }, { easing: 'cubicIn' }) .to(0.5, { x: targetPos.x, y: targetPos.y }, { easing: 'cubicIn' })
.call(() => {
this.playEffect('落地');
})
.start(); .start();
}); });
...@@ -265,7 +275,7 @@ cc.Class({ ...@@ -265,7 +275,7 @@ cc.Class({
checkCake(cakeNode) { checkCake(cakeNode) {
const word = cakeNode.getComponent('Cake').word; const word = cakeNode.getComponent('Cake').word;
if (this.data.rightWordList.findIndex(data => data == word) == -1) { if (this.data.rightWordList.findIndex(data => data.word == word) == -1) {
return false; return false;
} }
...@@ -295,7 +305,8 @@ cc.Class({ ...@@ -295,7 +305,8 @@ cc.Class({
hideNpc() { hideNpc() {
const nodeNpc = cc.find('Canvas/NodeNpc'); const nodeNpc = cc.find('Canvas/NodeNpc');
cc.tween(nodeNpc) cc.tween(nodeNpc)
.to(1, { y: nodeNpc.y + 100, opacity: 0 }) .by(1, { y: 350 })
.repeatForever()
.start(); .start();
}, },
...@@ -306,8 +317,10 @@ cc.Class({ ...@@ -306,8 +317,10 @@ cc.Class({
if (!cakeNode) { if (!cakeNode) {
continue; continue;
} }
// cakeNode.zIndex = 100;
cc.tween(cakeNode) cc.tween(cakeNode)
.to(1, { y: cakeNode.y + 100, opacity: 0 }) .by(1, { y: 350 })
.repeatForever()
.start(); .start();
} }
}, },
...@@ -344,9 +357,9 @@ cc.Class({ ...@@ -344,9 +357,9 @@ cc.Class({
openDoor() { openDoor() {
const delayTime = 2; const delayTime = 2;
const nodeDoor = cc.find('Canvas/NodeDoor'); const nodeDoor = cc.find('Canvas/NodeDoor');
const nodeWheel1 = cc.find('Canvas/NodeWheel1'); const nodeWheel1 = cc.find('Canvas/NodeDoorMask/NodeWheel1');
const nodeWheel2 = cc.find('Canvas/NodeWheel2'); const nodeWheel2 = cc.find('Canvas/NodeDoorMask/NodeWheel2');
const nodeWheel3 = cc.find('Canvas/NodeWheel3'); const nodeWheel3 = cc.find('Canvas/NodeDoorMask/NodeWheel3');
cc.tween(nodeWheel1) cc.tween(nodeWheel1)
.delay(delayTime) .delay(delayTime)
...@@ -363,15 +376,15 @@ cc.Class({ ...@@ -363,15 +376,15 @@ cc.Class({
.delay(delayTime) .delay(delayTime)
.by(1, { y: -200 }) .by(1, { y: -200 })
.start(); .start();
cc.tween(nodeDoor) // cc.tween(nodeDoor)
.delay(delayTime) // .delay(delayTime)
.by(1, { y: 300 }) // .by(1, { y: 300 })
.start(); // .start();
}, },
async characterMoveOut() { async characterMoveOut() {
await this.characterWalk({ x: 0, y: 360 }, 4); await this.characterWalk({ x: 0, y: 380 }, 4, true);
const nodeCharacter = cc.find('Canvas/NodeCharacter'); const nodeCharacter = cc.find('Canvas/NodeCharacter');
const nodeCharacterUp = cc.find('Canvas/NodeCharacter/NodeCharacterUp'); const nodeCharacterUp = cc.find('Canvas/NodeCharacter/NodeCharacterUp');
...@@ -383,8 +396,11 @@ cc.Class({ ...@@ -383,8 +396,11 @@ cc.Class({
nodeCharacterUp.active = true; nodeCharacterUp.active = true;
nodeCharacterFront.active = false; nodeCharacterFront.active = false;
cc.tween(nodeCharacter) const nodeDoorFront = cc.find('Canvas/NodeDoorFront');
.to(1, { opacity: 0 }) nodeDoorFront.zIndex = 100;
cc.tween(nodeDoorFront)
.to(1, { opacity: 255 })
.start(); .start();
}, },
...@@ -414,6 +430,8 @@ cc.Class({ ...@@ -414,6 +430,8 @@ cc.Class({
await asyncPlayDragonBoneAnimation(nodeNpcRight, 'npcright', 1); await asyncPlayDragonBoneAnimation(nodeNpcRight, 'npcright', 1);
nodeNpcNormal.active = true; nodeNpcNormal.active = true;
nodeNpcRight.active = false; nodeNpcRight.active = false;
// cakeNode
}, },
async npcPlayAnimWrong(cakeNode, idx) { async npcPlayAnimWrong(cakeNode, idx) {
......
module.exports = { module.exports = {
audio: 'e.mp3', audio: 'e.mp3',
rightWordList: ['ee', 'ea'], rightWordList: [{
wrongWordList: ['a', 'ao', 'ai'] word: 'ee',
audio: 'ee.mp3'
}, {
word: 'ea',
audio: 'ea.mp3'
}],
wrongWordList: [{
word: 'a',
audio: 'ee.mp3'
}, {
word: 'ao',
audio: 'ee.mp3'
}, {
word: 'ai',
audio: 'ee.mp3'
}]
} }
play/assets/tmpGame/textures/bg_bg.png

49.5 KB | W: | H:

play/assets/tmpGame/textures/bg_bg.png

9.88 KB | W: | H:

play/assets/tmpGame/textures/bg_bg.png
play/assets/tmpGame/textures/bg_bg.png
play/assets/tmpGame/textures/bg_bg.png
play/assets/tmpGame/textures/bg_bg.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"height": 1036, "height": 1036,
"rawWidth": 1280, "rawWidth": 1280,
"rawHeight": 1036, "rawHeight": 1036,
"borderTop": 141, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 387, "borderLeft": 0,
"borderRight": 462, "borderRight": 0,
"subMetas": {} "subMetas": {}
} }
} }
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
"rawHeight": 656, "rawHeight": 656,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 455, "borderLeft": 0,
"borderRight": 425, "borderRight": 0,
"subMetas": {} "subMetas": {}
} }
} }
......
{
"ver": "2.3.5",
"uuid": "a70c6636-6cd9-4795-9aec-99fccee6a35b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 426,
"height": 376,
"platformSettings": {},
"subMetas": {
"bg_qiu": {
"ver": "1.0.4",
"uuid": "113f307c-93e3-4149-9262-a958f01cef85",
"rawTextureUuid": "a70c6636-6cd9-4795-9aec-99fccee6a35b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 426,
"height": 376,
"rawWidth": 426,
"rawHeight": 376,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "2122f417-c4f4-42ae-9c78-c695beee306c",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 679,
"height": 257,
"platformSettings": {},
"subMetas": {
"bg_you": {
"ver": "1.0.4",
"uuid": "ea5e846f-5d69-457b-8246-292ab598ed44",
"rawTextureUuid": "2122f417-c4f4-42ae-9c78-c695beee306c",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 679,
"height": 257,
"rawWidth": 679,
"rawHeight": 257,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
# 雪寒是傻屌
\ 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