From 9f3a874cac1e0abf416a785b40bd87678095748b Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 4 Jan 2026 23:41:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B8=B8=E6=88=8F=E5=9C=B0=E5=9B=BE):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84=E5=8D=87=E7=BA=A7=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E5=B9=B6=E6=81=A2=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=A1=E5=85=B3=E9=97=AD=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 取消英雄升级奖励界面的直接显示,改为分发天赋选择事件 恢复任务卡选中后的延迟关闭效果,提升玩家体验 --- assets/resources/gui/role_controller.prefab | 2702 ++++++++++--------- assets/script/game/map/MissionCardComp.ts | 6 +- assets/script/game/map/MissionComp.ts | 4 +- 3 files changed, 1382 insertions(+), 1330 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 26d2d556..28d1921a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 504 + "__id__": 508 }, { - "__id__": 1013 + "__id__": 1017 }, { - "__id__": 1022 + "__id__": 1026 } ], "_active": true, "_components": [ - { - "__id__": 1068 - }, - { - "__id__": 1070 - }, { "__id__": 1072 + }, + { + "__id__": 1074 + }, + { + "__id__": 1076 } ], "_prefab": { - "__id__": 1074 + "__id__": 1078 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,17 +91,11 @@ "__id__": 23 }, { - "__id__": 446 + "__id__": 450 } ], "_active": true, "_components": [ - { - "__id__": 493 - }, - { - "__id__": 495 - }, { "__id__": 497 }, @@ -110,10 +104,16 @@ }, { "__id__": 501 + }, + { + "__id__": 503 + }, + { + "__id__": 505 } ], "_prefab": { - "__id__": 503 + "__id__": 507 }, "_lpos": { "__type__": "cc.Vec3", @@ -634,20 +634,20 @@ "__id__": 313 }, { - "__id__": 389 + "__id__": 393 } ], "_active": true, "_components": [ { - "__id__": 441 + "__id__": 445 }, { - "__id__": 443 + "__id__": 447 } ], "_prefab": { - "__id__": 445 + "__id__": 449 }, "_lpos": { "__type__": "cc.Vec3", @@ -705,7 +705,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -15.5, + "y": -155, "z": 0 }, "_lrot": { @@ -746,7 +746,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 710, - "height": 679 + "height": 400 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -819,11 +819,11 @@ "__prefab": { "__id__": 30 }, - "_alignFlags": 45, + "_alignFlags": 44, "_target": null, "_left": 5, "_right": 5, - "_top": 0.05, + "_top": 0.17430555555555555, "_bottom": 5, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -889,8 +889,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -175, - "y": 295, + "x": 0, + "y": 7.767999999999972, "z": 0 }, "_lrot": { @@ -999,7 +999,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -170, + "x": -340, "y": 0, "z": 0 }, @@ -1040,8 +1040,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 237.99999999999997, - "height": 30 + "width": 679.9, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1129,8 +1129,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 340, - "height": 30 + "width": 680, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1207,7 +1207,7 @@ "__id__": 37 }, "_mode": 0, - "_totalLength": 340, + "_totalLength": 680, "_progress": 0.7, "_reverse": false, "_id": "" @@ -1280,7 +1280,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -121.623, + "x": -283.241, "y": 2, "z": 0 }, @@ -2033,8 +2033,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 30 + "width": 680, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2059,12 +2059,12 @@ "__prefab": { "__id__": 82 }, - "_alignFlags": 9, + "_alignFlags": 44, "_target": null, - "_left": 135, - "_right": 405, + "_left": 20, + "_right": 20, "_top": 50, - "_bottom": 0, + "_bottom": 347.768, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2115,7 +2115,7 @@ "__id__": 107 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 131 @@ -2130,7 +2130,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 175, - "y": 295, + "y": -47.43799999999999, "z": 0 }, "_lrot": { @@ -3299,12 +3299,12 @@ "__prefab": { "__id__": 134 }, - "_alignFlags": 33, + "_alignFlags": 36, "_target": null, "_left": 310, "_right": 135, "_top": 50, - "_bottom": 0, + "_bottom": 297.562, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3376,7 +3376,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 255, + "y": -38.23199999999997, "z": 0 }, "_lrot": { @@ -4838,12 +4838,12 @@ "__prefab": { "__id__": 196 }, - "_alignFlags": 41, + "_alignFlags": 44, "_target": null, "_left": 15, "_right": 15, "_top": 85, - "_bottom": 0, + "_bottom": 301.76800000000003, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -4959,7 +4959,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 170, + "y": -119.232, "z": 0 }, "_lrot": { @@ -5772,12 +5772,12 @@ "__prefab": { "__id__": 261 }, - "_alignFlags": 41, + "_alignFlags": 44, "_target": null, "_left": 20, "_right": 20, "_top": 140, - "_bottom": 0, + "_bottom": 190.768, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -5881,7 +5881,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50.477, + "y": -198.35, "z": 0 }, "_lrot": { @@ -6032,7 +6032,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 136.4, - "height": 30 + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6121,7 +6121,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 682, - "height": 30 + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6942,37 +6942,37 @@ "__id__": 314 }, { - "__id__": 334 + "__id__": 335 }, { - "__id__": 350 + "__id__": 352 }, { - "__id__": 366 + "__id__": 369 } ], "_active": true, "_components": [ - { - "__id__": 380 - }, - { - "__id__": 382 - }, { "__id__": 384 }, { "__id__": 386 + }, + { + "__id__": 388 + }, + { + "__id__": 390 } ], "_prefab": { - "__id__": 388 + "__id__": 392 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -102.615, + "y": 190, "z": 0 }, "_lrot": { @@ -7062,6 +7062,9 @@ }, { "__id__": 332 + }, + { + "__id__": 334 } ], "removedComponents": [] @@ -7232,6 +7235,16 @@ "handler": "selectCard", "customEventData": "1" }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 318 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -7239,14 +7252,14 @@ "__id__": 313 }, "_prefab": { - "__id__": 335 + "__id__": 336 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 334 + "__id__": 335 }, "asset": { "__uuid__": "eb933093-ff09-4a1f-8ca9-fa933592ba8b", @@ -7254,7 +7267,7 @@ }, "fileId": "c3ePn06YJC6YTe2BxAPPm2", "instance": { - "__id__": 336 + "__id__": 337 }, "targetOverrides": null }, @@ -7268,10 +7281,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 337 - }, - { - "__id__": 339 + "__id__": 338 }, { "__id__": 340 @@ -7283,13 +7293,19 @@ "__id__": 342 }, { - "__id__": 344 + "__id__": 343 }, { - "__id__": 346 + "__id__": 345 }, { - "__id__": 348 + "__id__": 347 + }, + { + "__id__": 349 + }, + { + "__id__": 351 } ], "removedComponents": [] @@ -7297,7 +7313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 338 + "__id__": 339 }, "propertyPath": [ "_name" @@ -7313,7 +7329,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 338 + "__id__": 339 }, "propertyPath": [ "_lpos" @@ -7328,7 +7344,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 338 + "__id__": 339 }, "propertyPath": [ "_lrot" @@ -7344,7 +7360,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 338 + "__id__": 339 }, "propertyPath": [ "_euler" @@ -7359,7 +7375,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 343 + "__id__": 344 }, "propertyPath": [ "_active" @@ -7375,7 +7391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 345 + "__id__": 346 }, "propertyPath": [ "_active" @@ -7391,7 +7407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 347 + "__id__": 348 }, "propertyPath": [ "clickEvents", @@ -7408,14 +7424,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 347 + "__id__": 348 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 349 + "__id__": 350 } }, { @@ -7428,6 +7444,16 @@ "handler": "selectCard", "customEventData": "2" }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 339 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -7435,14 +7461,14 @@ "__id__": 313 }, "_prefab": { - "__id__": 351 + "__id__": 353 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 350 + "__id__": 352 }, "asset": { "__uuid__": "eb933093-ff09-4a1f-8ca9-fa933592ba8b", @@ -7450,7 +7476,7 @@ }, "fileId": "c3ePn06YJC6YTe2BxAPPm2", "instance": { - "__id__": 352 + "__id__": 354 }, "targetOverrides": null }, @@ -7463,21 +7489,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 353 - }, { "__id__": 355 }, - { - "__id__": 356 - }, { "__id__": 357 }, { "__id__": 358 }, + { + "__id__": 359 + }, { "__id__": 360 }, @@ -7486,6 +7509,12 @@ }, { "__id__": 364 + }, + { + "__id__": 366 + }, + { + "__id__": 368 } ], "removedComponents": [] @@ -7493,7 +7522,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 354 + "__id__": 356 }, "propertyPath": [ "_name" @@ -7509,7 +7538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 354 + "__id__": 356 }, "propertyPath": [ "_lpos" @@ -7524,7 +7553,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 354 + "__id__": 356 }, "propertyPath": [ "_lrot" @@ -7540,7 +7569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 354 + "__id__": 356 }, "propertyPath": [ "_euler" @@ -7555,7 +7584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 361 }, "propertyPath": [ "_active" @@ -7571,7 +7600,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 361 + "__id__": 363 }, "propertyPath": [ "_active" @@ -7587,7 +7616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 363 + "__id__": 365 }, "propertyPath": [ "clickEvents", @@ -7604,14 +7633,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 363 + "__id__": 365 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 365 + "__id__": 367 } }, { @@ -7624,6 +7653,16 @@ "handler": "selectCard", "customEventData": "3" }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 356 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -7631,14 +7670,14 @@ "__id__": 313 }, "_prefab": { - "__id__": 367 + "__id__": 370 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 366 + "__id__": 369 }, "asset": { "__uuid__": "eb933093-ff09-4a1f-8ca9-fa933592ba8b", @@ -7646,7 +7685,7 @@ }, "fileId": "c3ePn06YJC6YTe2BxAPPm2", "instance": { - "__id__": 368 + "__id__": 371 }, "targetOverrides": null }, @@ -7659,26 +7698,29 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 369 - }, - { - "__id__": 371 - }, { "__id__": 372 }, - { - "__id__": 373 - }, { "__id__": 374 }, + { + "__id__": 375 + }, { "__id__": 376 }, { - "__id__": 378 + "__id__": 377 + }, + { + "__id__": 379 + }, + { + "__id__": 381 + }, + { + "__id__": 383 } ], "removedComponents": [] @@ -7686,7 +7728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 370 + "__id__": 373 }, "propertyPath": [ "_name" @@ -7702,7 +7744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 370 + "__id__": 373 }, "propertyPath": [ "_lpos" @@ -7717,7 +7759,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 370 + "__id__": 373 }, "propertyPath": [ "_lrot" @@ -7733,7 +7775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 370 + "__id__": 373 }, "propertyPath": [ "_euler" @@ -7748,7 +7790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 375 + "__id__": 378 }, "propertyPath": [ "_active" @@ -7764,7 +7806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 377 + "__id__": 380 }, "propertyPath": [ "clickEvents", @@ -7781,14 +7823,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 377 + "__id__": 380 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 379 + "__id__": 382 } }, { @@ -7801,6 +7843,16 @@ "handler": "selectCard", "customEventData": "4" }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 373 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.UITransform", "_name": "", @@ -7811,7 +7863,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 385 }, "_contentSize": { "__type__": "cc.Size", @@ -7839,14 +7891,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 387 }, - "_alignFlags": 40, + "_alignFlags": 44, "_target": null, "_left": 20, "_right": 20, "_top": 0, - "_bottom": 0, + "_bottom": 400, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -7875,7 +7927,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 389 }, "_resizeMode": 0, "_layoutType": 1, @@ -7913,19 +7965,19 @@ }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 391 }, "card1": { "__id__": 314 }, "card2": { - "__id__": 334 + "__id__": 335 }, "card3": { - "__id__": 350 + "__id__": 352 }, "card4": { - "__id__": 366 + "__id__": 369 }, "_id": "" }, @@ -7956,37 +8008,37 @@ }, "_children": [ { - "__id__": 390 + "__id__": 394 }, { - "__id__": 398 + "__id__": 402 }, { - "__id__": 406 + "__id__": 410 }, { - "__id__": 414 + "__id__": 418 } ], "_active": true, "_components": [ - { - "__id__": 434 - }, - { - "__id__": 436 - }, { "__id__": 438 + }, + { + "__id__": 440 + }, + { + "__id__": 442 } ], "_prefab": { - "__id__": 440 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -102.615, + "y": 190, "z": 0 }, "_lrot": { @@ -8018,23 +8070,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 393 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 391 - }, - { - "__id__": 393 - }, { "__id__": 395 + }, + { + "__id__": 397 + }, + { + "__id__": 399 } ], "_prefab": { - "__id__": 397 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -8071,11 +8123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 396 }, "_contentSize": { "__type__": "cc.Size", @@ -8099,11 +8151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 398 }, "_alignFlags": 36, "_target": null, @@ -8135,11 +8187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 394 }, "_enabled": false, "__prefab": { - "__id__": 396 + "__id__": 400 }, "_id": "" }, @@ -8166,23 +8218,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 393 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 399 - }, - { - "__id__": 401 - }, { "__id__": 403 + }, + { + "__id__": 405 + }, + { + "__id__": 407 } ], "_prefab": { - "__id__": 405 + "__id__": 409 }, "_lpos": { "__type__": "cc.Vec3", @@ -8219,11 +8271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 404 }, "_contentSize": { "__type__": "cc.Size", @@ -8247,11 +8299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 402 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 406 }, "_alignFlags": 36, "_target": null, @@ -8283,11 +8335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 402 }, "_enabled": false, "__prefab": { - "__id__": 404 + "__id__": 408 }, "_id": "" }, @@ -8314,23 +8366,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 393 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 407 - }, - { - "__id__": 409 - }, { "__id__": 411 + }, + { + "__id__": 413 + }, + { + "__id__": 415 } ], "_prefab": { - "__id__": 413 + "__id__": 417 }, "_lpos": { "__type__": "cc.Vec3", @@ -8367,11 +8419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 406 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 408 + "__id__": 412 }, "_contentSize": { "__type__": "cc.Size", @@ -8395,11 +8447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 406 + "__id__": 410 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 414 }, "_alignFlags": 36, "_target": null, @@ -8431,11 +8483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 406 + "__id__": 410 }, "_enabled": false, "__prefab": { - "__id__": 412 + "__id__": 416 }, "_id": "" }, @@ -8462,27 +8514,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 393 }, "_children": [ { - "__id__": 415 + "__id__": 419 } ], "_active": true, "_components": [ - { - "__id__": 427 - }, - { - "__id__": 429 - }, { "__id__": 431 + }, + { + "__id__": 433 + }, + { + "__id__": 435 } ], "_prefab": { - "__id__": 433 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -8519,24 +8571,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 414 + "__id__": 418 }, "_children": [ { - "__id__": 416 + "__id__": 420 } ], "_active": true, "_components": [ { - "__id__": 422 + "__id__": 426 }, { - "__id__": 424 + "__id__": 428 } ], "_prefab": { - "__id__": 426 + "__id__": 430 }, "_lpos": { "__type__": "cc.Vec3", @@ -8573,20 +8625,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 419 }, "_children": [], "_active": true, "_components": [ { - "__id__": 417 + "__id__": 421 }, { - "__id__": 419 + "__id__": 423 } ], "_prefab": { - "__id__": 421 + "__id__": 425 }, "_lpos": { "__type__": "cc.Vec3", @@ -8623,11 +8675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", @@ -8651,11 +8703,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 424 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8732,11 +8784,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 427 }, "_contentSize": { "__type__": "cc.Size", @@ -8760,11 +8812,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 429 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8821,11 +8873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 432 }, "_contentSize": { "__type__": "cc.Size", @@ -8849,11 +8901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 434 }, "_alignFlags": 36, "_target": null, @@ -8885,11 +8937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 414 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 436 }, "_id": "" }, @@ -8916,11 +8968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 393 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 439 }, "_contentSize": { "__type__": "cc.Size", @@ -8944,18 +8996,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 393 }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 441 }, - "_alignFlags": 40, + "_alignFlags": 44, "_target": null, "_left": 20, "_right": 20, "_top": 0, - "_bottom": 0, + "_bottom": 400, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8980,11 +9032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 393 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 443 }, "_resizeMode": 0, "_layoutType": 1, @@ -9035,7 +9087,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 442 + "__id__": 446 }, "_contentSize": { "__type__": "cc.Size", @@ -9063,7 +9115,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 444 + "__id__": 448 }, "_alignFlags": 44, "_target": null, @@ -9112,38 +9164,38 @@ }, "_children": [ { - "__id__": 447 + "__id__": 451 }, { - "__id__": 455 + "__id__": 459 }, { - "__id__": 461 + "__id__": 465 }, { - "__id__": 467 + "__id__": 471 }, { - "__id__": 473 + "__id__": 477 }, { - "__id__": 479 + "__id__": 483 } ], "_active": true, "_components": [ { - "__id__": 485 + "__id__": 489 }, { - "__id__": 487 + "__id__": 491 }, { - "__id__": 490 + "__id__": 494 } ], "_prefab": { - "__id__": 492 + "__id__": 496 }, "_lpos": { "__type__": "cc.Vec3", @@ -9180,23 +9232,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 448 - }, - { - "__id__": 450 - }, { "__id__": 452 + }, + { + "__id__": 454 + }, + { + "__id__": 456 } ], "_prefab": { - "__id__": 454 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -9233,11 +9285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -9261,11 +9313,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9309,11 +9361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 447 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 457 }, "_alignFlags": 45, "_target": null, @@ -9358,20 +9410,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": false, "_components": [ { - "__id__": 456 + "__id__": 460 }, { - "__id__": 458 + "__id__": 462 } ], "_prefab": { - "__id__": 460 + "__id__": 464 }, "_lpos": { "__type__": "cc.Vec3", @@ -9408,11 +9460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 461 }, "_contentSize": { "__type__": "cc.Size", @@ -9436,11 +9488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 463 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9494,20 +9546,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": false, "_components": [ { - "__id__": 462 + "__id__": 466 }, { - "__id__": 464 + "__id__": 468 } ], "_prefab": { - "__id__": 466 + "__id__": 470 }, "_lpos": { "__type__": "cc.Vec3", @@ -9544,11 +9596,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 461 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 467 }, "_contentSize": { "__type__": "cc.Size", @@ -9572,11 +9624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 461 + "__id__": 465 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 469 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9630,20 +9682,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": false, "_components": [ { - "__id__": 468 + "__id__": 472 }, { - "__id__": 470 + "__id__": 474 } ], "_prefab": { - "__id__": 472 + "__id__": 476 }, "_lpos": { "__type__": "cc.Vec3", @@ -9680,11 +9732,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 473 }, "_contentSize": { "__type__": "cc.Size", @@ -9708,11 +9760,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 475 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9766,20 +9818,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 474 + "__id__": 478 }, { - "__id__": 476 + "__id__": 480 } ], "_prefab": { - "__id__": 478 + "__id__": 482 }, "_lpos": { "__type__": "cc.Vec3", @@ -9816,11 +9868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 479 }, "_contentSize": { "__type__": "cc.Size", @@ -9844,11 +9896,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 481 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9902,20 +9954,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 446 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 480 + "__id__": 484 }, { - "__id__": 482 + "__id__": 486 } ], "_prefab": { - "__id__": 484 + "__id__": 488 }, "_lpos": { "__type__": "cc.Vec3", @@ -9952,11 +10004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 479 + "__id__": 483 }, "_enabled": true, "__prefab": { - "__id__": 481 + "__id__": 485 }, "_contentSize": { "__type__": "cc.Size", @@ -9980,11 +10032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 479 + "__id__": 483 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 487 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10061,11 +10113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 446 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 490 }, "_contentSize": { "__type__": "cc.Size", @@ -10089,15 +10141,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 446 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 492 }, "clickEvents": [ { - "__id__": 489 + "__id__": 493 } ], "_interactable": true, @@ -10137,7 +10189,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 446 + "__id__": 450 }, "_id": "" }, @@ -10161,11 +10213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 446 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 491 + "__id__": 495 }, "_alignFlags": 12, "_target": null, @@ -10214,7 +10266,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 494 + "__id__": 498 }, "_contentSize": { "__type__": "cc.Size", @@ -10242,7 +10294,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 500 }, "_alignFlags": 21, "_target": null, @@ -10278,7 +10330,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 502 }, "_id": "" }, @@ -10296,7 +10348,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 504 }, "_id": "" }, @@ -10314,7 +10366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 506 }, "_id": "" }, @@ -10345,47 +10397,47 @@ }, "_children": [ { - "__id__": 505 + "__id__": 509 }, { - "__id__": 513 + "__id__": 517 }, { - "__id__": 519 + "__id__": 523 }, { - "__id__": 547 + "__id__": 551 }, { - "__id__": 900 + "__id__": 904 }, { - "__id__": 917 + "__id__": 921 }, { - "__id__": 958 + "__id__": 962 }, { - "__id__": 981 + "__id__": 985 } ], "_active": false, "_components": [ - { - "__id__": 1004 - }, - { - "__id__": 1006 - }, { "__id__": 1008 }, { "__id__": 1010 + }, + { + "__id__": 1012 + }, + { + "__id__": 1014 } ], "_prefab": { - "__id__": 1012 + "__id__": 1016 }, "_lpos": { "__type__": "cc.Vec3", @@ -10422,23 +10474,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 506 - }, - { - "__id__": 508 - }, { "__id__": 510 + }, + { + "__id__": 512 + }, + { + "__id__": 514 } ], "_prefab": { - "__id__": 512 + "__id__": 516 }, "_lpos": { "__type__": "cc.Vec3", @@ -10475,11 +10527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 505 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 511 }, "_contentSize": { "__type__": "cc.Size", @@ -10503,11 +10555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 505 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 513 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10551,11 +10603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 505 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 515 }, "_alignFlags": 4, "_target": null, @@ -10600,20 +10652,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [], "_active": true, "_components": [ { - "__id__": 514 + "__id__": 518 }, { - "__id__": 516 + "__id__": 520 } ], "_prefab": { - "__id__": 518 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -10650,11 +10702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 513 + "__id__": 517 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 519 }, "_contentSize": { "__type__": "cc.Size", @@ -10678,11 +10730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 513 + "__id__": 517 }, "_enabled": true, "__prefab": { - "__id__": 517 + "__id__": 521 }, "_alignFlags": 20, "_target": null, @@ -10727,33 +10779,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [ { - "__id__": 520 + "__id__": 524 }, { - "__id__": 526 + "__id__": 530 }, { - "__id__": 534 + "__id__": 538 } ], "_active": true, "_components": [ - { - "__id__": 540 - }, - { - "__id__": 542 - }, { "__id__": 544 + }, + { + "__id__": 546 + }, + { + "__id__": 548 } ], "_prefab": { - "__id__": 546 + "__id__": 550 }, "_lpos": { "__type__": "cc.Vec3", @@ -10790,20 +10842,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 519 + "__id__": 523 }, "_children": [], "_active": true, "_components": [ { - "__id__": 521 + "__id__": 525 }, { - "__id__": 523 + "__id__": 527 } ], "_prefab": { - "__id__": 525 + "__id__": 529 }, "_lpos": { "__type__": "cc.Vec3", @@ -10840,11 +10892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 520 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 522 + "__id__": 526 }, "_contentSize": { "__type__": "cc.Size", @@ -10868,11 +10920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 520 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 524 + "__id__": 528 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10929,23 +10981,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 519 + "__id__": 523 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 527 - }, - { - "__id__": 529 - }, { "__id__": 531 + }, + { + "__id__": 533 + }, + { + "__id__": 535 } ], "_prefab": { - "__id__": 533 + "__id__": 537 }, "_lpos": { "__type__": "cc.Vec3", @@ -10982,11 +11034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 526 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 532 }, "_contentSize": { "__type__": "cc.Size", @@ -11010,11 +11062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 526 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 534 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11078,11 +11130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 526 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 536 }, "_alignFlags": 1, "_target": null, @@ -11127,20 +11179,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 519 + "__id__": 523 }, "_children": [], "_active": true, "_components": [ { - "__id__": 535 + "__id__": 539 }, { - "__id__": 537 + "__id__": 541 } ], "_prefab": { - "__id__": 539 + "__id__": 543 }, "_lpos": { "__type__": "cc.Vec3", @@ -11177,11 +11229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 534 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 540 }, "_contentSize": { "__type__": "cc.Size", @@ -11205,11 +11257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 534 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 542 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11286,11 +11338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -11314,11 +11366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": false, "__prefab": { - "__id__": 543 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11356,11 +11408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 549 }, "_alignFlags": 20, "_target": null, @@ -11405,27 +11457,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [ { - "__id__": 548 + "__id__": 552 }, { - "__id__": 556 + "__id__": 560 } ], "_active": true, "_components": [ { - "__id__": 895 + "__id__": 899 }, { - "__id__": 897 + "__id__": 901 } ], "_prefab": { - "__id__": 899 + "__id__": 903 }, "_lpos": { "__type__": "cc.Vec3", @@ -11462,23 +11514,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 547 + "__id__": 551 }, "_children": [], "_active": false, "_components": [ - { - "__id__": 549 - }, - { - "__id__": 551 - }, { "__id__": 553 + }, + { + "__id__": 555 + }, + { + "__id__": 557 } ], "_prefab": { - "__id__": 555 + "__id__": 559 }, "_lpos": { "__type__": "cc.Vec3", @@ -11515,11 +11567,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 552 }, "_enabled": true, "__prefab": { - "__id__": 550 + "__id__": 554 }, "_contentSize": { "__type__": "cc.Size", @@ -11543,11 +11595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 552 }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 556 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11591,11 +11643,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 552 }, "_enabled": true, "__prefab": { - "__id__": 554 + "__id__": 558 }, "_alignFlags": 45, "_target": null, @@ -11640,30 +11692,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 547 + "__id__": 551 }, "_children": [ { - "__id__": 557 + "__id__": 561 }, { - "__id__": 576 + "__id__": 580 }, { - "__id__": 806 + "__id__": 810 }, { - "__id__": 812 + "__id__": 816 } ], "_active": true, "_components": [ { - "__id__": 892 + "__id__": 896 } ], "_prefab": { - "__id__": 894 + "__id__": 898 }, "_lpos": { "__type__": "cc.Vec3", @@ -11698,17 +11750,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 556 + "__id__": 560 }, "_prefab": { - "__id__": 558 + "__id__": 562 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 557 + "__id__": 561 }, "asset": { "__uuid__": "e6194357-1151-49a8-ba79-224f45ed688c", @@ -11716,7 +11768,7 @@ }, "fileId": "05DREFeeFN3J6MVw6Ib9Zw", "instance": { - "__id__": 559 + "__id__": 563 }, "targetOverrides": null }, @@ -11729,38 +11781,38 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 560 - }, - { - "__id__": 562 - }, - { - "__id__": 563 - }, { "__id__": 564 }, { - "__id__": 565 + "__id__": 566 }, { "__id__": 567 }, + { + "__id__": 568 + }, { "__id__": 569 }, { "__id__": 571 }, - { - "__id__": 572 - }, { "__id__": 573 }, { - "__id__": 574 + "__id__": 575 + }, + { + "__id__": 576 + }, + { + "__id__": 577 + }, + { + "__id__": 578 } ], "removedComponents": [] @@ -11768,7 +11820,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 561 + "__id__": 565 }, "propertyPath": [ "_name" @@ -11784,7 +11836,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 561 + "__id__": 565 }, "propertyPath": [ "_lpos" @@ -11799,7 +11851,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 561 + "__id__": 565 }, "propertyPath": [ "_lrot" @@ -11815,7 +11867,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 561 + "__id__": 565 }, "propertyPath": [ "_euler" @@ -11830,7 +11882,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 566 + "__id__": 570 }, "propertyPath": [ "_contentSize" @@ -11850,7 +11902,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 568 + "__id__": 572 }, "propertyPath": [ "_contentSize" @@ -11870,7 +11922,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 574 }, "propertyPath": [ "_left" @@ -11886,7 +11938,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 574 }, "propertyPath": [ "_right" @@ -11896,7 +11948,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 574 }, "propertyPath": [ "_top" @@ -11906,7 +11958,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 574 }, "propertyPath": [ "_bottom" @@ -11916,7 +11968,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 579 }, "propertyPath": [ "_spriteFrame" @@ -11938,42 +11990,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 560 }, "_children": [ { - "__id__": 577 + "__id__": 581 }, { - "__id__": 615 + "__id__": 619 }, { - "__id__": 653 + "__id__": 657 }, { - "__id__": 685 + "__id__": 689 }, { - "__id__": 723 + "__id__": 727 }, { - "__id__": 763 + "__id__": 767 } ], "_active": true, "_components": [ - { - "__id__": 799 - }, - { - "__id__": 801 - }, { "__id__": 803 + }, + { + "__id__": 805 + }, + { + "__id__": 807 } ], "_prefab": { - "__id__": 805 + "__id__": 809 }, "_lpos": { "__type__": "cc.Vec3", @@ -12010,27 +12062,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 578 + "__id__": 582 }, { - "__id__": 598 + "__id__": 602 }, { - "__id__": 606 + "__id__": 610 } ], "_active": true, "_components": [ { - "__id__": 612 + "__id__": 616 } ], "_prefab": { - "__id__": 614 + "__id__": 618 }, "_lpos": { "__type__": "cc.Vec3", @@ -12065,17 +12117,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 577 + "__id__": 581 }, "_prefab": { - "__id__": 579 + "__id__": 583 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 578 + "__id__": 582 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -12083,7 +12135,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 580 + "__id__": 584 }, "targetOverrides": null }, @@ -12096,24 +12148,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 581 - }, - { - "__id__": 583 - }, - { - "__id__": 584 - }, { "__id__": 585 }, { - "__id__": 586 + "__id__": 587 }, { "__id__": 588 }, + { + "__id__": 589 + }, { "__id__": 590 }, @@ -12127,7 +12173,13 @@ "__id__": 596 }, { - "__id__": 597 + "__id__": 598 + }, + { + "__id__": 600 + }, + { + "__id__": 601 } ], "removedComponents": [] @@ -12135,7 +12187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 586 }, "propertyPath": [ "_name" @@ -12151,7 +12203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 586 }, "propertyPath": [ "_lpos" @@ -12166,7 +12218,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 586 }, "propertyPath": [ "_lrot" @@ -12182,7 +12234,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 586 }, "propertyPath": [ "_euler" @@ -12197,7 +12249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 587 + "__id__": 591 }, "propertyPath": [ "_contentSize" @@ -12217,7 +12269,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 593 }, "propertyPath": [ "_progress" @@ -12233,7 +12285,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 591 + "__id__": 595 }, "propertyPath": [ "_right" @@ -12249,7 +12301,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 593 + "__id__": 597 }, "propertyPath": [ "_contentSize" @@ -12269,7 +12321,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 595 + "__id__": 599 }, "propertyPath": [ "_lpos" @@ -12290,7 +12342,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 593 + "__id__": 597 }, "propertyPath": [ "_anchorPoint" @@ -12304,7 +12356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 589 + "__id__": 593 }, "propertyPath": [ "_totalLength" @@ -12317,23 +12369,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 581 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 599 - }, - { - "__id__": 601 - }, { "__id__": 603 + }, + { + "__id__": 605 + }, + { + "__id__": 607 } ], "_prefab": { - "__id__": 605 + "__id__": 609 }, "_lpos": { "__type__": "cc.Vec3", @@ -12370,11 +12422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 598 + "__id__": 602 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 604 }, "_contentSize": { "__type__": "cc.Size", @@ -12398,11 +12450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 598 + "__id__": 602 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 606 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12466,11 +12518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 598 + "__id__": 602 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 608 }, "_alignFlags": 32, "_target": null, @@ -12515,20 +12567,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 581 }, "_children": [], "_active": true, "_components": [ { - "__id__": 607 + "__id__": 611 }, { - "__id__": 609 + "__id__": 613 } ], "_prefab": { - "__id__": 611 + "__id__": 615 }, "_lpos": { "__type__": "cc.Vec3", @@ -12565,11 +12617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 606 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 608 + "__id__": 612 }, "_contentSize": { "__type__": "cc.Size", @@ -12593,11 +12645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 606 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 614 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12674,11 +12726,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 613 + "__id__": 617 }, "_contentSize": { "__type__": "cc.Size", @@ -12715,27 +12767,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 616 + "__id__": 620 }, { - "__id__": 636 + "__id__": 640 }, { - "__id__": 644 + "__id__": 648 } ], "_active": true, "_components": [ { - "__id__": 650 + "__id__": 654 } ], "_prefab": { - "__id__": 652 + "__id__": 656 }, "_lpos": { "__type__": "cc.Vec3", @@ -12770,17 +12822,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 615 + "__id__": 619 }, "_prefab": { - "__id__": 617 + "__id__": 621 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 616 + "__id__": 620 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -12788,7 +12840,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 618 + "__id__": 622 }, "targetOverrides": null }, @@ -12801,24 +12853,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 619 - }, - { - "__id__": 621 - }, - { - "__id__": 622 - }, { "__id__": 623 }, { - "__id__": 624 + "__id__": 625 }, { "__id__": 626 }, + { + "__id__": 627 + }, { "__id__": 628 }, @@ -12826,13 +12872,19 @@ "__id__": 630 }, { - "__id__": 631 + "__id__": 632 }, { - "__id__": 633 + "__id__": 634 }, { "__id__": 635 + }, + { + "__id__": 637 + }, + { + "__id__": 639 } ], "removedComponents": [] @@ -12840,7 +12892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 620 + "__id__": 624 }, "propertyPath": [ "_name" @@ -12856,7 +12908,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 620 + "__id__": 624 }, "propertyPath": [ "_lpos" @@ -12871,7 +12923,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 620 + "__id__": 624 }, "propertyPath": [ "_lrot" @@ -12887,7 +12939,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 620 + "__id__": 624 }, "propertyPath": [ "_euler" @@ -12902,7 +12954,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 629 }, "propertyPath": [ "_contentSize" @@ -12922,7 +12974,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 631 }, "propertyPath": [ "_contentSize" @@ -12942,7 +12994,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 633 }, "propertyPath": [ "_lpos" @@ -12963,7 +13015,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 629 }, "propertyPath": [ "_anchorPoint" @@ -12977,7 +13029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 632 + "__id__": 636 }, "propertyPath": [ "_totalLength" @@ -12993,7 +13045,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 634 + "__id__": 638 }, "propertyPath": [ "_right" @@ -13009,7 +13061,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 632 + "__id__": 636 }, "propertyPath": [ "_progress" @@ -13022,23 +13074,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 615 + "__id__": 619 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 637 - }, - { - "__id__": 639 - }, { "__id__": 641 + }, + { + "__id__": 643 + }, + { + "__id__": 645 } ], "_prefab": { - "__id__": 643 + "__id__": 647 }, "_lpos": { "__type__": "cc.Vec3", @@ -13075,11 +13127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 636 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 642 }, "_contentSize": { "__type__": "cc.Size", @@ -13103,11 +13155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 636 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 644 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13171,11 +13223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 636 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 646 }, "_alignFlags": 32, "_target": null, @@ -13220,20 +13272,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 615 + "__id__": 619 }, "_children": [], "_active": true, "_components": [ { - "__id__": 645 + "__id__": 649 }, { - "__id__": 647 + "__id__": 651 } ], "_prefab": { - "__id__": 649 + "__id__": 653 }, "_lpos": { "__type__": "cc.Vec3", @@ -13270,11 +13322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 644 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 650 }, "_contentSize": { "__type__": "cc.Size", @@ -13298,11 +13350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 644 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 648 + "__id__": 652 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13379,11 +13431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 615 + "__id__": 619 }, "_enabled": true, "__prefab": { - "__id__": 651 + "__id__": 655 }, "_contentSize": { "__type__": "cc.Size", @@ -13420,27 +13472,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 654 + "__id__": 658 }, { - "__id__": 670 + "__id__": 674 }, { - "__id__": 676 + "__id__": 680 } ], "_active": false, "_components": [ { - "__id__": 682 + "__id__": 686 } ], "_prefab": { - "__id__": 684 + "__id__": 688 }, "_lpos": { "__type__": "cc.Vec3", @@ -13475,17 +13527,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 653 + "__id__": 657 }, "_prefab": { - "__id__": 655 + "__id__": 659 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 654 + "__id__": 658 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -13493,7 +13545,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 656 + "__id__": 660 }, "targetOverrides": null }, @@ -13506,20 +13558,11 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 657 - }, - { - "__id__": 659 - }, - { - "__id__": 660 - }, { "__id__": 661 }, { - "__id__": 662 + "__id__": 663 }, { "__id__": 664 @@ -13528,10 +13571,19 @@ "__id__": 665 }, { - "__id__": 667 + "__id__": 666 + }, + { + "__id__": 668 }, { "__id__": 669 + }, + { + "__id__": 671 + }, + { + "__id__": 673 } ], "removedComponents": [] @@ -13539,7 +13591,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 658 + "__id__": 662 }, "propertyPath": [ "_name" @@ -13555,7 +13607,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 658 + "__id__": 662 }, "propertyPath": [ "_lpos" @@ -13570,7 +13622,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 658 + "__id__": 662 }, "propertyPath": [ "_lrot" @@ -13586,7 +13638,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 658 + "__id__": 662 }, "propertyPath": [ "_euler" @@ -13601,7 +13653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 663 + "__id__": 667 }, "propertyPath": [ "_contentSize" @@ -13621,7 +13673,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 663 + "__id__": 667 }, "propertyPath": [ "_anchorPoint" @@ -13635,7 +13687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 666 + "__id__": 670 }, "propertyPath": [ "_contentSize" @@ -13655,7 +13707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 668 + "__id__": 672 }, "propertyPath": [ "_totalLength" @@ -13671,7 +13723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 668 + "__id__": 672 }, "propertyPath": [ "_progress" @@ -13684,20 +13736,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 657 }, "_children": [], "_active": true, "_components": [ { - "__id__": 671 + "__id__": 675 }, { - "__id__": 673 + "__id__": 677 } ], "_prefab": { - "__id__": 675 + "__id__": 679 }, "_lpos": { "__type__": "cc.Vec3", @@ -13734,11 +13786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 674 }, "_enabled": true, "__prefab": { - "__id__": 672 + "__id__": 676 }, "_contentSize": { "__type__": "cc.Size", @@ -13762,11 +13814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 674 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 678 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13843,20 +13895,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 653 + "__id__": 657 }, "_children": [], "_active": true, "_components": [ { - "__id__": 677 + "__id__": 681 }, { - "__id__": 679 + "__id__": 683 } ], "_prefab": { - "__id__": 681 + "__id__": 685 }, "_lpos": { "__type__": "cc.Vec3", @@ -13893,11 +13945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 680 }, "_enabled": true, "__prefab": { - "__id__": 678 + "__id__": 682 }, "_contentSize": { "__type__": "cc.Size", @@ -13921,11 +13973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 680 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 684 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14002,11 +14054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 657 }, "_enabled": true, "__prefab": { - "__id__": 683 + "__id__": 687 }, "_contentSize": { "__type__": "cc.Size", @@ -14043,27 +14095,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 686 + "__id__": 690 }, { - "__id__": 706 + "__id__": 710 }, { - "__id__": 714 + "__id__": 718 } ], "_active": true, "_components": [ { - "__id__": 720 + "__id__": 724 } ], "_prefab": { - "__id__": 722 + "__id__": 726 }, "_lpos": { "__type__": "cc.Vec3", @@ -14098,17 +14150,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 685 + "__id__": 689 }, "_prefab": { - "__id__": 687 + "__id__": 691 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 686 + "__id__": 690 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -14116,7 +14168,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 688 + "__id__": 692 }, "targetOverrides": null }, @@ -14129,24 +14181,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 689 - }, - { - "__id__": 691 - }, - { - "__id__": 692 - }, { "__id__": 693 }, { - "__id__": 694 + "__id__": 695 }, { "__id__": 696 }, + { + "__id__": 697 + }, { "__id__": 698 }, @@ -14154,13 +14200,19 @@ "__id__": 700 }, { - "__id__": 701 + "__id__": 702 }, { - "__id__": 703 + "__id__": 704 }, { "__id__": 705 + }, + { + "__id__": 707 + }, + { + "__id__": 709 } ], "removedComponents": [] @@ -14168,7 +14220,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 690 + "__id__": 694 }, "propertyPath": [ "_name" @@ -14184,7 +14236,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 690 + "__id__": 694 }, "propertyPath": [ "_lpos" @@ -14199,7 +14251,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 690 + "__id__": 694 }, "propertyPath": [ "_lrot" @@ -14215,7 +14267,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 690 + "__id__": 694 }, "propertyPath": [ "_euler" @@ -14230,7 +14282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 695 + "__id__": 699 }, "propertyPath": [ "_contentSize" @@ -14250,7 +14302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 697 + "__id__": 701 }, "propertyPath": [ "_contentSize" @@ -14270,7 +14322,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 699 + "__id__": 703 }, "propertyPath": [ "_lpos" @@ -14291,7 +14343,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 695 + "__id__": 699 }, "propertyPath": [ "_anchorPoint" @@ -14305,7 +14357,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 702 + "__id__": 706 }, "propertyPath": [ "_totalLength" @@ -14321,7 +14373,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 704 + "__id__": 708 }, "propertyPath": [ "_right" @@ -14337,7 +14389,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 702 + "__id__": 706 }, "propertyPath": [ "_progress" @@ -14350,23 +14402,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 685 + "__id__": 689 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 707 - }, - { - "__id__": 709 - }, { "__id__": 711 + }, + { + "__id__": 713 + }, + { + "__id__": 715 } ], "_prefab": { - "__id__": 713 + "__id__": 717 }, "_lpos": { "__type__": "cc.Vec3", @@ -14403,11 +14455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 708 + "__id__": 712 }, "_contentSize": { "__type__": "cc.Size", @@ -14431,11 +14483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 710 + "__id__": 714 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14499,11 +14551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 710 }, "_enabled": true, "__prefab": { - "__id__": 712 + "__id__": 716 }, "_alignFlags": 32, "_target": null, @@ -14548,20 +14600,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 685 + "__id__": 689 }, "_children": [], "_active": true, "_components": [ { - "__id__": 715 + "__id__": 719 }, { - "__id__": 717 + "__id__": 721 } ], "_prefab": { - "__id__": 719 + "__id__": 723 }, "_lpos": { "__type__": "cc.Vec3", @@ -14598,11 +14650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 714 + "__id__": 718 }, "_enabled": true, "__prefab": { - "__id__": 716 + "__id__": 720 }, "_contentSize": { "__type__": "cc.Size", @@ -14626,11 +14678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 714 + "__id__": 718 }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 722 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14707,11 +14759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 685 + "__id__": 689 }, "_enabled": true, "__prefab": { - "__id__": 721 + "__id__": 725 }, "_contentSize": { "__type__": "cc.Size", @@ -14748,27 +14800,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 724 + "__id__": 728 }, { - "__id__": 744 + "__id__": 748 }, { - "__id__": 754 + "__id__": 758 } ], "_active": true, "_components": [ { - "__id__": 760 + "__id__": 764 } ], "_prefab": { - "__id__": 762 + "__id__": 766 }, "_lpos": { "__type__": "cc.Vec3", @@ -14803,17 +14855,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 723 + "__id__": 727 }, "_prefab": { - "__id__": 725 + "__id__": 729 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 724 + "__id__": 728 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -14821,7 +14873,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 726 + "__id__": 730 }, "targetOverrides": null }, @@ -14834,24 +14886,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 727 - }, - { - "__id__": 729 - }, - { - "__id__": 730 - }, { "__id__": 731 }, { - "__id__": 732 + "__id__": 733 }, { "__id__": 734 }, + { + "__id__": 735 + }, { "__id__": 736 }, @@ -14859,13 +14905,19 @@ "__id__": 738 }, { - "__id__": 739 + "__id__": 740 }, { - "__id__": 741 + "__id__": 742 }, { "__id__": 743 + }, + { + "__id__": 745 + }, + { + "__id__": 747 } ], "removedComponents": [] @@ -14873,7 +14925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 728 + "__id__": 732 }, "propertyPath": [ "_name" @@ -14889,7 +14941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 728 + "__id__": 732 }, "propertyPath": [ "_lpos" @@ -14904,7 +14956,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 728 + "__id__": 732 }, "propertyPath": [ "_lrot" @@ -14920,7 +14972,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 728 + "__id__": 732 }, "propertyPath": [ "_euler" @@ -14935,7 +14987,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 733 + "__id__": 737 }, "propertyPath": [ "_contentSize" @@ -14955,7 +15007,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 735 + "__id__": 739 }, "propertyPath": [ "_contentSize" @@ -14975,7 +15027,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 737 + "__id__": 741 }, "propertyPath": [ "_lpos" @@ -14996,7 +15048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 733 + "__id__": 737 }, "propertyPath": [ "_anchorPoint" @@ -15010,7 +15062,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 740 + "__id__": 744 }, "propertyPath": [ "_totalLength" @@ -15026,7 +15078,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 742 + "__id__": 746 }, "propertyPath": [ "_right" @@ -15042,7 +15094,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 740 + "__id__": 744 }, "propertyPath": [ "_progress" @@ -15055,26 +15107,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 723 + "__id__": 727 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 745 - }, - { - "__id__": 747 - }, { "__id__": 749 }, { "__id__": 751 + }, + { + "__id__": 753 + }, + { + "__id__": 755 } ], "_prefab": { - "__id__": 753 + "__id__": 757 }, "_lpos": { "__type__": "cc.Vec3", @@ -15111,11 +15163,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 744 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 746 + "__id__": 750 }, "_contentSize": { "__type__": "cc.Size", @@ -15139,11 +15191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 744 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 748 + "__id__": 752 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15207,11 +15259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 744 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 750 + "__id__": 754 }, "_alignFlags": 34, "_target": null, @@ -15243,11 +15295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 744 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 752 + "__id__": 756 }, "_alignFlags": 0, "_target": null, @@ -15292,20 +15344,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 723 + "__id__": 727 }, "_children": [], "_active": true, "_components": [ { - "__id__": 755 + "__id__": 759 }, { - "__id__": 757 + "__id__": 761 } ], "_prefab": { - "__id__": 759 + "__id__": 763 }, "_lpos": { "__type__": "cc.Vec3", @@ -15342,11 +15394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 754 + "__id__": 758 }, "_enabled": true, "__prefab": { - "__id__": 756 + "__id__": 760 }, "_contentSize": { "__type__": "cc.Size", @@ -15370,11 +15422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 754 + "__id__": 758 }, "_enabled": true, "__prefab": { - "__id__": 758 + "__id__": 762 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15451,11 +15503,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 723 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 761 + "__id__": 765 }, "_contentSize": { "__type__": "cc.Size", @@ -15492,27 +15544,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 580 }, "_children": [ { - "__id__": 764 + "__id__": 768 }, { - "__id__": 780 + "__id__": 784 }, { - "__id__": 790 + "__id__": 794 } ], "_active": false, "_components": [ { - "__id__": 796 + "__id__": 800 } ], "_prefab": { - "__id__": 798 + "__id__": 802 }, "_lpos": { "__type__": "cc.Vec3", @@ -15547,17 +15599,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 763 + "__id__": 767 }, "_prefab": { - "__id__": 765 + "__id__": 769 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 764 + "__id__": 768 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -15565,7 +15617,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 766 + "__id__": 770 }, "targetOverrides": null }, @@ -15578,20 +15630,11 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 767 - }, - { - "__id__": 769 - }, - { - "__id__": 770 - }, { "__id__": 771 }, { - "__id__": 772 + "__id__": 773 }, { "__id__": 774 @@ -15600,10 +15643,19 @@ "__id__": 775 }, { - "__id__": 777 + "__id__": 776 + }, + { + "__id__": 778 }, { "__id__": 779 + }, + { + "__id__": 781 + }, + { + "__id__": 783 } ], "removedComponents": [] @@ -15611,7 +15663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 768 + "__id__": 772 }, "propertyPath": [ "_name" @@ -15627,7 +15679,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 768 + "__id__": 772 }, "propertyPath": [ "_lpos" @@ -15642,7 +15694,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 768 + "__id__": 772 }, "propertyPath": [ "_lrot" @@ -15658,7 +15710,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 768 + "__id__": 772 }, "propertyPath": [ "_euler" @@ -15673,7 +15725,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 773 + "__id__": 777 }, "propertyPath": [ "_contentSize" @@ -15693,7 +15745,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 773 + "__id__": 777 }, "propertyPath": [ "_anchorPoint" @@ -15707,7 +15759,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 776 + "__id__": 780 }, "propertyPath": [ "_contentSize" @@ -15727,7 +15779,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 778 + "__id__": 782 }, "propertyPath": [ "_totalLength" @@ -15743,7 +15795,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 778 + "__id__": 782 }, "propertyPath": [ "_progress" @@ -15756,26 +15808,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 763 + "__id__": 767 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 781 - }, - { - "__id__": 783 - }, { "__id__": 785 }, { "__id__": 787 + }, + { + "__id__": 789 + }, + { + "__id__": 791 } ], "_prefab": { - "__id__": 789 + "__id__": 793 }, "_lpos": { "__type__": "cc.Vec3", @@ -15812,11 +15864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 782 + "__id__": 786 }, "_contentSize": { "__type__": "cc.Size", @@ -15840,11 +15892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 784 + "__id__": 788 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15908,11 +15960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 790 }, "_alignFlags": 34, "_target": null, @@ -15944,11 +15996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 792 }, "_alignFlags": 0, "_target": null, @@ -15993,20 +16045,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 763 + "__id__": 767 }, "_children": [], "_active": true, "_components": [ { - "__id__": 791 + "__id__": 795 }, { - "__id__": 793 + "__id__": 797 } ], "_prefab": { - "__id__": 795 + "__id__": 799 }, "_lpos": { "__type__": "cc.Vec3", @@ -16043,11 +16095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 790 + "__id__": 794 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 796 }, "_contentSize": { "__type__": "cc.Size", @@ -16071,11 +16123,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 790 + "__id__": 794 }, "_enabled": true, "__prefab": { - "__id__": 794 + "__id__": 798 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16152,11 +16204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 767 }, "_enabled": true, "__prefab": { - "__id__": 797 + "__id__": 801 }, "_contentSize": { "__type__": "cc.Size", @@ -16193,11 +16245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 804 }, "_contentSize": { "__type__": "cc.Size", @@ -16221,11 +16273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 806 }, "_alignFlags": 45, "_target": null, @@ -16257,11 +16309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 804 + "__id__": 808 }, "_resizeMode": 0, "_layoutType": 3, @@ -16308,20 +16360,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 560 }, "_children": [], "_active": true, "_components": [ { - "__id__": 807 + "__id__": 811 }, { - "__id__": 809 + "__id__": 813 } ], "_prefab": { - "__id__": 811 + "__id__": 815 }, "_lpos": { "__type__": "cc.Vec3", @@ -16358,11 +16410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 810 }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 812 }, "_contentSize": { "__type__": "cc.Size", @@ -16386,11 +16438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 810 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 814 }, "_alignFlags": 40, "_target": null, @@ -16435,36 +16487,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 560 }, "_children": [ { - "__id__": 813 + "__id__": 817 }, { - "__id__": 821 + "__id__": 825 }, { - "__id__": 829 + "__id__": 833 }, { - "__id__": 857 + "__id__": 861 } ], "_active": true, "_components": [ - { - "__id__": 885 - }, - { - "__id__": 887 - }, { "__id__": 889 + }, + { + "__id__": 891 + }, + { + "__id__": 893 } ], "_prefab": { - "__id__": 891 + "__id__": 895 }, "_lpos": { "__type__": "cc.Vec3", @@ -16501,23 +16553,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 812 + "__id__": 816 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 814 - }, - { - "__id__": 816 - }, { "__id__": 818 + }, + { + "__id__": 820 + }, + { + "__id__": 822 } ], "_prefab": { - "__id__": 820 + "__id__": 824 }, "_lpos": { "__type__": "cc.Vec3", @@ -16554,11 +16606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 813 + "__id__": 817 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 819 }, "_contentSize": { "__type__": "cc.Size", @@ -16582,11 +16634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 813 + "__id__": 817 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 821 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16627,11 +16679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 813 + "__id__": 817 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 823 }, "_alignFlags": 45, "_target": null, @@ -16676,23 +16728,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 812 + "__id__": 816 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 822 - }, - { - "__id__": 824 - }, { "__id__": 826 + }, + { + "__id__": 828 + }, + { + "__id__": 830 } ], "_prefab": { - "__id__": 828 + "__id__": 832 }, "_lpos": { "__type__": "cc.Vec3", @@ -16729,11 +16781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 827 }, "_contentSize": { "__type__": "cc.Size", @@ -16757,11 +16809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 829 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16802,11 +16854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 827 + "__id__": 831 }, "_alignFlags": 42, "_target": null, @@ -16851,27 +16903,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 812 + "__id__": 816 }, "_children": [ { - "__id__": 830 + "__id__": 834 }, { - "__id__": 838 + "__id__": 842 } ], "_active": true, "_components": [ { - "__id__": 852 + "__id__": 856 }, { - "__id__": 854 + "__id__": 858 } ], "_prefab": { - "__id__": 856 + "__id__": 860 }, "_lpos": { "__type__": "cc.Vec3", @@ -16908,23 +16960,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 829 + "__id__": 833 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 831 - }, - { - "__id__": 833 - }, { "__id__": 835 + }, + { + "__id__": 837 + }, + { + "__id__": 839 } ], "_prefab": { - "__id__": 837 + "__id__": 841 }, "_lpos": { "__type__": "cc.Vec3", @@ -16961,11 +17013,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 830 + "__id__": 834 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 836 }, "_contentSize": { "__type__": "cc.Size", @@ -16989,11 +17041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 830 + "__id__": 834 }, "_enabled": true, "__prefab": { - "__id__": 834 + "__id__": 838 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17037,11 +17089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 830 + "__id__": 834 }, "_enabled": true, "__prefab": { - "__id__": 836 + "__id__": 840 }, "_alignFlags": 12, "_target": null, @@ -17086,24 +17138,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 829 + "__id__": 833 }, "_children": [ { - "__id__": 839 + "__id__": 843 } ], "_active": true, "_components": [ { - "__id__": 847 + "__id__": 851 }, { - "__id__": 849 + "__id__": 853 } ], "_prefab": { - "__id__": 851 + "__id__": 855 }, "_lpos": { "__type__": "cc.Vec3", @@ -17140,23 +17192,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 838 + "__id__": 842 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 840 - }, - { - "__id__": 842 - }, { "__id__": 844 + }, + { + "__id__": 846 + }, + { + "__id__": 848 } ], "_prefab": { - "__id__": 846 + "__id__": 850 }, "_lpos": { "__type__": "cc.Vec3", @@ -17193,11 +17245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 843 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 845 }, "_contentSize": { "__type__": "cc.Size", @@ -17221,11 +17273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 843 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 847 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17289,11 +17341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 843 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 849 }, "_alignFlags": 45, "_target": null, @@ -17338,11 +17390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 848 + "__id__": 852 }, "_contentSize": { "__type__": "cc.Size", @@ -17366,11 +17418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 854 }, "_alignFlags": 45, "_target": null, @@ -17415,11 +17467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 829 + "__id__": 833 }, "_enabled": true, "__prefab": { - "__id__": 853 + "__id__": 857 }, "_contentSize": { "__type__": "cc.Size", @@ -17443,11 +17495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 829 + "__id__": 833 }, "_enabled": true, "__prefab": { - "__id__": 855 + "__id__": 859 }, "_alignFlags": 41, "_target": null, @@ -17492,27 +17544,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 812 + "__id__": 816 }, "_children": [ { - "__id__": 858 + "__id__": 862 }, { - "__id__": 866 + "__id__": 870 } ], "_active": true, "_components": [ { - "__id__": 880 + "__id__": 884 }, { - "__id__": 882 + "__id__": 886 } ], "_prefab": { - "__id__": 884 + "__id__": 888 }, "_lpos": { "__type__": "cc.Vec3", @@ -17549,23 +17601,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 857 + "__id__": 861 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 859 - }, - { - "__id__": 861 - }, { "__id__": 863 + }, + { + "__id__": 865 + }, + { + "__id__": 867 } ], "_prefab": { - "__id__": 865 + "__id__": 869 }, "_lpos": { "__type__": "cc.Vec3", @@ -17602,11 +17654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 858 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 860 + "__id__": 864 }, "_contentSize": { "__type__": "cc.Size", @@ -17630,11 +17682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 858 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 862 + "__id__": 866 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17678,11 +17730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 858 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 868 }, "_alignFlags": 9, "_target": null, @@ -17727,24 +17779,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 857 + "__id__": 861 }, "_children": [ { - "__id__": 867 + "__id__": 871 } ], "_active": true, "_components": [ { - "__id__": 875 + "__id__": 879 }, { - "__id__": 877 + "__id__": 881 } ], "_prefab": { - "__id__": 879 + "__id__": 883 }, "_lpos": { "__type__": "cc.Vec3", @@ -17781,23 +17833,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 866 + "__id__": 870 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 868 - }, - { - "__id__": 870 - }, { "__id__": 872 + }, + { + "__id__": 874 + }, + { + "__id__": 876 } ], "_prefab": { - "__id__": 874 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -17834,11 +17886,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 869 + "__id__": 873 }, "_contentSize": { "__type__": "cc.Size", @@ -17862,11 +17914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 871 + "__id__": 875 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17930,11 +17982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 877 }, "_alignFlags": 45, "_target": null, @@ -17979,11 +18031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 870 }, "_enabled": true, "__prefab": { - "__id__": 876 + "__id__": 880 }, "_contentSize": { "__type__": "cc.Size", @@ -18007,11 +18059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 870 }, "_enabled": true, "__prefab": { - "__id__": 878 + "__id__": 882 }, "_alignFlags": 45, "_target": null, @@ -18056,11 +18108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 857 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 881 + "__id__": 885 }, "_contentSize": { "__type__": "cc.Size", @@ -18084,11 +18136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 857 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 883 + "__id__": 887 }, "_alignFlags": 44, "_target": null, @@ -18133,11 +18185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 886 + "__id__": 890 }, "_contentSize": { "__type__": "cc.Size", @@ -18161,11 +18213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 816 }, "_enabled": false, "__prefab": { - "__id__": 888 + "__id__": 892 }, "_resizeMode": 0, "_layoutType": 1, @@ -18199,11 +18251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 890 + "__id__": 894 }, "_alignFlags": 44, "_target": null, @@ -18248,11 +18300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 560 }, "_enabled": true, "__prefab": { - "__id__": 893 + "__id__": 897 }, "_contentSize": { "__type__": "cc.Size", @@ -18289,11 +18341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 547 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 900 }, "_contentSize": { "__type__": "cc.Size", @@ -18317,11 +18369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 547 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 898 + "__id__": 902 }, "_alignFlags": 44, "_target": null, @@ -18364,17 +18416,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 504 + "__id__": 508 }, "_prefab": { - "__id__": 901 + "__id__": 905 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 900 + "__id__": 904 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -18382,7 +18434,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 902 + "__id__": 906 }, "targetOverrides": null }, @@ -18395,32 +18447,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 903 - }, - { - "__id__": 905 - }, - { - "__id__": 906 - }, { "__id__": 907 }, { - "__id__": 908 + "__id__": 909 }, { "__id__": 910 }, + { + "__id__": 911 + }, { "__id__": 912 }, { - "__id__": 913 + "__id__": 914 }, { - "__id__": 915 + "__id__": 916 + }, + { + "__id__": 917 + }, + { + "__id__": 919 } ], "removedComponents": [] @@ -18428,7 +18480,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 904 + "__id__": 908 }, "propertyPath": [ "_name" @@ -18444,7 +18496,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 904 + "__id__": 908 }, "propertyPath": [ "_lpos" @@ -18459,7 +18511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 904 + "__id__": 908 }, "propertyPath": [ "_lrot" @@ -18475,7 +18527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 904 + "__id__": 908 }, "propertyPath": [ "_euler" @@ -18490,7 +18542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 909 + "__id__": 913 }, "propertyPath": [ "clickEvents", @@ -18507,20 +18559,20 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 909 + "__id__": 913 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 911 + "__id__": 915 } }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 504 + "__id__": 508 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -18530,19 +18582,19 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 909 + "__id__": 913 }, "propertyPath": [ "_target" ], "value": { - "__id__": 900 + "__id__": 904 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 914 + "__id__": 918 }, "propertyPath": [ "_bottom" @@ -18558,7 +18610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 916 + "__id__": 920 }, "propertyPath": [ "_spriteFrame" @@ -18580,36 +18632,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [ { - "__id__": 918 + "__id__": 922 }, { - "__id__": 926 + "__id__": 930 }, { - "__id__": 934 + "__id__": 938 } ], "_active": true, "_components": [ { - "__id__": 948 + "__id__": 952 }, { - "__id__": 950 + "__id__": 954 }, { - "__id__": 953 + "__id__": 957 }, { - "__id__": 955 + "__id__": 959 } ], "_prefab": { - "__id__": 957 + "__id__": 961 }, "_lpos": { "__type__": "cc.Vec3", @@ -18646,23 +18698,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 917 + "__id__": 921 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 919 - }, - { - "__id__": 921 - }, { "__id__": 923 + }, + { + "__id__": 925 + }, + { + "__id__": 927 } ], "_prefab": { - "__id__": 925 + "__id__": 929 }, "_lpos": { "__type__": "cc.Vec3", @@ -18699,11 +18751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 922 }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 924 }, "_contentSize": { "__type__": "cc.Size", @@ -18727,11 +18779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 922 }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 926 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18775,11 +18827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 922 }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 928 }, "_alignFlags": 45, "_target": null, @@ -18824,23 +18876,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 917 + "__id__": 921 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 927 - }, - { - "__id__": 929 - }, { "__id__": 931 + }, + { + "__id__": 933 + }, + { + "__id__": 935 } ], "_prefab": { - "__id__": 933 + "__id__": 937 }, "_lpos": { "__type__": "cc.Vec3", @@ -18877,11 +18929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 932 }, "_contentSize": { "__type__": "cc.Size", @@ -18905,11 +18957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 930 + "__id__": 934 }, "_alignFlags": 32, "_target": null, @@ -18941,11 +18993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 932 + "__id__": 936 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19022,27 +19074,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 917 + "__id__": 921 }, "_children": [ { - "__id__": 935 + "__id__": 939 } ], "_active": true, "_components": [ - { - "__id__": 941 - }, - { - "__id__": 943 - }, { "__id__": 945 + }, + { + "__id__": 947 + }, + { + "__id__": 949 } ], "_prefab": { - "__id__": 947 + "__id__": 951 }, "_lpos": { "__type__": "cc.Vec3", @@ -19079,20 +19131,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 938 }, "_children": [], "_active": true, "_components": [ { - "__id__": 936 + "__id__": 940 }, { - "__id__": 938 + "__id__": 942 } ], "_prefab": { - "__id__": 940 + "__id__": 944 }, "_lpos": { "__type__": "cc.Vec3", @@ -19129,11 +19181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 935 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 937 + "__id__": 941 }, "_contentSize": { "__type__": "cc.Size", @@ -19157,11 +19209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 935 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 939 + "__id__": 943 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19238,11 +19290,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 938 }, "_enabled": true, "__prefab": { - "__id__": 942 + "__id__": 946 }, "_contentSize": { "__type__": "cc.Size", @@ -19266,11 +19318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 938 }, "_enabled": true, "__prefab": { - "__id__": 944 + "__id__": 948 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19311,11 +19363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 938 }, "_enabled": true, "__prefab": { - "__id__": 946 + "__id__": 950 }, "_alignFlags": 8, "_target": null, @@ -19360,11 +19412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 921 }, "_enabled": true, "__prefab": { - "__id__": 949 + "__id__": 953 }, "_contentSize": { "__type__": "cc.Size", @@ -19388,15 +19440,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 921 }, "_enabled": true, "__prefab": { - "__id__": 951 + "__id__": 955 }, "clickEvents": [ { - "__id__": 952 + "__id__": 956 } ], "_interactable": true, @@ -19436,7 +19488,7 @@ "_duration": 0.3, "_zoomScale": 1.3, "_target": { - "__id__": 917 + "__id__": 921 }, "_id": "" }, @@ -19447,7 +19499,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 504 + "__id__": 508 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -19460,11 +19512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 921 }, "_enabled": true, "__prefab": { - "__id__": 954 + "__id__": 958 }, "_alignFlags": 4, "_target": null, @@ -19496,11 +19548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 921 }, "_enabled": true, "__prefab": { - "__id__": 956 + "__id__": 960 }, "_id": "" }, @@ -19527,27 +19579,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [ { - "__id__": 959 + "__id__": 963 } ], "_active": true, "_components": [ { - "__id__": 973 + "__id__": 977 }, { - "__id__": 975 + "__id__": 979 }, { - "__id__": 978 + "__id__": 982 } ], "_prefab": { - "__id__": 980 + "__id__": 984 }, "_lpos": { "__type__": "cc.Vec3", @@ -19584,27 +19636,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 958 + "__id__": 962 }, "_children": [ { - "__id__": 960 + "__id__": 964 } ], "_active": true, "_components": [ - { - "__id__": 966 - }, - { - "__id__": 968 - }, { "__id__": 970 + }, + { + "__id__": 972 + }, + { + "__id__": 974 } ], "_prefab": { - "__id__": 972 + "__id__": 976 }, "_lpos": { "__type__": "cc.Vec3", @@ -19641,20 +19693,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 959 + "__id__": 963 }, "_children": [], "_active": true, "_components": [ { - "__id__": 961 + "__id__": 965 }, { - "__id__": 963 + "__id__": 967 } ], "_prefab": { - "__id__": 965 + "__id__": 969 }, "_lpos": { "__type__": "cc.Vec3", @@ -19691,11 +19743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 964 }, "_enabled": true, "__prefab": { - "__id__": 962 + "__id__": 966 }, "_contentSize": { "__type__": "cc.Size", @@ -19719,11 +19771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 964 }, "_enabled": true, "__prefab": { - "__id__": 964 + "__id__": 968 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19777,11 +19829,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 959 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 967 + "__id__": 971 }, "_contentSize": { "__type__": "cc.Size", @@ -19805,11 +19857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 959 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 969 + "__id__": 973 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19853,11 +19905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 959 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 971 + "__id__": 975 }, "_alignFlags": 45, "_target": null, @@ -19902,11 +19954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 958 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 974 + "__id__": 978 }, "_contentSize": { "__type__": "cc.Size", @@ -19930,15 +19982,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 958 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 976 + "__id__": 980 }, "clickEvents": [ { - "__id__": 977 + "__id__": 981 } ], "_interactable": true, @@ -19978,7 +20030,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 958 + "__id__": 962 }, "_id": "" }, @@ -19989,7 +20041,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 504 + "__id__": 508 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -20002,11 +20054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 958 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 983 }, "_alignFlags": 4, "_target": null, @@ -20051,27 +20103,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 508 }, "_children": [ { - "__id__": 982 + "__id__": 986 } ], "_active": true, "_components": [ { - "__id__": 996 + "__id__": 1000 }, { - "__id__": 998 + "__id__": 1002 }, { - "__id__": 1001 + "__id__": 1005 } ], "_prefab": { - "__id__": 1003 + "__id__": 1007 }, "_lpos": { "__type__": "cc.Vec3", @@ -20108,27 +20160,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 981 + "__id__": 985 }, "_children": [ { - "__id__": 983 + "__id__": 987 } ], "_active": true, "_components": [ - { - "__id__": 989 - }, - { - "__id__": 991 - }, { "__id__": 993 + }, + { + "__id__": 995 + }, + { + "__id__": 997 } ], "_prefab": { - "__id__": 995 + "__id__": 999 }, "_lpos": { "__type__": "cc.Vec3", @@ -20165,20 +20217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 982 + "__id__": 986 }, "_children": [], "_active": true, "_components": [ { - "__id__": 984 + "__id__": 988 }, { - "__id__": 986 + "__id__": 990 } ], "_prefab": { - "__id__": 988 + "__id__": 992 }, "_lpos": { "__type__": "cc.Vec3", @@ -20215,11 +20267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 987 }, "_enabled": true, "__prefab": { - "__id__": 985 + "__id__": 989 }, "_contentSize": { "__type__": "cc.Size", @@ -20243,11 +20295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 987 }, "_enabled": true, "__prefab": { - "__id__": 987 + "__id__": 991 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20301,11 +20353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 986 }, "_enabled": true, "__prefab": { - "__id__": 990 + "__id__": 994 }, "_contentSize": { "__type__": "cc.Size", @@ -20329,11 +20381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 986 }, "_enabled": true, "__prefab": { - "__id__": 992 + "__id__": 996 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20377,11 +20429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 986 }, "_enabled": true, "__prefab": { - "__id__": 994 + "__id__": 998 }, "_alignFlags": 45, "_target": null, @@ -20426,11 +20478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 985 }, "_enabled": true, "__prefab": { - "__id__": 997 + "__id__": 1001 }, "_contentSize": { "__type__": "cc.Size", @@ -20454,15 +20506,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 985 }, "_enabled": true, "__prefab": { - "__id__": 999 + "__id__": 1003 }, "clickEvents": [ { - "__id__": 1000 + "__id__": 1004 } ], "_interactable": true, @@ -20502,7 +20554,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 981 + "__id__": 985 }, "_id": "" }, @@ -20513,7 +20565,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 504 + "__id__": 508 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -20526,11 +20578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 985 }, "_enabled": true, "__prefab": { - "__id__": 1002 + "__id__": 1006 }, "_alignFlags": 4, "_target": null, @@ -20575,11 +20627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 1005 + "__id__": 1009 }, "_contentSize": { "__type__": "cc.Size", @@ -20603,11 +20655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 1007 + "__id__": 1011 }, "_alignFlags": 21, "_target": null, @@ -20639,11 +20691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 1009 + "__id__": 1013 }, "_id": "" }, @@ -20657,11 +20709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 1011 + "__id__": 1015 }, "_id": "" }, @@ -20689,14 +20741,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1014 + "__id__": 1018 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1013 + "__id__": 1017 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -20704,7 +20756,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 1015 + "__id__": 1019 }, "targetOverrides": null }, @@ -20717,20 +20769,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 1016 - }, - { - "__id__": 1018 - }, - { - "__id__": 1019 - }, { "__id__": 1020 }, { - "__id__": 1021 + "__id__": 1022 + }, + { + "__id__": 1023 + }, + { + "__id__": 1024 + }, + { + "__id__": 1025 } ], "removedComponents": [] @@ -20738,7 +20790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1021 }, "propertyPath": [ "_name" @@ -20754,7 +20806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1021 }, "propertyPath": [ "_lpos" @@ -20769,7 +20821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1021 }, "propertyPath": [ "_lrot" @@ -20785,7 +20837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1021 }, "propertyPath": [ "_euler" @@ -20800,7 +20852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1021 }, "propertyPath": [ "_active" @@ -20817,23 +20869,23 @@ }, "_children": [ { - "__id__": 1023 + "__id__": 1027 } ], "_active": true, "_components": [ - { - "__id__": 1061 - }, - { - "__id__": 1063 - }, { "__id__": 1065 + }, + { + "__id__": 1067 + }, + { + "__id__": 1069 } ], "_prefab": { - "__id__": 1067 + "__id__": 1071 }, "_lpos": { "__type__": "cc.Vec3", @@ -20870,30 +20922,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1022 + "__id__": 1026 }, "_children": [ { - "__id__": 1024 + "__id__": 1028 } ], "_active": true, "_components": [ - { - "__id__": 1052 - }, - { - "__id__": 1054 - }, { "__id__": 1056 }, { "__id__": 1058 + }, + { + "__id__": 1060 + }, + { + "__id__": 1062 } ], "_prefab": { - "__id__": 1060 + "__id__": 1064 }, "_lpos": { "__type__": "cc.Vec3", @@ -20930,27 +20982,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1023 + "__id__": 1027 }, "_children": [ { - "__id__": 1025 + "__id__": 1029 }, { - "__id__": 1033 + "__id__": 1037 }, { - "__id__": 1039 + "__id__": 1043 } ], "_active": true, "_components": [ { - "__id__": 1049 + "__id__": 1053 } ], "_prefab": { - "__id__": 1051 + "__id__": 1055 }, "_lpos": { "__type__": "cc.Vec3", @@ -20987,23 +21039,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1024 + "__id__": 1028 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1026 - }, - { - "__id__": 1028 - }, { "__id__": 1030 + }, + { + "__id__": 1032 + }, + { + "__id__": 1034 } ], "_prefab": { - "__id__": 1032 + "__id__": 1036 }, "_lpos": { "__type__": "cc.Vec3", @@ -21040,11 +21092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1025 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1027 + "__id__": 1031 }, "_contentSize": { "__type__": "cc.Size", @@ -21068,11 +21120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1025 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1029 + "__id__": 1033 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21116,11 +21168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1025 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1031 + "__id__": 1035 }, "_alignFlags": 40, "_target": null, @@ -21165,20 +21217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1024 + "__id__": 1028 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1034 + "__id__": 1038 }, { - "__id__": 1036 + "__id__": 1040 } ], "_prefab": { - "__id__": 1038 + "__id__": 1042 }, "_lpos": { "__type__": "cc.Vec3", @@ -21215,11 +21267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1033 + "__id__": 1037 }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1039 }, "_contentSize": { "__type__": "cc.Size", @@ -21243,11 +21295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1033 + "__id__": 1037 }, "_enabled": true, "__prefab": { - "__id__": 1037 + "__id__": 1041 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21304,26 +21356,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1024 + "__id__": 1028 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1040 - }, - { - "__id__": 1042 - }, { "__id__": 1044 }, { "__id__": 1046 + }, + { + "__id__": 1048 + }, + { + "__id__": 1050 } ], "_prefab": { - "__id__": 1048 + "__id__": 1052 }, "_lpos": { "__type__": "cc.Vec3", @@ -21360,11 +21412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1043 }, "_enabled": true, "__prefab": { - "__id__": 1041 + "__id__": 1045 }, "_contentSize": { "__type__": "cc.Size", @@ -21388,11 +21440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1043 }, "_enabled": true, "__prefab": { - "__id__": 1043 + "__id__": 1047 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21456,11 +21508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1043 }, "_enabled": true, "__prefab": { - "__id__": 1045 + "__id__": 1049 }, "_alignFlags": 10, "_target": null, @@ -21492,11 +21544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1043 }, "_enabled": true, "__prefab": { - "__id__": 1047 + "__id__": 1051 }, "templateMode": true, "watchPath": "data.data.gold", @@ -21529,11 +21581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1028 }, "_enabled": true, "__prefab": { - "__id__": 1050 + "__id__": 1054 }, "_contentSize": { "__type__": "cc.Size", @@ -21570,11 +21622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1023 + "__id__": 1027 }, "_enabled": true, "__prefab": { - "__id__": 1053 + "__id__": 1057 }, "_contentSize": { "__type__": "cc.Size", @@ -21598,11 +21650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1023 + "__id__": 1027 }, "_enabled": true, "__prefab": { - "__id__": 1055 + "__id__": 1059 }, "_alignFlags": 8, "_target": null, @@ -21634,11 +21686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1023 + "__id__": 1027 }, "_enabled": true, "__prefab": { - "__id__": 1057 + "__id__": 1061 }, "_resizeMode": 0, "_layoutType": 1, @@ -21672,11 +21724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1023 + "__id__": 1027 }, "_enabled": true, "__prefab": { - "__id__": 1059 + "__id__": 1063 }, "_alignFlags": 40, "_target": null, @@ -21721,11 +21773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1022 + "__id__": 1026 }, "_enabled": true, "__prefab": { - "__id__": 1062 + "__id__": 1066 }, "_contentSize": { "__type__": "cc.Size", @@ -21749,11 +21801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1022 + "__id__": 1026 }, "_enabled": true, "__prefab": { - "__id__": 1064 + "__id__": 1068 }, "_alignFlags": 17, "_target": null, @@ -21785,11 +21837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1022 + "__id__": 1026 }, "_enabled": true, "__prefab": { - "__id__": 1066 + "__id__": 1070 }, "_id": "" }, @@ -21820,7 +21872,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1069 + "__id__": 1073 }, "_contentSize": { "__type__": "cc.Size", @@ -21848,7 +21900,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1071 + "__id__": 1075 }, "_alignFlags": 45, "_target": null, @@ -21884,7 +21936,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1073 + "__id__": 1077 }, "_id": "" }, @@ -21904,60 +21956,60 @@ "instance": null, "targetOverrides": [ { - "__id__": 1075 + "__id__": 1079 }, { - "__id__": 1078 + "__id__": 1082 }, { - "__id__": 1081 + "__id__": 1085 }, { - "__id__": 1084 + "__id__": 1088 }, { - "__id__": 1087 + "__id__": 1091 }, { - "__id__": 1090 + "__id__": 1094 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1013 + "__id__": 1017 }, { - "__id__": 900 + "__id__": 904 }, { - "__id__": 764 + "__id__": 768 }, { - "__id__": 724 + "__id__": 728 }, { - "__id__": 686 + "__id__": 690 }, { - "__id__": 654 + "__id__": 658 }, { - "__id__": 616 + "__id__": 620 }, { - "__id__": 578 + "__id__": 582 }, { - "__id__": 557 + "__id__": 561 }, { - "__id__": 366 + "__id__": 369 }, { - "__id__": 350 + "__id__": 352 }, { - "__id__": 334 + "__id__": 335 }, { "__id__": 314 @@ -21985,49 +22037,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 578 + "__id__": 582 }, "sourceInfo": { - "__id__": 1076 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 578 - }, - "targetInfo": { - "__id__": 1077 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "e2/huQDfhNt6fiJiNRbwSN" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "334GMK/IFMX7WWZHRi/+UF" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 616 - }, - "sourceInfo": { - "__id__": 1079 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 616 - }, - "targetInfo": { "__id__": 1080 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 582 + }, + "targetInfo": { + "__id__": 1081 } }, { @@ -22045,19 +22067,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 686 + "__id__": 620 }, "sourceInfo": { - "__id__": 1082 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 686 - }, - "targetInfo": { "__id__": 1083 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 620 + }, + "targetInfo": { + "__id__": 1084 } }, { @@ -22075,19 +22097,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 724 + "__id__": 690 }, "sourceInfo": { - "__id__": 1085 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 724 - }, - "targetInfo": { "__id__": 1086 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 690 + }, + "targetInfo": { + "__id__": 1087 } }, { @@ -22105,19 +22127,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 654 + "__id__": 728 }, "sourceInfo": { - "__id__": 1088 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 654 - }, - "targetInfo": { "__id__": 1089 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 728 + }, + "targetInfo": { + "__id__": 1090 } }, { @@ -22135,19 +22157,49 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 764 + "__id__": 658 }, "sourceInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_barSprite" ], "target": { - "__id__": 764 + "__id__": 658 }, "targetInfo": { - "__id__": 1092 + "__id__": 1093 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e2/huQDfhNt6fiJiNRbwSN" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "334GMK/IFMX7WWZHRi/+UF" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 768 + }, + "sourceInfo": { + "__id__": 1095 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 768 + }, + "targetInfo": { + "__id__": 1096 } }, { diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 3f3f5917..0b848fc3 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -180,9 +180,9 @@ export class MissionCardComp extends CCComp { // 后续扩展其他类型事件 // 延迟关闭界面,让玩家看到选中效果 - // this.scheduleOnce(() => { - // this.node.active = false; - // }, 0.5); + this.scheduleOnce(() => { + this.node.active = false; + }, 0.5); } } diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index e7e19568..e831e21a 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -54,9 +54,9 @@ export class MissionComp extends CCComp { // 升级奖励触发 onLevelUp(event: string, args: any) { console.log(`[MissionComp] 英雄升级到 ${args.lv} 级!`); - + oops.message.dispatchEvent(GameEvent.TalentSelect) // 触发奖励选择界面 (暂时留空) - this.showLevelUpReward(); + // this.showLevelUpReward(); } showLevelUpReward() {