Commit 74e4a3d7 74e4a3d7a144cda8c34faf3ee95b38ffca9d9c81 by 金学艇

1.解决列表页Android端加载数据异步问题

1 parent 2b6708fb
...@@ -39,32 +39,6 @@ cc.Class({ ...@@ -39,32 +39,6 @@ cc.Class({
39 // fiScrollBtn.init(null, true); 39 // fiScrollBtn.init(null, true);
40 40
41 this.getNavList(); //获取导航栏信息 41 this.getNavList(); //获取导航栏信息
42 this.getCategoryListJsonRequest();
43 },
44
45 getCategoryListJsonRequest: function () {
46 var self = this;
47 var aJsonList = ["catetory_jtdr_list.json", "catetory_all_list.json", "catetory_nlbz_list.json", "catetory_3dyx_list.json", "catetory_xyx_list.json", "catetory_tyjj_list.json"];
48 this.aCategoryListJson = [];
49 if (this.aCategoryListJson && this.aCategoryListJson.length > 0) {
50 return;
51 }
52 for (let i = 0; i < aJsonList.length; i++) { //这里可能会导致对应导航错乱,改为同步请求
53 CCNetwork.ajax("GET", Common.TOPDRAW_API_SERVER + "main/" + aJsonList[i], null, null,
54 function (strResponse) {
55 try {
56 // cc.log("远程数据:"+strResponse);
57 var oJSONResult = JSON.parse(strResponse);
58 this.aCategoryListJson.push(strResponse);
59 // cc.log("请求数据返回:" + oJSONResult.count);
60 } catch (error) {
61 cc.log("Business Exception:Get getCategoryListJsonRequest..." + error);
62 }
63 },
64 function (strResponse) {
65 cc.log("Business Error:Get getCategoryListJsonRequest..." + strResponse);
66 }, this, "uuid");
67 }
68 }, 42 },
69 43
70 getNavList: function () { 44 getNavList: function () {
...@@ -138,7 +112,8 @@ cc.Class({ ...@@ -138,7 +112,8 @@ cc.Class({
138 } 112 }
139 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/topNavi" + this._oSceneContext._iCurrentLeftIndex; 113 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/topNavi" + this._oSceneContext._iCurrentLeftIndex;
140 this.checkDataReadyAndInitFocus(); 114 this.checkDataReadyAndInitFocus();
141 this.requestMediaList(1); 115 // this.requestMediaList(1);
116 this.getSimulateRequest();
142 } else { 117 } else {
143 cc.log("Business Error:getNavList..." + oJSONResult.description); 118 cc.log("Business Error:getNavList..." + oJSONResult.description);
144 } 119 }
...@@ -151,6 +126,29 @@ cc.Class({ ...@@ -151,6 +126,29 @@ cc.Class({
151 }, this, "uuid"); 126 }, this, "uuid");
152 }, 127 },
153 128
129 getSimulateRequest: function () {
130 var self = this;
131 var aJsonList = ["catetory_jtdr_list.json", "catetory_all_list.json", "catetory_nlbz_list.json", "catetory_3dyx_list.json", "catetory_xyx_list.json", "catetory_tyjj_list.json"];
132 if (this._oInit[this._oSceneContext._iCurrentLeftIndex]) { //已经加载过数据直接取
133 self.requestMediaList(1);
134 } else {
135 Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/" + aJsonList[this._oSceneContext._iCurrentLeftIndex], null, null,
136 function (strResponse) {
137 try {
138 this._oInit[this._oSceneContext._iCurrentLeftIndex] = strResponse;
139 this.scheduleOnce(function () {
140 self.requestMediaList(1); //重新渲染CategoryList
141 }, 0);
142 } catch (error) {
143 cc.log("Business Exception:Get getSimulateRequest..." + error);
144 }
145 },
146 function (strResponse) {
147 cc.log("Business Error:Get getSimulateRequest..." + strResponse);
148 }, this, "uuid");
149 }
150 },
151
154 requestMediaList: function (cId) { 152 requestMediaList: function (cId) {
155 var self = this; 153 var self = this;
156 if (cId) { 154 if (cId) {
...@@ -262,8 +260,9 @@ cc.Class({ ...@@ -262,8 +260,9 @@ cc.Class({
262 ); 260 );
263 // lvCategoryList.loadData( 261 // lvCategoryList.loadData(
264 // function (strResponse) { 262 // function (strResponse) {
265 // cc.log("/////" + JSON.stringify(this.test_list_json1.json)); 263 // cc.log("/////" + this._oInit[this._oSceneContext._iCurrentLeftIndex]);
266 let strResponse = this.aCategoryListJson[this._oSceneContext._iCurrentLeftIndex]; 264 // let strResponse = this.aCategoryListJson[this._oSceneContext._iCurrentLeftIndex];
265 let strResponse = this._oInit[this._oSceneContext._iCurrentLeftIndex];
267 lvCategoryList.renderInitData(strResponse, function () { 266 lvCategoryList.renderInitData(strResponse, function () {
268 // cc.log("InitCategoryList-------------------->"); 267 // cc.log("InitCategoryList-------------------->");
269 var oJSONResult = JSON.parse(strResponse); 268 var oJSONResult = JSON.parse(strResponse);
...@@ -378,7 +377,7 @@ cc.Class({ ...@@ -378,7 +377,7 @@ cc.Class({
378 var index = parseInt(this._fiCurrentFocus.node.getName().replace('CategoryListCell', '')); 377 var index = parseInt(this._fiCurrentFocus.node.getName().replace('CategoryListCell', ''));
379 // cc.log("当前时多少条目:" + index); 378 // cc.log("当前时多少条目:" + index);
380 let lvCategoryList = this.node.getChildByName('CategoryList').getComponent(ListView); 379 let lvCategoryList = this.node.getChildByName('CategoryList').getComponent(ListView);
381 if (lvCategoryList.scrollARowUp(index, this.aCategoryListJson[this._oSceneContext._iCurrentLeftIndex])) { 380 if (lvCategoryList.scrollARowUp(index, this._oInit[this._oSceneContext._iCurrentLeftIndex])) {
382 return; 381 return;
383 } 382 }
384 } 383 }
...@@ -396,7 +395,7 @@ cc.Class({ ...@@ -396,7 +395,7 @@ cc.Class({
396 if (0 == this._fiCurrentFocus.node.getName().indexOf('CategoryListCell')) { 395 if (0 == this._fiCurrentFocus.node.getName().indexOf('CategoryListCell')) {
397 var index = parseInt(this._fiCurrentFocus.node.getName().replace('CategoryListCell', '')); 396 var index = parseInt(this._fiCurrentFocus.node.getName().replace('CategoryListCell', ''));
398 let lvCategoryList = this.node.getChildByName('CategoryList').getComponent(ListView); 397 let lvCategoryList = this.node.getChildByName('CategoryList').getComponent(ListView);
399 if (lvCategoryList.scrollARowDown(null, index, this.aCategoryListJson[this._oSceneContext._iCurrentLeftIndex])) { 398 if (lvCategoryList.scrollARowDown(null, index, this._oInit[this._oSceneContext._iCurrentLeftIndex])) {
400 return; 399 return;
401 } 400 }
402 } 401 }
...@@ -536,7 +535,8 @@ cc.Class({ ...@@ -536,7 +535,8 @@ cc.Class({
536 this._oSceneContext._iCurrentLeftIndex = iIndex; 535 this._oSceneContext._iCurrentLeftIndex = iIndex;
537 536
538 this.scheduleOnce(function () { 537 this.scheduleOnce(function () {
539 this.requestMediaList(1); //重新渲染CategoryList 538 // this.requestMediaList(1); //重新渲染CategoryList
539 this.getSimulateRequest();
540 }, 0); 540 }, 0);
541 } 541 }
542 542
......
...@@ -457,9 +457,9 @@ cc.Class({ ...@@ -457,9 +457,9 @@ cc.Class({
457 jsb.reflection.callStaticMethod("com/topdraw/melody/TopdrawSDKWrapper", "startOBiGame", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", Common.TOPDRAW_API_SERVER + this._oSceneContext._downloadUrl, this._oSceneContext._packageName, this._oSceneContext._className, ""); 457 jsb.reflection.callStaticMethod("com/topdraw/melody/TopdrawSDKWrapper", "startOBiGame", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", Common.TOPDRAW_API_SERVER + this._oSceneContext._downloadUrl, this._oSceneContext._packageName, this._oSceneContext._className, "");
458 } else { 458 } else {
459 //这里应该转圈圈等待加载游戏 459 //这里应该转圈圈等待加载游戏
460 cc.find("LoadingLabel", this.node).opacity = 255; 460 // cc.find("LoadingLabel", this.node).opacity = 255;
461 cc.find("Loading/LoadingIcon", this.node).opacity = 255; 461 // cc.find("Loading/LoadingIcon", this.node).opacity = 255;
462 cc.find("Loading/LoadingIcon", this.node).getComponent(cc.Animation).play(); 462 // cc.find("Loading/LoadingIcon", this.node).getComponent(cc.Animation).play();
463 jsb.reflection.callStaticMethod("com/topdraw/melody/TopdrawSDKWrapper", "startGame", "(Ljava/lang/String;Ljava/lang/String;)V", this._oSceneContext._packageName, ""); 463 jsb.reflection.callStaticMethod("com/topdraw/melody/TopdrawSDKWrapper", "startGame", "(Ljava/lang/String;Ljava/lang/String;)V", this._oSceneContext._packageName, "");
464 } 464 }
465 } else { 465 } else {
......
...@@ -58,6 +58,51 @@ cc.Class({ ...@@ -58,6 +58,51 @@ cc.Class({
58 } 58 }
59 }, 59 },
60 60
61 keyDownDirection: function (Direct) {
62 var fiFocusTarget = null;
63 var fiCurrentFocus = this._fiCurrentFocus;
64 var oScrollParameter = null;
65 let aCheckResult;
66 fiFocusTarget = this._cFocus.findTarget(fiCurrentFocus, this._aFocusTargets, this._iSceneStatus, Direct);
67 if (!fiFocusTarget) { return; }
68 // aCheckResult = this.checkFocusTarget(fiFocusTarget, oScrollParameter);
69 // fiFocusTarget = aCheckResult[0];
70 // oScrollParameter = aCheckResult[1];
71 this._cFocus.flyFocus(this._fiCurrentFocus, fiFocusTarget, Direct, null, oScrollParameter);
72 },
73
74 onKeyDown: function (event) {
75 this._super(event);
76 switch (event.keyCode) {
77 case cc.macro.KEY.up:
78 case Common.ANDROID_KEY.up:
79 this.keyDownDirection(Common.MOVE_DIRECTION_UP);
80 break;
81 case cc.macro.KEY.right:
82 case Common.ANDROID_KEY.right:
83 this.keyDownDirection(Common.MOVE_DIRECTION_RIGHT);
84 break;
85 case cc.macro.KEY.down:
86 case Common.ANDROID_KEY.down:
87 this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
88 break;
89 case cc.macro.KEY.left:
90 case Common.ANDROID_KEY.left:
91 this.keyDownDirection(Common.MOVE_DIRECTION_LEFT);
92 break;
93 case cc.macro.KEY.enter:
94 case cc.macro.KEY.space:
95 case Common.ANDROID_KEY.enter:
96 // this.doCurrentFocusTVLinkAction(Common.TV_LINK_ACTION_CLICK);
97 break;
98 case cc.macro.KEY.backspace:
99 case Common.ANDROID_KEY.back:
100 this._bIsFocusInit = true;
101 this.backAScene();
102 break;
103 }
104 },
105
61 // hideLoadingIcon: function () { 106 // hideLoadingIcon: function () {
62 // cc.log("隐藏LoadingIcon..."); 107 // cc.log("隐藏LoadingIcon...");
63 // cc.find("Loading/LoadingIcon", this.node).getComponent(cc.Animation).pause(); 108 // cc.find("Loading/LoadingIcon", this.node).getComponent(cc.Animation).pause();
......
...@@ -24,23 +24,23 @@ ...@@ -24,23 +24,23 @@
24 "__id__": 6 24 "__id__": 6
25 }, 25 },
26 { 26 {
27 "__id__": 40 27 "__id__": 41
28 } 28 }
29 ], 29 ],
30 "_active": true, 30 "_active": true,
31 "_components": [ 31 "_components": [
32 { 32 {
33 "__id__": 50
34 },
35 {
36 "__id__": 51 33 "__id__": 51
37 }, 34 },
38 { 35 {
39 "__id__": 52 36 "__id__": 52
37 },
38 {
39 "__id__": 53
40 } 40 }
41 ], 41 ],
42 "_prefab": { 42 "_prefab": {
43 "__id__": 53 43 "__id__": 54
44 }, 44 },
45 "_opacity": 255, 45 "_opacity": 255,
46 "_color": { 46 "_color": {
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 "_contentSize": { 120 "_contentSize": {
121 "__type__": "cc.Size", 121 "__type__": "cc.Size",
122 "width": 53.83, 122 "width": 53.83,
123 "height": 50.4 123 "height": 37.8
124 }, 124 },
125 "_anchorPoint": { 125 "_anchorPoint": {
126 "__type__": "cc.Vec2", 126 "__type__": "cc.Vec2",
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
173 "_string": "Label", 173 "_string": "Label",
174 "_N$string": "Label", 174 "_N$string": "Label",
175 "_fontSize": 22, 175 "_fontSize": 22,
176 "_lineHeight": 40, 176 "_lineHeight": 30,
177 "_enableWrapText": true, 177 "_enableWrapText": true,
178 "_N$file": null, 178 "_N$file": null,
179 "_isSystemFontUsed": true, 179 "_isSystemFontUsed": true,
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
199 "_alignFlags": 8, 199 "_alignFlags": 8,
200 "_left": 24, 200 "_left": 24,
201 "_right": 0, 201 "_right": 0,
202 "_top": 0, 202 "_top": 24.1,
203 "_bottom": 0, 203 "_bottom": 0,
204 "_verticalCenter": 0, 204 "_verticalCenter": 0,
205 "_horizontalCenter": 0, 205 "_horizontalCenter": 0,
...@@ -242,11 +242,11 @@ ...@@ -242,11 +242,11 @@
242 "_active": false, 242 "_active": false,
243 "_components": [ 243 "_components": [
244 { 244 {
245 "__id__": 38 245 "__id__": 39
246 } 246 }
247 ], 247 ],
248 "_prefab": { 248 "_prefab": {
249 "__id__": 39 249 "__id__": 40
250 }, 250 },
251 "_opacity": 255, 251 "_opacity": 255,
252 "_color": { 252 "_color": {
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
326 "_contentSize": { 326 "_contentSize": {
327 "__type__": "cc.Size", 327 "__type__": "cc.Size",
328 "width": 200, 328 "width": 200,
329 "height": 34 329 "height": 30
330 }, 330 },
331 "_anchorPoint": { 331 "_anchorPoint": {
332 "__type__": "cc.Vec2", 332 "__type__": "cc.Vec2",
...@@ -378,8 +378,8 @@ ...@@ -378,8 +378,8 @@
378 "_useOriginalSize": false, 378 "_useOriginalSize": false,
379 "_string": "脑力训练", 379 "_string": "脑力训练",
380 "_N$string": "脑力训练", 380 "_N$string": "脑力训练",
381 "_fontSize": 24, 381 "_fontSize": 22,
382 "_lineHeight": 34, 382 "_lineHeight": 30,
383 "_enableWrapText": true, 383 "_enableWrapText": true,
384 "_N$file": null, 384 "_N$file": null,
385 "_isSystemFontUsed": true, 385 "_isSystemFontUsed": true,
...@@ -405,9 +405,9 @@ ...@@ -405,9 +405,9 @@
405 "__id__": 1 405 "__id__": 1
406 }, 406 },
407 "_alignFlags": 9, 407 "_alignFlags": 9,
408 "_left": 26, 408 "_left": 24,
409 "_right": 0, 409 "_right": 0,
410 "_top": 17, 410 "_top": 15,
411 "_bottom": 0, 411 "_bottom": 0,
412 "_verticalCenter": 0, 412 "_verticalCenter": 0,
413 "_horizontalCenter": 0, 413 "_horizontalCenter": 0,
...@@ -450,14 +450,14 @@ ...@@ -450,14 +450,14 @@
450 "_active": true, 450 "_active": true,
451 "_components": [ 451 "_components": [
452 { 452 {
453 "__id__": 35 453 "__id__": 36
454 }, 454 },
455 { 455 {
456 "__id__": 36 456 "__id__": 37
457 } 457 }
458 ], 458 ],
459 "_prefab": { 459 "_prefab": {
460 "__id__": 37 460 "__id__": 38
461 }, 461 },
462 "_opacity": 255, 462 "_opacity": 255,
463 "_color": { 463 "_color": {
...@@ -740,7 +740,7 @@ ...@@ -740,7 +740,7 @@
740 "_contentSize": { 740 "_contentSize": {
741 "__type__": "cc.Size", 741 "__type__": "cc.Size",
742 "width": 69, 742 "width": 69,
743 "height": 31.5 743 "height": 22
744 }, 744 },
745 "_anchorPoint": { 745 "_anchorPoint": {
746 "__type__": "cc.Vec2", 746 "__type__": "cc.Vec2",
...@@ -792,8 +792,8 @@ ...@@ -792,8 +792,8 @@
792 "_useOriginalSize": false, 792 "_useOriginalSize": false,
793 "_string": "载入中...", 793 "_string": "载入中...",
794 "_N$string": "载入中...", 794 "_N$string": "载入中...",
795 "_fontSize": 18, 795 "_fontSize": 16,
796 "_lineHeight": 25, 796 "_lineHeight": 22,
797 "_enableWrapText": true, 797 "_enableWrapText": true,
798 "_N$file": null, 798 "_N$file": null,
799 "_isSystemFontUsed": true, 799 "_isSystemFontUsed": true,
...@@ -875,7 +875,7 @@ ...@@ -875,7 +875,7 @@
875 "_contentSize": { 875 "_contentSize": {
876 "__type__": "cc.Size", 876 "__type__": "cc.Size",
877 "width": 69, 877 "width": 69,
878 "height": 31.5 878 "height": 22
879 }, 879 },
880 "_anchorPoint": { 880 "_anchorPoint": {
881 "__type__": "cc.Vec2", 881 "__type__": "cc.Vec2",
...@@ -927,8 +927,8 @@ ...@@ -927,8 +927,8 @@
927 "_useOriginalSize": false, 927 "_useOriginalSize": false,
928 "_string": "载入中...", 928 "_string": "载入中...",
929 "_N$string": "载入中...", 929 "_N$string": "载入中...",
930 "_fontSize": 18, 930 "_fontSize": 16,
931 "_lineHeight": 25, 931 "_lineHeight": 22,
932 "_enableWrapText": true, 932 "_enableWrapText": true,
933 "_N$file": null, 933 "_N$file": null,
934 "_isSystemFontUsed": true, 934 "_isSystemFontUsed": true,
...@@ -989,11 +989,11 @@ ...@@ -989,11 +989,11 @@
989 "_enabled": true, 989 "_enabled": true,
990 "alignMode": 1, 990 "alignMode": 1,
991 "_target": null, 991 "_target": null,
992 "_alignFlags": 9, 992 "_alignFlags": 12,
993 "_left": 26, 993 "_left": 24,
994 "_right": 0, 994 "_right": 0,
995 "_top": 56, 995 "_top": 51,
996 "_bottom": 0, 996 "_bottom": 15,
997 "_verticalCenter": 0, 997 "_verticalCenter": 0,
998 "_horizontalCenter": 0, 998 "_horizontalCenter": 0,
999 "_isAbsLeft": true, 999 "_isAbsLeft": true,
...@@ -1074,14 +1074,14 @@ ...@@ -1074,14 +1074,14 @@
1074 "_active": true, 1074 "_active": true,
1075 "_components": [ 1075 "_components": [
1076 { 1076 {
1077 "__id__": 32 1077 "__id__": 33
1078 }, 1078 },
1079 { 1079 {
1080 "__id__": 33 1080 "__id__": 34
1081 } 1081 }
1082 ], 1082 ],
1083 "_prefab": { 1083 "_prefab": {
1084 "__id__": 34 1084 "__id__": 35
1085 }, 1085 },
1086 "_opacity": 255, 1086 "_opacity": 255,
1087 "_color": { 1087 "_color": {
...@@ -1142,10 +1142,13 @@ ...@@ -1142,10 +1142,13 @@
1142 "_components": [ 1142 "_components": [
1143 { 1143 {
1144 "__id__": 30 1144 "__id__": 30
1145 },
1146 {
1147 "__id__": 31
1145 } 1148 }
1146 ], 1149 ],
1147 "_prefab": { 1150 "_prefab": {
1148 "__id__": 31 1151 "__id__": 32
1149 }, 1152 },
1150 "_opacity": 255, 1153 "_opacity": 255,
1151 "_color": { 1154 "_color": {
...@@ -1158,7 +1161,7 @@ ...@@ -1158,7 +1161,7 @@
1158 "_contentSize": { 1161 "_contentSize": {
1159 "__type__": "cc.Size", 1162 "__type__": "cc.Size",
1160 "width": 72, 1163 "width": 72,
1161 "height": 31.5 1164 "height": 22
1162 }, 1165 },
1163 "_anchorPoint": { 1166 "_anchorPoint": {
1164 "__type__": "cc.Vec2", 1167 "__type__": "cc.Vec2",
...@@ -1210,8 +1213,8 @@ ...@@ -1210,8 +1213,8 @@
1210 "_useOriginalSize": false, 1213 "_useOriginalSize": false,
1211 "_string": "游戏名称", 1214 "_string": "游戏名称",
1212 "_N$string": "游戏名称", 1215 "_N$string": "游戏名称",
1213 "_fontSize": 18, 1216 "_fontSize": 16,
1214 "_lineHeight": 25, 1217 "_lineHeight": 22,
1215 "_enableWrapText": true, 1218 "_enableWrapText": true,
1216 "_N$file": null, 1219 "_N$file": null,
1217 "_isSystemFontUsed": true, 1220 "_isSystemFontUsed": true,
...@@ -1225,6 +1228,33 @@ ...@@ -1225,6 +1228,33 @@
1225 "_id": "" 1228 "_id": ""
1226 }, 1229 },
1227 { 1230 {
1231 "__type__": "cc.Widget",
1232 "_name": "",
1233 "_objFlags": 0,
1234 "node": {
1235 "__id__": 29
1236 },
1237 "_enabled": true,
1238 "alignMode": 1,
1239 "_target": null,
1240 "_alignFlags": 9,
1241 "_left": 0,
1242 "_right": 0,
1243 "_top": 0,
1244 "_bottom": 0,
1245 "_verticalCenter": 0,
1246 "_horizontalCenter": 0,
1247 "_isAbsLeft": true,
1248 "_isAbsRight": true,
1249 "_isAbsTop": true,
1250 "_isAbsBottom": true,
1251 "_isAbsHorizontalCenter": true,
1252 "_isAbsVerticalCenter": true,
1253 "_originalWidth": 0,
1254 "_originalHeight": 0,
1255 "_id": ""
1256 },
1257 {
1228 "__type__": "cc.PrefabInfo", 1258 "__type__": "cc.PrefabInfo",
1229 "root": { 1259 "root": {
1230 "__id__": 1 1260 "__id__": 1
...@@ -1265,11 +1295,11 @@ ...@@ -1265,11 +1295,11 @@
1265 "_enabled": true, 1295 "_enabled": true,
1266 "alignMode": 1, 1296 "alignMode": 1,
1267 "_target": null, 1297 "_target": null,
1268 "_alignFlags": 9, 1298 "_alignFlags": 12,
1269 "_left": 26, 1299 "_left": 24,
1270 "_right": 0, 1300 "_right": 0,
1271 "_top": 56, 1301 "_top": 51,
1272 "_bottom": 0, 1302 "_bottom": 15,
1273 "_verticalCenter": 0, 1303 "_verticalCenter": 0,
1274 "_horizontalCenter": 0, 1304 "_horizontalCenter": 0,
1275 "_isAbsLeft": true, 1305 "_isAbsLeft": true,
...@@ -1409,16 +1439,16 @@ ...@@ -1409,16 +1439,16 @@
1409 }, 1439 },
1410 "_children": [ 1440 "_children": [
1411 { 1441 {
1412 "__id__": 41 1442 "__id__": 42
1413 }, 1443 },
1414 { 1444 {
1415 "__id__": 45 1445 "__id__": 46
1416 } 1446 }
1417 ], 1447 ],
1418 "_active": false, 1448 "_active": false,
1419 "_components": [], 1449 "_components": [],
1420 "_prefab": { 1450 "_prefab": {
1421 "__id__": 49 1451 "__id__": 50
1422 }, 1452 },
1423 "_opacity": 255, 1453 "_opacity": 255,
1424 "_color": { 1454 "_color": {
...@@ -1472,20 +1502,20 @@ ...@@ -1472,20 +1502,20 @@
1472 "_name": "Title", 1502 "_name": "Title",
1473 "_objFlags": 0, 1503 "_objFlags": 0,
1474 "_parent": { 1504 "_parent": {
1475 "__id__": 40 1505 "__id__": 41
1476 }, 1506 },
1477 "_children": [], 1507 "_children": [],
1478 "_active": true, 1508 "_active": true,
1479 "_components": [ 1509 "_components": [
1480 { 1510 {
1481 "__id__": 42 1511 "__id__": 43
1482 }, 1512 },
1483 { 1513 {
1484 "__id__": 43 1514 "__id__": 44
1485 } 1515 }
1486 ], 1516 ],
1487 "_prefab": { 1517 "_prefab": {
1488 "__id__": 44 1518 "__id__": 45
1489 }, 1519 },
1490 "_opacity": 255, 1520 "_opacity": 255,
1491 "_color": { 1521 "_color": {
...@@ -1539,7 +1569,7 @@ ...@@ -1539,7 +1569,7 @@
1539 "_name": "", 1569 "_name": "",
1540 "_objFlags": 0, 1570 "_objFlags": 0,
1541 "node": { 1571 "node": {
1542 "__id__": 41 1572 "__id__": 42
1543 }, 1573 },
1544 "_enabled": true, 1574 "_enabled": true,
1545 "_materials": [ 1575 "_materials": [
...@@ -1569,7 +1599,7 @@ ...@@ -1569,7 +1599,7 @@
1569 "_name": "", 1599 "_name": "",
1570 "_objFlags": 0, 1600 "_objFlags": 0,
1571 "node": { 1601 "node": {
1572 "__id__": 41 1602 "__id__": 42
1573 }, 1603 },
1574 "_enabled": true, 1604 "_enabled": true,
1575 "alignMode": 1, 1605 "alignMode": 1,
...@@ -1607,20 +1637,20 @@ ...@@ -1607,20 +1637,20 @@
1607 "_name": "Name", 1637 "_name": "Name",
1608 "_objFlags": 0, 1638 "_objFlags": 0,
1609 "_parent": { 1639 "_parent": {
1610 "__id__": 40 1640 "__id__": 41
1611 }, 1641 },
1612 "_children": [], 1642 "_children": [],
1613 "_active": true, 1643 "_active": true,
1614 "_components": [ 1644 "_components": [
1615 { 1645 {
1616 "__id__": 46 1646 "__id__": 47
1617 }, 1647 },
1618 { 1648 {
1619 "__id__": 47 1649 "__id__": 48
1620 } 1650 }
1621 ], 1651 ],
1622 "_prefab": { 1652 "_prefab": {
1623 "__id__": 48 1653 "__id__": 49
1624 }, 1654 },
1625 "_opacity": 255, 1655 "_opacity": 255,
1626 "_color": { 1656 "_color": {
...@@ -1674,7 +1704,7 @@ ...@@ -1674,7 +1704,7 @@
1674 "_name": "", 1704 "_name": "",
1675 "_objFlags": 0, 1705 "_objFlags": 0,
1676 "node": { 1706 "node": {
1677 "__id__": 45 1707 "__id__": 46
1678 }, 1708 },
1679 "_enabled": true, 1709 "_enabled": true,
1680 "_materials": [ 1710 "_materials": [
...@@ -1704,7 +1734,7 @@ ...@@ -1704,7 +1734,7 @@
1704 "_name": "", 1734 "_name": "",
1705 "_objFlags": 0, 1735 "_objFlags": 0,
1706 "node": { 1736 "node": {
1707 "__id__": 45 1737 "__id__": 46
1708 }, 1738 },
1709 "_enabled": true, 1739 "_enabled": true,
1710 "alignMode": 1, 1740 "alignMode": 1,
...@@ -1832,10 +1862,10 @@ ...@@ -1832,10 +1862,10 @@
1832 "__id__": 30 1862 "__id__": 30
1833 }, 1863 },
1834 "afterTitle": { 1864 "afterTitle": {
1835 "__id__": 42 1865 "__id__": 43
1836 }, 1866 },
1837 "afterName": { 1867 "afterName": {
1838 "__id__": 46 1868 "__id__": 47
1839 }, 1869 },
1840 "_id": "" 1870 "_id": ""
1841 }, 1871 },
......