Commit 52646d3e authored by 李维's avatar 李维

dev commit

parent 7021d7af
import zh from "@angular/common/locales/zh";
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule, ErrorHandler } from '@angular/core'; import { NgModule, ErrorHandler } from '@angular/core';
import {MyErrorHandler} from './MyError'; import {MyErrorHandler} from './MyError';
import { AppComponent } from './app.component'; import { AppComponent } from "./app.component";
import { NgZorroAntdModule, NZ_I18N, zh_CN } from 'ng-zorro-antd'; import { NgZorroAntdModule, NZ_I18N, zh_CN } from "ng-zorro-antd";
import { FormsModule } from '@angular/forms'; import { FormsModule } from "@angular/forms";
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from "@angular/common/http";
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { registerLocaleData } from '@angular/common'; import { registerLocaleData } from "@angular/common";
import zh from '@angular/common/locales/zh'; import { FormComponent } from "./form/form.component";
import {FormComponent} from './form/form.component'; import { PlayComponent } from "./play/play.component";
import {PlayComponent} from './play/play.component'; import { LessonTitleConfigComponent } from "./common/lesson-title-config/lesson-title-config.component";
import {LessonTitleConfigComponent} from './common/lesson-title-config/lesson-title-config.component'; import { BackgroundImagePipe } from "./pipes/background-image.pipe";
import {BackgroundImagePipe} from './pipes/background-image.pipe'; import { UploadImageWithPreviewComponent } from "./common/upload-image-with-preview/upload-image-with-preview.component";
import {UploadImageWithPreviewComponent} from './common/upload-image-with-preview/upload-image-with-preview.component'; import { PlayerContentWrapperComponent } from "./common/player-content-wrapper/player-content-wrapper.component";
import {PlayerContentWrapperComponent} from './common/player-content-wrapper/player-content-wrapper.component'; import { CustomHotZoneComponent } from "./common/custom-hot-zone/custom-hot-zone.component";
import {CustomHotZoneComponent} from './common/custom-hot-zone/custom-hot-zone.component'; import { UploadVideoComponent } from "./common/upload-video/upload-video.component";
import {UploadVideoComponent} from './common/upload-video/upload-video.component'; import { UploadDragonBonesComponent } from "./common/upload-dragon-bones/upload-dragon-bones.component";
import {TimePipe} from './pipes/time.pipe'; import {TimePipe} from './pipes/time.pipe';
import {ResourcePipe} from './pipes/resource.pipe'; import {ResourcePipe} from './pipes/resource.pipe';
import {AudioRecorderComponent} from './common/audio-recorder/audio-recorder.component'; import {AudioRecorderComponent} from './common/audio-recorder/audio-recorder.component';
...@@ -40,7 +44,7 @@ registerLocaleData(zh); ...@@ -40,7 +44,7 @@ registerLocaleData(zh);
TimePipe, TimePipe,
UploadVideoComponent, UploadVideoComponent,
CustomHotZoneComponent, CustomHotZoneComponent,
UploadDragonBonesComponent,
PlayerContentWrapperComponent PlayerContentWrapperComponent
], ],
......
<!--龙骨面板-->
<p>
<span>&nbsp;</span>
<button nz-button nzType="dashed" (click)="setAnimaBtnClick(dragonBones)" nzSize="large">
<i nz-icon nzType="tool" nzTheme="outline"></i>
{{buttonText}}
</button>
</p>
<nz-modal [(nzVisible)]="animaPanelVisible" nzTitle="配置资源文件" (nzOnCancel)="animaPanelCancel()" (nzOnOk)="animaPanelOk()" nzOkText="保存">
<div class="anima-upload-btn">
<span style="margin-right: 10px">上传 ske_json 文件: </span>
<nz-upload
[nzShowUploadList]="false"
nzAccept="application/json"
[nzAction]="uploadUrl"
[nzData]="uploadData"
(nzChange)="skeJsonHandleChange($event)">
<button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
</nz-upload>
<i *ngIf="isSkeJsonLoading" style="margin-left: 10px;" nz-icon [nzType]="'loading'"></i>
<span *ngIf="skeJsonData['name']" style="margin-left: 10px"><u> {{skeJsonData['name']}} </u></span>
</div>
<div class="anima-upload-btn">
<span style="margin-right: 10px">上传 tex_json 文件: </span>
<nz-upload
[nzShowUploadList]="false"
nzAccept="application/json"
[nzAction]="uploadUrl"
[nzData]="uploadData"
(nzChange)="texJsonHandleChange($event)">
<button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
</nz-upload>
<i *ngIf="isTexJsonLoading" style="margin-left: 10px;" nz-icon [nzType]="'loading'"></i>
<span *ngIf="texJsonData['name']" style="margin-left: 10px"><u> {{texJsonData['name']}} </u></span>
</div>
<div class="anima-upload-btn">
<span style="margin-right: 10px">上传 tex_png 文件: </span>
<nz-upload
[nzShowUploadList]="false"
nzAccept = "image/*"
[nzAction]="uploadUrl"
[nzData]="uploadData"
(nzChange)="texPngHandleChange($event)">
<button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
</nz-upload>
<i *ngIf="isTexPngLoading" style="margin-left: 10px;" nz-icon [nzType]="'loading'"></i>
<span *ngIf="texPngData['name']" style="margin-left: 10px"><u> {{texPngData['name']}} </u></span>
</div>
</nz-modal>
\ No newline at end of file
@import '../../style/common_mixin.css';
.anima-upload-btn {
margin-bottom: 10px;
}
\ No newline at end of file
import {Component, ElementRef, EventEmitter, Input, Output, OnInit, OnChanges, ViewChild} from '@angular/core';
import {NzMessageService, UploadChangeParam, UploadFile, UploadFileStatus} from 'ng-zorro-antd';
import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
@Component({
selector: 'upload-dragon-bones',
templateUrl: './upload-dragon-bones.component.html',
styleUrls: ['./upload-dragon-bones.component.scss']
})
export class UploadDragonBonesComponent implements OnInit, OnChanges {
@Input() textDragonBones = {
skeJsonData: {url: "", name: ""},
texJsonData: {url: "", name: ""},
texPngData: {url: "", name: ""}
};
@Input() buttonText: string = "配置骨骼动画"
@Output() change = new EventEmitter();
@ViewChild('videoNode', {static: true }) videoNode: ElementRef;
uploadUrl;
uploadData;
animaPanelVisible: boolean = false;
isSkeJsonLoading = false;
isTexJsonLoading = false;
isTexPngLoading = false;
skeJsonData = {};
texJsonData = {};
texPngData = {};
dragonBones = {
skeJsonData: {url: "", name: ""},
texJsonData: {url: "", name: ""},
texPngData: {url: "", name: ""}
};
constructor(private nzMessageService: NzMessageService) {
this.uploadUrl = (<any> window).courseware.uploadUrl();
this.uploadData = (<any> window).courseware.uploadData();
window['air'].getUploadCallback = (url, data) => {
this.uploadUrl = url;
this.uploadData = data;
};
}
ngOnInit() {
if(this.textDragonBones) {
if(!this.textDragonBones.skeJsonData) {
this.textDragonBones.skeJsonData = {url: "", name: ""}
}
if(!this.textDragonBones.texJsonData) {
this.textDragonBones.texJsonData = {url: "", name: ""}
}
if(!this.textDragonBones.texPngData) {
this.textDragonBones.texPngData = {url: "", name: ""}
}
} else {
this.textDragonBones = {
skeJsonData: {url: "", name: ""},
texJsonData: {url: "", name: ""},
texPngData: {url: "", name: ""}
};
}
this.dragonBones = this.textDragonBones;
}
ngOnChanges() {
}
animaPanelCancel() {
this.animaPanelVisible = false;
}
animaPanelOk() {
this.animaPanelVisible = false;
this.change.emit({
texPngData: this.texPngData,
texJsonData: this.texJsonData,
skeJsonData: this.skeJsonData,
})
}
setAnimaBtnClick(dragonBones) {
const {skeJsonData, texJsonData, texPngData} = dragonBones;
this.skeJsonData = skeJsonData || {};
this.texJsonData = texJsonData || {};
this.texPngData = texPngData || {};
this.animaPanelVisible = true;
}
skeJsonHandleChange(e) {
switch (e.type) {
case 'start':
this.isSkeJsonLoading = true;
break;
case 'success':
this.skeJsonData['url'] = e.file.response.url;
this.skeJsonData['name'] = e.file.name;
this.nzMessageService.success('上传成功');
this.isSkeJsonLoading = false;
break;
case 'progress':
break;
}
}
texJsonHandleChange(e) {
switch (e.type) {
case 'start':
this.isTexJsonLoading = true;
break;
case 'success':
this.texJsonData['url'] = e.file.response.url;
this.texJsonData['name'] = e.file.name;
this.nzMessageService.success('上传成功');
this.isTexJsonLoading = false;
break;
case 'progress':
break;
}
}
texPngHandleChange(e) {
switch (e.type) {
case 'start':
this.isTexPngLoading = true;
break;
case 'success':
this.texPngData['url'] = e.file.response.url;
this.texPngData['name'] = e.file.name;
this.nzMessageService.success('上传成功');
this.isTexPngLoading = false;
break;
case 'progress':
break;
}
}
}
...@@ -11,29 +11,55 @@ ...@@ -11,29 +11,55 @@
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<nz-form-item > <nz-form-item >
<nz-form-label [nzSpan]="2" nzFor="email">背景音乐</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="email">背景音乐</nz-form-label>
<nz-form-control [nzSpan]="4"> <nz-form-control [nzSpan]="6">
<app-audio-recorder [audioUrl]="contentObj.bgMusic" (audioUploaded)="onAudioUploadSuccessByItem($event, contentObj, 'bgMusic')" ></app-audio-recorder> <app-audio-recorder [audioUrl]="contentObj.bgMusic" (audioUploaded)="onAudioUploadSuccessByItem($event, contentObj, 'bgMusic')" ></app-audio-recorder>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2" nzFor="email">题意音频</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="email">题意音频</nz-form-label>
<nz-form-control [nzSpan]="4"> <nz-form-control [nzSpan]="6">
<app-audio-recorder [audioUrl]="contentObj.questionAudio_url" (audioUploaded)="onAudioUploadSuccessByItem($event, contentObj, 'questionAudio_url')" ></app-audio-recorder> <app-audio-recorder [audioUrl]="contentObj.questionAudio_url" (audioUploaded)="onAudioUploadSuccessByItem($event, contentObj, 'questionAudio_url')" ></app-audio-recorder>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2" nzFor="email">标题</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="email">标题</nz-form-label>
<nz-form-control [nzSpan]="4"> <nz-form-control [nzSpan]="6">
<input type="text" nz-input placeholder="请输入标题" [(ngModel)]="contentObj.titleText" (blur)="saveItem()" style="width: 250px;" /> <input type="text" nz-input placeholder="请输入标题" [(ngModel)]="contentObj.titleText" (blur)="saveItem()" style="width: 250px;" />
</nz-form-control> </nz-form-control>
</nz-form-item > </nz-form-item >
<nz-form-item >
<nz-form-label [nzSpan]="2" nzFor="email">围巾小鸟</nz-form-label>
<nz-form-control [nzSpan]="8">
<upload-dragon-bones
[textDragonBones]="contentObj.birdDragonBones_1"
(change)="updateDragonBones($event, 'birdDragonBones_1', contentObj)"
></upload-dragon-bones>
</nz-form-control>
</nz-form-item >
<nz-form-item >
<nz-form-label [nzSpan]="2" nzFor="email">黄帽子小鸟</nz-form-label>
<nz-form-control [nzSpan]="8">
<upload-dragon-bones
[textDragonBones]="contentObj.birdDragonBones_2"
(change)="updateDragonBones($event, 'birdDragonBones_2', contentObj)"
></upload-dragon-bones>
</nz-form-control>
</nz-form-item >
<nz-form-item >
<nz-form-label [nzSpan]="2" nzFor="email">音频小鸟</nz-form-label>
<nz-form-control [nzSpan]="8">
<upload-dragon-bones
[textDragonBones]="contentObj.birdDragonBones_2"
(change)="updateDragonBones($event, 'birdDragonBones_audio', contentObj)"
></upload-dragon-bones>
</nz-form-control>
</nz-form-item >
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div *ngFor="let item of contentObj.dataArray; let i = index" class="card-item" style="padding: 0.5vw; " > <div *ngFor="let item of contentObj.dataArray; let i = index" class="card-item" style="padding: 0.5vw; " >
<div class="card-item-content border"> <div class="card-item-content border">
<div class="card-item-content"> <div class="card-item-content">
...@@ -43,6 +69,9 @@ ...@@ -43,6 +69,9 @@
<div class="section" > <div class="section" >
<div class="section-content"> <div class="section-content">
<div style="display: flex; margin-bottom: 10px;">
</div>
<div style="display: flex; margin-bottom: 10px;"> <div style="display: flex; margin-bottom: 10px;">
<div style="flex:1"> <div style="flex:1">
图片 图片
......
...@@ -37,6 +37,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -37,6 +37,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
bgMusic: "", bgMusic: "",
titleText: "", titleText: "",
questionAudio_url: "", questionAudio_url: "",
birdDragonBones_1: {},
birdDragonBones_2: {},
birdDragonBones_audio: {},
dataArray: [] dataArray: []
} }
...@@ -46,13 +49,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -46,13 +49,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
} }
handleQuestionTypeChange(){ handleQuestionTypeChange(){
// if(this.contentObj.question.type != 'LongAudio'){ // if(this.contentObj.question.type != 'LongAudio'){
// this.contentObj.answerType='Text' // this.contentObj.answerType='Text'
...@@ -76,10 +72,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -76,10 +72,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.refresh(); this.refresh();
} }
ngOnInit() { ngOnInit() {
this.item = {}; this.item = {};
this.item.contentObj = {}; this.item.contentObj = {};
...@@ -103,12 +95,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -103,12 +95,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
// this.save() // this.save()
}, this.KEY); }, this.KEY);
} }
ngOnChanges() {
}
ngOnDestroy() { ngOnChanges() {}
} ngOnDestroy() {}
init() { init() {
if (Object.keys(this.item.contentObj).length != 0 && this.item.contentObj.version && this.item.contentObj.version==this.contentObj.version) { if (Object.keys(this.item.contentObj).length != 0 && this.item.contentObj.version && this.item.contentObj.version==this.contentObj.version) {
...@@ -128,7 +117,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -128,7 +117,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
return { isText: true, text: "", image_url: "" } return { isText: true, text: "", image_url: "" }
} }
initData() { initData() {
} }
...@@ -157,7 +145,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -157,7 +145,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
} }
addItem(item?, type?) { addItem(item?, type?) {
item.push({text: "", image_url: ""}) item.push({text: "", image_url: "", dragonBones: {}})
this.saveItem(); this.saveItem();
} }
...@@ -167,12 +155,15 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -167,12 +155,15 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save(); this.save();
} }
onAudioUploadSuccessByItem(e, item, key) { onAudioUploadSuccessByItem(e, item, key) {
item[key] = e.url item[key] = e.url
this.save(); this.save();
} }
updateDragonBones(e, key, item) {
item[key] = e;
this.saveItem()
}
saveItem() { saveItem() {
this.save(); this.save();
......
{
"ver": "1.1.2",
"uuid": "ee1f26de-eba7-4d48-9ff4-be76e2be964f",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
"_children": [ "_children": [
{ {
"__id__": 2 "__id__": 2
},
{
"__id__": 230
} }
], ],
"_active": false, "_active": false,
...@@ -75,67 +78,64 @@ ...@@ -75,67 +78,64 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 24 "__id__": 26
},
{
"__id__": 29
}, },
{ {
"__id__": 34 "__id__": 31
}, },
{ {
"__id__": 49 "__id__": 36
}, },
{ {
"__id__": 64 "__id__": 51
}, },
{ {
"__id__": 79 "__id__": 66
}, },
{ {
"__id__": 94 "__id__": 81
}, },
{ {
"__id__": 109 "__id__": 96
}, },
{ {
"__id__": 124 "__id__": 111
}, },
{ {
"__id__": 139 "__id__": 126
}, },
{ {
"__id__": 154 "__id__": 141
}, },
{ {
"__id__": 169 "__id__": 156
}, },
{ {
"__id__": 184 "__id__": 171
}, },
{ {
"__id__": 187 "__id__": 186
}, },
{ {
"__id__": 189 "__id__": 189
}, },
{ {
"__id__": 191 "__id__": 193
}, },
{ {
"__id__": 192 "__id__": 197
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 214 "__id__": 227
}, },
{ {
"__id__": 215 "__id__": 228
}, },
{ {
"__id__": 216 "__id__": 229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
"array": [ "array": [
0, 0,
0, 0,
527.4094709047232, 412.2234881528291,
0, 0,
0, 0,
0, 0,
...@@ -308,7 +308,10 @@ ...@@ -308,7 +308,10 @@
"__id__": 17 "__id__": 17
}, },
{ {
"__id__": 22 "__id__": 19
},
{
"__id__": 24
} }
], ],
"_active": true, "_active": true,
...@@ -896,6 +899,100 @@ ...@@ -896,6 +899,100 @@
"_atlas": null, "_atlas": null,
"_id": "3bg3jNiMBDdIXqZdcr8weM" "_id": "3bg3jNiMBDdIXqZdcr8weM"
}, },
{
"__type__": "cc.Node",
"_name": "snow_container",
"_objFlags": 0,
"_parent": {
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 40,
"height": 36
},
"_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": "2fmcpkW5pMjonW/ptcPRM0"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
},
"_enabled": false,
"_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": "cbA96Qto5MqqkXV3l1TTh2"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bird_audio", "_name": "bird_audio",
...@@ -905,10 +1002,10 @@ ...@@ -905,10 +1002,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 18 "__id__": 20
}, },
{ {
"__id__": 20 "__id__": 22
} }
], ],
"_active": true, "_active": true,
...@@ -966,13 +1063,13 @@ ...@@ -966,13 +1063,13 @@
"_name": "pause", "_name": "pause",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1028,7 +1125,7 @@ ...@@ -1028,7 +1125,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1060,13 +1157,13 @@ ...@@ -1060,13 +1157,13 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 23
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1122,7 +1219,7 @@ ...@@ -1122,7 +1219,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1160,7 +1257,7 @@ ...@@ -1160,7 +1257,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1216,7 +1313,7 @@ ...@@ -1216,7 +1313,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1252,10 +1349,10 @@ ...@@ -1252,10 +1349,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 25 "__id__": 27
}, },
{ {
"__id__": 27 "__id__": 29
} }
], ],
"_active": true, "_active": true,
...@@ -1313,13 +1410,13 @@ ...@@ -1313,13 +1410,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 24 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1375,7 +1472,7 @@ ...@@ -1375,7 +1472,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1407,13 +1504,13 @@ ...@@ -1407,13 +1504,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 24 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1469,7 +1566,7 @@ ...@@ -1469,7 +1566,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1507,10 +1604,10 @@ ...@@ -1507,10 +1604,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 32
}, },
{ {
"__id__": 32 "__id__": 34
} }
], ],
"_active": true, "_active": true,
...@@ -1568,13 +1665,13 @@ ...@@ -1568,13 +1665,13 @@
"_name": "line_1", "_name": "line_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1630,7 +1727,7 @@ ...@@ -1630,7 +1727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1662,13 +1759,13 @@ ...@@ -1662,13 +1759,13 @@
"_name": "line_2", "_name": "line_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1724,7 +1821,7 @@ ...@@ -1724,7 +1821,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1759,9 +1856,6 @@ ...@@ -1759,9 +1856,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 35
},
{ {
"__id__": 37 "__id__": 37
}, },
...@@ -1769,7 +1863,10 @@ ...@@ -1769,7 +1863,10 @@
"__id__": 39 "__id__": 39
}, },
{ {
"__id__": 45 "__id__": 41
},
{
"__id__": 47
} }
], ],
"_active": true, "_active": true,
...@@ -1827,13 +1924,13 @@ ...@@ -1827,13 +1924,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1889,7 +1986,7 @@ ...@@ -1889,7 +1986,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1921,13 +2018,13 @@ ...@@ -1921,13 +2018,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1983,7 +2080,7 @@ ...@@ -1983,7 +2080,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2015,20 +2112,20 @@ ...@@ -2015,20 +2112,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [ "_children": [
{ {
"__id__": 40 "__id__": 42
}, },
{ {
"__id__": 42 "__id__": 44
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2084,13 +2181,13 @@ ...@@ -2084,13 +2181,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2146,7 +2243,7 @@ ...@@ -2146,7 +2243,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2180,13 +2277,13 @@ ...@@ -2180,13 +2277,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2242,7 +2339,7 @@ ...@@ -2242,7 +2339,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2274,7 +2371,7 @@ ...@@ -2274,7 +2371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2306,17 +2403,17 @@ ...@@ -2306,17 +2403,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [ "_children": [
{ {
"__id__": 46 "__id__": 48
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2372,13 +2469,13 @@ ...@@ -2372,13 +2469,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 47
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2434,7 +2531,7 @@ ...@@ -2434,7 +2531,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2466,7 +2563,7 @@ ...@@ -2466,7 +2563,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2501,9 +2598,6 @@ ...@@ -2501,9 +2598,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 50
},
{ {
"__id__": 52 "__id__": 52
}, },
...@@ -2511,7 +2605,10 @@ ...@@ -2511,7 +2605,10 @@
"__id__": 54 "__id__": 54
}, },
{ {
"__id__": 60 "__id__": 56
},
{
"__id__": 62
} }
], ],
"_active": true, "_active": true,
...@@ -2569,13 +2666,13 @@ ...@@ -2569,13 +2666,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 49 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2631,7 +2728,7 @@ ...@@ -2631,7 +2728,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2663,13 +2760,13 @@ ...@@ -2663,13 +2760,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 49 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2725,7 +2822,7 @@ ...@@ -2725,7 +2822,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2757,20 +2854,20 @@ ...@@ -2757,20 +2854,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 49 "__id__": 51
}, },
"_children": [ "_children": [
{ {
"__id__": 55 "__id__": 57
}, },
{ {
"__id__": 57 "__id__": 59
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2826,13 +2923,13 @@ ...@@ -2826,13 +2923,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2888,7 +2985,7 @@ ...@@ -2888,7 +2985,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2922,13 +3019,13 @@ ...@@ -2922,13 +3019,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2984,7 +3081,7 @@ ...@@ -2984,7 +3081,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3016,7 +3113,7 @@ ...@@ -3016,7 +3113,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3048,17 +3145,17 @@ ...@@ -3048,17 +3145,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 49 "__id__": 51
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 63
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3114,13 +3211,13 @@ ...@@ -3114,13 +3211,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3176,7 +3273,7 @@ ...@@ -3176,7 +3273,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3208,7 +3305,7 @@ ...@@ -3208,7 +3305,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3243,9 +3340,6 @@ ...@@ -3243,9 +3340,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 65
},
{ {
"__id__": 67 "__id__": 67
}, },
...@@ -3253,9 +3347,12 @@ ...@@ -3253,9 +3347,12 @@
"__id__": 69 "__id__": 69
}, },
{ {
"__id__": 75 "__id__": 71
} },
], {
"__id__": 77
}
],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
...@@ -3311,13 +3408,13 @@ ...@@ -3311,13 +3408,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3373,7 +3470,7 @@ ...@@ -3373,7 +3470,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3405,13 +3502,13 @@ ...@@ -3405,13 +3502,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3467,7 +3564,7 @@ ...@@ -3467,7 +3564,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3499,20 +3596,20 @@ ...@@ -3499,20 +3596,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 70 "__id__": 72
}, },
{ {
"__id__": 72 "__id__": 74
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3568,13 +3665,13 @@ ...@@ -3568,13 +3665,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 69 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3630,7 +3727,7 @@ ...@@ -3630,7 +3727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3664,13 +3761,13 @@ ...@@ -3664,13 +3761,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 69 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3726,7 +3823,7 @@ ...@@ -3726,7 +3823,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3758,7 +3855,7 @@ ...@@ -3758,7 +3855,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3790,17 +3887,17 @@ ...@@ -3790,17 +3887,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3856,13 +3953,13 @@ ...@@ -3856,13 +3953,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3918,7 +4015,7 @@ ...@@ -3918,7 +4015,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3950,7 +4047,7 @@ ...@@ -3950,7 +4047,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3985,9 +4082,6 @@ ...@@ -3985,9 +4082,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 80
},
{ {
"__id__": 82 "__id__": 82
}, },
...@@ -3995,7 +4089,10 @@ ...@@ -3995,7 +4089,10 @@
"__id__": 84 "__id__": 84
}, },
{ {
"__id__": 90 "__id__": 86
},
{
"__id__": 92
} }
], ],
"_active": true, "_active": true,
...@@ -4053,13 +4150,13 @@ ...@@ -4053,13 +4150,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 83
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4115,7 +4212,7 @@ ...@@ -4115,7 +4212,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4147,13 +4244,13 @@ ...@@ -4147,13 +4244,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4209,7 +4306,7 @@ ...@@ -4209,7 +4306,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4241,20 +4338,20 @@ ...@@ -4241,20 +4338,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 85 "__id__": 87
}, },
{ {
"__id__": 87 "__id__": 89
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4310,13 +4407,13 @@ ...@@ -4310,13 +4407,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 84 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4372,7 +4469,7 @@ ...@@ -4372,7 +4469,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4406,13 +4503,13 @@ ...@@ -4406,13 +4503,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 84 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4468,7 +4565,7 @@ ...@@ -4468,7 +4565,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4500,7 +4597,7 @@ ...@@ -4500,7 +4597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4532,17 +4629,17 @@ ...@@ -4532,17 +4629,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 91 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4598,13 +4695,13 @@ ...@@ -4598,13 +4695,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4660,7 +4757,7 @@ ...@@ -4660,7 +4757,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4692,7 +4789,7 @@ ...@@ -4692,7 +4789,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4727,9 +4824,6 @@ ...@@ -4727,9 +4824,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 95
},
{ {
"__id__": 97 "__id__": 97
}, },
...@@ -4737,7 +4831,10 @@ ...@@ -4737,7 +4831,10 @@
"__id__": 99 "__id__": 99
}, },
{ {
"__id__": 105 "__id__": 101
},
{
"__id__": 107
} }
], ],
"_active": true, "_active": true,
...@@ -4795,13 +4892,13 @@ ...@@ -4795,13 +4892,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 96
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4857,7 +4954,7 @@ ...@@ -4857,7 +4954,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4889,13 +4986,13 @@ ...@@ -4889,13 +4986,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 96
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4951,7 +5048,7 @@ ...@@ -4951,7 +5048,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4983,20 +5080,20 @@ ...@@ -4983,20 +5080,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 96
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 102
}, },
{ {
"__id__": 102 "__id__": 104
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5052,13 +5149,13 @@ ...@@ -5052,13 +5149,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5114,7 +5211,7 @@ ...@@ -5114,7 +5211,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5148,13 +5245,13 @@ ...@@ -5148,13 +5245,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5210,7 +5307,7 @@ ...@@ -5210,7 +5307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5242,7 +5339,7 @@ ...@@ -5242,7 +5339,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5274,17 +5371,17 @@ ...@@ -5274,17 +5371,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 96
}, },
"_children": [ "_children": [
{ {
"__id__": 106 "__id__": 108
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5340,13 +5437,13 @@ ...@@ -5340,13 +5437,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 107
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5402,7 +5499,7 @@ ...@@ -5402,7 +5499,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5434,7 +5531,7 @@ ...@@ -5434,7 +5531,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5469,9 +5566,6 @@ ...@@ -5469,9 +5566,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 110
},
{ {
"__id__": 112 "__id__": 112
}, },
...@@ -5479,7 +5573,10 @@ ...@@ -5479,7 +5573,10 @@
"__id__": 114 "__id__": 114
}, },
{ {
"__id__": 120 "__id__": 116
},
{
"__id__": 122
} }
], ],
"_active": true, "_active": true,
...@@ -5537,13 +5634,13 @@ ...@@ -5537,13 +5634,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5599,7 +5696,7 @@ ...@@ -5599,7 +5696,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5631,13 +5728,13 @@ ...@@ -5631,13 +5728,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5693,7 +5790,7 @@ ...@@ -5693,7 +5790,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5725,20 +5822,20 @@ ...@@ -5725,20 +5822,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 111
}, },
"_children": [ "_children": [
{ {
"__id__": 115 "__id__": 117
}, },
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5794,13 +5891,13 @@ ...@@ -5794,13 +5891,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5856,7 +5953,7 @@ ...@@ -5856,7 +5953,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5890,13 +5987,13 @@ ...@@ -5890,13 +5987,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5952,7 +6049,7 @@ ...@@ -5952,7 +6049,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5984,7 +6081,7 @@ ...@@ -5984,7 +6081,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6016,17 +6113,17 @@ ...@@ -6016,17 +6113,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 111
}, },
"_children": [ "_children": [
{ {
"__id__": 121 "__id__": 123
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 123 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6082,13 +6179,13 @@ ...@@ -6082,13 +6179,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 120 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6144,7 +6241,7 @@ ...@@ -6144,7 +6241,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 121 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6176,7 +6273,7 @@ ...@@ -6176,7 +6273,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6211,9 +6308,6 @@ ...@@ -6211,9 +6308,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 125
},
{ {
"__id__": 127 "__id__": 127
}, },
...@@ -6221,7 +6315,10 @@ ...@@ -6221,7 +6315,10 @@
"__id__": 129 "__id__": 129
}, },
{ {
"__id__": 135 "__id__": 131
},
{
"__id__": 137
} }
], ],
"_active": true, "_active": true,
...@@ -6279,13 +6376,13 @@ ...@@ -6279,13 +6376,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 126
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 126 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6341,7 +6438,7 @@ ...@@ -6341,7 +6438,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 125 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6373,13 +6470,13 @@ ...@@ -6373,13 +6470,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 126
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6435,7 +6532,7 @@ ...@@ -6435,7 +6532,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6467,20 +6564,20 @@ ...@@ -6467,20 +6564,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 126
}, },
"_children": [ "_children": [
{ {
"__id__": 130 "__id__": 132
}, },
{ {
"__id__": 132 "__id__": 134
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 136
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6536,13 +6633,13 @@ ...@@ -6536,13 +6633,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 129 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6598,7 +6695,7 @@ ...@@ -6598,7 +6695,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 130 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6632,13 +6729,13 @@ ...@@ -6632,13 +6729,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 129 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 133 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6694,7 +6791,7 @@ ...@@ -6694,7 +6791,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6726,7 +6823,7 @@ ...@@ -6726,7 +6823,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6758,17 +6855,17 @@ ...@@ -6758,17 +6855,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 126
}, },
"_children": [ "_children": [
{ {
"__id__": 136 "__id__": 138
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6824,13 +6921,13 @@ ...@@ -6824,13 +6921,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 135 "__id__": 137
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6886,7 +6983,7 @@ ...@@ -6886,7 +6983,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 136 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6918,7 +7015,7 @@ ...@@ -6918,7 +7015,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6953,9 +7050,6 @@ ...@@ -6953,9 +7050,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 140
},
{ {
"__id__": 142 "__id__": 142
}, },
...@@ -6963,7 +7057,10 @@ ...@@ -6963,7 +7057,10 @@
"__id__": 144 "__id__": 144
}, },
{ {
"__id__": 150 "__id__": 146
},
{
"__id__": 152
} }
], ],
"_active": true, "_active": true,
...@@ -7021,13 +7118,13 @@ ...@@ -7021,13 +7118,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 139 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 141 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7083,7 +7180,7 @@ ...@@ -7083,7 +7180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7115,13 +7212,13 @@ ...@@ -7115,13 +7212,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 139 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 143 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7177,7 +7274,7 @@ ...@@ -7177,7 +7274,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 142 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7209,20 +7306,20 @@ ...@@ -7209,20 +7306,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 139 "__id__": 141
}, },
"_children": [ "_children": [
{ {
"__id__": 145 "__id__": 147
}, },
{ {
"__id__": 147 "__id__": 149
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7278,13 +7375,13 @@ ...@@ -7278,13 +7375,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 146
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 146 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7340,7 +7437,7 @@ ...@@ -7340,7 +7437,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7374,13 +7471,13 @@ ...@@ -7374,13 +7471,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 146
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7436,7 +7533,7 @@ ...@@ -7436,7 +7533,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 149
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7468,7 +7565,7 @@ ...@@ -7468,7 +7565,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7500,17 +7597,17 @@ ...@@ -7500,17 +7597,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 139 "__id__": 141
}, },
"_children": [ "_children": [
{ {
"__id__": 151 "__id__": 153
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 153 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7566,13 +7663,13 @@ ...@@ -7566,13 +7663,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 150 "__id__": 152
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7628,7 +7725,7 @@ ...@@ -7628,7 +7725,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7660,7 +7757,7 @@ ...@@ -7660,7 +7757,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7695,9 +7792,6 @@ ...@@ -7695,9 +7792,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 155
},
{ {
"__id__": 157 "__id__": 157
}, },
...@@ -7705,7 +7799,10 @@ ...@@ -7705,7 +7799,10 @@
"__id__": 159 "__id__": 159
}, },
{ {
"__id__": 165 "__id__": 161
},
{
"__id__": 167
} }
], ],
"_active": true, "_active": true,
...@@ -7763,13 +7860,13 @@ ...@@ -7763,13 +7860,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 156
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7825,7 +7922,7 @@ ...@@ -7825,7 +7922,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 157
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7857,13 +7954,13 @@ ...@@ -7857,13 +7954,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 156
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 160
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7919,7 +8016,7 @@ ...@@ -7919,7 +8016,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7951,20 +8048,20 @@ ...@@ -7951,20 +8048,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 156
}, },
"_children": [ "_children": [
{ {
"__id__": 160 "__id__": 162
}, },
{ {
"__id__": 162 "__id__": 164
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 166
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8020,13 +8117,13 @@ ...@@ -8020,13 +8117,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8082,7 +8179,7 @@ ...@@ -8082,7 +8179,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8116,13 +8213,13 @@ ...@@ -8116,13 +8213,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 163 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8178,7 +8275,7 @@ ...@@ -8178,7 +8275,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8210,7 +8307,7 @@ ...@@ -8210,7 +8307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8242,17 +8339,17 @@ ...@@ -8242,17 +8339,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 156
}, },
"_children": [ "_children": [
{ {
"__id__": 166 "__id__": 168
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8308,13 +8405,13 @@ ...@@ -8308,13 +8405,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 165 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 167 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8370,7 +8467,7 @@ ...@@ -8370,7 +8467,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 166 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8402,7 +8499,7 @@ ...@@ -8402,7 +8499,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8437,9 +8534,6 @@ ...@@ -8437,9 +8534,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 170
},
{ {
"__id__": 172 "__id__": 172
}, },
...@@ -8447,9 +8541,12 @@ ...@@ -8447,9 +8541,12 @@
"__id__": 174 "__id__": 174
}, },
{ {
"__id__": 180 "__id__": 176
} },
], {
"__id__": 182
}
],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
...@@ -8505,13 +8602,13 @@ ...@@ -8505,13 +8602,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8567,7 +8664,7 @@ ...@@ -8567,7 +8664,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 172
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8599,13 +8696,13 @@ ...@@ -8599,13 +8696,13 @@
"_name": "selected", "_name": "selected",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 175
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8661,7 +8758,7 @@ ...@@ -8661,7 +8758,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 174
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8693,20 +8790,20 @@ ...@@ -8693,20 +8790,20 @@
"_name": "bell", "_name": "bell",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 171
}, },
"_children": [ "_children": [
{ {
"__id__": 175 "__id__": 177
}, },
{ {
"__id__": 177 "__id__": 179
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8762,13 +8859,13 @@ ...@@ -8762,13 +8859,13 @@
"_name": "index", "_name": "index",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 174 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 176 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8824,7 +8921,7 @@ ...@@ -8824,7 +8921,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8858,13 +8955,13 @@ ...@@ -8858,13 +8955,13 @@
"_name": "bell_outline", "_name": "bell_outline",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 174 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 178 "__id__": 180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8920,7 +9017,7 @@ ...@@ -8920,7 +9017,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8952,7 +9049,7 @@ ...@@ -8952,7 +9049,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 174 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8984,17 +9081,17 @@ ...@@ -8984,17 +9081,17 @@
"_name": "container", "_name": "container",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 171
}, },
"_children": [ "_children": [
{ {
"__id__": 181 "__id__": 183
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 183 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9050,13 +9147,13 @@ ...@@ -9050,13 +9147,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 180 "__id__": 182
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 182 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9112,7 +9209,7 @@ ...@@ -9112,7 +9209,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 181 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9144,7 +9241,7 @@ ...@@ -9144,7 +9241,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9180,7 +9277,7 @@ ...@@ -9180,7 +9277,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 185 "__id__": 187
} }
], ],
"_active": true, "_active": true,
...@@ -9238,13 +9335,13 @@ ...@@ -9238,13 +9335,13 @@
"_name": "restart", "_name": "restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 184 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9300,7 +9397,7 @@ ...@@ -9300,7 +9397,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9334,11 +9431,15 @@ ...@@ -9334,11 +9431,15 @@
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [
{
"__id__": 190
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 188 "__id__": 192
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9389,12 +9490,87 @@ ...@@ -9389,12 +9490,87 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "5a+9OdvFBIDbvh/+WUBqkc" "_id": "5a+9OdvFBIDbvh/+WUBqkc"
}, },
{
"__type__": "cc.Node",
"_name": "dragonBones",
"_objFlags": 0,
"_parent": {
"__id__": 189
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 76
},
"_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": "68qGDo7+1A3ppJ1dEwV7An"
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
},
"_enabled": true,
"_defaultClip": null,
"_clips": [],
"playOnLoad": false,
"_id": "2d6CCcVSxOXolPG8TaCNDk"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 187 "__id__": 189
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9428,11 +9604,15 @@ ...@@ -9428,11 +9604,15 @@
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [
{
"__id__": 194
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 190 "__id__": 196
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9483,48 +9663,20 @@ ...@@ -9483,48 +9663,20 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "a70mePzaBMfKscYV/TcuTd" "_id": "a70mePzaBMfKscYV/TcuTd"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f3bf912c-e1a9-4404-8928-8526d7b8b761"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "28+uEPDpFIsp3dj62UcUxg"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "MaskLayer", "_name": "dragonBones",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 193
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 195
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9536,8 +9688,8 @@ ...@@ -9536,8 +9688,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 0,
"height": 720 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -9571,7 +9723,52 @@ ...@@ -9571,7 +9723,52 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b7CZqDxDBLX4KJo5K0ULdk" "_id": "0a0xyWyX5CnbOjfgPgrye7"
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
},
"_enabled": true,
"_defaultClip": null,
"_clips": [],
"playOnLoad": false,
"_id": "eeNwWegi1JRp8S8VtchW5v"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f3bf912c-e1a9-4404-8928-8526d7b8b761"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "28+uEPDpFIsp3dj62UcUxg"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -9582,13 +9779,13 @@ ...@@ -9582,13 +9779,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 193 "__id__": 198
}, },
{ {
"__id__": 196 "__id__": 201
}, },
{ {
"__id__": 201 "__id__": 214
} }
], ],
"_active": false, "_active": false,
...@@ -9646,11 +9843,11 @@ ...@@ -9646,11 +9843,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 192 "__id__": 197
}, },
"_children": [ "_children": [
{ {
"__id__": 194 "__id__": 199
} }
], ],
"_active": true, "_active": true,
...@@ -9708,13 +9905,13 @@ ...@@ -9708,13 +9905,13 @@
"_name": "Comic Sans MS", "_name": "Comic Sans MS",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 193 "__id__": 198
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 200
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9770,7 +9967,7 @@ ...@@ -9770,7 +9967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 199
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -9802,14 +9999,26 @@ ...@@ -9802,14 +9999,26 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 192 "__id__": 197
}, },
"_children": [ "_children": [
{ {
"__id__": 197 "__id__": 202
}, },
{ {
"__id__": 199 "__id__": 204
},
{
"__id__": 206
},
{
"__id__": 208
},
{
"__id__": 210
},
{
"__id__": 212
} }
], ],
"_active": true, "_active": true,
...@@ -9867,13 +10076,13 @@ ...@@ -9867,13 +10076,13 @@
"_name": "card_demo", "_name": "card_demo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 196 "__id__": 201
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 198 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9929,7 +10138,7 @@ ...@@ -9929,7 +10138,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 197 "__id__": 202
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -9957,13 +10166,13 @@ ...@@ -9957,13 +10166,13 @@
"_name": "black", "_name": "black",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 196 "__id__": 201
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10019,7 +10228,7 @@ ...@@ -10019,7 +10228,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 199 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -10044,29 +10253,389 @@ ...@@ -10044,29 +10253,389 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "audio", "_name": "snow_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 192 "__id__": 201
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{ {
"__id__": 202 "__id__": 207
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 39,
"height": 44
},
"_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": "0dUZ9KISlHNYvoPOOrrYcw"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "ada7613b-b4fd-4367-8d20-0366cd6461e8"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "42L9tSM2xEq7Np00xC5lbD"
},
{
"__type__": "cc.Node",
"_name": "snow_2",
"_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": 33,
"height": 32
},
"_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": "1fr5jhaB9ITZrKKiSes1z1"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "65716f17-b067-4e1e-bdf9-c67894a38dc2"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "eaH+OcXKJGzZmG5Z0H48PW"
},
{
"__type__": "cc.Node",
"_name": "snow_3",
"_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": 25,
"height": 25
},
"_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": "8dbqHC+JdFLKpF4efPF0sZ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "5f3db4b3-4a26-4a1b-a3d0-f20c836f7ed0"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "f8q1li8JpNjY1MIce8atHK"
},
{
"__type__": "cc.Node",
"_name": "snow_4",
"_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": 39,
"height": 44
},
"_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": "5dDGqERfRDkIl6pfNFvEvl"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e3a6979e-6673-4118-8ba6-bf8c837ee899"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d7I6oMQyhCQq+pBTpx43cO"
},
{
"__type__": "cc.Node",
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 197
},
"_children": [
{
"__id__": 215
}, },
{ {
"__id__": 204 "__id__": 217
}, },
{ {
"__id__": 206 "__id__": 219
}, },
{ {
"__id__": 208 "__id__": 221
}, },
{ {
"__id__": 210 "__id__": 223
}, },
{ {
"__id__": 212 "__id__": 225
} }
], ],
"_active": true, "_active": true,
...@@ -10124,13 +10693,13 @@ ...@@ -10124,13 +10693,13 @@
"_name": "test_audio", "_name": "test_audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 203 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10186,7 +10755,7 @@ ...@@ -10186,7 +10755,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 202 "__id__": 215
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10204,13 +10773,13 @@ ...@@ -10204,13 +10773,13 @@
"_name": "star_boom", "_name": "star_boom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 205 "__id__": 218
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10266,7 +10835,7 @@ ...@@ -10266,7 +10835,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 217
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10284,13 +10853,13 @@ ...@@ -10284,13 +10853,13 @@
"_name": "good_job", "_name": "good_job",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 207 "__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10346,7 +10915,7 @@ ...@@ -10346,7 +10915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 206 "__id__": 219
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10364,13 +10933,13 @@ ...@@ -10364,13 +10933,13 @@
"_name": "bird_fly", "_name": "bird_fly",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 209 "__id__": 222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10426,7 +10995,7 @@ ...@@ -10426,7 +10995,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10444,13 +11013,13 @@ ...@@ -10444,13 +11013,13 @@
"_name": "try_again", "_name": "try_again",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 211 "__id__": 224
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10506,7 +11075,7 @@ ...@@ -10506,7 +11075,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 210 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10524,13 +11093,13 @@ ...@@ -10524,13 +11093,13 @@
"_name": "enter", "_name": "enter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 201 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 213 "__id__": 226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10586,7 +11155,7 @@ ...@@ -10586,7 +11155,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 212 "__id__": 225
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10652,5 +11221,63 @@ ...@@ -10652,5 +11221,63 @@
}, },
"_enabled": true, "_enabled": true,
"_id": "e687yyoRBIzZAOVRL8Sseh" "_id": "e687yyoRBIzZAOVRL8Sseh"
},
{
"__type__": "cc.Node",
"_name": "MaskLayer",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [],
"_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": [
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": "b7CZqDxDBLX4KJo5K0ULdk"
} }
] ]
\ No newline at end of file
...@@ -290,16 +290,20 @@ class DragonBones { ...@@ -290,16 +290,20 @@ class DragonBones {
const image = dragonBonesConfig.texPngData.url const image = dragonBonesConfig.texPngData.url
const ske = dragonBonesConfig.skeJsonData.url const ske = dragonBonesConfig.skeJsonData.url
const atlas = dragonBonesConfig.texJsonData.url const atlas = dragonBonesConfig.texJsonData.url
cc.assetManager.loadRemote(image, (error, texture) => { console.log(image)
cc.assetManager.loadRemote(atlas, (error, atlasJson) => { console.log(ske)
cc.assetManager.loadRemote(url, (error, dragonBonesJson) => { console.log(atlas)
cc.loader.load(image, (error, texture) => {
cc.loader.load({url: atlas, type: 'txt'}, (error, atlasJson) => {
cc.loader.load({url: ske, type: 'txt'}, (error, dragonBonesJson) => {
const atlas = new dragonBones.DragonBonesAtlasAsset(); const atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson; atlas.atlasJson = (atlasJson);
atlas.texture = texture; atlas.texture = texture;
const asset = new dragonBones.DragonBonesAsset(); const asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = dragonBonesJson; asset.dragonBonesJson = (dragonBonesJson);
dragonDisplay.dragonAtlasAsset = atlas; dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset; dragonDisplay.dragonAsset = asset;
...@@ -345,8 +349,9 @@ class DragonBones { ...@@ -345,8 +349,9 @@ class DragonBones {
} }
showDragonBones(times = 1) { showDragonBones(times = 1) {
console.log(this._animationLoaded)
if (this._animationLoaded && this._animationLoaded.animaNames.length > 0) { if (this._animationLoaded && this._animationLoaded.animaNames.length > 0) {
this._animationLoaded.playAnimation(this._animationLoaded.animaNames[0], times); this._animationLoaded.playAnimation(this._animationLoaded.animaNames[0], -1);
} }
} }
} }
\ No newline at end of file
...@@ -30,6 +30,8 @@ export default class GameLogic { ...@@ -30,6 +30,8 @@ export default class GameLogic {
console.log("User saved data =>", this.g_formData) console.log("User saved data =>", this.g_formData)
} }
this.g_enableClick = false;
this.g_cartoon.initLocalAudios([ this.g_cartoon.initLocalAudios([
"test_audio", "test_audio",
"bird_fly", "bird_fly",
...@@ -58,7 +60,6 @@ export default class GameLogic { ...@@ -58,7 +60,6 @@ export default class GameLogic {
this.initBirds(); this.initBirds();
this.initImageCards(); this.initImageCards();
this.initTitle(); this.initTitle();
this.initMaskLayer(); this.initMaskLayer();
} }
...@@ -87,23 +88,30 @@ export default class GameLogic { ...@@ -87,23 +88,30 @@ export default class GameLogic {
this.g_cartoon.getNodeByPath(`Canvas/shengzi/line_2`).active = false; this.g_cartoon.getNodeByPath(`Canvas/shengzi/line_2`).active = false;
} }
this.g_cartoon.initCartoonElement(`snow_container`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/snow_container`));
this.g_cartoon.initCartoonElement(`bottomButtons`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons`)); this.g_cartoon.initCartoonElement(`bottomButtons`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons`));
this.g_cartoon.initCartoonElement(`restart_button`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/restart`)); this.g_cartoon.initCartoonElement(`restart_button`, this.g_cartoon.getNodeByPath(`Canvas/bottomButtons/restart`));
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(`birdAni_1`, this.g_cartoon.getNodeByPath(`Canvas/bird_1/dragonBones`));
this.g_cartoon.initCartoonElement(`birdAni_2`, this.g_cartoon.getNodeByPath(`Canvas/bird_2/dragonBones`));
this.g_cartoon.initCartoonElement(`birdAudio`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bird_audio`)); this.g_cartoon.initCartoonElement(`birdAudio`, this.g_cartoon.getNodeByPath(`Canvas/bgMain/bird_audio`));
} }
initBg() { initBg() {
const bgNode = cc.find('Canvas/bgMain/bg'); const bgNode = cc.find('Canvas/bgMain/bg');
const bgSnowContainer = cc.find('Canvas/bgMain/snow_container');
const bgNodeSnow = cc.find('Canvas/bgMain/bg_snow'); const bgNodeSnow = cc.find('Canvas/bgMain/bg_snow');
const tree1 = cc.find('Canvas/bgMain/tree_1'); const tree1 = cc.find('Canvas/bgMain/tree_1');
const tree2 = cc.find('Canvas/bgMain/tree_2/1') const tree2 = cc.find('Canvas/bgMain/tree_2/1')
const tree3 = cc.find('Canvas/bgMain/tree_2/2') const tree3 = cc.find('Canvas/bgMain/tree_2/2')
bgNode.scale = this.g_systemOption.mapScaleMax; bgNode.scale = this.g_systemOption.mapScaleMax;
bgSnowContainer.scale = this.g_systemOption.mapScaleMax;
bgNodeSnow.width = cc.winSize.width bgNodeSnow.width = cc.winSize.width
tree1.height = cc.winSize.height tree1.height = cc.winSize.height
tree2.height = cc.winSize.height tree2.height = cc.winSize.height
...@@ -267,33 +275,38 @@ export default class GameLogic { ...@@ -267,33 +275,38 @@ export default class GameLogic {
let x_2 = card_2.node.x let x_2 = card_2.node.x
let y_2 = card_2.node.y let y_2 = card_2.node.y
card_1.node.setSiblingIndex(10); // card_1.node.setSiblingIndex(10);
card_2.node.setSiblingIndex(10); // card_2.node.setSiblingIndex(10);
let bell1 = this.g_cartoon.getCartoonElement(`card_${i1}_bell`) let bell1 = this.g_cartoon.getCartoonElement(`card_${i1}_bell`)
let bell2 = this.g_cartoon.getCartoonElement(`card_${toIndex+1}_bell`) let bell2 = this.g_cartoon.getCartoonElement(`card_${toIndex+1}_bell`)
this.g_cartoon.tweenChange(bell1.node, {scaleX: 0, scaleY: 0}, 0.2, ()=>{
this.g_cartoon.tweenChange(card_1.node, {x: x_2, y: y_2}, 1, ()=>{ this.g_cartoon.tweenChange(bell1.node, {scaleX: 1.2, scaleY: 1.2}, 0.3, ()=>{
this.g_cartoon.tweenChange(bell1.node, {scaleX: 1, scaleY: 1}, 0.2); this.g_cartoon.tweenChange(bell1.node, {scaleX: 0, scaleY: 0}, 0.4, ()=>{
}); this.g_cartoon.tweenChange(card_1.node, {x: x_2, y: y_2}, 1, ()=>{
this.g_cartoon.tweenChange(bell1.node, {scaleX: 1, scaleY: 1}, 0.2);
});
});
}); });
this.g_cartoon.tweenChange(bell2.node, {scaleX: 0, scaleY: 0}, 0.2, ()=>{ this.g_cartoon.tweenChange(bell2.node, {scaleX: 1.2, scaleY: 1.2}, 0.3, ()=>{
this.g_cartoon.tweenChange(card_2.node, {x: x_1, y: y_1}, 1, ()=>{ this.g_cartoon.tweenChange(bell2.node, {scaleX: 0, scaleY: 0}, 0.4, ()=>{
this.g_cartoon.tweenChange(bell2.node, {scaleX: 1, scaleY: 1}, 0.2, ()=>{ this.g_cartoon.tweenChange(card_2.node, {x: x_1, y: y_1}, 1, ()=>{
this.g_cartoon.getCartoonElement("bird_1").flyBack(()=>{ this.g_cartoon.tweenChange(bell2.node, {scaleX: 1, scaleY: 1}, 0.2, ()=>{
setTimeout(()=>{ this.g_cartoon.getCartoonElement("bird_1").flyBack(()=>{
if(callback) { setTimeout(()=>{
callback(); if(callback) {
} callback();
}, 1500) }
}) }, 1500)
this.g_cartoon.getCartoonElement("bird_2").flyBack() })
}); this.g_cartoon.getCartoonElement("bird_2").flyBack()
}); });
});
});
}); });
let bellText1 = this.g_cartoon.getCartoonElement(`card_${i1}_bell_text`) let bellText1 = this.g_cartoon.getCartoonElement(`card_${i1}_bell_text`)
let bellText2 = this.g_cartoon.getCartoonElement(`card_${toIndex+1}_bell_text`) let bellText2 = this.g_cartoon.getCartoonElement(`card_${toIndex+1}_bell_text`)
toIndex = this.getCurrentIndex(toIndex) toIndex = this.getCurrentIndex(toIndex)
bellText1.node.getComponent(cc.Label).string = "" + (toIndex+1) bellText1.node.getComponent(cc.Label).string = "" + (toIndex+1)
...@@ -411,6 +424,7 @@ export default class GameLogic { ...@@ -411,6 +424,7 @@ export default class GameLogic {
} 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_enableClick = true;
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].audio_url) 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;
...@@ -419,7 +433,8 @@ export default class GameLogic { ...@@ -419,7 +433,8 @@ export default class GameLogic {
} }
endGame() { endGame() {
this.m_gameEnd = true; this.m_gameEnd = true;
this.snowing(5000)
let resetBtn = this.g_cartoon.getCartoonElement("restart_button") let resetBtn = this.g_cartoon.getCartoonElement("restart_button")
resetBtn.node.active = true; resetBtn.node.active = true;
} }
...@@ -466,12 +481,54 @@ export default class GameLogic { ...@@ -466,12 +481,54 @@ 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 birdAni_1 = this.g_cartoon.getCartoonElement("birdAni_1");
let birdAni_2 = this.g_cartoon.getCartoonElement("birdAni_2");
let birdAudio = this.g_cartoon.getCartoonElement("birdAudio"); let birdAudio = this.g_cartoon.getCartoonElement("birdAudio");
const birdDragonBones_1 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png",
"name": "bird1_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json",
"name": "bird1_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json",
"name": "bird1_ske.json"
}
}
const birdDragonBones_2 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png",
"name": "bird2_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json",
"name": "bird2_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json",
"name": "bird2_ske.json"
}
}
birdAni_1.dragonBones.setDragonBones(birdDragonBones_1, ()=>{
birdAni_1.dragonBones.showDragonBones()
})
birdAni_2.dragonBones.setDragonBones(birdDragonBones_2, ()=>{
birdAni_2.dragonBones.showDragonBones()
})
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}`)
card.node.setSiblingIndex(100)
const worldPos = cc.find("Canvas").convertToWorldSpaceAR(cc.v2(bird_1.node.x, bird_1.node.y)); const worldPos = cc.find("Canvas").convertToWorldSpaceAR(cc.v2(bird_1.node.x, bird_1.node.y));
const localPos = card.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y)); const localPos = card.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y));
...@@ -503,7 +560,8 @@ export default class GameLogic { ...@@ -503,7 +560,8 @@ export default class GameLogic {
bird_2.flyTo = (cardIndex, callback)=>{ bird_2.flyTo = (cardIndex, callback)=>{
let card = this.g_cartoon.getCartoonElement(`card_${cardIndex+1}`) let card = this.g_cartoon.getCartoonElement(`card_${cardIndex+1}`)
card.node.setSiblingIndex(100)
const worldPos = cc.find("Canvas").convertToWorldSpaceAR(cc.v2(bird_2.node.x, bird_2.node.y)); const worldPos = cc.find("Canvas").convertToWorldSpaceAR(cc.v2(bird_2.node.x, bird_2.node.y));
const localPos = card.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y)); const localPos = card.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y));
...@@ -537,8 +595,10 @@ export default class GameLogic { ...@@ -537,8 +595,10 @@ export default class GameLogic {
bird_2.node.y = -cc.winSize.height / 2 + bird_2.node.height 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.node.y = -cc.winSize.height / 2 + bird_2.node.height + 20
birdAudio.audioID = null birdAudio.audioID = null
bird_1.node.setSiblingIndex(20); // bird_1.node.setSiblingIndex(20);
bird_2.node.setSiblingIndex(20); // bird_2.node.setSiblingIndex(20);
// bird_1.node.zIndex = 20
// bird_2.node.zIndex = 20
this.g_cartoon.subscribeTouchEvent(birdAudio.key, ()=>{ this.g_cartoon.subscribeTouchEvent(birdAudio.key, ()=>{
if(birdAudio.audioID) { if(birdAudio.audioID) {
...@@ -558,455 +618,38 @@ export default class GameLogic { ...@@ -558,455 +618,38 @@ export default class GameLogic {
}) })
} }
snowing(time=5000) {
const parent = this.g_cartoon.getCartoonElement("snow_container")
const getSnow = (index) => {
const snowArray = [
this.getSprNode('snow_1'), this.getSprNode('snow_2'), this.getSprNode('snow_3'), this.getSprNode('snow_4')
]
const sf = this.getSprNode(`snow_${index}`).getComponent(cc.Sprite).spriteFrame;
const node = new cc.Node();
node.addComponent(cc.Sprite).spriteFrame = sf;
node.y = cc.winSize.height/2 + node.height - 10;
node.x = Math.ceil(Math.random() * cc.winSize.width) - cc.winSize.width / 2
node.parent = parent.node
initCenterImage() {
let imageContainer = this.g_cartoon.getCartoonElement("center_image_container") return node;
if(!this.g_formData.dataArray[this.m_currentQuestion].question.centerImage_url) {
let fr = this.getSpriteFrimeByResName("default_stage")
imageContainer.node.setScale(1)
imageContainer.node.getComponent(cc.Sprite).spriteFrame = fr
} else {
let parentWidth = imageContainer.node.parent.width
let parentHeight = imageContainer.node.parent.height
this.getSpriteFrimeByUrl(this.g_formData.dataArray[this.m_currentQuestion].question.centerImage_url, (fr)=>{
imageContainer.node.getComponent(cc.Sprite).spriteFrame = fr
imageContainer.node.scaleX = parentWidth / imageContainer.node.width
imageContainer.node.scaleY = parentHeight / imageContainer.node.height
})
}
}
initQuestionPannel() {
let title = this.g_cartoon.getCartoonElement("question_title_pannel")
let body = this.g_cartoon.getCartoonElement("question_body_pannel")
let bodyText = this.g_cartoon.getCartoonElement("question_body_pannel_text")
this.g_cartoon.subscribeTouchEvent(title.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
if(this.g_formData.dataArray[this.m_currentQuestion].question.question_audio_url) {
this.g_cartoon.stopAllAudio()
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].question.question_audio_url, ()=>{
})
}
})
body.in = (callback) => {
body.node.y = -cc.winSize.height / 2 - this.g_cartoon.getCartoonElement("question_body_pannel_background").node.height / 2
this.g_cartoon.tweenChange(body.node, {y: -270}, 0.5, ()=>{
this.g_cartoon.tweenChange(bodyText.node, {opacity: 255}, 0.5, ()=>{
if(callback) {
callback()
}
})
})
}
body.out = () => {
bodyText.node.opacity = 0;
body.node.y = -cc.winSize.height / 2 - this.g_cartoon.getCartoonElement("question_body_pannel_background").node.height / 2
} }
this.g_cartoon.subscribeTouchEvent(body.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
if(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url) {
this.g_cartoon.stopAllAudio()
this.g_cartoon.getCartoonElement("Text_DragonBones").dragonBones.showDragonBones(1)
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url, ()=>{
})
}
})
}
initDragonBonesContainer () {
let container = this.g_cartoon.getCartoonElement("DragonBones-Container")
container.hide = () => {
// container.node.scaleX = 0
// container.node.scaleY = 0
container.node.opacity = 0;
}
container.show = (callback) => {
// container.node.y = container.node.y + 220;
container.node.opacity = 0;
this.g_cartoon.tweenChange(container.node, {opacity: 255}, 0.7, ()=>{
if(callback) {
callback()
}
})
}
}
initSelectedCards() {
let order = [2,6,3,7,1,5,4,8]
let dragonBones = this.g_formData.dataArray[this.m_currentQuestion].dragonBones;
for (let index = 0; index < 8; index++) {
let dataItem = this.g_formData.dataArray[this.m_currentQuestion].selectCards[index];
let el = this.g_cartoon.getCartoonElement(`selected_${order[index]}`)
if(!dataItem) {
el.node.active = false;
continue;
} else {
el.node.active = true;
}
this.g_cartoon.getCartoonElement(`selected_${order[index]}_highlight`).node.active = false;
this.g_cartoon.getCartoonElement(`selected_${order[index]}_play`).node.active = false; let intervalID = setInterval(() => {
let snow = getSnow( Math.ceil(Math.random()*4) )
let audioEl = this.g_cartoon.getCartoonElement(`selected_${order[index]}_speaker`); this.g_cartoon.tweenChange(snow, {y: -cc.winSize.height / 2}, 2000)
let audioAni = this.g_cartoon.creatSpeaker(audioEl.node, "icon_sound", "icon_sound_2") cc.tween(snow).to(3, {y: -cc.winSize.height / 2}).start()
let imageContainer = this.g_cartoon.getCartoonElement(`selected_${order[index]}_image_container`) }, 100);
let errorIcon = this.g_cartoon.getCartoonElement(`selected_${order[index]}_error_x`)
errorIcon.node.scale = 0;
let errorMask = this.g_cartoon.getCartoonElement(`selected_${order[index]}_error_mask`)
errorMask.node.active = false;
if(this.g_useDefaultData) {
let fr = this.getSpriteFrimeByResName(dataItem.image_url)
imageContainer.node.getComponent(cc.Sprite).spriteFrame = fr
} else {
this.getSpriteFrimeByUrl(dataItem.image_url, (fr)=>{
imageContainer.node.getComponent(cc.Sprite).spriteFrame = fr
})
}
this.g_cartoon.subscribeTouchEvent(el.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
if(this.m_questionDone) {
return;
}
this.g_enableClick = false;
if(dataItem.isAnswer) {
this.maskOthers(order[index]-1)
this.g_cartoon.getCartoonElement(`selected_${order[index]}_highlight`).node.active = true;
this.g_cartoon.playAudio("right_goodjob")
this.showRightCircle(imageContainer, ()=>{
this.m_questionDone = true;
this.g_enableClick = true;
if(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url) {
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url, ()=>{
this.g_cartoon.playAudio("good_job")
})
} else {
this.g_cartoon.playAudio("good_job")
}
if(dragonBones && dragonBones.texPngData.url && dragonBones.skeJsonData.url && dragonBones.texJsonData.url) {
this.g_cartoon.getCartoonElement("Center_DragonBones").dragonBones.setDragonBones(dragonBones, (handle)=>{
this.g_cartoon.getCartoonElement("DragonBones-Container").show(()=>{
handle.showDragonBones(0);
}, ()=>{
// handle.showDragonBones();
})
})
}
})
} else {
this.showWrongCircle(errorIcon.node, errorMask.node)
this.g_enableClick = true;
}
})
el.in = (callback) => {
this.g_cartoon.tweenChange(el.node, {x: el.initX}, 0.5, ()=>{
callback && callback()
})
}
el.out = (callback) => {
this.g_cartoon.tweenChange(el.node, {x: el.initX - this.g_canvas.width}, 0.5, ()=>{
callback && callback()
})
}
el.setContent = (image_url) => {
this.g_cartoon.tweenChange(imageContainer.node, {scaleX: 0, scaleY: 0}, 0.1, ()=>{
this.getSpriteFrimeByUrl(image_url, (fr)=>{
imageContainer.node.getComponent(cc.Sprite).spriteFrame = fr
this.g_cartoon.tweenChange(imageContainer.node, {scaleX: imageContainer.initScaleX, scaleY: imageContainer.initScaleY}, 0.1)
})
})
}
if(!dataItem.audio_url) { setTimeout(() => {
audioEl.node.active = false; clearInterval(intervalID)
} else { }, time);
audioEl.node.active = true;
}
this.g_cartoon.getCartoonElement(`selected_${order[index]}_speaker`).node.off("click")
this.g_cartoon.getCartoonElement(`selected_${order[index]}_speaker`).node.on("click", ()=>{
this.g_cartoon.stopAllAudio()
this.g_cartoon.stopSoundAnima(audioAni)
this.g_cartoon.showSoundAnima(audioAni)
if(!this.m_questionDone) {
this.g_cartoon.getCartoonElement(`selected_${order[index]}_play`).node.active = true;
}
this.g_cartoon.playAudio(dataItem.audio_url, ()=>{
this.g_cartoon.stopSoundAnima(audioAni)
this.g_cartoon.getCartoonElement(`selected_${order[index]}_play`).node.active = false;
})
})
}
} }
playQuestion(callback) {
if(this.m_currentQuestion==0 && this.g_formData.dataArray[this.m_currentQuestion].question.question_audio_url) {
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].question.question_audio_url, ()=>{
this.m_questionAudioPlayed = true;
this.g_cartoon.getCartoonElement("question_body_pannel").in(()=>this.playQuestionBody(()=>{
if(callback) {
callback()
}
}));
})
} else {
this.g_cartoon.getCartoonElement("question_body_pannel").in(()=>this.playQuestionBody(()=>{
if(callback) {
callback()
}
}));
}
}
playQuestionBody(callback) {
console.log("TEST", this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url)
if(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url) {
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestion].question.body_audio_url, ()=>{
if(callback) {
callback()
}
})
} else {
if(callback) {
callback()
}
}
}
initButtons() {
let left = this.g_cartoon.getCartoonElement(`buttombutton_left`)
let right = this.g_cartoon.getCartoonElement(`buttombutton_right`)
let reload = this.g_cartoon.getCartoonElement(`buttombutton_restart`)
let close = this.g_cartoon.getCartoonElement(`buttombutton_close`)
left.disabled = true;
left.node.opacity = 128;
right.disabled = false;
this.g_cartoon.subscribeTouchEvent(left.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
if(left.disabled) {
return
}
this.g_enableClick = false;
jelly(left.node)
if(this.m_currentQuestion >0) {
this.m_currentQuestion--
this.refreshQuestion(()=>{
this.g_enableClick = true;
})
} else {
this.g_enableClick = true;
}
})
this.g_cartoon.subscribeTouchEvent(right.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
if(right.disabled) {
return
}
jelly(right.node)
this.g_enableClick = false;
if(this.m_currentQuestion<this.g_formData.dataArray.length-1) {
this.m_currentQuestion++
this.refreshQuestion(()=>{
this.g_enableClick = true;
})
} else {
this.g_enableClick = true;
}
})
this.g_cartoon.subscribeTouchEvent(reload.key, ()=>{
if(!this.g_enableClick) {
console.warn("g_enableClick disabeld!")
return;
}
jelly(reload.node)
this.g_enableClick = false;
this.refreshQuestion(()=>{
this.g_enableClick = true;
})
})
}
maskOthers(index) {
for(let i=0; i<8; i++) {
this.g_cartoon.getCartoonElement(`selected_${i+1}_error_mask`).node.active = (index==i)?false:true;
}
}
resetAllSelectedCards() {
this.m_questionDone = false;
this.m_questionAudioPlayed = false;
for(let i=1; i<=8; i++) {
this.g_cartoon.getCartoonElement(`selected_${i}_highlight`).node.active = false
this.g_cartoon.getCartoonElement(`selected_${i}_play`).node.active = false
this.g_cartoon.getCartoonElement(`selected_${i}_image_container`).node.active = true
}
this.g_cartoon.getCartoonElement("DragonBones-Container").hide();
this.g_cartoon.getCartoonElement("question_body_pannel").out();
// this.g_cartoon.getCartoonElement("question_title_pannel").out()
this.g_cartoon.getCartoonElement("Center_DragonBones").dragonBones.resetDragonBones()
}
initText() {
this.g_cartoon.getCartoonElement("question_title_pannel_text").node.color = this.g_cartoon.getColor("FFFFFF")
this.g_cartoon.getCartoonElement("question_title_pannel_text").node.getComponent(cc.Label).string = this.g_formData.dataArray[this.m_currentQuestion].question.question_text
this.g_cartoon.getCartoonElement("question_title_pannel_text").node.getComponent(cc.Label).font = this.g_cartoon.getFontFamily("FatMarker")
this.g_cartoon.getCartoonElement("question_title_pannel_text").node.getComponent(cc.Label).fontSize = 32
this.g_cartoon.getCartoonElement("question_body_pannel_text").node.color = this.g_cartoon.getColor("ffd75f")
this.g_cartoon.getCartoonElement("question_body_pannel_text").node.getComponent(cc.Label).string = this.g_formData.dataArray[this.m_currentQuestion].question.body_text
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.active = true;
}
checkButtonStatus() {
if(this.m_currentQuestion == 0) {
this.g_cartoon.getCartoonElement("buttombutton_left").node.opacity = 128;
this.g_cartoon.getCartoonElement("buttombutton_left").disabled = true;
} else {
this.g_cartoon.getCartoonElement("buttombutton_left").node.opacity = 255;
this.g_cartoon.getCartoonElement("buttombutton_left").disabled = false;
}
if(this.m_currentQuestion == this.g_formData.dataArray.length-1) {
this.g_cartoon.getCartoonElement("buttombutton_right").node.opacity = 128;
this.g_cartoon.getCartoonElement("buttombutton_right").disabled = true;
} else {
this.g_cartoon.getCartoonElement("buttombutton_right").node.opacity = 255;
this.g_cartoon.getCartoonElement("buttombutton_right").disabled = false;
}
}
refreshQuestion(callback) {
this.g_cartoon.stopAllAudio()
this.showMaskLayer(()=>{
this.checkButtonStatus()
this.resetAllSelectedCards()
this.initSelectedCards();
this.initText()
this.initCenterImage();
this.hideMaskLayer(()=>{
this.playQuestion(()=>{
if(callback) {
callback()
}
})
})
})
}
showRightCircle(targetNode, callback) {
const centerPic = this.g_cartoon.getNodeByPath(`Canvas/center_image`)
const oldParent = targetNode.node.parent
const worldPos = oldParent.convertToWorldSpaceAR(cc.v2(targetNode.node.x, targetNode.node.y));
const localPos = centerPic.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y));
const picNode = this.g_cartoon.cloneNode(targetNode.node)
targetNode.node.active = false;
picNode.parent = centerPic;
picNode.x = localPos.x;
picNode.y = localPos.y;
const sx = centerPic.width / picNode.width
const sy = centerPic.height / picNode.height;
const s = Math.min(sx, sy);
cc.tween(picNode)
.to(0.7, {x: 0, y: 0, angle: 360}, {easing: 'sineOut'})
.delay(0.2)
.to(1.5, {scale: s, opacity: 0}, {easing: 'cubicOut'})
.call(() => {
if(callback) {
callback()
}
})
.start();
}
showWrongCircle(icon, mask) {
if (mask.active) {
return;
}
// cc.audioEngine.play(this.audioWrong.clip, false, 0.2)
this.g_cartoon.playAudio("error")
const showIcon = () => {
cc.tween(icon)
.to(0.3, {scale: 0.9}, {easing: 'bounceOut'})
.delay(0.2)
.to(0.7, {scale: 0}, {easing: 'cubicIn'})
.call(()=>{
this.g_cartoon.playAudio("tryagain")
})
.start();
}
const hide = () => {
mask.opacity = 0;
cc.tween(mask)
.to(0.1, {opacity: 255})
.call(() => {
showIcon();
})
.start()
}
hide();
mask.active = true;
}
...@@ -1020,7 +663,7 @@ export default class GameLogic { ...@@ -1020,7 +663,7 @@ export default class GameLogic {
// Common function // Common function
maskLayer = null; maskLayer = null;
initMaskLayer() { initMaskLayer() {
const parentNode = this.g_cartoon.getNodeByPath("Canvas/MaskLayer") const parentNode = this.g_cartoon.getNodeByPath("MaskLayer")
parentNode.x = cc.winSize.width / 2 parentNode.x = cc.winSize.width / 2
parentNode.y = cc.winSize.height / 2 parentNode.y = cc.winSize.height / 2
const bNode = this.getSprNode('black'); const bNode = this.getSprNode('black');
...@@ -1029,7 +672,7 @@ export default class GameLogic { ...@@ -1029,7 +672,7 @@ export default class GameLogic {
bNode.x = 0 bNode.x = 0
bNode.y = 0 bNode.y = 0
parentNode.setSiblingIndex(255) parentNode.setSiblingIndex(255)
bNode.parent = cc.find('Canvas'); bNode.parent = cc.find('MaskLayer');
bNode.active = false; bNode.active = false;
this.maskLayer = bNode; this.maskLayer = bNode;
} }
......
...@@ -92,9 +92,9 @@ cc.Class({ ...@@ -92,9 +92,9 @@ cc.Class({
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":"TEST","questionAudio_url":"","dataArray":[{"text":"","image_url":"","dragonBones":{"texPngData":{"url":"","name":""},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/70f2284f40825f812603c2302ca23607.json","name":"鸟飞_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/813eea2f97e13533a47ba94edd0a9f22.json","name":"鸟飞_ske.json"}}},{"text":"","image_url":"","dragonBones":{"texPngData":{"url":"","name":""},"texJsonData":{"url":"","name":""},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/813eea2f97e13533a47ba94edd0a9f22.json","name":"鸟飞_ske.json"}}}],"birdDragonBones_1":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png","name":"bird1_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json","name":"bird1_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json","name":"bird1_ske.json"}},"birdDragonBones_2":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png","name":"bird2_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json","name":"bird2_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json","name":"bird2_ske.json"}}}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","dataArray":[]}}' // 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;
}, },
......
{
"ver": "2.3.5",
"uuid": "19ea226d-eee6-4a1b-b2bc-6e48d4c6ba03",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 39,
"height": 44,
"platformSettings": {},
"subMetas": {
"snow_1": {
"ver": "1.0.4",
"uuid": "ada7613b-b4fd-4367-8d20-0366cd6461e8",
"rawTextureUuid": "19ea226d-eee6-4a1b-b2bc-6e48d4c6ba03",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 39,
"height": 44,
"rawWidth": 39,
"rawHeight": 44,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "fc81610c-bae3-42ec-8b38-3c5431715f3f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 33,
"height": 32,
"platformSettings": {},
"subMetas": {
"snow_2": {
"ver": "1.0.4",
"uuid": "65716f17-b067-4e1e-bdf9-c67894a38dc2",
"rawTextureUuid": "fc81610c-bae3-42ec-8b38-3c5431715f3f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 33,
"height": 32,
"rawWidth": 33,
"rawHeight": 32,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "7298e197-dd6f-4fed-b5c5-6f8a2cef5e31",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 25,
"height": 25,
"platformSettings": {},
"subMetas": {
"snow_3": {
"ver": "1.0.4",
"uuid": "5f3db4b3-4a26-4a1b-a3d0-f20c836f7ed0",
"rawTextureUuid": "7298e197-dd6f-4fed-b5c5-6f8a2cef5e31",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 25,
"height": 25,
"rawWidth": 25,
"rawHeight": 25,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "1c4f6e54-2c12-4136-b6da-16abb51bf0fe",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 39,
"height": 44,
"platformSettings": {},
"subMetas": {
"snow_4": {
"ver": "1.0.4",
"uuid": "e3a6979e-6673-4118-8ba6-bf8c837ee899",
"rawTextureUuid": "1c4f6e54-2c12-4136-b6da-16abb51bf0fe",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 39,
"height": 44,
"rawWidth": 39,
"rawHeight": 44,
"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