diff --git a/assets/Scenes/LoginScene.scene b/assets/Scenes/LoginScene.scene index af2f4a46..0394fb03 100644 --- a/assets/Scenes/LoginScene.scene +++ b/assets/Scenes/LoginScene.scene @@ -90,7 +90,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 540, - "y": 1170, + "y": 1057.5, "z": 0 }, "_lrot": { @@ -175,7 +175,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 1170, + "_orthoHeight": 1057.5, "_near": 0, "_far": 2000, "_color": { @@ -383,7 +383,7 @@ "__id__": 5 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 10 @@ -1433,7 +1433,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1498,7 +1498,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index a1fc7795..1a7d8720 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -102,7 +102,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 540, - "y": 1170, + "y": 1057.5, "z": 0 }, "_lrot": { @@ -187,7 +187,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 1170, + "_orthoHeight": 1057.5, "_near": 0, "_far": 2000, "_color": { @@ -337,8 +337,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 384, - "height": 672 + "width": 400, + "height": 866 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -410,7 +410,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -523,7 +523,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -623,7 +623,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -764,7 +764,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Scenes/PreloadScene.scene b/assets/Scenes/PreloadScene.scene index 2ba43bd9..aae77688 100644 --- a/assets/Scenes/PreloadScene.scene +++ b/assets/Scenes/PreloadScene.scene @@ -90,7 +90,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 540, - "y": 1170, + "y": 1057.5, "z": 0 }, "_lrot": { @@ -175,7 +175,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 1170, + "_orthoHeight": 1057.5, "_near": 0, "_far": 2000, "_color": { @@ -386,7 +386,7 @@ "__id__": 5 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 10 @@ -440,8 +440,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 1170, - "height": 2532 + "width": 1080, + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1015,7 +1015,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -755.781, + "y": -643.281, "z": 0 }, "_lrot": { @@ -1691,7 +1691,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1755,7 +1755,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index 10eb39fe..14e38d02 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -266,10 +266,14 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { // this.videoLayer.playVideo(currentVideo, { size, position }); } onChatCountChange() { + if (NavigationManager.Instance.getCurrentActivePanel() != PanelType.CHAT) + return; + console.log("Trigger On ChatCount Change"); const girlData = DataManager.I.getDataById(DataId.Girl); let triggerId = girlData.getTriggerGrilPhotoId(this.categoryId, this.id); if (triggerId == 0) return; + console.log("Trigger pop up Image id:" + this.id + "--" + triggerId); this.popUpImage.refresh(this.categoryId, this.id, triggerId); } diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 5857a4f5..17105377 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -177,7 +177,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -771.3, + "y": -658.8, "z": 0 }, "_lrot": { @@ -352,7 +352,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1170, + "y": -1057.5, "z": 0 }, "_lrot": { @@ -537,7 +537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 996.9, + "y": 983.1, "z": 0 }, "_lrot": { @@ -1370,7 +1370,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 98.7, + "_top": 0, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -1490,7 +1490,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 487.9770000000001, - "y": -700.24, + "y": -587.74, "z": 0 }, "_lrot": { @@ -3754,7 +3754,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1548 + "height": 1323 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3886,7 +3886,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 83.80000000000007, "z": 0 }, "_lrot": { @@ -4048,7 +4048,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 1947.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4078,7 +4078,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 167.6, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -4141,7 +4141,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -812.124, + "y": -699.624, "z": 0 }, "_lrot": { @@ -5753,7 +5753,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5900,7 +5900,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -455.91200000000003, + "y": -312.697, "z": 0 }, "_lrot": { @@ -7877,8 +7877,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -1027.5320000000002, - "y": 493.18200000000013, + "x": -943.769, + "y": 493.182, "z": 0 }, "_lrot": { @@ -7931,8 +7931,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 253.86700000000016, - "y": -28.935000000000173, + "x": 197.46599999999998, + "y": -28.934999999999945, "z": 0 }, "_lrot": { @@ -8517,7 +8517,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index c51119ea..356a09a2 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -24,9 +24,6 @@ ], "_active": true, "_components": [ - { - "__id__": 380 - }, { "__id__": 382 }, @@ -35,10 +32,13 @@ }, { "__id__": 386 + }, + { + "__id__": 388 } ], "_prefab": { - "__id__": 388 + "__id__": 390 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,29 +82,29 @@ "__id__": 3 }, { - "__id__": 9 + "__id__": 11 }, { - "__id__": 15 + "__id__": 17 }, { - "__id__": 362 + "__id__": 364 } ], "_active": true, "_components": [ - { - "__id__": 373 - }, { "__id__": 375 }, { "__id__": 377 + }, + { + "__id__": 379 } ], "_prefab": { - "__id__": 379 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -151,15 +151,18 @@ }, { "__id__": 6 + }, + { + "__id__": 8 } ], "_prefab": { - "__id__": 8 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -937.5140000000001, + "y": -897.9, "z": 0 }, "_lrot": { @@ -200,7 +203,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 458.7 + "height": 319.2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -258,6 +261,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "80NQM8i6lCj7NahY+3Xnn5" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dcnfaWY1hBE5ulPr6V2wc8" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -283,19 +322,19 @@ "_active": true, "_components": [ { - "__id__": 10 + "__id__": 12 }, { - "__id__": 12 + "__id__": 14 } ], "_prefab": { - "__id__": 14 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -492.55899999999997, + "y": -568.345, "z": 0 }, "_lrot": { @@ -327,16 +366,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 9 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 458.7 + "height": 345.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -355,11 +394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 9 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 15 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -417,31 +456,31 @@ }, "_children": [ { - "__id__": 16 + "__id__": 18 }, { - "__id__": 281 + "__id__": 283 } ], "_active": true, "_components": [ - { - "__id__": 355 - }, { "__id__": 357 }, { "__id__": 359 + }, + { + "__id__": 361 } ], "_prefab": { - "__id__": 361 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -79.95000000000005, "z": 0 }, "_lrot": { @@ -473,18 +512,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 15 + "__id__": 17 }, "_children": [ { - "__id__": 17 + "__id__": 19 } ], "_active": true, "_components": [ - { - "__id__": 272 - }, { "__id__": 274 }, @@ -493,15 +529,18 @@ }, { "__id__": 278 + }, + { + "__id__": 280 } ], "_prefab": { - "__id__": 280 + "__id__": 282 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 26.800000000000068, + "y": 120.69999999999993, "z": 0 }, "_lrot": { @@ -533,18 +572,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 18 }, "_children": [ { - "__id__": 18 + "__id__": 20 } ], "_active": true, "_components": [ - { - "__id__": 263 - }, { "__id__": 265 }, @@ -553,10 +589,13 @@ }, { "__id__": 269 + }, + { + "__id__": 271 } ], "_prefab": { - "__id__": 271 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -593,44 +632,44 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 19 }, "_children": [ { - "__id__": 19 + "__id__": 21 }, { - "__id__": 39 + "__id__": 41 }, { - "__id__": 142 + "__id__": 144 }, { - "__id__": 166 + "__id__": 168 }, { - "__id__": 248 + "__id__": 250 } ], "_active": true, "_components": [ - { - "__id__": 256 - }, { "__id__": 258 }, { "__id__": 260 + }, + { + "__id__": 262 } ], "_prefab": { - "__id__": 262 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 955.4000000000001, + "y": 856.8499999999999, "z": 0 }, "_lrot": { @@ -662,32 +701,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 20 }, "_children": [ { - "__id__": 20 + "__id__": 22 } ], "_active": true, "_components": [ - { - "__id__": 32 - }, { "__id__": 34 }, { "__id__": 36 + }, + { + "__id__": 38 } ], "_prefab": { - "__id__": 38 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -462.05, + "y": -391.5, "z": 0 }, "_lrot": { @@ -719,29 +758,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 19 + "__id__": 21 }, "_children": [ { - "__id__": 21 + "__id__": 23 } ], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 29 }, { - "__id__": 29 + "__id__": 31 } ], "_prefab": { - "__id__": 31 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -497.95, + "y": -568.5, "z": 0 }, "_lrot": { @@ -773,25 +812,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 22 }, "_children": [], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 24 }, { - "__id__": 24 + "__id__": 26 } ], "_prefab": { - "__id__": 26 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 208, + "y": 270.30000000000007, "z": 0 }, "_lrot": { @@ -823,16 +862,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1879.6 + "height": 1714.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -851,18 +890,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 23 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 27 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": -187.8, - "_bottom": 228.2, + "_top": -167.5, + "_bottom": 373.1, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -900,11 +939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -928,11 +967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 32 }, "_alignFlags": 41, "_target": null, @@ -977,16 +1016,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 924.1 + "height": 783 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1005,11 +1044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 21 }, "_enabled": false, "__prefab": { - "__id__": 35 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1050,13 +1089,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 39 }, - "_alignFlags": 1, + "_alignFlags": 0, "_target": null, "_left": 0, "_right": 0, @@ -1099,47 +1138,47 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 20 }, "_children": [ { - "__id__": 40 + "__id__": 42 }, { - "__id__": 48 + "__id__": 50 }, { - "__id__": 56 + "__id__": 58 }, { - "__id__": 94 + "__id__": 96 }, { - "__id__": 119 + "__id__": 121 }, { - "__id__": 127 + "__id__": 129 } ], "_active": true, "_components": [ - { - "__id__": 135 - }, { "__id__": 137 }, { "__id__": 139 + }, + { + "__id__": 141 } ], "_prefab": { - "__id__": 141 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1161.5, + "y": -1020.4, "z": 0 }, "_lrot": { @@ -1171,23 +1210,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 41 - }, { "__id__": 43 }, { "__id__": 45 + }, + { + "__id__": 47 } ], "_prefab": { - "__id__": 47 + "__id__": 49 }, "_lpos": { "__type__": "cc.Vec3", @@ -1224,11 +1263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -1252,11 +1291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 46 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1266,7 +1305,7 @@ "r": 255, "g": 255, "b": 255, - "a": 255 + "a": 151 }, "_spriteFrame": { "__uuid__": "b645e1bb-4f9f-49aa-a27f-603fcd4387b4@f9941", @@ -1297,11 +1336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 48 }, "_alignFlags": 45, "_target": null, @@ -1336,8 +1375,6 @@ "__id__": 0 }, "fileId": "30Y/ksyBxMHaP3nhLfx2yw", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1346,23 +1383,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 49 - }, { "__id__": 51 }, { "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 55 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -1399,11 +1436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1427,11 +1464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1495,11 +1532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_alignFlags": 8, "_target": null, @@ -1544,39 +1581,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [ { - "__id__": 57 + "__id__": 59 }, { - "__id__": 63 + "__id__": 65 }, { - "__id__": 69 + "__id__": 71 }, { - "__id__": 75 + "__id__": 77 }, { - "__id__": 81 + "__id__": 83 } ], "_active": true, "_components": [ - { - "__id__": 87 - }, { "__id__": 89 }, { "__id__": 91 + }, + { + "__id__": 93 } ], "_prefab": { - "__id__": 93 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -1613,20 +1650,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 60 }, { - "__id__": 60 + "__id__": 62 } ], "_prefab": { - "__id__": 62 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1663,11 +1700,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1691,11 +1728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1749,20 +1786,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 66 }, { - "__id__": 66 + "__id__": 68 } ], "_prefab": { - "__id__": 68 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1799,11 +1836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -1827,11 +1864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1885,20 +1922,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 72 }, { - "__id__": 72 + "__id__": 74 } ], "_prefab": { - "__id__": 74 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1935,11 +1972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1963,11 +2000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2021,20 +2058,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 78 }, { - "__id__": 78 + "__id__": 80 } ], "_prefab": { - "__id__": 80 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -2071,11 +2108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", @@ -2099,11 +2136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2157,20 +2194,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 56 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 84 }, { - "__id__": 84 + "__id__": 86 } ], "_prefab": { - "__id__": 86 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", @@ -2207,11 +2244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -2235,11 +2272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2293,11 +2330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 90 }, "_contentSize": { "__type__": "cc.Size", @@ -2321,11 +2358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 92 }, "_alignFlags": 17, "_target": null, @@ -2357,11 +2394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 94 }, "_resizeMode": 1, "_layoutType": 1, @@ -2408,21 +2445,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [ { - "__id__": 95 + "__id__": 97 }, { - "__id__": 103 + "__id__": 105 } ], "_active": true, "_components": [ - { - "__id__": 109 - }, { "__id__": 111 }, @@ -2430,11 +2464,14 @@ "__id__": 113 }, { - "__id__": 116 + "__id__": 115 + }, + { + "__id__": 118 } ], "_prefab": { - "__id__": 118 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -2471,23 +2508,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 94 + "__id__": 96 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 96 - }, { "__id__": 98 }, { "__id__": 100 + }, + { + "__id__": 102 } ], "_prefab": { - "__id__": 102 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2524,11 +2561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2552,11 +2589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2597,11 +2634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 103 }, "_alignFlags": 8, "_target": null, @@ -2646,20 +2683,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 94 + "__id__": 96 }, "_children": [], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 106 }, { - "__id__": 106 + "__id__": 108 } ], "_prefab": { - "__id__": 108 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -2696,11 +2733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2724,11 +2761,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 109 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2808,11 +2845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -2836,11 +2873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2881,15 +2918,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 116 }, "clickEvents": [ { - "__id__": 115 + "__id__": 117 } ], "_interactable": true, @@ -2929,7 +2966,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 94 + "__id__": 96 }, "_id": "" }, @@ -2953,11 +2990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 119 }, "_alignFlags": 42, "_target": null, @@ -3002,23 +3039,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 120 - }, { "__id__": 122 }, { "__id__": 124 + }, + { + "__id__": 126 } ], "_prefab": { - "__id__": 126 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -3055,11 +3092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 123 }, "_contentSize": { "__type__": "cc.Size", @@ -3083,11 +3120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 125 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3151,11 +3188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 121 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 127 }, "_alignFlags": 9, "_target": null, @@ -3200,23 +3237,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 128 - }, { "__id__": 130 }, { "__id__": 132 + }, + { + "__id__": 134 } ], "_prefab": { - "__id__": 134 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -3253,11 +3290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -3281,11 +3318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3349,11 +3386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 135 }, "_alignFlags": 33, "_target": null, @@ -3398,11 +3435,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -3426,11 +3463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 41 }, "_enabled": false, "__prefab": { - "__id__": 138 + "__id__": 140 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3471,17 +3508,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 142 }, "_alignFlags": 41, "_target": null, "_left": 25.5, "_right": 25.5, - "_top": 937, + "_top": 795.9, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3520,35 +3557,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 20 }, "_children": [ { - "__id__": 143 + "__id__": 145 }, { - "__id__": 151 + "__id__": 153 } ], "_active": true, "_components": [ - { - "__id__": 159 - }, { "__id__": 161 }, { "__id__": 163 + }, + { + "__id__": 165 } ], "_prefab": { - "__id__": 165 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1565.4, + "y": -1384.5500000000002, "z": 0 }, "_lrot": { @@ -3580,23 +3617,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 144 - }, { "__id__": 146 }, { "__id__": 148 + }, + { + "__id__": 150 } ], "_prefab": { - "__id__": 150 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3633,16 +3670,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", "width": 1030, - "height": 333 + "height": 253.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3661,11 +3698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3706,11 +3743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 151 }, "_alignFlags": 45, "_target": null, @@ -3755,23 +3792,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 152 - }, { "__id__": 154 }, { "__id__": 156 + }, + { + "__id__": 158 } ], "_prefab": { - "__id__": 158 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -3808,16 +3845,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", "width": 970, - "height": 273 + "height": 193.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3836,11 +3873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3855,7 +3892,7 @@ "_string": "mature American black female,successful entrepreneur , curvy hourglass figure with full buttocks and tight curves, full D-cup chest, dark brown long wavy hair, deep brown eyes exuding fiery charm, dark cocoa glowing skin, elegant and confident facial features, wearing slim-fit elegant dress, jewelry,", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 39, + "_actualFontSize": 33, "_fontSize": 38, "_fontFamily": "NotoSans-Regular", "_lineHeight": 44, @@ -3907,11 +3944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 159 }, "_alignFlags": 45, "_target": null, @@ -3956,16 +3993,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", "width": 1030, - "height": 333 + "height": 253.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3984,11 +4021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": false, "__prefab": { - "__id__": 162 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4029,17 +4066,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 166 }, "_alignFlags": 41, "_target": null, "_left": 25, "_right": 25, - "_top": 1398.9, + "_top": 1257.8000000000002, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -4078,38 +4115,38 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 20 }, "_children": [ { - "__id__": 167 + "__id__": 169 }, { - "__id__": 173 + "__id__": 175 }, { - "__id__": 207 + "__id__": 209 } ], "_active": true, "_components": [ - { - "__id__": 241 - }, { "__id__": 243 }, { "__id__": 245 + }, + { + "__id__": 247 } ], "_prefab": { - "__id__": 247 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1807.45, + "y": -1586.8500000000001, "z": 0 }, "_lrot": { @@ -4141,20 +4178,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 170 }, { - "__id__": 170 + "__id__": 172 } ], "_prefab": { - "__id__": 172 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -4191,11 +4228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -4219,11 +4256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4277,21 +4314,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 168 }, "_children": [ { - "__id__": 174 + "__id__": 176 }, { - "__id__": 186 + "__id__": 188 } ], "_active": true, "_components": [ - { - "__id__": 198 - }, { "__id__": 200 }, @@ -4300,10 +4334,13 @@ }, { "__id__": 204 + }, + { + "__id__": 206 } ], "_prefab": { - "__id__": 206 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -4340,24 +4377,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 175 }, "_children": [ { - "__id__": 175 + "__id__": 177 } ], "_active": true, "_components": [ { - "__id__": 181 + "__id__": 183 }, { - "__id__": 183 + "__id__": 185 } ], "_prefab": { - "__id__": 185 + "__id__": 187 }, "_lpos": { "__type__": "cc.Vec3", @@ -4394,20 +4431,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 174 + "__id__": 176 }, "_children": [], "_active": true, "_components": [ { - "__id__": 176 + "__id__": 178 }, { - "__id__": 178 + "__id__": 180 } ], "_prefab": { - "__id__": 180 + "__id__": 182 }, "_lpos": { "__type__": "cc.Vec3", @@ -4444,11 +4481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", @@ -4472,11 +4509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 175 + "__id__": 177 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 181 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4530,11 +4567,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 176 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", @@ -4558,11 +4595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 176 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 186 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4616,24 +4653,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 175 }, "_children": [ { - "__id__": 187 + "__id__": 189 } ], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 195 }, { - "__id__": 195 + "__id__": 197 } ], "_prefab": { - "__id__": 197 + "__id__": 199 }, "_lpos": { "__type__": "cc.Vec3", @@ -4670,20 +4707,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 190 }, { - "__id__": 190 + "__id__": 192 } ], "_prefab": { - "__id__": 192 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -4720,11 +4757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -4748,11 +4785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4806,11 +4843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 196 }, "_contentSize": { "__type__": "cc.Size", @@ -4834,11 +4871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4892,11 +4929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4920,11 +4957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 203 }, "_alignFlags": 5, "_target": null, @@ -4956,17 +4993,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 205 }, "selectedSprite": { - "__id__": 195 + "__id__": 197 }, "unSelectedSprite": { - "__id__": 183 + "__id__": 185 }, "_id": "" }, @@ -4980,11 +5017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 207 }, "clickEvents": [], "_interactable": true, @@ -5049,21 +5086,18 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 168 }, "_children": [ { - "__id__": 208 + "__id__": 210 }, { - "__id__": 220 + "__id__": 222 } ], "_active": true, "_components": [ - { - "__id__": 232 - }, { "__id__": 234 }, @@ -5072,10 +5106,13 @@ }, { "__id__": 238 + }, + { + "__id__": 240 } ], "_prefab": { - "__id__": 240 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -5112,24 +5149,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 209 }, "_children": [ { - "__id__": 209 + "__id__": 211 } ], "_active": true, "_components": [ { - "__id__": 215 + "__id__": 217 }, { - "__id__": 217 + "__id__": 219 } ], "_prefab": { - "__id__": 219 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -5166,20 +5203,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 210 }, "_children": [], "_active": true, "_components": [ { - "__id__": 210 + "__id__": 212 }, { - "__id__": 212 + "__id__": 214 } ], "_prefab": { - "__id__": 214 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -5216,11 +5253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5244,11 +5281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5302,11 +5339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -5330,11 +5367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5388,24 +5425,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 207 + "__id__": 209 }, "_children": [ { - "__id__": 221 + "__id__": 223 } ], "_active": false, "_components": [ { - "__id__": 227 + "__id__": 229 }, { - "__id__": 229 + "__id__": 231 } ], "_prefab": { - "__id__": 231 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -5442,20 +5479,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 220 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 222 + "__id__": 224 }, { - "__id__": 224 + "__id__": 226 } ], "_prefab": { - "__id__": 226 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -5492,11 +5529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -5520,11 +5557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5578,11 +5615,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -5606,11 +5643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5664,11 +5701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5692,11 +5729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 237 }, "_alignFlags": 5, "_target": null, @@ -5728,17 +5765,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 239 }, "selectedSprite": { - "__id__": 229 + "__id__": 231 }, "unSelectedSprite": { - "__id__": 217 + "__id__": 219 }, "_id": "" }, @@ -5752,11 +5789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 241 }, "clickEvents": [], "_interactable": true, @@ -5821,11 +5858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -5849,11 +5886,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 246 }, "_alignFlags": 40, "_target": null, @@ -5885,11 +5922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 248 }, "_id": "" }, @@ -5916,28 +5953,28 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 20 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 249 - }, { "__id__": 251 }, { "__id__": 253 + }, + { + "__id__": 255 } ], "_prefab": { - "__id__": 255 + "__id__": 257 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1883.0000000000002, + "y": -1662.4000000000003, "z": 0 }, "_lrot": { @@ -5969,11 +6006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -5997,11 +6034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 254 }, "_resizeMode": 1, "_layoutType": 3, @@ -6035,11 +6072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 256 }, "_alignFlags": 40, "_target": null, @@ -6084,16 +6121,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1882.9999999999998 + "height": 1662.3999999999999 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6112,11 +6149,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 261 }, "_alignFlags": 41, "_target": null, @@ -6148,11 +6185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 263 }, "_resizeMode": 1, "_layoutType": 2, @@ -6199,16 +6236,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1910.8000000000002 + "height": 1713.6999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6227,11 +6264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 268 }, "_type": 0, "_inverted": false, @@ -6249,11 +6286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6295,11 +6332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_alignFlags": 45, "_target": null, @@ -6344,16 +6381,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1910.8000000000002 + "height": 1713.6999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6372,11 +6409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 18 }, "_enabled": false, "__prefab": { - "__id__": 275 + "__id__": 277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6417,11 +6454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 279 }, "bounceDuration": 0.23, "brake": 0.75, @@ -6432,7 +6469,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 18 + "__id__": 20 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -6448,17 +6485,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 18 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 281 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 187.8, + "_top": 0, "_bottom": 241.4, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6487,8 +6524,6 @@ "__id__": 0 }, "fileId": "4cPLdPNYtIyKxjZXbpFSuo", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6497,30 +6532,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 15 + "__id__": 17 }, "_children": [ { - "__id__": 282 + "__id__": 284 }, { - "__id__": 288 + "__id__": 290 }, { - "__id__": 312 + "__id__": 314 }, { - "__id__": 318 + "__id__": 320 }, { - "__id__": 324 + "__id__": 326 } ], "_active": true, "_components": [ - { - "__id__": 344 - }, { "__id__": 346 }, @@ -6532,10 +6564,13 @@ }, { "__id__": 352 + }, + { + "__id__": 354 } ], "_prefab": { - "__id__": 354 + "__id__": 356 }, "_lpos": { "__type__": "cc.Vec3", @@ -6572,20 +6607,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 283 }, "_children": [], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 285 }, { - "__id__": 285 + "__id__": 287 } ], "_prefab": { - "__id__": 287 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", @@ -6622,11 +6657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 286 }, "_contentSize": { "__type__": "cc.Size", @@ -6650,11 +6685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 282 + "__id__": 284 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 288 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6708,30 +6743,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 283 }, "_children": [ { - "__id__": 289 + "__id__": 291 }, { - "__id__": 297 + "__id__": 299 } ], "_active": true, "_components": [ - { - "__id__": 305 - }, { "__id__": 307 }, { "__id__": 309 + }, + { + "__id__": 311 } ], "_prefab": { - "__id__": 311 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -6768,23 +6803,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 290 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 290 - }, { "__id__": 292 }, { "__id__": 294 + }, + { + "__id__": 296 } ], "_prefab": { - "__id__": 296 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", @@ -6821,11 +6856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 293 }, "_contentSize": { "__type__": "cc.Size", @@ -6849,11 +6884,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 295 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6894,11 +6929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 297 }, "_alignFlags": 45, "_target": null, @@ -6943,23 +6978,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 290 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 298 - }, { "__id__": 300 }, { "__id__": 302 + }, + { + "__id__": 304 } ], "_prefab": { - "__id__": 304 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -6996,11 +7031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", @@ -7024,11 +7059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7069,11 +7104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 297 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 305 }, "playOnLoad": true, "_clips": [ @@ -7111,11 +7146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -7139,11 +7174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 310 }, "_alignFlags": 45, "_target": null, @@ -7175,14 +7210,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 290 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 312 }, "animation": { - "__id__": 302 + "__id__": 304 }, "_id": "" }, @@ -7209,20 +7244,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 283 }, "_children": [], "_active": true, "_components": [ { - "__id__": 313 + "__id__": 315 }, { - "__id__": 315 + "__id__": 317 } ], "_prefab": { - "__id__": 317 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -7259,11 +7294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -7287,11 +7322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7345,20 +7380,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 283 }, "_children": [], "_active": true, "_components": [ { - "__id__": 319 + "__id__": 321 }, { - "__id__": 321 + "__id__": 323 } ], "_prefab": { - "__id__": 323 + "__id__": 325 }, "_lpos": { "__type__": "cc.Vec3", @@ -7395,11 +7430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -7423,11 +7458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 324 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7481,30 +7516,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 281 + "__id__": 283 }, "_children": [ { - "__id__": 325 + "__id__": 327 }, { - "__id__": 331 + "__id__": 333 } ], "_active": true, "_components": [ - { - "__id__": 337 - }, { "__id__": 339 }, { "__id__": 341 + }, + { + "__id__": 343 } ], "_prefab": { - "__id__": 343 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -7541,20 +7576,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 328 }, { - "__id__": 328 + "__id__": 330 } ], "_prefab": { - "__id__": 330 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -7591,11 +7626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -7619,11 +7654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 331 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7700,20 +7735,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 332 + "__id__": 334 }, { - "__id__": 334 + "__id__": 336 } ], "_prefab": { - "__id__": 336 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -7750,11 +7785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -7778,11 +7813,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 333 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 337 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7836,11 +7871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 340 }, "_contentSize": { "__type__": "cc.Size", @@ -7864,11 +7899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 342 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7909,11 +7944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 344 }, "_alignFlags": 9, "_target": null, @@ -7958,11 +7993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -7986,11 +8021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 349 }, "clickEvents": [], "_interactable": true, @@ -8030,7 +8065,7 @@ "_duration": 0.1, "_zoomScale": 0.95, "_target": { - "__id__": 281 + "__id__": 283 }, "_id": "" }, @@ -8044,29 +8079,29 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 351 }, "img": { - "__id__": 285 + "__id__": 287 }, "question": { - "__id__": 312 + "__id__": 314 }, "video": { - "__id__": 321 + "__id__": 323 }, "priceFrame": { - "__id__": 324 + "__id__": 326 }, "videoPrice": { - "__id__": 328 + "__id__": 330 }, "loading": { - "__id__": 288 + "__id__": 290 }, "_id": "" }, @@ -8080,11 +8115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 353 }, "_type": 0, "_inverted": false, @@ -8102,11 +8137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 281 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 355 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8161,16 +8196,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 15 + "__id__": 17 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 358 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 1955.1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8189,11 +8224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 15 + "__id__": 17 }, "_enabled": false, "__prefab": { - "__id__": 358 + "__id__": 360 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8234,18 +8269,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 15 + "__id__": 17 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 362 }, - "_alignFlags": 40, + "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 0, - "_bottom": 770, + "_top": 159.9, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8255,9 +8290,9 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 100, - "_originalHeight": 800, + "_originalHeight": 2340, "_alignMode": 2, - "_lockFlags": 41, + "_lockFlags": 40, "_id": "" }, { @@ -8288,9 +8323,6 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 363 - }, { "__id__": 365 }, @@ -8298,16 +8330,19 @@ "__id__": 367 }, { - "__id__": 370 + "__id__": 369 + }, + { + "__id__": 372 } ], "_prefab": { - "__id__": 372 + "__id__": 374 }, "_lpos": { "__type__": "cc.Vec3", - "x": -515.502, - "y": 1083.3319999999999, + "x": -490, + "y": 1007.5, "z": 0 }, "_lrot": { @@ -8339,11 +8374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 364 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 366 }, "_contentSize": { "__type__": "cc.Size", @@ -8367,11 +8402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 364 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 368 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8412,15 +8447,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 364 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 370 }, "clickEvents": [ { - "__id__": 369 + "__id__": 371 } ], "_interactable": true, @@ -8460,7 +8495,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 362 + "__id__": 364 }, "_id": "" }, @@ -8484,17 +8519,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 364 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 373 }, "_alignFlags": 9, "_target": null, - "_left": 24.498000000000047, + "_left": 50, "_right": 0, - "_top": 86.66800000000012, + "_top": 50, "_bottom": 30, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -8537,12 +8572,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8565,7 +8600,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 376 + "__id__": 378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8607,7 +8642,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 380 }, "_alignFlags": 45, "_target": null, @@ -8656,12 +8691,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8684,7 +8719,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 385 }, "_alignFlags": 45, "_target": null, @@ -8720,7 +8755,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 387 }, "_id": "" }, @@ -8738,44 +8773,44 @@ }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 389 }, "m_rootNode": null, "videoArea": { - "__id__": 22 + "__id__": 24 }, "girlName": { - "__id__": 51 + "__id__": 53 }, "imgToggle": { - "__id__": 202 + "__id__": 204 }, "videoToggle": { - "__id__": 236 + "__id__": 238 }, "starParent": { - "__id__": 56 + "__id__": 58 }, "tags": { - "__id__": 122 + "__id__": 124 }, "descAge": { - "__id__": 130 + "__id__": 132 }, "desc": { - "__id__": 154 + "__id__": 156 }, "chatBtn": { - "__id__": 94 + "__id__": 96 }, "descContent": { - "__id__": 15 + "__id__": 17 }, "imgItemInst": { - "__id__": 348 + "__id__": 350 }, "imgsLayout": { - "__id__": 248 + "__id__": 250 }, "_id": "" }, @@ -8792,7 +8827,6 @@ "__id__": 0 }, "fileId": "24mSBg+Z9OS5KNS5Yscqr0", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/GirlListPanel.prefab b/assets/bundles/Chat18x/GirlListPanel.prefab index 7fc1ed41..8f0282b4 100644 --- a/assets/bundles/Chat18x/GirlListPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPanel.prefab @@ -163,7 +163,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -125, + "y": -73.70000000000005, "z": 0 }, "_lrot": { @@ -661,8 +661,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.82, - "y": 0.82, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -689,8 +689,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 491, - "height": 350 + "width": 392.8, + "height": 280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1403,6 +1403,8 @@ "__id__": 0 }, "fileId": "84tq+XsAhMD7Pf5ZzCDcs4", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4200,7 +4202,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 836.9090000000001, "z": 0 }, "_lrot": { @@ -4241,7 +4243,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": -50 + "height": -30 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4279,7 +4281,7 @@ "_paddingTop": 0, "_paddingBottom": 0, "_spacingX": 0, - "_spacingY": 50, + "_spacingY": 30, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, @@ -4356,7 +4358,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1834.4 + "height": 1712 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4501,7 +4503,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1834.4 + "height": 1712 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4654,7 +4656,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2090 + "height": 1967.6 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4683,7 +4685,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 250, + "_top": 147.4, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -4818,7 +4820,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 996, + "y": 982.5, "z": 0 }, "_lrot": { @@ -5500,7 +5502,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 99, + "_top": 0, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -5513,7 +5515,7 @@ "_originalWidth": 100, "_originalHeight": 0, "_alignMode": 2, - "_lockFlags": 1, + "_lockFlags": 0, "_id": "" }, { @@ -5548,7 +5550,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5670,7 +5672,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index c9ea7135..6ac440cd 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -302,7 +302,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -690.788, + "y": -526.722, "z": 0 }, "_lrot": { @@ -866,7 +866,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 164.06600000000003, "z": 0 }, "_lrot": { @@ -3745,7 +3745,6 @@ "__id__": 0 }, "fileId": "a56vp8DEdDloy+JjDTTm7J", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/PersonalPanel.prefab b/assets/bundles/Chat18x/PersonalPanel.prefab index d407c776..08f465d3 100644 --- a/assets/bundles/Chat18x/PersonalPanel.prefab +++ b/assets/bundles/Chat18x/PersonalPanel.prefab @@ -22,17 +22,14 @@ "__id__": 2 }, { - "__id__": 10 + "__id__": 12 }, { - "__id__": 70 + "__id__": 72 } ], "_active": true, "_components": [ - { - "__id__": 384 - }, { "__id__": 386 }, @@ -41,10 +38,13 @@ }, { "__id__": 390 + }, + { + "__id__": 392 } ], "_prefab": { - "__id__": 392 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -94,15 +94,18 @@ }, { "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 9 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", - "x": 419.24300000000005, - "y": 982.9560000000001, + "x": 423.24300000000005, + "y": 946.854, "z": 0 }, "_lrot": { @@ -257,6 +260,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "02bsk9JJpEv7mPE5QdWm1H" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_alignFlags": 33, + "_target": null, + "_left": 0, + "_right": 81.75699999999995, + "_top": 76.64599999999996, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d6/9UvXchAS7ybZGtx0Ch9" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -280,31 +319,31 @@ }, "_children": [ { - "__id__": 11 + "__id__": 13 }, { - "__id__": 43 + "__id__": 45 }, { - "__id__": 59 + "__id__": 61 } ], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 67 }, { - "__id__": 67 + "__id__": 69 } ], "_prefab": { - "__id__": 69 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 881.25, + "y": 824, "z": 0 }, "_lrot": { @@ -336,30 +375,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 12 }, "_children": [ { - "__id__": 12 + "__id__": 14 }, { - "__id__": 26 + "__id__": 28 }, { - "__id__": 32 + "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 40 }, { - "__id__": 40 + "__id__": 42 } ], "_prefab": { - "__id__": 42 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -396,27 +435,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 13 }, "_children": [ { - "__id__": 13 + "__id__": 15 } ], "_active": true, "_components": [ - { - "__id__": 19 - }, { "__id__": 21 }, { "__id__": 23 + }, + { + "__id__": 25 } ], "_prefab": { - "__id__": 25 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -453,20 +492,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 14 }, "_children": [], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 16 }, { - "__id__": 16 + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -503,11 +542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -531,11 +570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -589,11 +628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -617,11 +656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 24 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -662,11 +701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 26 }, "_type": 3, "_inverted": false, @@ -697,20 +736,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 13 }, "_children": [], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 29 }, { - "__id__": 29 + "__id__": 31 } ], "_prefab": { - "__id__": 31 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -747,11 +786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -775,11 +814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -833,20 +872,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 11 + "__id__": 13 }, "_children": [], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 35 }, { - "__id__": 35 + "__id__": 37 } ], "_prefab": { - "__id__": 37 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", @@ -883,11 +922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", @@ -911,11 +950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 38 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -969,11 +1008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 41 }, "_contentSize": { "__type__": "cc.Size", @@ -997,11 +1036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 43 }, "_alignFlags": 40, "_target": null, @@ -1046,24 +1085,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 12 }, "_children": [ { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 56 }, { - "__id__": 56 + "__id__": 58 } ], "_prefab": { - "__id__": 58 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -1100,14 +1139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 43 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 45 - }, { "__id__": 47 }, @@ -1116,10 +1152,13 @@ }, { "__id__": 51 + }, + { + "__id__": 53 } ], "_prefab": { - "__id__": 53 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -1156,11 +1195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1184,11 +1223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 50 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1229,11 +1268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 52 }, "_alignFlags": 32, "_target": null, @@ -1265,11 +1304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 54 }, "clickEvents": [], "_interactable": true, @@ -1334,11 +1373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1362,11 +1401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1443,20 +1482,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 60 + "__id__": 62 }, { - "__id__": 62 + "__id__": 64 } ], "_prefab": { - "__id__": 64 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -1493,11 +1532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1521,11 +1560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1602,16 +1641,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 577.5 + "height": 467 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1630,11 +1669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 70 }, "_alignFlags": 41, "_target": null, @@ -1669,8 +1708,6 @@ "__id__": 0 }, "fileId": "cb8+iIEeFIc44IlD6dsgZl", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1683,14 +1720,11 @@ }, "_children": [ { - "__id__": 71 + "__id__": 73 } ], "_active": true, "_components": [ - { - "__id__": 375 - }, { "__id__": 377 }, @@ -1699,15 +1733,18 @@ }, { "__id__": 381 + }, + { + "__id__": 383 } ], "_prefab": { - "__id__": 383 + "__id__": 385 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -264.95000000000005, + "y": -238.25, "z": 0 }, "_lrot": { @@ -1739,18 +1776,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 72 }, "_children": [ { - "__id__": 72 + "__id__": 74 } ], "_active": true, "_components": [ - { - "__id__": 366 - }, { "__id__": 368 }, @@ -1759,10 +1793,13 @@ }, { "__id__": 372 + }, + { + "__id__": 374 } ], "_prefab": { - "__id__": 374 + "__id__": 376 }, "_lpos": { "__type__": "cc.Vec3", @@ -1799,30 +1836,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 73 }, "_children": [ { - "__id__": 73 + "__id__": 75 }, { - "__id__": 131 + "__id__": 133 }, { - "__id__": 187 + "__id__": 189 } ], "_active": true, "_components": [ { - "__id__": 361 + "__id__": 363 }, { - "__id__": 363 + "__id__": 365 } ], "_prefab": { - "__id__": 365 + "__id__": 367 }, "_lpos": { "__type__": "cc.Vec3", @@ -1859,24 +1896,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 74 }, "_children": [ { - "__id__": 74 + "__id__": 76 } ], "_active": true, "_components": [ { - "__id__": 126 + "__id__": 128 }, { - "__id__": 128 + "__id__": 130 } ], "_prefab": { - "__id__": 130 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", @@ -1913,36 +1950,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 73 + "__id__": 75 }, "_children": [ { - "__id__": 75 + "__id__": 77 }, { - "__id__": 81 + "__id__": 83 }, { - "__id__": 87 + "__id__": 89 }, { - "__id__": 103 + "__id__": 105 } ], "_active": true, "_components": [ - { - "__id__": 119 - }, { "__id__": 121 }, { "__id__": 123 + }, + { + "__id__": 125 } ], "_prefab": { - "__id__": 125 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -1979,20 +2016,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 78 }, { - "__id__": 78 + "__id__": 80 } ], "_prefab": { - "__id__": 80 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -2029,11 +2066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", @@ -2057,11 +2094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2115,20 +2152,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 84 }, { - "__id__": 84 + "__id__": 86 } ], "_prefab": { - "__id__": 86 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", @@ -2165,11 +2202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -2193,11 +2230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2274,24 +2311,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [ { - "__id__": 88 + "__id__": 90 }, { - "__id__": 94 + "__id__": 96 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 102 } ], "_prefab": { - "__id__": 102 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2328,20 +2365,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 89 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 91 }, { - "__id__": 91 + "__id__": 93 } ], "_prefab": { - "__id__": 93 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -2378,11 +2415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2406,11 +2443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2487,20 +2524,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 87 + "__id__": 89 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 97 }, { - "__id__": 97 + "__id__": 99 } ], "_prefab": { - "__id__": 99 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -2537,11 +2574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -2565,11 +2602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2623,11 +2660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -2664,24 +2701,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [ { - "__id__": 104 + "__id__": 106 }, { - "__id__": 110 + "__id__": 112 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 118 } ], "_prefab": { - "__id__": 118 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -2718,20 +2755,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 107 }, { - "__id__": 107 + "__id__": 109 } ], "_prefab": { - "__id__": 109 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -2768,11 +2805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -2796,11 +2833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2877,20 +2914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 113 }, { - "__id__": 113 + "__id__": 115 } ], "_prefab": { - "__id__": 115 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -2927,11 +2964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -2955,11 +2992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3013,11 +3050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -3054,11 +3091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -3082,11 +3119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 124 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3127,11 +3164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 126 }, "clickEvents": [], "_interactable": true, @@ -3196,11 +3233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 129 }, "_contentSize": { "__type__": "cc.Size", @@ -3224,11 +3261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 131 }, "_alignFlags": 40, "_target": null, @@ -3273,24 +3310,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 74 }, "_children": [ { - "__id__": 132 + "__id__": 134 } ], "_active": false, "_components": [ { - "__id__": 182 + "__id__": 184 }, { - "__id__": 184 + "__id__": 186 } ], "_prefab": { - "__id__": 186 + "__id__": 188 }, "_lpos": { "__type__": "cc.Vec3", @@ -3327,33 +3364,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 133 }, "_children": [ { - "__id__": 133 + "__id__": 135 }, { - "__id__": 151 + "__id__": 153 }, { - "__id__": 169 + "__id__": 171 } ], "_active": true, "_components": [ - { - "__id__": 175 - }, { "__id__": 177 }, { "__id__": 179 + }, + { + "__id__": 181 } ], "_prefab": { - "__id__": 181 + "__id__": 183 }, "_lpos": { "__type__": "cc.Vec3", @@ -3390,27 +3427,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [ { - "__id__": 134 + "__id__": 136 }, { - "__id__": 140 + "__id__": 142 } ], "_active": true, "_components": [ { - "__id__": 146 + "__id__": 148 }, { - "__id__": 148 + "__id__": 150 } ], "_prefab": { - "__id__": 150 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3447,20 +3484,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 133 + "__id__": 135 }, "_children": [], "_active": true, "_components": [ { - "__id__": 135 + "__id__": 137 }, { - "__id__": 137 + "__id__": 139 } ], "_prefab": { - "__id__": 139 + "__id__": 141 }, "_lpos": { "__type__": "cc.Vec3", @@ -3497,11 +3534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -3525,11 +3562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 140 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3606,20 +3643,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 133 + "__id__": 135 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 143 }, { - "__id__": 143 + "__id__": 145 } ], "_prefab": { - "__id__": 145 + "__id__": 147 }, "_lpos": { "__type__": "cc.Vec3", @@ -3656,11 +3693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 144 }, "_contentSize": { "__type__": "cc.Size", @@ -3684,11 +3721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 146 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3765,11 +3802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -3793,11 +3830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3851,27 +3888,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [ { - "__id__": 152 + "__id__": 154 }, { - "__id__": 158 + "__id__": 160 } ], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 166 }, { - "__id__": 166 + "__id__": 168 } ], "_prefab": { - "__id__": 168 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -3908,20 +3945,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 151 + "__id__": 153 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 155 }, { - "__id__": 155 + "__id__": 157 } ], "_prefab": { - "__id__": 157 + "__id__": 159 }, "_lpos": { "__type__": "cc.Vec3", @@ -3958,11 +3995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 156 }, "_contentSize": { "__type__": "cc.Size", @@ -3986,11 +4023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 158 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4044,20 +4081,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 151 + "__id__": 153 }, "_children": [], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 161 }, { - "__id__": 161 + "__id__": 163 } ], "_prefab": { - "__id__": 163 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -4094,11 +4131,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -4122,11 +4159,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4206,11 +4243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 165 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", @@ -4234,11 +4271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4292,20 +4329,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 132 + "__id__": 134 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 172 }, { - "__id__": 172 + "__id__": 174 } ], "_prefab": { - "__id__": 174 + "__id__": 176 }, "_lpos": { "__type__": "cc.Vec3", @@ -4342,11 +4379,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4370,11 +4407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4451,11 +4488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 178 }, "_contentSize": { "__type__": "cc.Size", @@ -4479,11 +4516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 180 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4524,11 +4561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 182 }, "clickEvents": [], "_interactable": true, @@ -4593,11 +4630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 185 }, "_contentSize": { "__type__": "cc.Size", @@ -4621,11 +4658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 187 }, "_alignFlags": 40, "_target": null, @@ -4670,27 +4707,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 74 }, "_children": [ { - "__id__": 188 + "__id__": 190 }, { - "__id__": 204 + "__id__": 206 } ], "_active": true, "_components": [ { - "__id__": 356 + "__id__": 358 }, { - "__id__": 358 + "__id__": 360 } ], "_prefab": { - "__id__": 360 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -4727,27 +4764,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 187 + "__id__": 189 }, "_children": [ { - "__id__": 189 + "__id__": 191 } ], "_active": true, "_components": [ - { - "__id__": 197 - }, { "__id__": 199 }, { "__id__": 201 + }, + { + "__id__": 203 } ], "_prefab": { - "__id__": 203 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -4784,23 +4821,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 188 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 190 - }, { "__id__": 192 }, { "__id__": 194 + }, + { + "__id__": 196 } ], "_prefab": { - "__id__": 196 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -4837,11 +4874,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -4865,11 +4902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4936,11 +4973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 197 }, "_alignFlags": 1, "_target": null, @@ -4985,11 +5022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -5013,11 +5050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5058,11 +5095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 204 }, "_alignFlags": 5, "_target": null, @@ -5107,42 +5144,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 187 + "__id__": 189 }, "_children": [ { - "__id__": 205 + "__id__": 207 }, { - "__id__": 229 + "__id__": 231 }, { - "__id__": 253 + "__id__": 255 }, { - "__id__": 277 + "__id__": 279 }, { - "__id__": 301 + "__id__": 303 }, { - "__id__": 325 + "__id__": 327 } ], "_active": true, "_components": [ - { - "__id__": 349 - }, { "__id__": 351 }, { "__id__": 353 + }, + { + "__id__": 355 } ], "_prefab": { - "__id__": 355 + "__id__": 357 }, "_lpos": { "__type__": "cc.Vec3", @@ -5179,27 +5216,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 206 + "__id__": 208 }, { - "__id__": 218 + "__id__": 220 } ], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 226 }, { - "__id__": 226 + "__id__": 228 } ], "_prefab": { - "__id__": 228 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -5236,24 +5273,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 207 }, "_children": [ { - "__id__": 207 + "__id__": 209 } ], "_active": true, "_components": [ { - "__id__": 213 + "__id__": 215 }, { - "__id__": 215 + "__id__": 217 } ], "_prefab": { - "__id__": 217 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -5290,20 +5327,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 206 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 210 }, { - "__id__": 210 + "__id__": 212 } ], "_prefab": { - "__id__": 212 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -5340,11 +5377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -5368,11 +5405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5426,11 +5463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 216 }, "_contentSize": { "__type__": "cc.Size", @@ -5454,11 +5491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 206 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5512,20 +5549,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 205 + "__id__": 207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 221 }, { - "__id__": 221 + "__id__": 223 } ], "_prefab": { - "__id__": 223 + "__id__": 225 }, "_lpos": { "__type__": "cc.Vec3", @@ -5562,11 +5599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 222 }, "_contentSize": { "__type__": "cc.Size", @@ -5590,11 +5627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 218 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5674,11 +5711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -5702,11 +5739,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 205 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 229 }, "clickEvents": [], "_interactable": true, @@ -5771,27 +5808,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 230 + "__id__": 232 }, { - "__id__": 242 + "__id__": 244 } ], "_active": false, "_components": [ { - "__id__": 248 + "__id__": 250 }, { - "__id__": 250 + "__id__": 252 } ], "_prefab": { - "__id__": 252 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -5828,24 +5865,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 229 + "__id__": 231 }, "_children": [ { - "__id__": 231 + "__id__": 233 } ], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 239 }, { - "__id__": 239 + "__id__": 241 } ], "_prefab": { - "__id__": 241 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -5882,20 +5919,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 230 + "__id__": 232 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 234 }, { - "__id__": 234 + "__id__": 236 } ], "_prefab": { - "__id__": 236 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -5932,11 +5969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", @@ -5960,11 +5997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6018,11 +6055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 240 }, "_contentSize": { "__type__": "cc.Size", @@ -6046,11 +6083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 242 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6104,20 +6141,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 229 + "__id__": 231 }, "_children": [], "_active": true, "_components": [ { - "__id__": 243 + "__id__": 245 }, { - "__id__": 245 + "__id__": 247 } ], "_prefab": { - "__id__": 247 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -6154,11 +6191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -6182,11 +6219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6266,11 +6303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", @@ -6294,11 +6331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 253 }, "clickEvents": [], "_interactable": true, @@ -6363,27 +6400,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 254 + "__id__": 256 }, { - "__id__": 266 + "__id__": 268 } ], "_active": false, "_components": [ { - "__id__": 272 + "__id__": 274 }, { - "__id__": 274 + "__id__": 276 } ], "_prefab": { - "__id__": 276 + "__id__": 278 }, "_lpos": { "__type__": "cc.Vec3", @@ -6420,24 +6457,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 255 }, "_children": [ { - "__id__": 255 + "__id__": 257 } ], "_active": true, "_components": [ { - "__id__": 261 + "__id__": 263 }, { - "__id__": 263 + "__id__": 265 } ], "_prefab": { - "__id__": 265 + "__id__": 267 }, "_lpos": { "__type__": "cc.Vec3", @@ -6474,20 +6511,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 254 + "__id__": 256 }, "_children": [], "_active": true, "_components": [ { - "__id__": 256 + "__id__": 258 }, { - "__id__": 258 + "__id__": 260 } ], "_prefab": { - "__id__": 260 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -6524,11 +6561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", @@ -6552,11 +6589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6610,11 +6647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 264 }, "_contentSize": { "__type__": "cc.Size", @@ -6638,11 +6675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 266 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6696,20 +6733,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 253 + "__id__": 255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 269 }, { - "__id__": 269 + "__id__": 271 } ], "_prefab": { - "__id__": 271 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -6746,11 +6783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6774,11 +6811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 266 + "__id__": 268 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6858,11 +6895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -6886,11 +6923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 253 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 277 }, "clickEvents": [], "_interactable": true, @@ -6955,27 +6992,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 278 + "__id__": 280 }, { - "__id__": 290 + "__id__": 292 } ], "_active": false, "_components": [ { - "__id__": 296 + "__id__": 298 }, { - "__id__": 298 + "__id__": 300 } ], "_prefab": { - "__id__": 300 + "__id__": 302 }, "_lpos": { "__type__": "cc.Vec3", @@ -7012,24 +7049,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 277 + "__id__": 279 }, "_children": [ { - "__id__": 279 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 287 }, { - "__id__": 287 + "__id__": 289 } ], "_prefab": { - "__id__": 289 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -7066,20 +7103,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 278 + "__id__": 280 }, "_children": [], "_active": true, "_components": [ { - "__id__": 280 + "__id__": 282 }, { - "__id__": 282 + "__id__": 284 } ], "_prefab": { - "__id__": 284 + "__id__": 286 }, "_lpos": { "__type__": "cc.Vec3", @@ -7116,11 +7153,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 283 }, "_contentSize": { "__type__": "cc.Size", @@ -7144,11 +7181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 279 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 285 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7202,11 +7239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 288 }, "_contentSize": { "__type__": "cc.Size", @@ -7230,11 +7267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 278 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 290 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7288,20 +7325,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 277 + "__id__": 279 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 293 }, { - "__id__": 293 + "__id__": 295 } ], "_prefab": { - "__id__": 295 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -7338,11 +7375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -7366,11 +7403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 296 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7450,11 +7487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -7478,11 +7515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 301 }, "clickEvents": [], "_interactable": true, @@ -7547,27 +7584,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 302 + "__id__": 304 }, { - "__id__": 314 + "__id__": 316 } ], "_active": false, "_components": [ { - "__id__": 320 + "__id__": 322 }, { - "__id__": 322 + "__id__": 324 } ], "_prefab": { - "__id__": 324 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -7604,24 +7641,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 301 + "__id__": 303 }, "_children": [ { - "__id__": 303 + "__id__": 305 } ], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 311 }, { - "__id__": 311 + "__id__": 313 } ], "_prefab": { - "__id__": 313 + "__id__": 315 }, "_lpos": { "__type__": "cc.Vec3", @@ -7658,20 +7695,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 302 + "__id__": 304 }, "_children": [], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 306 }, { - "__id__": 306 + "__id__": 308 } ], "_prefab": { - "__id__": 308 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -7708,11 +7745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 307 }, "_contentSize": { "__type__": "cc.Size", @@ -7736,11 +7773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 309 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7794,11 +7831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", @@ -7822,11 +7859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 314 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7880,20 +7917,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 301 + "__id__": 303 }, "_children": [], "_active": true, "_components": [ { - "__id__": 315 + "__id__": 317 }, { - "__id__": 317 + "__id__": 319 } ], "_prefab": { - "__id__": 319 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -7930,11 +7967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 318 }, "_contentSize": { "__type__": "cc.Size", @@ -7958,11 +7995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 316 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 320 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8042,11 +8079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 323 }, "_contentSize": { "__type__": "cc.Size", @@ -8070,11 +8107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 301 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 325 }, "clickEvents": [], "_interactable": true, @@ -8139,27 +8176,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 204 + "__id__": 206 }, "_children": [ { - "__id__": 326 + "__id__": 328 }, { - "__id__": 338 + "__id__": 340 } ], "_active": false, "_components": [ { - "__id__": 344 + "__id__": 346 }, { - "__id__": 346 + "__id__": 348 } ], "_prefab": { - "__id__": 348 + "__id__": 350 }, "_lpos": { "__type__": "cc.Vec3", @@ -8196,24 +8233,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 325 + "__id__": 327 }, "_children": [ { - "__id__": 327 + "__id__": 329 } ], "_active": true, "_components": [ { - "__id__": 333 + "__id__": 335 }, { - "__id__": 335 + "__id__": 337 } ], "_prefab": { - "__id__": 337 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -8250,20 +8287,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 326 + "__id__": 328 }, "_children": [], "_active": true, "_components": [ { - "__id__": 328 + "__id__": 330 }, { - "__id__": 330 + "__id__": 332 } ], "_prefab": { - "__id__": 332 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -8300,11 +8337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -8328,11 +8365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 327 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8386,11 +8423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -8414,11 +8451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 326 + "__id__": 328 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8472,20 +8509,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 325 + "__id__": 327 }, "_children": [], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 341 }, { - "__id__": 341 + "__id__": 343 } ], "_prefab": { - "__id__": 343 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -8522,11 +8559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -8550,11 +8587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8634,11 +8671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -8662,11 +8699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 349 }, "clickEvents": [], "_interactable": true, @@ -8731,11 +8768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 352 }, "_contentSize": { "__type__": "cc.Size", @@ -8759,11 +8796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 354 }, "_resizeMode": 0, "_layoutType": 3, @@ -8797,11 +8834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 356 }, "_alignFlags": 5, "_target": null, @@ -8846,11 +8883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -8874,11 +8911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 361 }, "_alignFlags": 40, "_target": null, @@ -8923,11 +8960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 364 }, "_contentSize": { "__type__": "cc.Size", @@ -8951,11 +8988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 366 }, "_resizeMode": 1, "_layoutType": 2, @@ -9002,16 +9039,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 369 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1810.1 + "height": 1638.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9030,11 +9067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 371 }, "_type": 0, "_inverted": false, @@ -9052,11 +9089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9098,11 +9135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 375 }, "_alignFlags": 45, "_target": null, @@ -9147,16 +9184,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 378 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1810.1 + "height": 1638.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9175,11 +9212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 380 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9217,11 +9254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 382 }, "bounceDuration": 0.23, "brake": 0.75, @@ -9232,7 +9269,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 72 + "__id__": 74 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -9248,17 +9285,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 384 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 529.9, + "_top": 476.5, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -9301,12 +9338,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 387 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9329,23 +9366,23 @@ }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 389 }, "m_rootNode": null, "userNameLabel": { - "__id__": 56 + "__id__": 58 }, "userIdLabel": { - "__id__": 62 + "__id__": 64 }, "balanceLabel": { - "__id__": 91 + "__id__": 93 }, "vipStatusLabel": { - "__id__": 107 + "__id__": 109 }, "avatarSprite": { - "__id__": 16 + "__id__": 18 }, "_id": "" }, @@ -9363,7 +9400,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 391 }, "_alignFlags": 45, "_target": null, @@ -9399,7 +9436,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 393 }, "_customMaterial": null, "_srcBlendFactor": 2, diff --git a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab index 952eedd4..761326e3 100644 --- a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab @@ -311,7 +311,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 203.29999999999995, "z": 0 }, "_lrot": { @@ -2068,8 +2068,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0, - "_bottom": 0, + "_top": -203.29999999999995, + "_bottom": 203.29999999999995, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2199,7 +2199,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -690.788, + "y": -487.48800000000006, "z": 0 }, "_lrot": { @@ -2779,7 +2779,6 @@ "__id__": 0 }, "fileId": "72STeCq6BIVrAqirSTzbfr", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/PurchasePanel.prefab b/assets/bundles/Chat18x/PurchasePanel.prefab index a07b036e..34b4101f 100644 --- a/assets/bundles/Chat18x/PurchasePanel.prefab +++ b/assets/bundles/Chat18x/PurchasePanel.prefab @@ -163,7 +163,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 996, + "y": 982.5, "z": 0 }, "_lrot": { @@ -725,12 +725,12 @@ "__prefab": { "__id__": 28 }, - "_alignFlags": 45, + "_alignFlags": 41, "_target": null, "_left": 0, "_right": 0, - "_top": 99, - "_bottom": 2091, + "_top": 0, + "_bottom": 1971.75, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -796,7 +796,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -127.20000000000005, + "y": -75, "z": 0 }, "_lrot": { @@ -913,7 +913,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1040.483, + "y": 978.083, "z": 0 }, "_lrot": { @@ -979,7 +979,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 10, - "y": -390.05, + "y": -367.1, "z": 0 }, "_lrot": { @@ -1036,7 +1036,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -101.37, - "y": 314.0809999999999, + "y": 322.3739999999998, "z": 0 }, "_lrot": { @@ -1419,7 +1419,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 254.16600000000005, - "y": 314.0809999999999, + "y": 322.3739999999998, "z": 0 }, "_lrot": { @@ -1997,7 +1997,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 238.47900000000004, + "y": 263.4459999999999, "z": 0 }, "_lrot": { @@ -2377,7 +2377,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 214.394, - "y": -348.3620000000001, + "y": -299.7750000000001, "z": 0 }, "_lrot": { @@ -2905,7 +2905,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -206.026, - "y": -348.3620000000001, + "y": -299.7750000000001, "z": 0 }, "_lrot": { @@ -3411,7 +3411,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 780.1 + "height": 734.2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3469,6 +3469,8 @@ "__id__": 0 }, "fileId": "bfmQnNE+dDppKipXIAljrF", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -3508,7 +3510,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 10, - "y": -1280.1, + "y": -1214.7, "z": 0 }, "_lrot": { @@ -9019,7 +9021,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1000 + "height": 961 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9094,7 +9096,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1780.1 + "height": 1695.2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9173,7 +9175,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2085.6 + "height": 1965 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9318,7 +9320,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2085.6 + "height": 1965 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9420,7 +9422,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 254.4, + "_top": 150, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -9468,7 +9470,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9590,7 +9592,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9705,7 +9707,6 @@ "__id__": 0 }, "fileId": "69Vc962V9Na7L7FyQxaYOk", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/SettingPanel.prefab b/assets/bundles/Chat18x/SettingPanel.prefab index 60ab73ce..322a9444 100644 --- a/assets/bundles/Chat18x/SettingPanel.prefab +++ b/assets/bundles/Chat18x/SettingPanel.prefab @@ -46,7 +46,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 251.15699999999993, + "y": 115.62400000000002, "z": 0 }, "_lrot": { @@ -6207,7 +6207,6 @@ "__id__": 0 }, "fileId": "38Fm50GEVAG5PwFkR1o9QJ", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 549994ed..f3afbb03 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 272 + "__id__": 266 }, { - "__id__": 274 + "__id__": 268 }, { - "__id__": 276 + "__id__": 270 } ], "_prefab": { - "__id__": 278 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -79,23 +79,23 @@ "__id__": 3 }, { - "__id__": 89 + "__id__": 83 } ], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 259 }, { - "__id__": 267 + "__id__": 261 }, { - "__id__": 269 + "__id__": 263 } ], "_prefab": { - "__id__": 271 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -139,43 +139,40 @@ "__id__": 4 }, { - "__id__": 10 + "__id__": 14 }, { - "__id__": 20 + "__id__": 24 }, { - "__id__": 30 + "__id__": 32 }, { - "__id__": 38 + "__id__": 48 }, { - "__id__": 54 - }, - { - "__id__": 78 + "__id__": 72 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 76 }, { - "__id__": 84 + "__id__": 78 }, { - "__id__": 86 + "__id__": 80 } ], "_prefab": { - "__id__": 88 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1060, + "y": 876.05, "z": 0 }, "_lrot": { @@ -203,7 +200,7 @@ }, { "__type__": "cc.Node", - "_name": "Bg", + "_name": "settingBtn", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -217,15 +214,21 @@ }, { "__id__": 7 + }, + { + "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 9 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 110, + "x": 363.20000000000005, + "y": 6.0160000000000196, "z": 0 }, "_lrot": { @@ -263,139 +266,6 @@ "__prefab": { "__id__": 6 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 811 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7XRgdRN9IY6S8Hot2m2ee" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_alignFlags": 41, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 1080, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "dfLIJh4StD6JX6LLTK3n4P" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "19W6mP+vtPorRCU1ewvrUL", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "settingBtn", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 11 - }, - { - "__id__": 13 - }, - { - "__id__": 15 - }, - { - "__id__": 17 - } - ], - "_prefab": { - "__id__": 19 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 363.2, - "y": -157.087, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -418,11 +288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 8 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -463,11 +333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 10 }, "clickEvents": [], "_interactable": true, @@ -507,7 +377,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 10 + "__id__": 4 }, "_id": "" }, @@ -521,17 +391,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 12 }, "_alignFlags": 33, "_target": null, "_left": 0, - "_right": 86.8, - "_top": 179.087, + "_right": 86.79999999999994, + "_top": 87.43399999999997, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -575,26 +445,26 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 + }, { "__id__": 21 - }, - { - "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 27 } ], "_prefab": { - "__id__": 29 + "__id__": 23 }, "_lpos": { "__type__": "cc.Vec3", "x": -483.418, - "y": -93.56800000000021, + "y": 69.53500000000003, "z": 0 }, "_lrot": { @@ -626,11 +496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 16 }, "_contentSize": { "__type__": "cc.Size", @@ -654,11 +524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 18 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -725,17 +595,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 20 }, "_alignFlags": 9, "_target": null, "_left": 56.581999999999994, "_right": 0, - "_top": 155.05800000000022, + "_top": 63.404999999999966, "_bottom": 108.25899999999993, "_horizontalCenter": -342.1, "_verticalCenter": 0, @@ -761,11 +631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 22 }, "languageKey": "themepanel.title", "defaultText": "", @@ -801,22 +671,22 @@ "_active": true, "_components": [ { - "__id__": 31 + "__id__": 25 }, { - "__id__": 33 + "__id__": 27 }, { - "__id__": 35 + "__id__": 29 } ], "_prefab": { - "__id__": 37 + "__id__": 31 }, "_lpos": { "__type__": "cc.Vec3", "x": -486.904, - "y": -184.56400000000008, + "y": -21.461000000000077, "z": 0 }, "_lrot": { @@ -848,11 +718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -876,11 +746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -947,17 +817,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 30 }, "_alignFlags": 9, "_target": null, "_left": 53.096000000000004, "_right": 0, - "_top": 246.0540000000001, + "_top": 154.40100000000007, "_bottom": 108.25899999999993, "_horizontalCenter": -186.67000000000002, "_verticalCenter": 0, @@ -1000,28 +870,28 @@ }, "_children": [ { - "__id__": 39 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 41 }, { - "__id__": 49 + "__id__": 43 }, { - "__id__": 51 + "__id__": 45 } ], "_prefab": { - "__id__": 53 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", "x": -96.65300000000002, - "y": -289.5350000000001, + "y": -115.91299999999995, "z": 0 }, "_lrot": { @@ -1053,23 +923,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 38 + "__id__": 32 }, "_children": [], "_active": true, "_components": [ { - "__id__": 40 + "__id__": 34 }, { - "__id__": 42 + "__id__": 36 }, { - "__id__": 44 + "__id__": 38 } ], "_prefab": { - "__id__": 46 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -1106,11 +976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1134,11 +1004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1205,11 +1075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 39 }, "_alignFlags": 10, "_target": null, @@ -1254,11 +1124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -1282,11 +1152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1327,18 +1197,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 46 }, "_alignFlags": 36, "_target": null, "_left": 194.1, "_right": 578.153, "_top": 0, - "_bottom": -209.03500000000008, + "_bottom": 36.037000000000035, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1380,31 +1250,31 @@ }, "_children": [ { - "__id__": 55 + "__id__": 49 }, { - "__id__": 63 + "__id__": 57 } ], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 65 }, { - "__id__": 73 + "__id__": 67 }, { - "__id__": 75 + "__id__": 69 } ], "_prefab": { - "__id__": 77 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", "x": 261.34900000000005, - "y": -289.5350000000001, + "y": -115.91299999999995, "z": 0 }, "_lrot": { @@ -1436,23 +1306,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 54 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 50 }, { - "__id__": 58 + "__id__": 52 }, { - "__id__": 60 + "__id__": 54 } ], "_prefab": { - "__id__": 62 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -1489,11 +1359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -1517,11 +1387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1588,11 +1458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 55 }, "_alignFlags": 34, "_target": null, @@ -1637,23 +1507,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 54 + "__id__": 48 }, "_children": [], "_active": false, "_components": [ { - "__id__": 64 + "__id__": 58 }, { - "__id__": 66 + "__id__": 60 }, { - "__id__": 68 + "__id__": 62 } ], "_prefab": { - "__id__": 70 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1690,11 +1560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", @@ -1718,11 +1588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 61 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1786,11 +1656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 63 }, "_alignFlags": 34, "_target": null, @@ -1835,11 +1705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 66 }, "_contentSize": { "__type__": "cc.Size", @@ -1863,11 +1733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 68 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1908,18 +1778,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 70 }, "_alignFlags": 36, "_target": null, "_left": 194.1, "_right": 218.65099999999995, "_top": 0, - "_bottom": -211.53500000000008, + "_bottom": 33.537000000000035, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1963,16 +1833,16 @@ "_active": true, "_components": [ { - "__id__": 79 + "__id__": 73 } ], "_prefab": { - "__id__": 81 + "__id__": 75 }, "_lpos": { "__type__": "cc.Vec3", - "x": -120.06799999999998, - "y": -319.047, + "x": -155.49599999999998, + "y": -231.3789999999999, "z": 0 }, "_lrot": { @@ -2004,15 +1874,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 78 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 74 }, "_contentSize": { "__type__": "cc.Size", - "width": 578.871, + "width": 640.971, "height": 66.501 }, "_anchorPoint": { @@ -2049,12 +1919,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 220 + "height": 362.9 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2077,7 +1947,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 85 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2122,7 +1992,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 81 }, "_alignFlags": 41, "_target": null, @@ -2171,31 +2041,31 @@ }, "_children": [ { - "__id__": 90 + "__id__": 84 }, { - "__id__": 136 + "__id__": 130 } ], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 252 }, { - "__id__": 260 + "__id__": 254 }, { - "__id__": 262 + "__id__": 256 } ], "_prefab": { - "__id__": 264 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -234.04999999999995, + "y": -178.10000000000002, "z": 0 }, "_lrot": { @@ -2227,42 +2097,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 89 + "__id__": 83 }, "_children": [ + { + "__id__": 85 + }, { "__id__": 91 }, { - "__id__": 97 + "__id__": 99 }, { - "__id__": 105 + "__id__": 107 }, { - "__id__": 113 - }, - { - "__id__": 121 + "__id__": 115 } ], "_active": true, "_components": [ + { + "__id__": 121 + }, + { + "__id__": 123 + }, + { + "__id__": 125 + }, { "__id__": 127 - }, - { - "__id__": 129 - }, - { - "__id__": 131 - }, - { - "__id__": 133 } ], "_prefab": { - "__id__": 135 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -2299,8 +2169,139 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { + "__id__": 84 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + } + ], + "_prefab": { "__id__": 90 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0.33400000000006, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 85 + }, + "_enabled": true, + "__prefab": { + "__id__": 87 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 444, + "height": 330 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fc6M6UaJxCOamdXUFDaikM" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 85 + }, + "_enabled": true, + "__prefab": { + "__id__": 89 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "45pHX4m2RK5avindWplT2F" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bdOmBCAOtEJpJ09eEkr5aS", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "nameBg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 84 + }, "_children": [], "_active": true, "_components": [ @@ -2309,15 +2310,18 @@ }, { "__id__": 94 + }, + { + "__id__": 96 } ], "_prefab": { - "__id__": 96 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0.33400000000006, + "x": -220.553, + "y": -126.5, "z": 0 }, "_lrot": { @@ -2355,145 +2359,6 @@ "__prefab": { "__id__": 93 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 444, - "height": 330 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fc6M6UaJxCOamdXUFDaikM" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 91 - }, - "_enabled": true, - "__prefab": { - "__id__": 95 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "8ecb8155-67a6-44a6-aa1e-352c37fcd2db@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "45pHX4m2RK5avindWplT2F" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "bdOmBCAOtEJpJ09eEkr5aS", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "nameBg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 90 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - } - ], - "_prefab": { - "__id__": 104 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -220.553, - "y": -126.5, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 97 - }, - "_enabled": true, - "__prefab": { - "__id__": 99 - }, "_contentSize": { "__type__": "cc.Size", "width": 229.082031, @@ -2516,11 +2381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 95 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2561,11 +2426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 97 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 97 }, "_alignFlags": 12, "_target": null, @@ -2610,23 +2475,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 84 }, "_children": [], "_active": true, "_components": [ { - "__id__": 106 + "__id__": 100 }, { - "__id__": 108 + "__id__": 102 }, { - "__id__": 110 + "__id__": 104 } ], "_prefab": { - "__id__": 112 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -2663,11 +2528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2691,11 +2556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2762,11 +2627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 105 }, "_alignFlags": 12, "_target": null, @@ -2811,23 +2676,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 84 }, "_children": [], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 108 }, { - "__id__": 116 + "__id__": 110 }, { - "__id__": 118 + "__id__": 112 } ], "_prefab": { - "__id__": 120 + "__id__": 114 }, "_lpos": { "__type__": "cc.Vec3", @@ -2864,11 +2729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 109 }, "_contentSize": { "__type__": "cc.Size", @@ -2892,11 +2757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 111 }, "_alignFlags": 45, "_target": null, @@ -2928,24 +2793,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 113 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 194, - "g": 194, - "b": 194, - "a": 255 + "r": 0, + "g": 0, + "b": 0, + "a": 181 }, "_spriteFrame": { - "__uuid__": "f2c34361-263d-487a-9a9e-70fa78fc7893@f9941", + "__uuid__": "82aaafa8-eac0-4090-8a18-35d5a474cfec@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -2986,20 +2851,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 84 }, "_children": [], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 116 }, { - "__id__": 124 + "__id__": 118 } ], "_prefab": { - "__id__": 126 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -3036,11 +2901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -3064,11 +2929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 119 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3122,11 +2987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -3150,11 +3015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 124 }, "clickEvents": [], "_interactable": true, @@ -3194,7 +3059,7 @@ "_duration": 0.1, "_zoomScale": 0.95, "_target": { - "__id__": 90 + "__id__": 84 }, "_id": "" }, @@ -3208,27 +3073,27 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 126 }, "lockImg": { - "__id__": 124 - }, - "lockCover": { "__id__": 118 }, + "lockCover": { + "__id__": 112 + }, "titleName": { - "__id__": 108 + "__id__": 102 }, "titleNameBg": { - "__id__": 98 + "__id__": 92 }, "loading": null, "img": { - "__id__": 94 + "__id__": 88 }, "_id": "" }, @@ -3242,11 +3107,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3300,35 +3165,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 89 + "__id__": 83 }, "_children": [ { - "__id__": 137 + "__id__": 131 } ], "_active": true, "_components": [ + { + "__id__": 243 + }, + { + "__id__": 245 + }, + { + "__id__": 247 + }, { "__id__": 249 - }, - { - "__id__": 251 - }, - { - "__id__": 253 - }, - { - "__id__": 255 } ], "_prefab": { - "__id__": 257 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 78.10000000000002, + "y": 98.84999999999991, "z": 0 }, "_lrot": { @@ -3360,30 +3225,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 136 + "__id__": 130 }, "_children": [ { - "__id__": 138 + "__id__": 132 } ], "_active": true, "_components": [ + { + "__id__": 234 + }, + { + "__id__": 236 + }, + { + "__id__": 238 + }, { "__id__": 240 - }, - { - "__id__": 242 - }, - { - "__id__": 244 - }, - { - "__id__": 246 } ], "_prefab": { - "__id__": 248 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -3420,35 +3285,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 137 + "__id__": 131 }, "_children": [ { - "__id__": 139 + "__id__": 133 }, { - "__id__": 225 + "__id__": 219 } ], "_active": true, "_components": [ { - "__id__": 233 + "__id__": 227 }, { - "__id__": 235 + "__id__": 229 }, { - "__id__": 237 + "__id__": 231 } ], "_prefab": { - "__id__": 239 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 788.1500000000001, + "y": 752.3499999999999, "z": 0 }, "_lrot": { @@ -3480,27 +3345,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 138 + "__id__": 132 }, "_children": [ { - "__id__": 140 + "__id__": 134 }, { - "__id__": 148 + "__id__": 142 } ], "_active": true, "_components": [ { - "__id__": 220 + "__id__": 214 }, { - "__id__": 222 + "__id__": 216 } ], "_prefab": { - "__id__": 224 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -3537,23 +3402,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 133 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 135 }, { - "__id__": 143 + "__id__": 137 }, { - "__id__": 145 + "__id__": 139 } ], "_prefab": { - "__id__": 147 + "__id__": 141 }, "_lpos": { "__type__": "cc.Vec3", @@ -3590,11 +3455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 136 }, "_contentSize": { "__type__": "cc.Size", @@ -3618,11 +3483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 138 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3663,11 +3528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 140 }, "_alignFlags": 18, "_target": null, @@ -3712,39 +3577,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 139 + "__id__": 133 }, "_children": [ { - "__id__": 149 + "__id__": 143 }, { - "__id__": 187 + "__id__": 181 + }, + { + "__id__": 189 }, { "__id__": 195 - }, - { - "__id__": 201 } ], "_active": true, "_components": [ + { + "__id__": 205 + }, + { + "__id__": 207 + }, + { + "__id__": 209 + }, { "__id__": 211 - }, - { - "__id__": 213 - }, - { - "__id__": 215 - }, - { - "__id__": 217 } ], "_prefab": { - "__id__": 219 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -3781,30 +3646,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 142 }, "_children": [ { - "__id__": 150 + "__id__": 144 }, { - "__id__": 156 + "__id__": 150 } ], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 174 }, { - "__id__": 182 + "__id__": 176 }, { - "__id__": 184 + "__id__": 178 } ], "_prefab": { - "__id__": 186 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -3841,20 +3706,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 145 }, { - "__id__": 153 + "__id__": 147 } ], "_prefab": { - "__id__": 155 + "__id__": 149 }, "_lpos": { "__type__": "cc.Vec3", @@ -3891,11 +3756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 146 }, "_contentSize": { "__type__": "cc.Size", @@ -3919,11 +3784,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 148 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3974,30 +3839,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 149 + "__id__": 143 }, "_children": [ { - "__id__": 157 + "__id__": 151 }, { - "__id__": 165 + "__id__": 159 } ], "_active": true, "_components": [ { - "__id__": 173 + "__id__": 167 }, { - "__id__": 175 + "__id__": 169 }, { - "__id__": 177 + "__id__": 171 } ], "_prefab": { - "__id__": 179 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", @@ -4034,23 +3899,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 150 }, "_children": [], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 152 }, { - "__id__": 160 + "__id__": 154 }, { - "__id__": 162 + "__id__": 156 } ], "_prefab": { - "__id__": 164 + "__id__": 158 }, "_lpos": { "__type__": "cc.Vec3", @@ -4087,11 +3952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 153 }, "_contentSize": { "__type__": "cc.Size", @@ -4115,11 +3980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 155 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4160,11 +4025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 151 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 157 }, "_alignFlags": 45, "_target": null, @@ -4209,23 +4074,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 156 + "__id__": 150 }, "_children": [], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 160 }, { - "__id__": 168 + "__id__": 162 }, { - "__id__": 170 + "__id__": 164 } ], "_prefab": { - "__id__": 172 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -4262,11 +4127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 161 }, "_contentSize": { "__type__": "cc.Size", @@ -4290,11 +4155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 163 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4335,11 +4200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 159 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 165 }, "playOnLoad": true, "_clips": [ @@ -4377,11 +4242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 174 + "__id__": 168 }, "_contentSize": { "__type__": "cc.Size", @@ -4405,11 +4270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 170 }, "_alignFlags": 45, "_target": null, @@ -4441,14 +4306,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 156 + "__id__": 150 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 172 }, "animation": { - "__id__": 170 + "__id__": 164 }, "_id": "" }, @@ -4475,11 +4340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 175 }, "_contentSize": { "__type__": "cc.Size", @@ -4503,11 +4368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 177 }, "_type": 0, "_inverted": false, @@ -4525,11 +4390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4584,23 +4449,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 142 }, "_children": [], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 182 }, { - "__id__": 190 + "__id__": 184 }, { - "__id__": 192 + "__id__": 186 } ], "_prefab": { - "__id__": 194 + "__id__": 188 }, "_lpos": { "__type__": "cc.Vec3", @@ -4637,11 +4502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4665,11 +4530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4736,11 +4601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 187 }, "languageKey": "themepanel.recomandtext", "defaultText": "", @@ -4770,20 +4635,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 142 }, "_children": [], "_active": true, "_components": [ { - "__id__": 196 + "__id__": 190 }, { - "__id__": 198 + "__id__": 192 } ], "_prefab": { - "__id__": 200 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -4820,11 +4685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 191 }, "_contentSize": { "__type__": "cc.Size", @@ -4848,11 +4713,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 189 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 193 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4932,26 +4797,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 148 + "__id__": 142 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 196 + }, + { + "__id__": 198 + }, + { + "__id__": 200 + }, { "__id__": 202 - }, - { - "__id__": 204 - }, - { - "__id__": 206 - }, - { - "__id__": 208 } ], "_prefab": { - "__id__": 210 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -4988,11 +4853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -5016,11 +4881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5061,11 +4926,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 201 }, "_alignFlags": 34, "_target": null, @@ -5097,11 +4962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 203 }, "clickEvents": [], "_interactable": true, @@ -5166,11 +5031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -5194,11 +5059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 208 }, "_alignFlags": 45, "_target": null, @@ -5230,11 +5095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 210 }, "_type": 3, "_inverted": false, @@ -5252,11 +5117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 148 + "__id__": 142 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5310,11 +5175,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -5338,13 +5203,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 139 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 217 }, - "_alignFlags": 41, + "_alignFlags": 40, "_target": null, "_left": 56, "_right": 56, @@ -5387,23 +5252,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 138 + "__id__": 132 }, "_children": [], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 220 }, { - "__id__": 228 + "__id__": 222 }, { - "__id__": 230 + "__id__": 224 } ], "_prefab": { - "__id__": 232 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -5440,11 +5305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 221 }, "_contentSize": { "__type__": "cc.Size", @@ -5468,11 +5333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 223 }, "_resizeMode": 1, "_layoutType": 3, @@ -5506,11 +5371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 225 }, "_alignFlags": 40, "_target": null, @@ -5555,11 +5420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5583,11 +5448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 230 }, "_resizeMode": 1, "_layoutType": 2, @@ -5621,11 +5486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 232 }, "_alignFlags": 1, "_target": null, @@ -5670,16 +5535,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", "width": 1060, - "height": 1576.3000000000002 + "height": 1504.6999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5698,11 +5563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 237 }, "_type": 0, "_inverted": false, @@ -5720,11 +5585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5766,11 +5631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 241 }, "_alignFlags": 45, "_target": null, @@ -5815,16 +5680,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", "width": 1060, - "height": 1576.3000000000002 + "height": 1504.6999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5843,11 +5708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 130 }, "_enabled": false, "__prefab": { - "__id__": 252 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5888,11 +5753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 248 }, "bounceDuration": 0.23, "brake": 0.75, @@ -5903,7 +5768,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 138 + "__id__": 132 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -5919,17 +5784,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 130 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 250 }, "_alignFlags": 45, "_target": null, "_left": 10, "_right": 10, - "_top": 69.7, + "_top": 28.2, "_bottom": 225.9, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -5968,16 +5833,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1871.9 + "height": 1758.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5996,11 +5861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 83 }, "_enabled": false, "__prefab": { - "__id__": 261 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6041,17 +5906,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 257 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 468.1, + "_top": 356.2, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6064,7 +5929,7 @@ "_originalWidth": 100, "_originalHeight": 400, "_alignMode": 2, - "_lockFlags": 45, + "_lockFlags": 40, "_id": "" }, { @@ -6094,12 +5959,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6122,7 +5987,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6135,7 +6000,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "73d2e328-4c47-42e2-83e1-07967b503a51@f9941", + "__uuid__": "c70aaaff-69dc-4c52-a6dd-d22f641cef80@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6167,7 +6032,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 264 }, "_alignFlags": 45, "_target": null, @@ -6216,12 +6081,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6244,7 +6109,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 269 }, "_alignFlags": 45, "_target": null, @@ -6280,7 +6145,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 271 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/TipsPanel.prefab b/assets/bundles/Chat18x/TipsPanel.prefab index 0a8a9b1b..f5424c95 100644 --- a/assets/bundles/Chat18x/TipsPanel.prefab +++ b/assets/bundles/Chat18x/TipsPanel.prefab @@ -46,7 +46,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 181.9000000000001, "z": 0 }, "_lrot": { @@ -673,7 +673,6 @@ "__id__": 0 }, "fileId": "630e3mesJKuZJC9gpYcm7p", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab index 6f205117..f80103d8 100644 --- a/assets/bundles/Chat18x/Web3PopPanel.prefab +++ b/assets/bundles/Chat18x/Web3PopPanel.prefab @@ -776,8 +776,6 @@ "__id__": 0 }, "fileId": "67/o4AddJIMYDC0pibo3hL", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1114,8 +1112,6 @@ "__id__": 0 }, "fileId": "f8J7SrhdhEHqWpsWttBkYa", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1848,8 +1844,6 @@ "__id__": 0 }, "fileId": "f8yhhA7YlP3o9EvKnSzBXh", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1981,8 +1975,6 @@ "__id__": 0 }, "fileId": "60IjPNkWBPTY02lkUjdFp5", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2140,8 +2132,6 @@ "__id__": 0 }, "fileId": "d5PyVw8otHPYM+NbJGTrkx", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5068,8 +5058,6 @@ "__id__": 0 }, "fileId": "a5ftK2459Kc5kIoPPjxxMi", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5898,8 +5886,6 @@ "__id__": 0 }, "fileId": "7fzivavZVLqrsTZzcDSMIv", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6398,8 +6384,6 @@ "__id__": 0 }, "fileId": "6fB8Gy5QRC2qHC6x3aKXuo", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6417,7 +6401,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 2340 + "height": 2115 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6494,7 +6478,6 @@ "__id__": 0 }, "fileId": "e6pU+M6i9MErSV0E0QWx3B", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/ui/common/图层 60.png b/assets/resources/ui/common/图层 60.png new file mode 100644 index 00000000..99104589 Binary files /dev/null and b/assets/resources/ui/common/图层 60.png differ diff --git a/assets/resources/ui/personal/图层 60.png.meta b/assets/resources/ui/common/图层 60.png.meta similarity index 92% rename from assets/resources/ui/personal/图层 60.png.meta rename to assets/resources/ui/common/图层 60.png.meta index ceb340b7..5158354a 100644 --- a/assets/resources/ui/personal/图层 60.png.meta +++ b/assets/resources/ui/common/图层 60.png.meta @@ -47,9 +47,9 @@ "trimX": 0, "trimY": 0, "width": 1080, - "height": 2340, + "height": 2115, "rawWidth": 1080, - "rawHeight": 2340, + "rawHeight": 2115, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -540, - -1170, + -1057.5, 0, 540, - -1170, + -1057.5, 0, -540, - 1170, + 1057.5, 0, 540, - 1170, + 1057.5, 0 ], "indexes": [ @@ -84,9 +84,9 @@ ], "uv": [ 0, - 2340, + 2115, 1080, - 2340, + 2115, 0, 0, 1080, @@ -104,12 +104,12 @@ ], "minPos": [ -540, - -1170, + -1057.5, 0 ], "maxPos": [ 540, - 1170, + 1057.5, 0 ] }, diff --git a/assets/resources/ui/personal/图层 60.png b/assets/resources/ui/personal/图层 60.png deleted file mode 100644 index 127f5db4..00000000 Binary files a/assets/resources/ui/personal/图层 60.png and /dev/null differ diff --git a/settings/v2/packages/project.json b/settings/v2/packages/project.json index a69c9484..18ede2e8 100644 --- a/settings/v2/packages/project.json +++ b/settings/v2/packages/project.json @@ -3,7 +3,7 @@ "general": { "designResolution": { "width": 1080, - "height": 2340, + "height": 2115, "fitHeight": false, "fitWidth": true } diff --git a/web-view_project/app.js b/web-view_project/app.js deleted file mode 100644 index b3b9dc05..00000000 --- a/web-view_project/app.js +++ /dev/null @@ -1,34 +0,0 @@ - -//app.js -App({ - onLaunch: function () { - // show localstorage - let logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) - - // login - wx.login({ - success: res => { - // get custom login info res - } - }) - // get user settings - wx.getSetting({ - success: res => { - if (res.authSetting['scope.userInfo']) { - // Already authorized, you can directly call getUserInfo to get the avatar nickname without popping up - wx.getUserInfo({ - success: res => { - // get custom user info res - this.globalData.userInfo = res.userInfo; - } - }) - } - } - }) - }, - globalData: { - userInfo: null - } -}) \ No newline at end of file diff --git a/web-view_project/app.json b/web-view_project/app.json deleted file mode 100644 index 96e5d48d..00000000 --- a/web-view_project/app.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "pages": [ - "pages/index/index", - "pages/logs/logs" - ], - "style": "v2", - "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "TCSAS Mini Program", - "navigationBarTextStyle": "black" - } -} \ No newline at end of file diff --git a/web-view_project/app.wxss b/web-view_project/app.wxss deleted file mode 100644 index 28a4e613..00000000 --- a/web-view_project/app.wxss +++ /dev/null @@ -1,9 +0,0 @@ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; - } \ No newline at end of file diff --git a/web-view_project/pages/index/index.js b/web-view_project/pages/index/index.js deleted file mode 100644 index 59ca6b10..00000000 --- a/web-view_project/pages/index/index.js +++ /dev/null @@ -1,53 +0,0 @@ -//index.js -//get application instance -const { defaultIcon } = require('../../utils/icon'); -const app = getApp() - - -Page({ - data: { - motto: 'Hello World', - userInfo: {}, - hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo') - }, - // event handler function - bindViewTap: function () { - wx.navigateTo({ - url: '../logs/logs' - }) - }, - onLoad: function () { - if (app.globalData.userInfo) { - this.setData({ - userInfo: app.globalData.userInfo, - hasUserInfo: true - }) - } else if (this.data.canIUse) { - // do someting - } else { - // There is no compatibility processing for open-type=getUserInfo version - wx.getUserInfo({ - success: res => { - app.globalData.userInfo = res.userInfo - this.setData({ - userInfo: res.userInfo, - hasUserInfo: true - }) - } - }) - } - }, - getUserInfo: function (e) { - console.log('getUserInfo ----> ', e); - app.globalData.userInfo = e.detail.userInfo || ""; - const userInfo = e.detail.userInfo || { - avatarUrl: defaultIcon, - nickName: 'userNickName' - } - this.setData({ - userInfo: userInfo, - hasUserInfo: true - }) - } -}) diff --git a/web-view_project/pages/index/index.json b/web-view_project/pages/index/index.json deleted file mode 100644 index 8835af06..00000000 --- a/web-view_project/pages/index/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/web-view_project/pages/index/index.wxml b/web-view_project/pages/index/index.wxml deleted file mode 100644 index 672d03cb..00000000 --- a/web-view_project/pages/index/index.wxml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/web-view_project/pages/index/index.wxss b/web-view_project/pages/index/index.wxss deleted file mode 100644 index 05d6924f..00000000 --- a/web-view_project/pages/index/index.wxss +++ /dev/null @@ -1,20 +0,0 @@ -.userinfo { - display: flex; - flex-direction: column; - align-items: center; -} - -.userinfo-avatar { - width: 128rpx; - height: 128rpx; - margin: 20rpx; - border-radius: 50%; -} - -.userinfo-nickname { - color: #aaa; -} - -.usermotto { - margin-top: 200px; -} \ No newline at end of file diff --git a/web-view_project/pages/logs/logs.js b/web-view_project/pages/logs/logs.js deleted file mode 100644 index b2b967d8..00000000 --- a/web-view_project/pages/logs/logs.js +++ /dev/null @@ -1,15 +0,0 @@ -//logs.js -const util = require('../../utils/util.js') - -Page({ - data: { - logs: [] - }, - onLoad: function () { - this.setData({ - logs: (wx.getStorageSync('logs') || []).map(log => { - return util.formatTime(new Date(log)) - }) - }) - } -}) diff --git a/web-view_project/pages/logs/logs.json b/web-view_project/pages/logs/logs.json deleted file mode 100644 index 93196209..00000000 --- a/web-view_project/pages/logs/logs.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "Logs", - "usingComponents": {} -} \ No newline at end of file diff --git a/web-view_project/pages/logs/logs.wxml b/web-view_project/pages/logs/logs.wxml deleted file mode 100644 index bf46409e..00000000 --- a/web-view_project/pages/logs/logs.wxml +++ /dev/null @@ -1,5 +0,0 @@ - - - {{index + 1}}. {{log}} - - diff --git a/web-view_project/pages/logs/logs.wxss b/web-view_project/pages/logs/logs.wxss deleted file mode 100644 index a4eeb41d..00000000 --- a/web-view_project/pages/logs/logs.wxss +++ /dev/null @@ -1,9 +0,0 @@ -.log-list { - display: flex; - flex-direction: column; - padding: 40rpx; - } - .log-item { - margin: 10rpx; - } - \ No newline at end of file diff --git a/web-view_project/project.config.json b/web-view_project/project.config.json deleted file mode 100644 index a9748a73..00000000 --- a/web-view_project/project.config.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "projectid": "mp0ygqvghc940ppb_AIphrodite", - "setting": { - "urlCheck": true, - "es6": true, - "postcss": true, - "minified": true, - "newFeature": true, - "autoAudits": false, - "nodeModules": true, - "uploadWithSourceMap": true, - "uglifyFileName": true, - "remoteDebugLogEnable": true, - "prefetch": false - }, - "LuffaToolsLibVersion": "2.2.13", - "compileType": "miniprogram", - "createTime": 1758263984023, - "accessTime": 1758263984023, - "packOptions": { - "ignore": [] - }, - "debugOptions": { - "hidedInDevtools": [] - }, - "LuffaToolsappid": "mp0ygqvghc940ppb", - "projectname": "AIphrodite", - "scripts": {}, - "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "miniprogram": { - "current": -1, - "list": [] - } - } -} \ No newline at end of file diff --git a/web-view_project/utils/icon.js b/web-view_project/utils/icon.js deleted file mode 100644 index abb8ada5..00000000 --- a/web-view_project/utils/icon.js +++ /dev/null @@ -1,5 +0,0 @@ -const defaultIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAAbFBMVEUyxnH///+x5sUOwmPm9+wsxW4lxGsUwmUdw2jW8uBZzojQ8NzY8uLb8+Rg0Iw+yXih4bn0/Pf5/fvg9ejr+fCW3rHE7NOk4rtm0ZCQ3K2C2KO86c1Iy35w1JfK7td31ZtRzYN+16C258iL26mIAYOpAAAK/klEQVR4nN3d53bjKhAAYGSZEttxUdziuPv933GR3GQVmEE07fy695zdRN8OAiTBQBL3sfgZ/w3mv7vTYTsdjUbT6eF0uc0Hf+OfhYffTlz+8Oz7ujrtKedCMMZoOeT/C8E5m21/B19Ooa6E2WRzmqVcSBdRhbQKkdLD/OiK6UKYHVdnwXW2TygTfH9bu1BaF/5spnnm4LiyMj2vvmxfkF3h141wI91byenlaPWaLAonv5SzDrpnMMEuY3uXZUu42Mys8B5ITldDS1dmRzg+pJ0aZxMynf5ZuTYLwmww45Z5RVDB5hY6187CxYoJF74iGN8tAwsXt9Te3ddoTA8/AYWLm8XepS1oeujU6XQQZisPvrvx0qGtmgsHzI8vD8ZXmW/heCa8+QojvXoVLrZOxgdl8LNZl2Mk3LgbHxRB019PwuHZbwN9ByMG81W8cO6/gb4j3TkXLoMl8B6MTNwK/0ImsAiazl0KTzywLw8xQs3HMcLhzN8YrwrKMK86EMJ18Bb6inTjQrhKQ7tKwU/2hYewfWg12Bk6UQUKF/s4bsF3UAJ8poIJlySaW/AVlMP6G5BwEmQeqo0U9KoKIhzHMAo2RTqwI1zH1Il+BmTU0Av/4gXKUUM/hdMKowbKLGqJOmHETfQe2ixqhOPYgfruRi2cxNqLlkMzaCiFy7hmam2RKt9tqISLCGcyjcFVb+FUwn1PgIRSxTOxQniIbbLdHnRvIlz14ya8BzvghZGP9NUQrcNim3DYh3GiHK0daptw1pde5hWspbdpEZ7608s8g54xwmvf2mgeovnDTaNw2Udg263YKDz37ia8B4UK530aCcvROCo2CH/6NRKWg69Bwt5MRxuC1d8T14WbvrbRPNhFL+xpP/qMtPaauCbc9riNyqAznfDY7xTKcb/6CrUq7N98tBpioRT2upu5B9uphFn/gbKz+VEIf/v3SFEPum0XLvo7mynH54jxIdz9DymUSRy1CXs+2L+Dj1uE/0kKK0ksCf+TuzCP8p1YEkbakTIumOC4lQTl7vQtjHMsFGT+vciy5d80xRjTYYMwyukMf88yJ5hVdaWJzVvo7jLNg38sJh0hiGlWE8b4UCEqX82mcCLb1IQRPhfWPwvCie/nxKdwGd9QUc0gjvga9Z/CeXRDRRMQQaSnitDpxZqE+G4CIog8+xB+xdbPNGcQQxTXD2FsU9K2DCKIdPohjA2o3OIEJKbLkjCy9ZVckUE4UQxKwltUOVQ1UQTx8Qx1F0Y12usyCCbyxUsY1fI1fQahRPH3EsY03EMyCCTeB/1CGNE3X1gG8xjpL5o9hVk8c1I4EDINKx6+cuE6mmdfaBMtQv+8x+YPYTQvaDAZTAAfq4tpDYH8SU+ByqCMjTYz7C5cRDJWIDMoHxe0d1d+I0rhOI7bEJtByDt6NiiEcYyGAruDGSKkl0J4iOE25Hhg8qMXzgqhD4AuDDKYJH/62yvNpDCGzxUmGUySk77xiS8p1PdIzsMMCEmNuErhILjQDAjqP9ivFAaf0RgCN5BhXM5qSPCX3YbAAaz7mEnhzLFAE6lTIBEZScLehm4zKH/+kISdlTrOYD5ckO+QQtcZzN/VkKNBK80rxnLkp/WmcA+Uc29yxQv5fj4eLifXA+rTesPPcQ8kbEX0j5GVoOS1XHy57dJN+QASuiMrpPCzqMjcfFILLGvRDUjoiexwLY2NPn/hxpToJYP5pIYAJuilqAKNifUV506AhOwJ6vm3DjQk+mmiecwIZlraBDQiestgHoCX489oBhoQ/WUwjzP4T7YB0USvGUQI24FIot8M5n0NLFRAFNE3ECpUAxFDv3cgsJXqgGCifyABfR3VA4FEz51MEVPIGysAMC/dqv1BATJIIHMaGBBADJHBGWBeSoFALTFIBvf6Z4v6nkVDYogMyvQQ7Qth1L+8gsjNzh3pBiT0oH3Gr+wEMyaqizm5AhJ6IQONUCBPClk1E8NkMP9wQXRLTTj2WIJGYiggYRsy0QgF+lCCBmKgJppf/pXoPoYz/IXViMEyKIVjotvuhM9hjRgug/meDaL7jK+s9gYiBsxgvmKf6Nb4MUTp7EZiyAzKSIhumT5mStNEDJrBfMZJtKvDBKRYbysxcAbZTgq1H5+M7sQHMWwGi2VfBLI6zOy8JUkMnMF8sMjXRGm/H1FD4m9wIEkXuVD/1psKM6JZ87YIzKt/SSHg+5ppFoMDD4UQsszbNIthgcVgToDFInxl0Sow72iKdd6gNUN+smgXWEyqc+EF9PnJRxYtA4tymLkQuBzDPdEykLDVQwjdx+2aaBtIxPEhBBf4cku0Drxvdi6E4A2WLon2gfedwIUQvuPCHdE+sNht8dxDCl/a5GrQcAAkfPgWIpacuMmiC+Dj2f0uBOxceP9FB1l0AbzvzXsKM8wiU/tZdAJ81t57VBxArYyyTXQDfJ4m8BDitpHaJboBPhvpq7YJbqGoTaIj4LNoxEuIrKpgj+gK+Ppy/RRiF7TbIroCvr8KvupEYffk2xk0nAHfX5ReQvQGLxtZdAh8HSPwrteGXpTePYvugKWie28hfg9b1yw6BJZWH7yFBtVLu2XRIbD8NaFU+9Jgx3OXLLoElk9HKglNzkQwJ7oEfiwgKdegNdlraUp0CiRlVfm/jUoNmRHdAp+l2mrCBLISsxYm3Y1b4Odn6w/ht9EvxmfRcRP9XMb1WZPdrIAENouOgZWVB5/CodnvxmXRMZDwo0JoWpoOk0XXwGe9xBahaUFoeBZdA6tHI9RO8DCtCA0lOgdWj7eonzNjekgJjOgcWF+HVxN+mV4DhOgeyK/V31k/7+liWglET3QPbNhXUBdmxrVOdET3wHK1+XZhsjausqAeNDwAm04jbTo7z/yYXFUWPQAbD81tPP/QvFRCexY9AF8vgfXCo/nVtGXRB5A3LvZtPof0Zl4NopnoA8ia9760nCXboVhkE9EHsOnsQ4Wwy7nxdaIXYNvGsbYTj9cdLqpK9AJsvgkVwk4Hj1NW/vcE7C3tHu1Hj7efrb7tUsct/X2e0TfsVMMGGoodBe3CbkchMnEaHMfrzYh7KQcn2vefKYRdehtSFJMSgvkpd6cqGaYQJpMIqmKCIq09MgGFnTpUj8Eb5ttAoZ9+vmuIm9KgFvrp6buFuKgJGmHyGztRtA6EQGHsxJbpNkaY3GImCv1eer0w5ixqmyhM2KWwntvQdTJgYayDBlcPExhhnEN/qhzokcLkq3uxUtuhnKrhhckSc0amh6ACWnIFKkyyafDK5qVgM3C5DrBQDozx3IyAYdBEmPz5eZrVB7CPwQuTYRQ3I2WoDdQoYZLswrdUMV3or9NcmKwDDxs0xdbpwAqTbBtymir26AVYaGGSXIN1ODRd4S/XQJgsDmHuRnE2WSRoIpR3I/HfqTLDIitmwrysh9+mStOLQTmnLsJk2bWqPsrHR+gTvToL5fOGpzf28gacrfWX40CYJMe9D6MgwOckB0LZ5bg2UkHMOhhbQplHl22V8lmn/FkRJsnkkLoZO1g6Oup/vQeh7FdXxPp0lQpxs7IB0IpQxnqbWvxWSBk/Xw3Hv2rYEsq53OZsCcn4bGVvF649oYzh5tz1BCGa88yOL2kJq0IZy8GWm37bpkyko41ZgbD2sC3MY7waob/g50dI7W9r3OM7KFwIZWTjzYGmggGcNMeJ6eroQJeHI2ERi+NgdyZctloprVKplOVHf9HzZb7G1irGhEvhPbKf43Vzu2zP5ZJis/P2tJsPjt+OEleKf+9clRDl++4DAAAAAElFTkSuQmCC' - -module.exports = { - defaultIcon -} \ No newline at end of file diff --git a/web-view_project/utils/util.js b/web-view_project/utils/util.js deleted file mode 100644 index dbadbb81..00000000 --- a/web-view_project/utils/util.js +++ /dev/null @@ -1,19 +0,0 @@ -const formatTime = date => { - const year = date.getFullYear() - const month = date.getMonth() + 1 - const day = date.getDate() - const hour = date.getHours() - const minute = date.getMinutes() - const second = date.getSeconds() - - return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':') -} - -const formatNumber = n => { - n = n.toString() - return n[1] ? n : '0' + n -} - -module.exports = { - formatTime: formatTime -}