Commit 8cbd53f3 authored by Tt's avatar Tt

处理流程

parent daa178c4
class Single {
constructor() {
this.imageani = { ske: "", tex: "", png: "", }
this.wordani = { ske: "", tex: "", png: "", }
this.wordaudio = "";
this.backgroundImage = "";
}
}
//底部items
class Card {
constructor(picItem, cardId) {
this.cardId = cardId;
this.txt = picItem.title;
this.img = picItem.pic_url;
this.audio = picItem.audio_url;
}
}
class defClass {
constructor(id, title, audio_url, type) {
this.id = id;
this.audio_url = audio_url;
this.type = type;
this.title = title;
this.child = [];
this.success = [];
}
addChild(child) {
this.child.push(child);
}
isChild(childId) {
return this.child.some(ch => ch.id == childId);
}
}
// class MainClass extends defaultClass {
// constructor(id, name) {
// this.id = id;
// this.name = name;
// }
// parseData() {
// }
// }
class GameManager { class GameManager {
static TYPE_NULL = 0; static TYPE_NULL = 0;
static TYPE_TXT = 1; static TYPE_TXT = 1;
...@@ -51,92 +8,43 @@ class GameManager { ...@@ -51,92 +8,43 @@ class GameManager {
static getIns() { static getIns() {
if (!GameManager.instance) GameManager.instance = new GameManager(); if (!GameManager.instance) GameManager.instance = new GameManager();
return GameManager.instance; return GameManager.instance;
} }//允许调用
constructor() { constructor() {
//主类 1 this._list = [];
this._title = {}; this._stage = 0;//关卡
this._allClass = []; this._state = 0;//状态
this._sonArray = [];//卡片数据解析
this._cardArray = [];//卡片数据解析
} }
init() { init() {
console.log(`init`); console.log(`init`);
this.parseData();
} }
parseData(data) { parseData(data) {
this._title = {}; console.log(data);
this._allClass = []; let arr = data.contentObj.picArr;
this._sonArray = []; for (let i = 0; i < arr.length; i++) {
this._cardArray = []; let ar = arr[i];
let obj = {};
let obj = data.contentObj.picArr; obj.word = ar.title;
let fenId = 1; obj.sound = ar.wordAudio;
let sonId = 100; obj.img = ar.bgImg;
let cardId = 1000; obj.cartoonSke = ar.imgAni.ske.url;
this._title = obj[0]; obj.cartoonTex = ar.imgAni.ske.url;
for (let i = 0; i < obj[0].child.length; i++) { obj.cartoonPng = ar.imgAni.ske.url;
let zhulei = obj[0].child[i]; this._list.push(obj);
let zhuleiClass = new defClass(zhulei.id, zhulei.title, zhulei.audio_url, 0);
for (let a = 0; a < zhulei.child.length; a++) {
let fenlei = zhulei.child[a];
let fenleiClass = new defClass(fenId, fenlei.title, fenlei.audio_url, 0);
fenId++;//只有1和2
for (let b = 0; b < fenlei.child.length; b++) {
sonId++;
let sonlei = fenlei.child[b];
let sonleiClass = new defClass(sonId, sonlei.title, sonlei.audio_url, a);
for (let c = 0; c < sonlei.child.length; c++) {
let card = sonlei.child[c];
cardId++;
let cardClass = new Card(card, cardId);
sonleiClass.addChild(cardClass);
this._cardArray.push(cardClass);
}
fenleiClass.addChild(sonleiClass);
}
zhuleiClass.addChild(fenleiClass);
}
this._allClass.push(zhuleiClass);
}
console.log(this._allClass);
}
getTitle() {
return this._title.title;
}
getZhuClass() {
return this._allClass[0];
}
getFenClass(id) {
return this._allClass[0].child.filter(fen => fen.id == id)[0];
} }
getSonClass(id) { console.log(this._list);//原始数据转为数组
return this._sonArray.filter(son => son.id == id)[0];
} }
getCards() { setState(num) {
//基础卡片列表 this._state = num;
return this._cardArray.concat();
} }
compareCard(cardId, sonId) { getState() {
let sonClass = this.getSonClass(sonId); return this._state;
return sonClass.isChild(cardId);
} }
randomPageCards() { getStageData() {
//页面内部数字要打乱 0 1 2 3 4 5 6 7 8 每次动态取出一个值 然后动态处理 return this._list[this._stage];
let arr = [];
while (this._cardArray.length > 0) {
let rand = Math.floor(Math.random() * this._cardArray.length);
arr.push(this._cardArray[rand]);
this._cardArray.splice(rand, 1);
} }
this._cardArray = arr; addStage() {
this._stage++;
} }
} }
// []zhuclass
// [] []fenclass
//[] [] [] [] [] []sonclass
//[] [] [] [] [] []sonclass
//() () () () () () () ()card
//() () () () () () () ()
//() () () () () () () ()
export default GameManager; export default GameManager;
\ No newline at end of file
...@@ -252,21 +252,6 @@ pg.view = { ...@@ -252,21 +252,6 @@ pg.view = {
//加载 未封装bundle //加载 未封装bundle
pg.load = { pg.load = {
loadRes: function (res, type, bundleName) { loadRes: function (res, type, bundleName) {
// cc.assetManager.loadBundle('hall', (err, bundle) => {
// if (err) return cc.error(err);
// cc.director.loadScene("hall", () => { });
// });
// cc.assetManager.loadBundle('chess', (err, bundle) => {
// if (err) return cc.error(err);
// cc.director.loadScene("chess", () => {
// // //清理hall的资源
// // let hallBundle = cc.assetManager.getBundle(`hall`);
// // hallBundle.releaseAll();
// // cc.assetManager.removeBundle(hallBundle);
// });
// });
//此处需要二次封装,新的存在assetbundle //此处需要二次封装,新的存在assetbundle
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
cc.loader.loadRes(res, type, (err, data) => { cc.loader.loadRes(res, type, (err, data) => {
...@@ -294,7 +279,7 @@ pg.load = { ...@@ -294,7 +279,7 @@ pg.load = {
}, },
loadNetImg: function (url) { loadNetImg: function (url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
cc.loader.load({ url }, (err, texture) => { cc.assetManager.loadRemote(url, (err, texture) => {
if (err && !data) return resolve(pg.logger.w('loading loadRes warn-> ', res)); if (err && !data) return resolve(pg.logger.w('loading loadRes warn-> ', res));
resolve(texture); resolve(texture);
}); });
......
...@@ -95,98 +95,92 @@ ...@@ -95,98 +95,92 @@
{ {
"__id__": 19 "__id__": 19
}, },
{
"__id__": 21
},
{ {
"__id__": 23 "__id__": 23
}, },
{ {
"__id__": 25 "__id__": 28
}, },
{ {
"__id__": 30 "__id__": 33
}, },
{ {
"__id__": 35 "__id__": 42
}, },
{ {
"__id__": 44 "__id__": 48
}, },
{ {
"__id__": 50 "__id__": 55
}, },
{ {
"__id__": 57 "__id__": 62
}, },
{ {
"__id__": 64 "__id__": 89
}, },
{ {
"__id__": 91 "__id__": 110
}, },
{ {
"__id__": 112 "__id__": 112
}, },
{ {
"__id__": 114 "__id__": 113
}, },
{ {
"__id__": 115 "__id__": 121
}, },
{ {
"__id__": 123 "__id__": 122
}, },
{ {
"__id__": 124 "__id__": 142
}, },
{ {
"__id__": 144 "__id__": 144
}, },
{ {
"__id__": 146 "__id__": 148
}, },
{ {
"__id__": 150 "__id__": 151
}, },
{ {
"__id__": 153 "__id__": 152
}, },
{ {
"__id__": 154 "__id__": 153
}, },
{ {
"__id__": 155 "__id__": 155
}, },
{ {
"__id__": 157 "__id__": 161
}, },
{ {
"__id__": 163 "__id__": 174
}, },
{ {
"__id__": 176 "__id__": 200
}, },
{ {
"__id__": 202 "__id__": 202
}, },
{ {
"__id__": 204 "__id__": 204
},
{
"__id__": 206
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 208 "__id__": 206
}, },
{ {
"__id__": 209 "__id__": 207
}, },
{ {
"__id__": 210 "__id__": 208
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -337,13 +331,13 @@ ...@@ -337,13 +331,13 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "view1", "_name": "bg_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 6 "__id__": 6
...@@ -374,7 +368,7 @@ ...@@ -374,7 +368,7 @@
"array": [ "array": [
0, 0,
0, 0,
362.85545, 0,
0, 0,
0, 0,
0, 0,
...@@ -395,7 +389,7 @@ ...@@ -395,7 +389,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "25oW+AXwpHn5fO1vgP9FiR" "_id": "59+q5nPBhGo4YF9hk0Ysis"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -413,7 +407,7 @@ ...@@ -413,7 +407,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "91685340-aa82-4b1a-9e32-b078eca362f6" "__uuid__": "ea192d54-bdfd-4ec4-8ea5-4d19053eda65"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -427,17 +421,17 @@ ...@@ -427,17 +421,17 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "09QLwswMZPjbG/wedYvoSX" "_id": "a4lt3/0u1FSrV3A/SAsa4j"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_bg", "_name": "btn_return",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 8 "__id__": 8
...@@ -454,8 +448,8 @@ ...@@ -454,8 +448,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 171,
"height": 1600 "height": 146
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -466,8 +460,8 @@ ...@@ -466,8 +460,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -958.325,
0, 703.051,
0, 0,
0, 0,
0, 0,
...@@ -489,7 +483,7 @@ ...@@ -489,7 +483,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "59+q5nPBhGo4YF9hk0Ysis" "_id": "311W8b+j5Ez5Z69q3bHALi"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -507,7 +501,7 @@ ...@@ -507,7 +501,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ea192d54-bdfd-4ec4-8ea5-4d19053eda65" "__uuid__": "3c77fd69-041b-4411-a9b4-273c49497376"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -521,17 +515,17 @@ ...@@ -521,17 +515,17 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a4lt3/0u1FSrV3A/SAsa4j" "_id": "c7bQkedKlC77jAZ06Ngnpe"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_book", "_name": "btn_next",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 10 "__id__": 10
...@@ -548,8 +542,8 @@ ...@@ -548,8 +542,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2416, "width": 209,
"height": 644 "height": 146
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -560,8 +554,8 @@ ...@@ -560,8 +554,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 955.14,
-447.776, 702.051,
0, 0,
0, 0,
0, 0,
...@@ -583,7 +577,7 @@ ...@@ -583,7 +577,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b5tZjDTTdDH4b3kXmLS2Pk" "_id": "a1HqZoOVdKApagEOzkh3zV"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -601,7 +595,7 @@ ...@@ -601,7 +595,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "49accd5b-11ef-422b-9442-3645842f76a4" "__uuid__": "056d41b1-2a9b-4f22-8092-306cf5af3251"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -615,11 +609,11 @@ ...@@ -615,11 +609,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "480yumgB9KKpzyic1h7yEc" "_id": "a8DY+g38JOG7MEmUALIvh0"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_return", "_name": "bg_book",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -642,8 +636,8 @@ ...@@ -642,8 +636,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 171, "width": 2416,
"height": 146 "height": 644
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -654,102 +648,8 @@ ...@@ -654,102 +648,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-958.325,
703.051,
0,
0,
0, 0,
0, -447.776,
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": "311W8b+j5Ez5Z69q3bHALi"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3c77fd69-041b-4411-a9b4-273c49497376"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c7bQkedKlC77jAZ06Ngnpe"
},
{
"__type__": "cc.Node",
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 209,
"height": 146
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
955.14,
702.051,
0, 0,
0, 0,
0, 0,
...@@ -771,14 +671,14 @@ ...@@ -771,14 +671,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a1HqZoOVdKApagEOzkh3zV" "_id": "b5tZjDTTdDH4b3kXmLS2Pk"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 13 "__id__": 11
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -788,9 +688,7 @@ ...@@ -788,9 +688,7 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": null,
"__uuid__": "056d41b1-2a9b-4f22-8092-306cf5af3251"
},
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
...@@ -803,7 +701,7 @@ ...@@ -803,7 +701,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a8DY+g38JOG7MEmUALIvh0" "_id": "480yumgB9KKpzyic1h7yEc"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -816,7 +714,7 @@ ...@@ -816,7 +714,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -872,7 +770,7 @@ ...@@ -872,7 +770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -915,10 +813,10 @@ ...@@ -915,10 +813,10 @@
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 18 "__id__": 16
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -974,7 +872,7 @@ ...@@ -974,7 +872,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1011,16 +909,16 @@ ...@@ -1011,16 +909,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ant_ske", "_name": "btn_replay",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1034,8 +932,8 @@ ...@@ -1034,8 +932,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1472, "width": 244,
"height": 552 "height": 232
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1046,8 +944,8 @@ ...@@ -1046,8 +944,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -552.397,
0, -644.463,
0, 0,
0, 0,
0, 0,
...@@ -1069,14 +967,14 @@ ...@@ -1069,14 +967,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "43VDTmgRlJK6LL5qumBSbi" "_id": "495QX07mtM5bGdwHmcE7cR"
}, },
{ {
"__type__": "dragonBones.ArmatureDisplay", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1084,42 +982,38 @@ ...@@ -1084,42 +982,38 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_armatureName": "Armature", "_srcBlendFactor": 770,
"_animationName": "newAnimation", "_dstBlendFactor": 771,
"_preCacheMode": 0, "_spriteFrame": {
"_cacheMode": 0, "__uuid__": "dd09a3f5-2df8-4334-89a7-36396823aae0"
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "430f14b7-59ac-4f6d-a79d-838296c9713c#b49c0c6a-b9af-4989-946a-24d24ea4759f",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "430f14b7-59ac-4f6d-a79d-838296c9713c"
}, },
"_N$dragonAtlasAsset": { "_type": 0,
"__uuid__": "b49c0c6a-b9af-4989-946a-24d24ea4759f" "_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
}, },
"_N$_defaultArmatureIndex": 0, "_fillStart": 0,
"_N$_animationIndex": 1, "_fillRange": 0,
"_N$_defaultCacheMode": 0, "_isTrimmedMode": true,
"_N$timeScale": 1, "_atlas": null,
"_N$debugBones": false, "_id": "c6lCUW2lxPGpPFuo+y7PYz"
"_N$enableBatch": false,
"_id": "b7yG6c9U1PnIxxxcQxE0Xo"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ax_ske", "_name": "icon_ex",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [
"_active": true, {
"__id__": 20
}
],
"_active": false,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 22
...@@ -1136,8 +1030,8 @@ ...@@ -1136,8 +1030,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1188, "width": 684,
"height": 705 "height": 244
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1148,8 +1042,8 @@ ...@@ -1148,8 +1042,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 411.535,
0, -111.538,
0, 0,
0, 0,
0, 0,
...@@ -1171,75 +1065,35 @@ ...@@ -1171,75 +1065,35 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "2f60LPvOdMFoeCx6f5Ghor" "_id": "f8NY22GK5Nn71H8UQRTTTG"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "3dea3437-c958-4db1-8892-577532882929#43b1cdd8-e759-482d-9435-3ca8696e8d11",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "3dea3437-c958-4db1-8892-577532882929"
},
"_N$dragonAtlasAsset": {
"__uuid__": "43b1cdd8-e759-482d-9435-3ca8696e8d11"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "74CIOP4ClGQalXYMxpuJxF"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_replay", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 0,
"g": 255, "g": 0,
"b": 255, "b": 0,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 244, "width": 244.68,
"height": 232 "height": 126
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1250,8 +1104,8 @@ ...@@ -1250,8 +1104,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-552.397, 0,
-644.463, 0,
0, 0,
0, 0,
0, 0,
...@@ -1273,14 +1127,47 @@ ...@@ -1273,14 +1127,47 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "495QX07mtM5bGdwHmcE7cR" "_id": "edS49W3stLdYoRlSXQ3XC/"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Label",
"_N$string": "Label",
"_fontSize": 100,
"_lineHeight": 100,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "fd0g1jwyFHep3zaVWR6xRH"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1291,7 +1178,7 @@ ...@@ -1291,7 +1178,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "dd09a3f5-2df8-4334-89a7-36396823aae0" "__uuid__": "1077458b-a6e0-4e1c-a0cc-4cf56c575178"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1305,7 +1192,7 @@ ...@@ -1305,7 +1192,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "c6lCUW2lxPGpPFuo+y7PYz" "_id": "f1rc/ZPqhBmYncNX2wuiYH"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1316,16 +1203,16 @@ ...@@ -1316,16 +1203,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 26 "__id__": 24
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 26
}, },
{ {
"__id__": 29 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1381,13 +1268,13 @@ ...@@ -1381,13 +1268,13 @@
"_name": "icon_record", "_name": "icon_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1443,7 +1330,7 @@ ...@@ -1443,7 +1330,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1475,7 +1362,7 @@ ...@@ -1475,7 +1362,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1507,7 +1394,7 @@ ...@@ -1507,7 +1394,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1568,7 +1455,7 @@ ...@@ -1568,7 +1455,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 25 "__id__": 23
}, },
"_id": "b09HfTfohGxpd5Ff9vXa7G" "_id": "b09HfTfohGxpd5Ff9vXa7G"
}, },
...@@ -1581,16 +1468,16 @@ ...@@ -1581,16 +1468,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 29
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 31
}, },
{ {
"__id__": 34 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1646,13 +1533,13 @@ ...@@ -1646,13 +1533,13 @@
"_name": "icon_recording", "_name": "icon_recording",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 28
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1708,7 +1595,7 @@ ...@@ -1708,7 +1595,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1740,7 +1627,7 @@ ...@@ -1740,7 +1627,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1772,7 +1659,7 @@ ...@@ -1772,7 +1659,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1833,7 +1720,7 @@ ...@@ -1833,7 +1720,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 30 "__id__": 28
}, },
"_id": "feA2HsnyFASLUXjdq0vRse" "_id": "feA2HsnyFASLUXjdq0vRse"
}, },
...@@ -1845,6 +1732,9 @@ ...@@ -1845,6 +1732,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 34
},
{ {
"__id__": 36 "__id__": 36
}, },
...@@ -1853,9 +1743,6 @@ ...@@ -1853,9 +1743,6 @@
}, },
{ {
"__id__": 40 "__id__": 40
},
{
"__id__": 42
} }
], ],
"_active": false, "_active": false,
...@@ -1913,13 +1800,13 @@ ...@@ -1913,13 +1800,13 @@
"_name": "bg_btm", "_name": "bg_btm",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1975,7 +1862,7 @@ ...@@ -1975,7 +1862,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2007,13 +1894,13 @@ ...@@ -2007,13 +1894,13 @@
"_name": "bg_light", "_name": "bg_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2039,8 +1926,8 @@ ...@@ -2039,8 +1926,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-8.983, -8.982999999999947,
32.779, 32.778999999999996,
0, 0,
0, 0,
0, 0,
...@@ -2069,7 +1956,7 @@ ...@@ -2069,7 +1956,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2101,13 +1988,13 @@ ...@@ -2101,13 +1988,13 @@
"_name": "bg_tryagain", "_name": "bg_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2163,7 +2050,7 @@ ...@@ -2163,7 +2050,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2192,16 +2079,16 @@ ...@@ -2192,16 +2079,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_good-job", "_name": "bg_success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2227,8 +2114,8 @@ ...@@ -2227,8 +2114,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-8.983, -8.982999999999947,
32.779, 32.778999999999996,
0, 0,
0, 0,
0, 0,
...@@ -2257,7 +2144,7 @@ ...@@ -2257,7 +2144,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2293,19 +2180,19 @@ ...@@ -2293,19 +2180,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 43
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 45
}, },
{ {
"__id__": 48 "__id__": 46
}, },
{ {
"__id__": 49 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2361,13 +2248,13 @@ ...@@ -2361,13 +2248,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 44 "__id__": 42
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2423,7 +2310,7 @@ ...@@ -2423,7 +2310,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2455,7 +2342,7 @@ ...@@ -2455,7 +2342,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2487,12 +2374,12 @@ ...@@ -2487,12 +2374,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 1383.3, "_N$totalLength": 1383.3,
"_N$barSprite": { "_N$barSprite": {
"__id__": 46 "__id__": 44
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
...@@ -2504,7 +2391,7 @@ ...@@ -2504,7 +2391,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_id": "32zyfUT/9EG4jgWsKPFVzS" "_id": "32zyfUT/9EG4jgWsKPFVzS"
...@@ -2518,10 +2405,10 @@ ...@@ -2518,10 +2405,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 51 "__id__": 49
}, },
{ {
"__id__": 54 "__id__": 52
} }
], ],
"_active": false, "_active": false,
...@@ -2579,16 +2466,16 @@ ...@@ -2579,16 +2466,16 @@
"_name": "invalid-name", "_name": "invalid-name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 50
}, },
{ {
"__id__": 53 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2644,7 +2531,7 @@ ...@@ -2644,7 +2531,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2676,7 +2563,7 @@ ...@@ -2676,7 +2563,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -2697,16 +2584,16 @@ ...@@ -2697,16 +2584,16 @@
"_name": "invalid-name_2", "_name": "invalid-name_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 53
}, },
{ {
"__id__": 56 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2762,7 +2649,7 @@ ...@@ -2762,7 +2649,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2794,7 +2681,7 @@ ...@@ -2794,7 +2681,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -2819,16 +2706,16 @@ ...@@ -2819,16 +2706,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 58 "__id__": 56
}, },
{ {
"__id__": 60 "__id__": 58
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2884,13 +2771,13 @@ ...@@ -2884,13 +2771,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 55
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2946,7 +2833,7 @@ ...@@ -2946,7 +2833,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2978,16 +2865,16 @@ ...@@ -2978,16 +2865,16 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 55
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 59
}, },
{ {
"__id__": 62 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3043,7 +2930,7 @@ ...@@ -3043,7 +2930,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3078,7 +2965,7 @@ ...@@ -3078,7 +2965,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -3096,7 +2983,7 @@ ...@@ -3096,7 +2983,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -3121,22 +3008,22 @@ ...@@ -3121,22 +3008,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 65 "__id__": 63
}, },
{ {
"__id__": 68 "__id__": 66
}, },
{ {
"__id__": 71 "__id__": 69
}, },
{ {
"__id__": 78 "__id__": 76
}, },
{ {
"__id__": 85 "__id__": 83
}, },
{ {
"__id__": 88 "__id__": 86
} }
], ],
"_active": false, "_active": false,
...@@ -3194,11 +3081,11 @@ ...@@ -3194,11 +3081,11 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 66 "__id__": 64
} }
], ],
"_active": true, "_active": true,
...@@ -3256,13 +3143,13 @@ ...@@ -3256,13 +3143,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3318,7 +3205,7 @@ ...@@ -3318,7 +3205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 64
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3350,11 +3237,11 @@ ...@@ -3350,11 +3237,11 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 69 "__id__": 67
} }
], ],
"_active": true, "_active": true,
...@@ -3412,13 +3299,13 @@ ...@@ -3412,13 +3299,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 68 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3474,7 +3361,7 @@ ...@@ -3474,7 +3361,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3506,14 +3393,14 @@ ...@@ -3506,14 +3393,14 @@
"_name": "line2", "_name": "line2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 70
}, },
{ {
"__id__": 74 "__id__": 72
} }
], ],
"_active": true, "_active": true,
...@@ -3571,13 +3458,13 @@ ...@@ -3571,13 +3458,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 69
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 71
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3633,7 +3520,7 @@ ...@@ -3633,7 +3520,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3665,17 +3552,17 @@ ...@@ -3665,17 +3552,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 69
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 73
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3731,13 +3618,13 @@ ...@@ -3731,13 +3618,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 72
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3793,7 +3680,7 @@ ...@@ -3793,7 +3680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3825,7 +3712,7 @@ ...@@ -3825,7 +3712,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3857,14 +3744,14 @@ ...@@ -3857,14 +3744,14 @@
"_name": "line3", "_name": "line3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 79 "__id__": 77
}, },
{ {
"__id__": 81 "__id__": 79
} }
], ],
"_active": true, "_active": true,
...@@ -3922,13 +3809,13 @@ ...@@ -3922,13 +3809,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 76
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3984,7 +3871,7 @@ ...@@ -3984,7 +3871,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4016,17 +3903,17 @@ ...@@ -4016,17 +3903,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 80
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4082,13 +3969,13 @@ ...@@ -4082,13 +3969,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4144,7 +4031,7 @@ ...@@ -4144,7 +4031,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4176,7 +4063,7 @@ ...@@ -4176,7 +4063,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4208,11 +4095,11 @@ ...@@ -4208,11 +4095,11 @@
"_name": "line4", "_name": "line4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 84
} }
], ],
"_active": true, "_active": true,
...@@ -4270,13 +4157,13 @@ ...@@ -4270,13 +4157,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 83
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4332,7 +4219,7 @@ ...@@ -4332,7 +4219,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4364,11 +4251,11 @@ ...@@ -4364,11 +4251,11 @@
"_name": "line5", "_name": "line5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 89 "__id__": 87
} }
], ],
"_active": true, "_active": true,
...@@ -4426,13 +4313,13 @@ ...@@ -4426,13 +4313,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4488,7 +4375,7 @@ ...@@ -4488,7 +4375,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4524,13 +4411,13 @@ ...@@ -4524,13 +4411,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 92 "__id__": 90
}, },
{ {
"__id__": 99 "__id__": 97
}, },
{ {
"__id__": 106 "__id__": 104
} }
], ],
"_active": false, "_active": false,
...@@ -4588,23 +4475,23 @@ ...@@ -4588,23 +4475,23 @@
"_name": "sub_0", "_name": "sub_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 91 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 91
}, },
{ {
"__id__": 95 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 95
}, },
{ {
"__id__": 98 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4660,13 +4547,13 @@ ...@@ -4660,13 +4547,13 @@
"_name": "combined-shape_4", "_name": "combined-shape_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4722,7 +4609,7 @@ ...@@ -4722,7 +4609,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4754,13 +4641,13 @@ ...@@ -4754,13 +4641,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4816,7 +4703,7 @@ ...@@ -4816,7 +4703,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4851,7 +4738,7 @@ ...@@ -4851,7 +4738,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4883,7 +4770,7 @@ ...@@ -4883,7 +4770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4944,7 +4831,7 @@ ...@@ -4944,7 +4831,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 92 "__id__": 90
}, },
"_id": "e9hETjbwFN6ofBSoo7woie" "_id": "e9hETjbwFN6ofBSoo7woie"
}, },
...@@ -4953,23 +4840,23 @@ ...@@ -4953,23 +4840,23 @@
"_name": "sub_1", "_name": "sub_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 91 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 98
}, },
{ {
"__id__": 102 "__id__": 100
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 102
}, },
{ {
"__id__": 105 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5025,13 +4912,13 @@ ...@@ -5025,13 +4912,13 @@
"_name": "combined-shape_3", "_name": "combined-shape_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5087,7 +4974,7 @@ ...@@ -5087,7 +4974,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5119,13 +5006,13 @@ ...@@ -5119,13 +5006,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5181,7 +5068,7 @@ ...@@ -5181,7 +5068,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5216,7 +5103,7 @@ ...@@ -5216,7 +5103,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5248,7 +5135,7 @@ ...@@ -5248,7 +5135,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5309,7 +5196,7 @@ ...@@ -5309,7 +5196,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 99 "__id__": 97
}, },
"_id": "8cGgjvgvhL/LuPKRoVnVQq" "_id": "8cGgjvgvhL/LuPKRoVnVQq"
}, },
...@@ -5318,20 +5205,20 @@ ...@@ -5318,20 +5205,20 @@
"_name": "main", "_name": "main",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 91 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 107 "__id__": 105
}, },
{ {
"__id__": 109 "__id__": 107
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5387,13 +5274,13 @@ ...@@ -5387,13 +5274,13 @@
"_name": "oval-18", "_name": "oval-18",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 106 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5449,7 +5336,7 @@ ...@@ -5449,7 +5336,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5481,13 +5368,13 @@ ...@@ -5481,13 +5368,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 106 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5543,7 +5430,7 @@ ...@@ -5543,7 +5430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5578,7 +5465,7 @@ ...@@ -5578,7 +5465,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5639,7 +5526,7 @@ ...@@ -5639,7 +5526,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 106 "__id__": 104
}, },
"_id": "f41Ic5OXhCRpAxS/kMIRiA" "_id": "f41Ic5OXhCRpAxS/kMIRiA"
}, },
...@@ -5654,7 +5541,7 @@ ...@@ -5654,7 +5541,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5710,7 +5597,7 @@ ...@@ -5710,7 +5597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5804,19 +5691,19 @@ ...@@ -5804,19 +5691,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 114
}, },
{ {
"__id__": 118 "__id__": 116
}, },
{ {
"__id__": 120 "__id__": 118
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5872,13 +5759,13 @@ ...@@ -5872,13 +5759,13 @@
"_name": "bg_blue", "_name": "bg_blue",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5934,7 +5821,7 @@ ...@@ -5934,7 +5821,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5966,13 +5853,13 @@ ...@@ -5966,13 +5853,13 @@
"_name": "bg_green", "_name": "bg_green",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6028,7 +5915,7 @@ ...@@ -6028,7 +5915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6060,13 +5947,13 @@ ...@@ -6060,13 +5947,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6122,7 +6009,7 @@ ...@@ -6122,7 +6009,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6157,7 +6044,7 @@ ...@@ -6157,7 +6044,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6218,7 +6105,7 @@ ...@@ -6218,7 +6105,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 115 "__id__": 113
}, },
"_id": "176BYmeDpPZ68HlISEHa8t" "_id": "176BYmeDpPZ68HlISEHa8t"
}, },
...@@ -6288,6 +6175,9 @@ ...@@ -6288,6 +6175,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 123
},
{ {
"__id__": 125 "__id__": 125
}, },
...@@ -6301,16 +6191,13 @@ ...@@ -6301,16 +6191,13 @@
"__id__": 131 "__id__": 131
}, },
{ {
"__id__": 133 "__id__": 135
},
{
"__id__": 137
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 143 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6366,13 +6253,13 @@ ...@@ -6366,13 +6253,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 126 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6428,7 +6315,7 @@ ...@@ -6428,7 +6315,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 125 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6460,13 +6347,13 @@ ...@@ -6460,13 +6347,13 @@
"_name": "chose", "_name": "chose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6522,7 +6409,7 @@ ...@@ -6522,7 +6409,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6554,13 +6441,13 @@ ...@@ -6554,13 +6441,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6616,7 +6503,7 @@ ...@@ -6616,7 +6503,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6648,13 +6535,13 @@ ...@@ -6648,13 +6535,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6710,7 +6597,7 @@ ...@@ -6710,7 +6597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6745,17 +6632,17 @@ ...@@ -6745,17 +6632,17 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 134 "__id__": 132
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6811,13 +6698,13 @@ ...@@ -6811,13 +6698,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6873,7 +6760,7 @@ ...@@ -6873,7 +6760,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6908,7 +6795,7 @@ ...@@ -6908,7 +6795,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6940,20 +6827,20 @@ ...@@ -6940,20 +6827,20 @@
"_name": "success", "_name": "success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 138 "__id__": 136
}, },
{ {
"__id__": 140 "__id__": 138
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7009,13 +6896,13 @@ ...@@ -7009,13 +6896,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 137 "__id__": 135
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7071,7 +6958,7 @@ ...@@ -7071,7 +6958,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7106,13 +6993,13 @@ ...@@ -7106,13 +6993,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 137 "__id__": 135
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 141 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7168,7 +7055,7 @@ ...@@ -7168,7 +7055,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7200,7 +7087,7 @@ ...@@ -7200,7 +7087,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7232,7 +7119,7 @@ ...@@ -7232,7 +7119,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7293,7 +7180,7 @@ ...@@ -7293,7 +7180,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 124 "__id__": 122
}, },
"_id": "58IQ76yf1KT71BqZoNtHOV" "_id": "58IQ76yf1KT71BqZoNtHOV"
}, },
...@@ -7308,7 +7195,7 @@ ...@@ -7308,7 +7195,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7364,7 +7251,7 @@ ...@@ -7364,7 +7251,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -7391,13 +7278,13 @@ ...@@ -7391,13 +7278,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 145
}, },
{ {
"__id__": 148 "__id__": 146
}, },
{ {
"__id__": 149 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7453,7 +7340,7 @@ ...@@ -7453,7 +7340,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7485,7 +7372,7 @@ ...@@ -7485,7 +7372,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7546,7 +7433,7 @@ ...@@ -7546,7 +7433,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 146 "__id__": 144
}, },
"_id": "86ErSTSUhP26kFUGhhqqPn" "_id": "86ErSTSUhP26kFUGhhqqPn"
}, },
...@@ -7555,7 +7442,7 @@ ...@@ -7555,7 +7442,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -7582,10 +7469,10 @@ ...@@ -7582,10 +7469,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 149
}, },
{ {
"__id__": 152 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7641,7 +7528,7 @@ ...@@ -7641,7 +7528,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -7673,7 +7560,7 @@ ...@@ -7673,7 +7560,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7822,7 +7709,7 @@ ...@@ -7822,7 +7709,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7878,7 +7765,7 @@ ...@@ -7878,7 +7765,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7922,13 +7809,13 @@ ...@@ -7922,13 +7809,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 158 "__id__": 156
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 160
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7984,17 +7871,17 @@ ...@@ -7984,17 +7871,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 157 "__id__": 155
}, },
"_children": [ "_children": [
{ {
"__id__": 159 "__id__": 157
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8050,13 +7937,13 @@ ...@@ -8050,13 +7937,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 156
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 160 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8112,7 +7999,7 @@ ...@@ -8112,7 +7999,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 157
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8144,7 +8031,7 @@ ...@@ -8144,7 +8031,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8176,7 +8063,7 @@ ...@@ -8176,7 +8063,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8211,6 +8098,9 @@ ...@@ -8211,6 +8098,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 162
},
{ {
"__id__": 164 "__id__": 164
}, },
...@@ -8225,9 +8115,6 @@ ...@@ -8225,9 +8115,6 @@
}, },
{ {
"__id__": 172 "__id__": 172
},
{
"__id__": 174
} }
], ],
"_active": false, "_active": false,
...@@ -8285,13 +8172,13 @@ ...@@ -8285,13 +8172,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 165 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8347,7 +8234,7 @@ ...@@ -8347,7 +8234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 164 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8379,13 +8266,13 @@ ...@@ -8379,13 +8266,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 167 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8441,7 +8328,7 @@ ...@@ -8441,7 +8328,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 166 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8473,13 +8360,13 @@ ...@@ -8473,13 +8360,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8535,7 +8422,7 @@ ...@@ -8535,7 +8422,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8567,13 +8454,13 @@ ...@@ -8567,13 +8454,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8629,7 +8516,7 @@ ...@@ -8629,7 +8516,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8661,13 +8548,13 @@ ...@@ -8661,13 +8548,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8723,7 +8610,7 @@ ...@@ -8723,7 +8610,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8755,13 +8642,13 @@ ...@@ -8755,13 +8642,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8817,7 +8704,7 @@ ...@@ -8817,7 +8704,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 174 "__id__": 172
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8853,19 +8740,19 @@ ...@@ -8853,19 +8740,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 177 "__id__": 175
}, },
{ {
"__id__": 182 "__id__": 180
}, },
{ {
"__id__": 187 "__id__": 185
}, },
{ {
"__id__": 192 "__id__": 190
}, },
{ {
"__id__": 197 "__id__": 195
} }
], ],
"_active": false, "_active": false,
...@@ -8923,11 +8810,11 @@ ...@@ -8923,11 +8810,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 174
}, },
"_children": [ "_children": [
{ {
"__id__": 178 "__id__": 176
} }
], ],
"_active": true, "_active": true,
...@@ -8985,17 +8872,17 @@ ...@@ -8985,17 +8872,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 175
}, },
"_children": [ "_children": [
{ {
"__id__": 179 "__id__": 177
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 179
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9051,13 +8938,13 @@ ...@@ -9051,13 +8938,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 178 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9113,7 +9000,7 @@ ...@@ -9113,7 +9000,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9145,7 +9032,7 @@ ...@@ -9145,7 +9032,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9167,11 +9054,11 @@ ...@@ -9167,11 +9054,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 174
}, },
"_children": [ "_children": [
{ {
"__id__": 183 "__id__": 181
} }
], ],
"_active": true, "_active": true,
...@@ -9229,17 +9116,17 @@ ...@@ -9229,17 +9116,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 180
}, },
"_children": [ "_children": [
{ {
"__id__": 184 "__id__": 182
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9295,13 +9182,13 @@ ...@@ -9295,13 +9182,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 183 "__id__": 181
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 185 "__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9357,7 +9244,7 @@ ...@@ -9357,7 +9244,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 184 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9389,7 +9276,7 @@ ...@@ -9389,7 +9276,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9411,11 +9298,11 @@ ...@@ -9411,11 +9298,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 174
}, },
"_children": [ "_children": [
{ {
"__id__": 188 "__id__": 186
} }
], ],
"_active": true, "_active": true,
...@@ -9473,17 +9360,17 @@ ...@@ -9473,17 +9360,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 187 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 189 "__id__": 187
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 191 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9539,13 +9426,13 @@ ...@@ -9539,13 +9426,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 190 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9601,7 +9488,7 @@ ...@@ -9601,7 +9488,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9633,7 +9520,7 @@ ...@@ -9633,7 +9520,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 188 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9655,11 +9542,11 @@ ...@@ -9655,11 +9542,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 174
}, },
"_children": [ "_children": [
{ {
"__id__": 193 "__id__": 191
} }
], ],
"_active": true, "_active": true,
...@@ -9717,17 +9604,17 @@ ...@@ -9717,17 +9604,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 192 "__id__": 190
}, },
"_children": [ "_children": [
{ {
"__id__": 194 "__id__": 192
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 196 "__id__": 194
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9783,13 +9670,13 @@ ...@@ -9783,13 +9670,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 193 "__id__": 191
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 193
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9845,7 +9732,7 @@ ...@@ -9845,7 +9732,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 192
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9877,7 +9764,7 @@ ...@@ -9877,7 +9764,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 193 "__id__": 191
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9899,11 +9786,11 @@ ...@@ -9899,11 +9786,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 174
}, },
"_children": [ "_children": [
{ {
"__id__": 198 "__id__": 196
} }
], ],
"_active": true, "_active": true,
...@@ -9961,17 +9848,17 @@ ...@@ -9961,17 +9848,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 197 "__id__": 195
}, },
"_children": [ "_children": [
{ {
"__id__": 199 "__id__": 197
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 201 "__id__": 199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10027,13 +9914,13 @@ ...@@ -10027,13 +9914,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 198 "__id__": 196
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 198
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10089,7 +9976,7 @@ ...@@ -10089,7 +9976,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 199 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10121,7 +10008,7 @@ ...@@ -10121,7 +10008,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 198 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10149,7 +10036,7 @@ ...@@ -10149,7 +10036,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 203 "__id__": 201
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10205,7 +10092,7 @@ ...@@ -10205,7 +10092,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 202 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10230,7 +10117,7 @@ ...@@ -10230,7 +10117,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 205 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10286,7 +10173,7 @@ ...@@ -10286,7 +10173,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 202
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -10311,7 +10198,7 @@ ...@@ -10311,7 +10198,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 207 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10367,7 +10254,7 @@ ...@@ -10367,7 +10254,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 206 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
......
...@@ -157,32 +157,134 @@ cc.Class({ ...@@ -157,32 +157,134 @@ cc.Class({
_cardTouchItems: null, _cardTouchItems: null,
_successItems: null, _successItems: null,
initSingleData() { initSingleData() {
this._title = GameManager.getIns().getTitle(); this._stageData = GameManager.getIns().getStageData();
this._zhuClass = GameManager.getIns().getZhuClass(); GameManager.getIns().setState(0);//调用数组中的数据,同时设置关卡状态为0
// console.log("1")
// 所有全局变量 默认都是null // this._title = GameManager.getIns().getTitle();
this._cantouch = 0; // this._zhuClass = GameManager.getIns().getZhuClass();
//界面用数据 // // 所有全局变量 默认都是null
this._cardTouchItems = []; // this._cantouch = 0;
this._successItems = []; // //界面用数据
// this._cardTouchItems = [];
// this._successItems = [];
// this._cardPage = CardManager.getIns().getPage(); // this._cardPage = CardManager.getIns().getPage();
// cc.log(this._cardPage); // cc.log(this._cardPage);
}, },
initAudio() { initAudio() {
}, },
initView() { initView() {
this.btn_replay = pg.view.find(this, "btn_replay");
// pg.view.visible(this.btn_replay, false);
pg.view.touchOn(this.btn_replay, this.onTouchReplay, this);
this.initLayout(); this.initLayout();
this.initEvent();
this.initStep1();
}, },
initEvent() { initLayout() {
let btn_record = pg.view.find(this, "btn_record")//按钮监听 let btn_replay = pg.view.find(this, "btn_replay")
pg.view.touchOn(btn_record, this.onTouchIconRecord, this); let btn_recording = pg.view.find(this, "btn_recording")
let btn_record = pg.view.find(this, "btn_record")
let progress = pg.view.find(this, "progress")
let end = pg.view.find(this, "end");
let end_success = pg.view.find(end, "bg_success")
let bg_book = pg.view.find(this, "bg_book");
let icon_ex = pg.view.find(this, "icon_ex");
let btn_next = pg.view.find(this, "btn_next");
let btn_return = pg.view.find(this, "btn_return");
let icon_ex_txt = pg.view.find(icon_ex, "txt");
if (GameManager.getIns().getState() == 0) {
pg.view.visible(end, false);//不显示的内容用false
pg.view.visible(end_success, false);
pg.view.visible(icon_ex, false);
//更换书的样子
pg.view.visible(btn_next, true);//显示的内容用true
pg.view.visible(btn_return, true);
let bg_book_img = this._stageData.img;//从数组中调取img数据
pg.view.setNetImg(bg_book, bg_book_img);//与界面的节点绑定
//创建一个动画 ---
//playAni().then(()=> { GameManager.getIns().setState(1); this.initLayout() } )
GameManager.getIns().setState(1);
this.initLayout()//完成后直接进入下一步
} else if (GameManager.getIns().getState() == 1) {
setTimeout(() => {
pg.view.visible(icon_ex, true);
let icon_ex_word = this._stageData.word;
pg.view.setString(icon_ex_txt, icon_ex_word);
}, 1000 * 2);
setTimeout(() => {
pg.view.visible(btn_record, true);
pg.view.visible(btn_replay, true);
pg.view.touchOn(btn_record, this.onTouchRecord, this);//注册按钮监听,从按钮里进入的下一步
}, 1000 * 4);
//显示文字动画
//播放文字的声音
//setTimeout(() => {
// GameManager.getIns().setState(2);
// this.initLayout()
//}, 1000 * 5);
//playAni().then(()=> { GameManager.getIns().setState(2); this.initLayout } )
} else if (GameManager.getIns().getState() == 2) {
pg.view.visible(btn_record, false);
pg.view.visible(btn_replay, false);
pg.view.visible(btn_recording, true);
pg.view.visible(progress, true);
setTimeout(() => {
GameManager.getIns().setState(3);
this.initLayout()
}, 1000 * 4);//4秒钟之后进入下一步
} else if (GameManager.getIns().getState() == 3) {
pg.view.visible(btn_record, true);
pg.view.visible(btn_recording, false);
pg.view.visible(progress, false);
setTimeout(() => {
pg.view.visible(end, true);
pg.view.visible(end_success, true);
}, 1000 * 4);//4秒钟之后出现goodjob提示
setTimeout(() => {
this.nextStage();
}, 1000 * 6);//6秒钟之后进入下一关卡
} else if (GameManager.getIns().getState() == 4) {
} else if (GameManager.getIns().getState() == 5) {
} else if (GameManager.getIns().getState() == 6) {
}
// //根据当前显示用数据来执行对应的效果
// pg.view.setString(pg.view.find(this, "title/txt"), this._title);
// //刷新主类
// pg.view.setString(pg.view.find(this, "main/main/txt"), this._zhuClass.title);
// pg.view.touchOn(pg.view.find(this, "main/main"), this.onTouchVoice, this);
// pg.view.find(this, "main/main").data = this._zhuClass;
// //刷新分类
// pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title);
// pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title);
// pg.view.find(this, "main/sub_0").data = this._zhuClass.child[0];
// pg.view.find(this, "main/sub_1").data = this._zhuClass.child[1];
// pg.view.touchOn(pg.view.find(this, "main/sub_0"), this.onTouchVoice, this);
// pg.view.touchOn(pg.view.find(this, "main/sub_1"), this.onTouchVoice, this);
},
onTouchRecord() {
GameManager.getIns().setState(2);
this.initLayout()
}, },
nextStage() {
GameManager.getIns().addStage();//关卡标记+1
this.initSingleData();//刷新当前关卡所使用的的数据
this.initLayout();//刷新界面显示内容
},
onTouchIconRecord() { onTouchIconRecord() {
let btn_replay = pg.view.find(this, "btn_replay") let btn_replay = pg.view.find(this, "btn_replay")
let btn_record = pg.view.find(this, "btn_record") let btn_record = pg.view.find(this, "btn_record")
...@@ -226,21 +328,18 @@ cc.Class({ ...@@ -226,21 +328,18 @@ cc.Class({
}, },
initLayout() { createAni() {
// //根据当前显示用数据来执行对应的效果 // cc.assetManager.loadRemote('http://www.cloud.com/test1.jpg', (err, texture) => console.log(err));
// pg.view.setString(pg.view.find(this, "title/txt"), this._title);
// //刷新主类
// pg.view.setString(pg.view.find(this, "main/main/txt"), this._zhuClass.title);
// pg.view.touchOn(pg.view.find(this, "main/main"), this.onTouchVoice, this);
// pg.view.find(this, "main/main").data = this._zhuClass;
// //刷新分类
// pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title);
// pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title);
// pg.view.find(this, "main/sub_0").data = this._zhuClass.child[0];
// pg.view.find(this, "main/sub_1").data = this._zhuClass.child[1];
// pg.view.touchOn(pg.view.find(this, "main/sub_0"), this.onTouchVoice, this);
// pg.view.touchOn(pg.view.find(this, "main/sub_1"), this.onTouchVoice, this);
}, },
// //
onTouchVoice(touch) { onTouchVoice(touch) {
let item = touch.target; let item = touch.target;
......
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