From 7436944752d559dbb716c74beb54355062f0bbdb Mon Sep 17 00:00:00 2001 From: pan Date: Thu, 6 Aug 2026 10:44:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(map):=20=E4=BC=98=E5=8C=96=E6=A7=BD?= =?UTF-8?q?=E4=BD=8D=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91=E5=B9=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=BB=A1=E6=A7=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为MissEquipComp和MissSkillsComp新增静态实例缓存和isFull方法,避免强引用查询 2. 修复槽位坐标的空格格式问题 3. 扩展showSmallTip的参数类型,新增多种面板满槽提示场景 4. 在英雄、装备、技能面板开启逻辑中添加满槽校验和对应提示 --- assets/resources/gui/element/mission.prefab | 2987 +++++++++++-------- assets/script/game/map/MissEquipComp.ts | 29 +- assets/script/game/map/MissSkillsComp.ts | 29 +- assets/script/game/map/MissionCardComp.ts | 34 +- 4 files changed, 1883 insertions(+), 1196 deletions(-) diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index faa22154..d8ea1011 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -34,56 +34,56 @@ "__id__": 420 }, { - "__id__": 741 + "__id__": 786 }, { - "__id__": 781 + "__id__": 826 }, { - "__id__": 868 + "__id__": 913 }, { - "__id__": 987 + "__id__": 1032 }, { - "__id__": 1076 + "__id__": 1121 }, { - "__id__": 1163 + "__id__": 1208 }, { - "__id__": 1193 + "__id__": 1238 } ], "_active": true, "_components": [ { - "__id__": 1237 + "__id__": 1282 }, { - "__id__": 1239 + "__id__": 1284 }, { - "__id__": 1241 + "__id__": 1286 }, { - "__id__": 1243 + "__id__": 1288 }, { - "__id__": 1245 + "__id__": 1290 }, { - "__id__": 1247 + "__id__": 1292 }, { - "__id__": 1249 + "__id__": 1294 }, { - "__id__": 1251 + "__id__": 1296 } ], "_prefab": { - "__id__": 1253 + "__id__": 1298 }, "_lpos": { "__type__": "cc.Vec3", @@ -6870,29 +6870,29 @@ "__id__": 421 }, { - "__id__": 498 + "__id__": 509 }, { - "__id__": 578 + "__id__": 600 }, { - "__id__": 655 + "__id__": 688 } ], "_active": true, "_components": [ { - "__id__": 734 + "__id__": 779 }, { - "__id__": 736 + "__id__": 781 }, { - "__id__": 738 + "__id__": 783 } ], "_prefab": { - "__id__": 740 + "__id__": 785 }, "_lpos": { "__type__": "cc.Vec3", @@ -6958,35 +6958,17 @@ "mountedChildren": [ { "__id__": 424 - } - ], - "mountedComponents": [ + }, { "__id__": 464 } ], - "propertyOverrides": [ - { - "__id__": 468 - }, - { - "__id__": 470 - }, - { - "__id__": 471 - }, - { - "__id__": 472 - }, - { - "__id__": 473 - }, + "mountedComponents": [ { "__id__": 475 - }, - { - "__id__": 477 - }, + } + ], + "propertyOverrides": [ { "__id__": 479 }, @@ -6996,6 +6978,9 @@ { "__id__": 482 }, + { + "__id__": 483 + }, { "__id__": 484 }, @@ -7003,22 +6988,40 @@ "__id__": 486 }, { - "__id__": 487 + "__id__": 488 }, { - "__id__": 489 - }, - { - "__id__": 491 + "__id__": 490 }, { "__id__": 492 }, { - "__id__": 494 + "__id__": 493 }, { - "__id__": 496 + "__id__": 495 + }, + { + "__id__": 497 + }, + { + "__id__": 498 + }, + { + "__id__": 500 + }, + { + "__id__": 502 + }, + { + "__id__": 503 + }, + { + "__id__": 505 + }, + { + "__id__": 507 } ], "removedComponents": [] @@ -7959,11 +7962,11 @@ "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.MountedComponentsInfo", + "__type__": "cc.MountedChildrenInfo", "targetInfo": { "__id__": 465 }, - "components": [ + "nodes": [ { "__id__": 466 } @@ -7975,6 +7978,152 @@ "cfWG6+EKVJ3IlHCuz5Pa35" ] }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 421 + }, + "_prefab": { + "__id__": 467 + }, + "__editorExtras__": { + "mountedRoot": { + "__id__": 421 + } + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 466 + }, + "asset": { + "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", + "__expectedType__": "cc.Prefab" + }, + "fileId": "d3jYvT7whFS5scQFZeO5AK", + "instance": { + "__id__": 468 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "f6W5D3Sp5KZaBEm7oQnBWI", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 469 + }, + { + "__id__": 471 + }, + { + "__id__": 472 + }, + { + "__id__": 473 + }, + { + "__id__": 474 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 470 + }, + "propertyPath": [ + "_name" + ], + "value": "smalltip" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d3jYvT7whFS5scQFZeO5AK" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 470 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 44.261, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 470 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 470 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 470 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.MountedComponentsInfo", + "targetInfo": { + "__id__": 476 + }, + "components": [ + { + "__id__": 477 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, { "__type__": "cc.Widget", "_name": "", @@ -7989,7 +8138,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 467 + "__id__": 478 }, "_alignFlags": 4, "_target": null, @@ -8018,7 +8167,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 469 + "__id__": 480 }, "propertyPath": [ "_name" @@ -8034,7 +8183,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 469 + "__id__": 480 }, "propertyPath": [ "_lpos" @@ -8049,7 +8198,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 469 + "__id__": 480 }, "propertyPath": [ "_lrot" @@ -8065,7 +8214,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 469 + "__id__": 480 }, "propertyPath": [ "_euler" @@ -8080,7 +8229,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 474 + "__id__": 485 }, "propertyPath": [ "_contentSize" @@ -8100,7 +8249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 476 + "__id__": 487 }, "propertyPath": [ "_contentSize" @@ -8120,7 +8269,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 478 + "__id__": 489 }, "propertyPath": [ "_contentSize" @@ -8140,7 +8289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 480 + "__id__": 491 }, "propertyPath": [ "_spriteFrame" @@ -8159,7 +8308,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 480 + "__id__": 491 }, "propertyPath": [ "_atlas" @@ -8172,7 +8321,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 494 }, "propertyPath": [ "_contentSize" @@ -8192,7 +8341,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 485 + "__id__": 496 }, "propertyPath": [ "_spriteFrame" @@ -8211,7 +8360,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 485 + "__id__": 496 }, "propertyPath": [ "_atlas" @@ -8224,7 +8373,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 488 + "__id__": 499 }, "propertyPath": [ "_string" @@ -8240,7 +8389,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 490 + "__id__": 501 }, "propertyPath": [ "_string" @@ -8256,7 +8405,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 474 + "__id__": 485 }, "propertyPath": [ "_anchorPoint" @@ -8270,7 +8419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 493 + "__id__": 504 }, "propertyPath": [ "_lpos" @@ -8291,7 +8440,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 495 + "__id__": 506 }, "propertyPath": [ "_lpos" @@ -8312,7 +8461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 508 }, "propertyPath": [ "_lpos" @@ -8337,14 +8486,14 @@ "__id__": 420 }, "_prefab": { - "__id__": 499 + "__id__": 510 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 498 + "__id__": 509 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -8352,7 +8501,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 500 + "__id__": 511 }, "targetOverrides": null }, @@ -8364,63 +8513,27 @@ }, "mountedChildren": [ { - "__id__": 501 + "__id__": 512 + }, + { + "__id__": 552 } ], "mountedComponents": [ { - "__id__": 541 + "__id__": 563 } ], "propertyOverrides": [ - { - "__id__": 545 - }, - { - "__id__": 547 - }, - { - "__id__": 548 - }, - { - "__id__": 549 - }, - { - "__id__": 550 - }, - { - "__id__": 552 - }, - { - "__id__": 554 - }, - { - "__id__": 556 - }, - { - "__id__": 557 - }, - { - "__id__": 559 - }, - { - "__id__": 561 - }, - { - "__id__": 562 - }, - { - "__id__": 564 - }, - { - "__id__": 566 - }, { "__id__": 567 }, { "__id__": 569 }, + { + "__id__": 570 + }, { "__id__": 571 }, @@ -8432,6 +8545,45 @@ }, { "__id__": 576 + }, + { + "__id__": 578 + }, + { + "__id__": 579 + }, + { + "__id__": 581 + }, + { + "__id__": 583 + }, + { + "__id__": 584 + }, + { + "__id__": 586 + }, + { + "__id__": 588 + }, + { + "__id__": 589 + }, + { + "__id__": 591 + }, + { + "__id__": 593 + }, + { + "__id__": 594 + }, + { + "__id__": 596 + }, + { + "__id__": 598 } ], "removedComponents": [] @@ -8439,11 +8591,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 502 + "__id__": 513 }, "nodes": [ { - "__id__": 503 + "__id__": 514 } ] }, @@ -8459,31 +8611,31 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 498 + "__id__": 509 } }, "_parent": { - "__id__": 504 + "__id__": 515 }, "_children": [ { - "__id__": 524 + "__id__": 535 }, { - "__id__": 530 + "__id__": 541 } ], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 547 }, { - "__id__": 538 + "__id__": 549 } ], "_prefab": { - "__id__": 540 + "__id__": 551 }, "_lpos": { "__type__": "cc.Vec3", @@ -8520,33 +8672,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 498 + "__id__": 509 }, "_children": [ { - "__id__": 505 + "__id__": 516 }, { - "__id__": 511 + "__id__": 522 }, { - "__id__": 503 + "__id__": 514 } ], "_active": true, "_components": [ { - "__id__": 517 + "__id__": 528 }, { - "__id__": 519 + "__id__": 530 }, { - "__id__": 521 + "__id__": 532 } ], "_prefab": { - "__id__": 523 + "__id__": 534 }, "_lpos": { "__type__": "cc.Vec3", @@ -8583,20 +8735,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 506 + "__id__": 517 }, { - "__id__": 508 + "__id__": 519 } ], "_prefab": { - "__id__": 510 + "__id__": 521 }, "_lpos": { "__type__": "cc.Vec3", @@ -8633,11 +8785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 505 + "__id__": 516 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 518 }, "_contentSize": { "__type__": "cc.Size", @@ -8661,11 +8813,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 505 + "__id__": 516 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 520 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8722,20 +8874,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 504 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 512 + "__id__": 523 }, { - "__id__": 514 + "__id__": 525 } ], "_prefab": { - "__id__": 516 + "__id__": 527 }, "_lpos": { "__type__": "cc.Vec3", @@ -8772,11 +8924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 511 + "__id__": 522 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 524 }, "_contentSize": { "__type__": "cc.Size", @@ -8800,11 +8952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 511 + "__id__": 522 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 526 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8881,11 +9033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 529 }, "_contentSize": { "__type__": "cc.Size", @@ -8909,11 +9061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 531 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8954,11 +9106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 522 + "__id__": 533 }, "_alignFlags": 45, "_target": null, @@ -9003,20 +9155,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 503 + "__id__": 514 }, "_children": [], "_active": true, "_components": [ { - "__id__": 525 + "__id__": 536 }, { - "__id__": 527 + "__id__": 538 } ], "_prefab": { - "__id__": 529 + "__id__": 540 }, "_lpos": { "__type__": "cc.Vec3", @@ -9053,11 +9205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 537 }, "_contentSize": { "__type__": "cc.Size", @@ -9081,11 +9233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 539 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9139,20 +9291,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 503 + "__id__": 514 }, "_children": [], "_active": true, "_components": [ { - "__id__": 531 + "__id__": 542 }, { - "__id__": 533 + "__id__": 544 } ], "_prefab": { - "__id__": 535 + "__id__": 546 }, "_lpos": { "__type__": "cc.Vec3", @@ -9189,11 +9341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 543 }, "_contentSize": { "__type__": "cc.Size", @@ -9217,11 +9369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 545 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9298,11 +9450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 503 + "__id__": 514 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 548 }, "_contentSize": { "__type__": "cc.Size", @@ -9326,11 +9478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 503 + "__id__": 514 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 550 }, "_resizeMode": 1, "_layoutType": 1, @@ -9371,14 +9523,160 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 553 + }, + "nodes": [ + { + "__id__": 554 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 509 + }, + "_prefab": { + "__id__": 555 + }, + "__editorExtras__": { + "mountedRoot": { + "__id__": 509 + } + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 554 + }, + "asset": { + "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", + "__expectedType__": "cc.Prefab" + }, + "fileId": "d3jYvT7whFS5scQFZeO5AK", + "instance": { + "__id__": 556 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "e05paOHtpFAIs1/1FP/Lbk", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 557 + }, + { + "__id__": 559 + }, + { + "__id__": 560 + }, + { + "__id__": 561 + }, + { + "__id__": 562 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_name" + ], + "value": "smalltip" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d3jYvT7whFS5scQFZeO5AK" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 44.261, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 558 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 542 + "__id__": 564 }, "components": [ { - "__id__": 543 + "__id__": 565 } ] }, @@ -9394,15 +9692,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 498 + "__id__": 509 } }, "node": { - "__id__": 498 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 566 }, "_alignFlags": 4, "_target": null, @@ -9431,7 +9729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 568 }, "propertyPath": [ "_name" @@ -9447,7 +9745,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 568 }, "propertyPath": [ "_lpos" @@ -9462,7 +9760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 568 }, "propertyPath": [ "_lrot" @@ -9478,7 +9776,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 568 }, "propertyPath": [ "_euler" @@ -9493,7 +9791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 573 }, "propertyPath": [ "_contentSize" @@ -9513,7 +9811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 553 + "__id__": 575 }, "propertyPath": [ "_contentSize" @@ -9533,7 +9831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 577 }, "propertyPath": [ "_active" @@ -9549,7 +9847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 577 }, "propertyPath": [ "_lpos" @@ -9564,7 +9862,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 558 + "__id__": 580 }, "propertyPath": [ "_contentSize" @@ -9584,7 +9882,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 560 + "__id__": 582 }, "propertyPath": [ "_spriteFrame" @@ -9603,7 +9901,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 560 + "__id__": 582 }, "propertyPath": [ "_atlas" @@ -9616,7 +9914,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 563 + "__id__": 585 }, "propertyPath": [ "_contentSize" @@ -9636,7 +9934,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 587 }, "propertyPath": [ "_spriteFrame" @@ -9655,7 +9953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 565 + "__id__": 587 }, "propertyPath": [ "_atlas" @@ -9668,7 +9966,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 568 + "__id__": 590 }, "propertyPath": [ "_string" @@ -9684,7 +9982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 570 + "__id__": 592 }, "propertyPath": [ "_string" @@ -9700,7 +9998,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 573 }, "propertyPath": [ "_anchorPoint" @@ -9714,7 +10012,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 595 }, "propertyPath": [ "_lpos" @@ -9735,7 +10033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 597 }, "propertyPath": [ "_lpos" @@ -9756,7 +10054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 599 }, "propertyPath": [ "_lpos" @@ -9781,14 +10079,14 @@ "__id__": 420 }, "_prefab": { - "__id__": 579 + "__id__": 601 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 578 + "__id__": 600 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -9796,7 +10094,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 580 + "__id__": 602 }, "targetOverrides": null }, @@ -9808,68 +10106,71 @@ }, "mountedChildren": [ { - "__id__": 581 + "__id__": 603 + }, + { + "__id__": 643 } ], "mountedComponents": [ { - "__id__": 621 + "__id__": 654 } ], "propertyOverrides": [ { - "__id__": 625 + "__id__": 658 }, { - "__id__": 627 + "__id__": 660 }, { - "__id__": 628 + "__id__": 661 }, { - "__id__": 629 + "__id__": 662 }, { - "__id__": 630 + "__id__": 663 }, { - "__id__": 632 + "__id__": 665 }, { - "__id__": 634 + "__id__": 667 }, { - "__id__": 636 + "__id__": 669 }, { - "__id__": 638 + "__id__": 671 }, { - "__id__": 639 + "__id__": 672 }, { - "__id__": 641 + "__id__": 674 }, { - "__id__": 643 + "__id__": 676 }, { - "__id__": 644 + "__id__": 677 }, { - "__id__": 646 + "__id__": 679 }, { - "__id__": 648 + "__id__": 681 }, { - "__id__": 649 + "__id__": 682 }, { - "__id__": 651 + "__id__": 684 }, { - "__id__": 653 + "__id__": 686 } ], "removedComponents": [] @@ -9877,11 +10178,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 582 + "__id__": 604 }, "nodes": [ { - "__id__": 583 + "__id__": 605 } ] }, @@ -9897,31 +10198,31 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 578 + "__id__": 600 } }, "_parent": { - "__id__": 584 + "__id__": 606 }, "_children": [ { - "__id__": 604 + "__id__": 626 }, { - "__id__": 610 + "__id__": 632 } ], "_active": true, "_components": [ { - "__id__": 616 + "__id__": 638 }, { - "__id__": 618 + "__id__": 640 } ], "_prefab": { - "__id__": 620 + "__id__": 642 }, "_lpos": { "__type__": "cc.Vec3", @@ -9958,33 +10259,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 578 + "__id__": 600 }, "_children": [ { - "__id__": 585 + "__id__": 607 }, { - "__id__": 591 + "__id__": 613 }, { - "__id__": 583 + "__id__": 605 } ], "_active": true, "_components": [ { - "__id__": 597 + "__id__": 619 }, { - "__id__": 599 + "__id__": 621 }, { - "__id__": 601 + "__id__": 623 } ], "_prefab": { - "__id__": 603 + "__id__": 625 }, "_lpos": { "__type__": "cc.Vec3", @@ -10021,20 +10322,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 584 + "__id__": 606 }, "_children": [], "_active": true, "_components": [ { - "__id__": 586 + "__id__": 608 }, { - "__id__": 588 + "__id__": 610 } ], "_prefab": { - "__id__": 590 + "__id__": 612 }, "_lpos": { "__type__": "cc.Vec3", @@ -10071,11 +10372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 585 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 587 + "__id__": 609 }, "_contentSize": { "__type__": "cc.Size", @@ -10099,11 +10400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 585 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 611 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10160,20 +10461,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 584 + "__id__": 606 }, "_children": [], "_active": true, "_components": [ { - "__id__": 592 + "__id__": 614 }, { - "__id__": 594 + "__id__": 616 } ], "_prefab": { - "__id__": 596 + "__id__": 618 }, "_lpos": { "__type__": "cc.Vec3", @@ -10210,11 +10511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 613 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 615 }, "_contentSize": { "__type__": "cc.Size", @@ -10238,11 +10539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 613 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 617 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10319,11 +10620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 584 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 620 }, "_contentSize": { "__type__": "cc.Size", @@ -10347,11 +10648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 584 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 622 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10392,11 +10693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 584 + "__id__": 606 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 624 }, "_alignFlags": 45, "_target": null, @@ -10441,20 +10742,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 583 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 605 + "__id__": 627 }, { - "__id__": 607 + "__id__": 629 } ], "_prefab": { - "__id__": 609 + "__id__": 631 }, "_lpos": { "__type__": "cc.Vec3", @@ -10491,11 +10792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 604 + "__id__": 626 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 628 }, "_contentSize": { "__type__": "cc.Size", @@ -10519,11 +10820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 604 + "__id__": 626 }, "_enabled": true, "__prefab": { - "__id__": 608 + "__id__": 630 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10577,20 +10878,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 583 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 611 + "__id__": 633 }, { - "__id__": 613 + "__id__": 635 } ], "_prefab": { - "__id__": 615 + "__id__": 637 }, "_lpos": { "__type__": "cc.Vec3", @@ -10627,11 +10928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 610 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 612 + "__id__": 634 }, "_contentSize": { "__type__": "cc.Size", @@ -10655,11 +10956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 610 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 636 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10736,11 +11037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 583 + "__id__": 605 }, "_enabled": true, "__prefab": { - "__id__": 617 + "__id__": 639 }, "_contentSize": { "__type__": "cc.Size", @@ -10764,11 +11065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 583 + "__id__": 605 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 641 }, "_resizeMode": 1, "_layoutType": 1, @@ -10809,14 +11110,160 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 644 + }, + "nodes": [ + { + "__id__": 645 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 600 + }, + "_prefab": { + "__id__": 646 + }, + "__editorExtras__": { + "mountedRoot": { + "__id__": 600 + } + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 645 + }, + "asset": { + "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", + "__expectedType__": "cc.Prefab" + }, + "fileId": "d3jYvT7whFS5scQFZeO5AK", + "instance": { + "__id__": 647 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "eez2CPNRZILZ29vJlhOyGz", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 648 + }, + { + "__id__": 650 + }, + { + "__id__": 651 + }, + { + "__id__": 652 + }, + { + "__id__": 653 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 649 + }, + "propertyPath": [ + "_name" + ], + "value": "smalltip" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d3jYvT7whFS5scQFZeO5AK" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 649 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 44.261, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 649 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 649 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 649 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 622 + "__id__": 655 }, "components": [ { - "__id__": 623 + "__id__": 656 } ] }, @@ -10832,15 +11279,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 578 + "__id__": 600 } }, "node": { - "__id__": 578 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 657 }, "_alignFlags": 4, "_target": null, @@ -10869,7 +11316,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 626 + "__id__": 659 }, "propertyPath": [ "_name" @@ -10885,7 +11332,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 626 + "__id__": 659 }, "propertyPath": [ "_lpos" @@ -10900,7 +11347,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 626 + "__id__": 659 }, "propertyPath": [ "_lrot" @@ -10916,7 +11363,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 626 + "__id__": 659 }, "propertyPath": [ "_euler" @@ -10931,7 +11378,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 664 }, "propertyPath": [ "_contentSize" @@ -10951,7 +11398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 666 }, "propertyPath": [ "_contentSize" @@ -10971,7 +11418,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 635 + "__id__": 668 }, "propertyPath": [ "_contentSize" @@ -10991,7 +11438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 637 + "__id__": 670 }, "propertyPath": [ "_spriteFrame" @@ -11010,7 +11457,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 637 + "__id__": 670 }, "propertyPath": [ "_atlas" @@ -11023,7 +11470,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 640 + "__id__": 673 }, "propertyPath": [ "_contentSize" @@ -11043,7 +11490,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 642 + "__id__": 675 }, "propertyPath": [ "_spriteFrame" @@ -11062,7 +11509,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 642 + "__id__": 675 }, "propertyPath": [ "_atlas" @@ -11075,7 +11522,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 645 + "__id__": 678 }, "propertyPath": [ "_string" @@ -11091,7 +11538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 647 + "__id__": 680 }, "propertyPath": [ "_string" @@ -11107,7 +11554,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 664 }, "propertyPath": [ "_anchorPoint" @@ -11121,7 +11568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 650 + "__id__": 683 }, "propertyPath": [ "_lpos" @@ -11142,7 +11589,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 652 + "__id__": 685 }, "propertyPath": [ "_lpos" @@ -11163,7 +11610,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 654 + "__id__": 687 }, "propertyPath": [ "_lpos" @@ -11188,14 +11635,14 @@ "__id__": 420 }, "_prefab": { - "__id__": 656 + "__id__": 689 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 655 + "__id__": 688 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -11203,7 +11650,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 657 + "__id__": 690 }, "targetOverrides": null }, @@ -11215,71 +11662,77 @@ }, "mountedChildren": [ { - "__id__": 658 + "__id__": 691 + }, + { + "__id__": 731 } ], "mountedComponents": [ { - "__id__": 698 + "__id__": 742 } ], "propertyOverrides": [ { - "__id__": 702 + "__id__": 746 }, { - "__id__": 704 + "__id__": 748 }, { - "__id__": 705 + "__id__": 749 }, { - "__id__": 706 + "__id__": 750 }, { - "__id__": 707 + "__id__": 751 }, { - "__id__": 709 + "__id__": 753 }, { - "__id__": 711 + "__id__": 755 }, { - "__id__": 713 + "__id__": 757 }, { - "__id__": 715 + "__id__": 759 }, { - "__id__": 716 + "__id__": 760 }, { - "__id__": 718 + "__id__": 762 }, { - "__id__": 720 + "__id__": 764 }, { - "__id__": 721 + "__id__": 765 }, { - "__id__": 723 + "__id__": 767 }, { - "__id__": 725 + "__id__": 769 }, { - "__id__": 727 + "__id__": 771 }, { - "__id__": 728 + "__id__": 772 }, { - "__id__": 730 + "__id__": 774 }, { - "__id__": 732 + "__id__": 776 + }, + { + "__id__": 778 } ], "removedComponents": [] @@ -11287,11 +11740,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 659 + "__id__": 692 }, "nodes": [ { - "__id__": 660 + "__id__": 693 } ] }, @@ -11307,31 +11760,31 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 655 + "__id__": 688 } }, "_parent": { - "__id__": 661 + "__id__": 694 }, "_children": [ { - "__id__": 681 + "__id__": 714 }, { - "__id__": 687 + "__id__": 720 } ], "_active": true, "_components": [ { - "__id__": 693 + "__id__": 726 }, { - "__id__": 695 + "__id__": 728 } ], "_prefab": { - "__id__": 697 + "__id__": 730 }, "_lpos": { "__type__": "cc.Vec3", @@ -11368,33 +11821,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 655 + "__id__": 688 }, "_children": [ { - "__id__": 662 + "__id__": 695 }, { - "__id__": 668 + "__id__": 701 }, { - "__id__": 660 + "__id__": 693 } ], "_active": true, "_components": [ { - "__id__": 674 + "__id__": 707 }, { - "__id__": 676 + "__id__": 709 }, { - "__id__": 678 + "__id__": 711 } ], "_prefab": { - "__id__": 680 + "__id__": 713 }, "_lpos": { "__type__": "cc.Vec3", @@ -11431,20 +11884,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 661 + "__id__": 694 }, "_children": [], "_active": true, "_components": [ { - "__id__": 663 + "__id__": 696 }, { - "__id__": 665 + "__id__": 698 } ], "_prefab": { - "__id__": 667 + "__id__": 700 }, "_lpos": { "__type__": "cc.Vec3", @@ -11481,11 +11934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 662 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 697 }, "_contentSize": { "__type__": "cc.Size", @@ -11509,11 +11962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 662 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 666 + "__id__": 699 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11570,20 +12023,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 661 + "__id__": 694 }, "_children": [], "_active": true, "_components": [ { - "__id__": 669 + "__id__": 702 }, { - "__id__": 671 + "__id__": 704 } ], "_prefab": { - "__id__": 673 + "__id__": 706 }, "_lpos": { "__type__": "cc.Vec3", @@ -11620,11 +12073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 668 + "__id__": 701 }, "_enabled": true, "__prefab": { - "__id__": 670 + "__id__": 703 }, "_contentSize": { "__type__": "cc.Size", @@ -11648,11 +12101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 668 + "__id__": 701 }, "_enabled": true, "__prefab": { - "__id__": 672 + "__id__": 705 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11729,11 +12182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 675 + "__id__": 708 }, "_contentSize": { "__type__": "cc.Size", @@ -11757,11 +12210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 710 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11802,11 +12255,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 712 }, "_alignFlags": 45, "_target": null, @@ -11851,20 +12304,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 660 + "__id__": 693 }, "_children": [], "_active": true, "_components": [ { - "__id__": 682 + "__id__": 715 }, { - "__id__": 684 + "__id__": 717 } ], "_prefab": { - "__id__": 686 + "__id__": 719 }, "_lpos": { "__type__": "cc.Vec3", @@ -11901,11 +12354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 683 + "__id__": 716 }, "_contentSize": { "__type__": "cc.Size", @@ -11929,11 +12382,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 685 + "__id__": 718 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11987,20 +12440,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 660 + "__id__": 693 }, "_children": [], "_active": true, "_components": [ { - "__id__": 688 + "__id__": 721 }, { - "__id__": 690 + "__id__": 723 } ], "_prefab": { - "__id__": 692 + "__id__": 725 }, "_lpos": { "__type__": "cc.Vec3", @@ -12037,11 +12490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 687 + "__id__": 720 }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 722 }, "_contentSize": { "__type__": "cc.Size", @@ -12065,11 +12518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 687 + "__id__": 720 }, "_enabled": true, "__prefab": { - "__id__": 691 + "__id__": 724 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12146,11 +12599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 694 + "__id__": 727 }, "_contentSize": { "__type__": "cc.Size", @@ -12174,11 +12627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 693 }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 729 }, "_resizeMode": 1, "_layoutType": 1, @@ -12219,14 +12672,160 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 732 + }, + "nodes": [ + { + "__id__": 733 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 688 + }, + "_prefab": { + "__id__": 734 + }, + "__editorExtras__": { + "mountedRoot": { + "__id__": 688 + } + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 733 + }, + "asset": { + "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", + "__expectedType__": "cc.Prefab" + }, + "fileId": "d3jYvT7whFS5scQFZeO5AK", + "instance": { + "__id__": 735 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "62I5ciWVxOTa/4fHC2KZyZ", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 736 + }, + { + "__id__": 738 + }, + { + "__id__": 739 + }, + { + "__id__": 740 + }, + { + "__id__": 741 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_name" + ], + "value": "smalltip" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d3jYvT7whFS5scQFZeO5AK" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 44.261, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 737 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 699 + "__id__": 743 }, "components": [ { - "__id__": 700 + "__id__": 744 } ] }, @@ -12242,15 +12841,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 655 + "__id__": 688 } }, "node": { - "__id__": 655 + "__id__": 688 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 745 }, "_alignFlags": 4, "_target": null, @@ -12279,7 +12878,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 747 }, "propertyPath": [ "_name" @@ -12295,7 +12894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 747 }, "propertyPath": [ "_lpos" @@ -12310,7 +12909,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 747 }, "propertyPath": [ "_lrot" @@ -12326,7 +12925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 747 }, "propertyPath": [ "_euler" @@ -12341,7 +12940,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 752 }, "propertyPath": [ "_contentSize" @@ -12361,7 +12960,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 754 }, "propertyPath": [ "_contentSize" @@ -12381,7 +12980,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 712 + "__id__": 756 }, "propertyPath": [ "_contentSize" @@ -12401,7 +13000,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 714 + "__id__": 758 }, "propertyPath": [ "_spriteFrame" @@ -12420,7 +13019,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 714 + "__id__": 758 }, "propertyPath": [ "_atlas" @@ -12433,7 +13032,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 717 + "__id__": 761 }, "propertyPath": [ "_contentSize" @@ -12453,7 +13052,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 719 + "__id__": 763 }, "propertyPath": [ "_spriteFrame" @@ -12472,7 +13071,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 719 + "__id__": 763 }, "propertyPath": [ "_atlas" @@ -12485,7 +13084,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 722 + "__id__": 766 }, "propertyPath": [ "_string" @@ -12501,7 +13100,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 724 + "__id__": 768 }, "propertyPath": [ "_string" @@ -12517,7 +13116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 770 }, "propertyPath": [ "_contentSize" @@ -12537,7 +13136,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 752 }, "propertyPath": [ "_anchorPoint" @@ -12551,7 +13150,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 729 + "__id__": 773 }, "propertyPath": [ "_lpos" @@ -12572,7 +13171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 731 + "__id__": 775 }, "propertyPath": [ "_lpos" @@ -12593,7 +13192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 733 + "__id__": 777 }, "propertyPath": [ "_lpos" @@ -12611,6 +13210,16 @@ "86S3E4+VBNF5Q4sYq5WENB" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 747 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.UITransform", "_name": "", @@ -12621,7 +13230,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 735 + "__id__": 780 }, "_contentSize": { "__type__": "cc.Size", @@ -12649,7 +13258,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 782 }, "_alignFlags": 44, "_target": null, @@ -12685,7 +13294,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 784 }, "_resizeMode": 0, "_layoutType": 1, @@ -12736,32 +13345,32 @@ }, "_children": [ { - "__id__": 742 + "__id__": 787 }, { - "__id__": 752 + "__id__": 797 }, { - "__id__": 762 + "__id__": 807 } ], "_active": false, "_components": [ { - "__id__": 772 + "__id__": 817 }, { - "__id__": 774 + "__id__": 819 }, { - "__id__": 776 + "__id__": 821 }, { - "__id__": 778 + "__id__": 823 } ], "_prefab": { - "__id__": 780 + "__id__": 825 }, "_lpos": { "__type__": "cc.Vec3", @@ -12798,21 +13407,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 741 + "__id__": 786 }, "_children": [ { - "__id__": 743 + "__id__": 788 } ], "_active": true, "_components": [ { - "__id__": 749 + "__id__": 794 } ], "_prefab": { - "__id__": 751 + "__id__": 796 }, "_lpos": { "__type__": "cc.Vec3", @@ -12849,20 +13458,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 742 + "__id__": 787 }, "_children": [], "_active": true, "_components": [ { - "__id__": 744 + "__id__": 789 }, { - "__id__": 746 + "__id__": 791 } ], "_prefab": { - "__id__": 748 + "__id__": 793 }, "_lpos": { "__type__": "cc.Vec3", @@ -12899,11 +13508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 743 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 745 + "__id__": 790 }, "_contentSize": { "__type__": "cc.Size", @@ -12927,11 +13536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 743 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 747 + "__id__": 792 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12985,11 +13594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 742 + "__id__": 787 }, "_enabled": true, "__prefab": { - "__id__": 750 + "__id__": 795 }, "_contentSize": { "__type__": "cc.Size", @@ -13026,21 +13635,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 741 + "__id__": 786 }, "_children": [ { - "__id__": 753 + "__id__": 798 } ], "_active": true, "_components": [ { - "__id__": 759 + "__id__": 804 } ], "_prefab": { - "__id__": 761 + "__id__": 806 }, "_lpos": { "__type__": "cc.Vec3", @@ -13077,20 +13686,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 752 + "__id__": 797 }, "_children": [], "_active": true, "_components": [ { - "__id__": 754 + "__id__": 799 }, { - "__id__": 756 + "__id__": 801 } ], "_prefab": { - "__id__": 758 + "__id__": 803 }, "_lpos": { "__type__": "cc.Vec3", @@ -13127,11 +13736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 800 }, "_contentSize": { "__type__": "cc.Size", @@ -13155,11 +13764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 757 + "__id__": 802 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13213,11 +13822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 752 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 760 + "__id__": 805 }, "_contentSize": { "__type__": "cc.Size", @@ -13254,21 +13863,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 741 + "__id__": 786 }, "_children": [ { - "__id__": 763 + "__id__": 808 } ], "_active": true, "_components": [ { - "__id__": 769 + "__id__": 814 } ], "_prefab": { - "__id__": 771 + "__id__": 816 }, "_lpos": { "__type__": "cc.Vec3", @@ -13305,20 +13914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 762 + "__id__": 807 }, "_children": [], "_active": true, "_components": [ { - "__id__": 764 + "__id__": 809 }, { - "__id__": 766 + "__id__": 811 } ], "_prefab": { - "__id__": 768 + "__id__": 813 }, "_lpos": { "__type__": "cc.Vec3", @@ -13355,11 +13964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 808 }, "_enabled": true, "__prefab": { - "__id__": 765 + "__id__": 810 }, "_contentSize": { "__type__": "cc.Size", @@ -13383,11 +13992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 808 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 812 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13441,11 +14050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 807 }, "_enabled": true, "__prefab": { - "__id__": 770 + "__id__": 815 }, "_contentSize": { "__type__": "cc.Size", @@ -13482,11 +14091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 773 + "__id__": 818 }, "_contentSize": { "__type__": "cc.Size", @@ -13510,11 +14119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 775 + "__id__": 820 }, "_alignFlags": 44, "_target": null, @@ -13546,11 +14155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 777 + "__id__": 822 }, "_resizeMode": 0, "_layoutType": 1, @@ -13584,11 +14193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 779 + "__id__": 824 }, "_id": "" }, @@ -13619,35 +14228,35 @@ }, "_children": [ { - "__id__": 782 + "__id__": 827 }, { - "__id__": 790 + "__id__": 835 }, { - "__id__": 839 + "__id__": 884 }, { - "__id__": 847 + "__id__": 892 } ], "_active": false, "_components": [ { - "__id__": 859 + "__id__": 904 }, { - "__id__": 861 + "__id__": 906 }, { - "__id__": 863 + "__id__": 908 }, { - "__id__": 865 + "__id__": 910 } ], "_prefab": { - "__id__": 867 + "__id__": 912 }, "_lpos": { "__type__": "cc.Vec3", @@ -13684,23 +14293,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 781 + "__id__": 826 }, "_children": [], "_active": true, "_components": [ { - "__id__": 783 + "__id__": 828 }, { - "__id__": 785 + "__id__": 830 }, { - "__id__": 787 + "__id__": 832 } ], "_prefab": { - "__id__": 789 + "__id__": 834 }, "_lpos": { "__type__": "cc.Vec3", @@ -13737,11 +14346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 784 + "__id__": 829 }, "_contentSize": { "__type__": "cc.Size", @@ -13765,11 +14374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 831 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13810,11 +14419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 833 }, "_alignFlags": 45, "_target": null, @@ -13857,17 +14466,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 826 }, "_prefab": { - "__id__": 791 + "__id__": 836 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 790 + "__id__": 835 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -13875,7 +14484,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 792 + "__id__": 837 }, "targetOverrides": null }, @@ -13887,40 +14496,40 @@ }, "mountedChildren": [ { - "__id__": 793 + "__id__": 838 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 823 + "__id__": 868 }, { - "__id__": 825 + "__id__": 870 }, { - "__id__": 826 + "__id__": 871 }, { - "__id__": 827 + "__id__": 872 }, { - "__id__": 828 + "__id__": 873 }, { - "__id__": 830 + "__id__": 875 }, { - "__id__": 832 + "__id__": 877 }, { - "__id__": 834 + "__id__": 879 }, { - "__id__": 836 + "__id__": 881 }, { - "__id__": 838 + "__id__": 883 } ], "removedComponents": [] @@ -13928,11 +14537,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 794 + "__id__": 839 }, "nodes": [ { - "__id__": 795 + "__id__": 840 } ] }, @@ -13946,21 +14555,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 790 + "__id__": 835 }, "_prefab": { - "__id__": 796 + "__id__": 841 }, "__editorExtras__": { "mountedRoot": { - "__id__": 790 + "__id__": 835 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 795 + "__id__": 840 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -13968,7 +14577,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 797 + "__id__": 842 }, "targetOverrides": null }, @@ -13982,55 +14591,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 798 + "__id__": 843 }, { - "__id__": 800 + "__id__": 845 }, { - "__id__": 801 + "__id__": 846 }, { - "__id__": 802 + "__id__": 847 }, { - "__id__": 803 + "__id__": 848 }, { - "__id__": 805 + "__id__": 850 }, { - "__id__": 807 + "__id__": 852 }, { - "__id__": 808 + "__id__": 853 }, { - "__id__": 810 + "__id__": 855 }, { - "__id__": 812 + "__id__": 857 }, { - "__id__": 814 + "__id__": 859 }, { - "__id__": 815 + "__id__": 860 }, { - "__id__": 817 + "__id__": 862 }, { - "__id__": 818 + "__id__": 863 }, { - "__id__": 819 + "__id__": 864 }, { - "__id__": 821 + "__id__": 866 }, { - "__id__": 822 + "__id__": 867 } ], "removedComponents": [] @@ -14038,7 +14647,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 799 + "__id__": 844 }, "propertyPath": [ "_name" @@ -14054,7 +14663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 799 + "__id__": 844 }, "propertyPath": [ "_lpos" @@ -14069,7 +14678,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 799 + "__id__": 844 }, "propertyPath": [ "_lrot" @@ -14085,7 +14694,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 799 + "__id__": 844 }, "propertyPath": [ "_euler" @@ -14100,7 +14709,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 849 }, "propertyPath": [ "_top" @@ -14116,7 +14725,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 806 + "__id__": 851 }, "propertyPath": [ "_active" @@ -14132,7 +14741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 849 }, "propertyPath": [ "_left" @@ -14142,7 +14751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 809 + "__id__": 854 }, "propertyPath": [ "_contentSize" @@ -14162,7 +14771,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 811 + "__id__": 856 }, "propertyPath": [ "_contentSize" @@ -14182,7 +14791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 813 + "__id__": 858 }, "propertyPath": [ "_contentSize" @@ -14202,7 +14811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 849 }, "propertyPath": [ "_right" @@ -14212,7 +14821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 861 }, "propertyPath": [ "_alignFlags" @@ -14228,7 +14837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 861 }, "propertyPath": [ "_top" @@ -14238,7 +14847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 861 }, "propertyPath": [ "_bottom" @@ -14248,7 +14857,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 820 + "__id__": 865 }, "propertyPath": [ "_lpos" @@ -14269,7 +14878,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 849 }, "propertyPath": [ "_alignFlags" @@ -14279,7 +14888,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 849 }, "propertyPath": [ "_bottom" @@ -14289,7 +14898,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 824 + "__id__": 869 }, "propertyPath": [ "_name" @@ -14305,7 +14914,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 824 + "__id__": 869 }, "propertyPath": [ "_lpos" @@ -14320,7 +14929,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 824 + "__id__": 869 }, "propertyPath": [ "_lrot" @@ -14336,7 +14945,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 824 + "__id__": 869 }, "propertyPath": [ "_euler" @@ -14351,7 +14960,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 829 + "__id__": 874 }, "propertyPath": [ "_contentSize" @@ -14371,7 +14980,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 831 + "__id__": 876 }, "propertyPath": [ "_contentSize" @@ -14391,7 +15000,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 833 + "__id__": 878 }, "propertyPath": [ "_contentSize" @@ -14411,7 +15020,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 835 + "__id__": 880 }, "propertyPath": [ "_contentSize" @@ -14431,7 +15040,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 837 + "__id__": 882 }, "propertyPath": [ "_active" @@ -14447,7 +15056,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 824 + "__id__": 869 }, "propertyPath": [ "_active" @@ -14460,23 +15069,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 781 + "__id__": 826 }, "_children": [], "_active": true, "_components": [ { - "__id__": 840 + "__id__": 885 }, { - "__id__": 842 + "__id__": 887 }, { - "__id__": 844 + "__id__": 889 } ], "_prefab": { - "__id__": 846 + "__id__": 891 }, "_lpos": { "__type__": "cc.Vec3", @@ -14513,11 +15122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 886 }, "_contentSize": { "__type__": "cc.Size", @@ -14541,11 +15150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 888 }, "_alignFlags": 18, "_target": null, @@ -14577,11 +15186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 884 }, "_enabled": false, "__prefab": { - "__id__": 845 + "__id__": 890 }, "_resizeMode": 0, "_layoutType": 1, @@ -14626,17 +15235,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 826 }, "_prefab": { - "__id__": 848 + "__id__": 893 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 847 + "__id__": 892 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -14644,7 +15253,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 849 + "__id__": 894 }, "targetOverrides": null }, @@ -14657,21 +15266,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 850 + "__id__": 895 } ], "propertyOverrides": [ { - "__id__": 854 + "__id__": 899 }, { - "__id__": 856 + "__id__": 901 }, { - "__id__": 857 + "__id__": 902 }, { - "__id__": 858 + "__id__": 903 } ], "removedComponents": [] @@ -14679,11 +15288,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 851 + "__id__": 896 }, "components": [ { - "__id__": 852 + "__id__": 897 } ] }, @@ -14699,15 +15308,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 847 + "__id__": 892 } }, "node": { - "__id__": 847 + "__id__": 892 }, "_enabled": true, "__prefab": { - "__id__": 853 + "__id__": 898 }, "_alignFlags": 2, "_target": null, @@ -14736,7 +15345,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 900 }, "propertyPath": [ "_name" @@ -14752,7 +15361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 900 }, "propertyPath": [ "_lpos" @@ -14767,7 +15376,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 900 }, "propertyPath": [ "_lrot" @@ -14783,7 +15392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 855 + "__id__": 900 }, "propertyPath": [ "_euler" @@ -14801,11 +15410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 860 + "__id__": 905 }, "_contentSize": { "__type__": "cc.Size", @@ -14829,11 +15438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 862 + "__id__": 907 }, "_alignFlags": 45, "_target": null, @@ -14865,11 +15474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 826 }, "_enabled": false, "__prefab": { - "__id__": 864 + "__id__": 909 }, "_resizeMode": 1, "_layoutType": 1, @@ -14903,11 +15512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 866 + "__id__": 911 }, "_id": "" }, @@ -14938,35 +15547,35 @@ }, "_children": [ { - "__id__": 869 + "__id__": 914 }, { - "__id__": 877 + "__id__": 922 }, { - "__id__": 926 + "__id__": 971 }, { - "__id__": 934 + "__id__": 979 } ], "_active": false, "_components": [ { - "__id__": 978 + "__id__": 1023 }, { - "__id__": 980 + "__id__": 1025 }, { - "__id__": 982 + "__id__": 1027 }, { - "__id__": 984 + "__id__": 1029 } ], "_prefab": { - "__id__": 986 + "__id__": 1031 }, "_lpos": { "__type__": "cc.Vec3", @@ -15003,23 +15612,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 868 + "__id__": 913 }, "_children": [], "_active": true, "_components": [ { - "__id__": 870 + "__id__": 915 }, { - "__id__": 872 + "__id__": 917 }, { - "__id__": 874 + "__id__": 919 } ], "_prefab": { - "__id__": 876 + "__id__": 921 }, "_lpos": { "__type__": "cc.Vec3", @@ -15056,11 +15665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 914 }, "_enabled": true, "__prefab": { - "__id__": 871 + "__id__": 916 }, "_contentSize": { "__type__": "cc.Size", @@ -15084,11 +15693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 914 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 918 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15129,11 +15738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 914 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 920 }, "_alignFlags": 45, "_target": null, @@ -15176,17 +15785,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 868 + "__id__": 913 }, "_prefab": { - "__id__": 878 + "__id__": 923 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 877 + "__id__": 922 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -15194,7 +15803,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 879 + "__id__": 924 }, "targetOverrides": null }, @@ -15206,40 +15815,40 @@ }, "mountedChildren": [ { - "__id__": 880 + "__id__": 925 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 910 + "__id__": 955 }, { - "__id__": 912 + "__id__": 957 }, { - "__id__": 913 + "__id__": 958 }, { - "__id__": 914 + "__id__": 959 }, { - "__id__": 915 + "__id__": 960 }, { - "__id__": 917 + "__id__": 962 }, { - "__id__": 919 + "__id__": 964 }, { - "__id__": 921 + "__id__": 966 }, { - "__id__": 923 + "__id__": 968 }, { - "__id__": 924 + "__id__": 969 } ], "removedComponents": [] @@ -15247,11 +15856,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 881 + "__id__": 926 }, "nodes": [ { - "__id__": 882 + "__id__": 927 } ] }, @@ -15265,21 +15874,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 877 + "__id__": 922 }, "_prefab": { - "__id__": 883 + "__id__": 928 }, "__editorExtras__": { "mountedRoot": { - "__id__": 877 + "__id__": 922 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 882 + "__id__": 927 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -15287,7 +15896,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 884 + "__id__": 929 }, "targetOverrides": null }, @@ -15301,55 +15910,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 885 + "__id__": 930 }, { - "__id__": 887 + "__id__": 932 }, { - "__id__": 888 + "__id__": 933 }, { - "__id__": 889 + "__id__": 934 }, { - "__id__": 890 + "__id__": 935 }, { - "__id__": 892 + "__id__": 937 }, { - "__id__": 894 + "__id__": 939 }, { - "__id__": 895 + "__id__": 940 }, { - "__id__": 897 + "__id__": 942 }, { - "__id__": 899 + "__id__": 944 }, { - "__id__": 901 + "__id__": 946 }, { - "__id__": 902 + "__id__": 947 }, { - "__id__": 904 + "__id__": 949 }, { - "__id__": 905 + "__id__": 950 }, { - "__id__": 906 + "__id__": 951 }, { - "__id__": 908 + "__id__": 953 }, { - "__id__": 909 + "__id__": 954 } ], "removedComponents": [] @@ -15357,7 +15966,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 931 }, "propertyPath": [ "_name" @@ -15373,7 +15982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 931 }, "propertyPath": [ "_lpos" @@ -15388,7 +15997,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 931 }, "propertyPath": [ "_lrot" @@ -15404,7 +16013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 931 }, "propertyPath": [ "_euler" @@ -15419,7 +16028,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 936 }, "propertyPath": [ "_top" @@ -15435,7 +16044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 893 + "__id__": 938 }, "propertyPath": [ "_active" @@ -15451,7 +16060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 936 }, "propertyPath": [ "_left" @@ -15461,7 +16070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 896 + "__id__": 941 }, "propertyPath": [ "_contentSize" @@ -15481,7 +16090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 898 + "__id__": 943 }, "propertyPath": [ "_contentSize" @@ -15501,7 +16110,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 900 + "__id__": 945 }, "propertyPath": [ "_contentSize" @@ -15521,7 +16130,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 936 }, "propertyPath": [ "_right" @@ -15531,7 +16140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 948 }, "propertyPath": [ "_alignFlags" @@ -15547,7 +16156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 948 }, "propertyPath": [ "_top" @@ -15557,7 +16166,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 948 }, "propertyPath": [ "_bottom" @@ -15567,7 +16176,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 907 + "__id__": 952 }, "propertyPath": [ "_lpos" @@ -15588,7 +16197,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 936 }, "propertyPath": [ "_alignFlags" @@ -15598,7 +16207,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 936 }, "propertyPath": [ "_bottom" @@ -15608,7 +16217,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 956 }, "propertyPath": [ "_name" @@ -15624,7 +16233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 956 }, "propertyPath": [ "_lpos" @@ -15639,7 +16248,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 956 }, "propertyPath": [ "_lrot" @@ -15655,7 +16264,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 956 }, "propertyPath": [ "_euler" @@ -15670,7 +16279,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 916 + "__id__": 961 }, "propertyPath": [ "_contentSize" @@ -15690,7 +16299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 918 + "__id__": 963 }, "propertyPath": [ "_contentSize" @@ -15710,7 +16319,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 920 + "__id__": 965 }, "propertyPath": [ "_contentSize" @@ -15730,7 +16339,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 922 + "__id__": 967 }, "propertyPath": [ "_contentSize" @@ -15750,7 +16359,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 911 + "__id__": 956 }, "propertyPath": [ "_active" @@ -15760,7 +16369,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 925 + "__id__": 970 }, "propertyPath": [ "_active" @@ -15779,23 +16388,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 868 + "__id__": 913 }, "_children": [], "_active": true, "_components": [ { - "__id__": 927 + "__id__": 972 }, { - "__id__": 929 + "__id__": 974 }, { - "__id__": 931 + "__id__": 976 } ], "_prefab": { - "__id__": 933 + "__id__": 978 }, "_lpos": { "__type__": "cc.Vec3", @@ -15832,11 +16441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 973 }, "_contentSize": { "__type__": "cc.Size", @@ -15860,11 +16469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 930 + "__id__": 975 }, "_alignFlags": 18, "_target": null, @@ -15896,11 +16505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 971 }, "_enabled": false, "__prefab": { - "__id__": 932 + "__id__": 977 }, "_resizeMode": 0, "_layoutType": 1, @@ -15947,33 +16556,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 868 + "__id__": 913 }, "_children": [ { - "__id__": 935 + "__id__": 980 }, { - "__id__": 945 + "__id__": 990 } ], "_active": true, "_components": [ { - "__id__": 969 + "__id__": 1014 }, { - "__id__": 971 + "__id__": 1016 }, { - "__id__": 973 + "__id__": 1018 }, { - "__id__": 975 + "__id__": 1020 } ], "_prefab": { - "__id__": 977 + "__id__": 1022 }, "_lpos": { "__type__": "cc.Vec3", @@ -16008,17 +16617,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 934 + "__id__": 979 }, "_prefab": { - "__id__": 936 + "__id__": 981 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 935 + "__id__": 980 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16026,7 +16635,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 937 + "__id__": 982 }, "targetOverrides": null }, @@ -16040,31 +16649,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 938 + "__id__": 983 }, { - "__id__": 940 + "__id__": 985 }, { - "__id__": 941 + "__id__": 986 }, { - "__id__": 942 + "__id__": 987 } ], "removedComponents": [ { - "__id__": 943 + "__id__": 988 }, { - "__id__": 944 + "__id__": 989 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 984 }, "propertyPath": [ "_name" @@ -16080,7 +16689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 984 }, "propertyPath": [ "_lpos" @@ -16095,7 +16704,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 984 }, "propertyPath": [ "_lrot" @@ -16111,7 +16720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 984 }, "propertyPath": [ "_euler" @@ -16139,17 +16748,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 934 + "__id__": 979 }, "_prefab": { - "__id__": 946 + "__id__": 991 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 945 + "__id__": 990 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16157,7 +16766,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 947 + "__id__": 992 }, "targetOverrides": null }, @@ -16171,55 +16780,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 948 + "__id__": 993 }, { - "__id__": 950 + "__id__": 995 }, { - "__id__": 951 + "__id__": 996 }, { - "__id__": 952 + "__id__": 997 }, { - "__id__": 953 + "__id__": 998 }, { - "__id__": 955 + "__id__": 1000 }, { - "__id__": 957 + "__id__": 1002 }, { - "__id__": 959 + "__id__": 1004 }, { - "__id__": 961 + "__id__": 1006 }, { - "__id__": 962 + "__id__": 1007 }, { - "__id__": 964 + "__id__": 1009 }, { - "__id__": 966 + "__id__": 1011 } ], "removedComponents": [ { - "__id__": 967 + "__id__": 1012 }, { - "__id__": 968 + "__id__": 1013 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 994 }, "propertyPath": [ "_name" @@ -16235,7 +16844,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 994 }, "propertyPath": [ "_lpos" @@ -16250,7 +16859,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 994 }, "propertyPath": [ "_lrot" @@ -16266,7 +16875,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 994 }, "propertyPath": [ "_euler" @@ -16281,7 +16890,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 954 + "__id__": 999 }, "propertyPath": [ "_active" @@ -16297,7 +16906,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 956 + "__id__": 1001 }, "propertyPath": [ "_lpos" @@ -16318,7 +16927,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 958 + "__id__": 1003 }, "propertyPath": [ "_contentSize" @@ -16338,7 +16947,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 960 + "__id__": 1005 }, "propertyPath": [ "_top" @@ -16354,7 +16963,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 960 + "__id__": 1005 }, "propertyPath": [ "_bottom" @@ -16364,7 +16973,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 963 + "__id__": 1008 }, "propertyPath": [ "_string" @@ -16380,7 +16989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 965 + "__id__": 1010 }, "propertyPath": [ "_contentSize" @@ -16400,12 +17009,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 994 }, "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "cc.TargetInfo", @@ -16425,11 +17034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 970 + "__id__": 1015 }, "_contentSize": { "__type__": "cc.Size", @@ -16453,11 +17062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 972 + "__id__": 1017 }, "_alignFlags": 42, "_target": null, @@ -16489,11 +17098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 974 + "__id__": 1019 }, "_resizeMode": 1, "_layoutType": 1, @@ -16527,11 +17136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 976 + "__id__": 1021 }, "_alignFlags": 0, "_target": null, @@ -16576,11 +17185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 913 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 1024 }, "_contentSize": { "__type__": "cc.Size", @@ -16604,11 +17213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 913 }, "_enabled": true, "__prefab": { - "__id__": 981 + "__id__": 1026 }, "_alignFlags": 45, "_target": null, @@ -16640,11 +17249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 913 }, "_enabled": false, "__prefab": { - "__id__": 983 + "__id__": 1028 }, "_resizeMode": 1, "_layoutType": 1, @@ -16678,11 +17287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 913 }, "_enabled": true, "__prefab": { - "__id__": 985 + "__id__": 1030 }, "_id": "" }, @@ -16713,35 +17322,35 @@ }, "_children": [ { - "__id__": 988 + "__id__": 1033 }, { - "__id__": 996 + "__id__": 1041 }, { - "__id__": 1045 + "__id__": 1090 }, { - "__id__": 1053 + "__id__": 1098 } ], "_active": false, "_components": [ { - "__id__": 1067 + "__id__": 1112 }, { - "__id__": 1069 + "__id__": 1114 }, { - "__id__": 1071 + "__id__": 1116 }, { - "__id__": 1073 + "__id__": 1118 } ], "_prefab": { - "__id__": 1075 + "__id__": 1120 }, "_lpos": { "__type__": "cc.Vec3", @@ -16778,23 +17387,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 987 + "__id__": 1032 }, "_children": [], "_active": true, "_components": [ { - "__id__": 989 + "__id__": 1034 }, { - "__id__": 991 + "__id__": 1036 }, { - "__id__": 993 + "__id__": 1038 } ], "_prefab": { - "__id__": 995 + "__id__": 1040 }, "_lpos": { "__type__": "cc.Vec3", @@ -16831,11 +17440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 988 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 990 + "__id__": 1035 }, "_contentSize": { "__type__": "cc.Size", @@ -16859,11 +17468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 988 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 992 + "__id__": 1037 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16904,11 +17513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 988 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 994 + "__id__": 1039 }, "_alignFlags": 45, "_target": null, @@ -16951,17 +17560,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 987 + "__id__": 1032 }, "_prefab": { - "__id__": 997 + "__id__": 1042 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 996 + "__id__": 1041 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -16969,7 +17578,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 998 + "__id__": 1043 }, "targetOverrides": null }, @@ -16981,40 +17590,40 @@ }, "mountedChildren": [ { - "__id__": 999 + "__id__": 1044 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1029 + "__id__": 1074 }, { - "__id__": 1031 + "__id__": 1076 }, { - "__id__": 1032 + "__id__": 1077 }, { - "__id__": 1033 + "__id__": 1078 }, { - "__id__": 1034 + "__id__": 1079 }, { - "__id__": 1036 + "__id__": 1081 }, { - "__id__": 1038 + "__id__": 1083 }, { - "__id__": 1040 + "__id__": 1085 }, { - "__id__": 1042 + "__id__": 1087 }, { - "__id__": 1044 + "__id__": 1089 } ], "removedComponents": [] @@ -17022,11 +17631,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 1000 + "__id__": 1045 }, "nodes": [ { - "__id__": 1001 + "__id__": 1046 } ] }, @@ -17040,21 +17649,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 996 + "__id__": 1041 }, "_prefab": { - "__id__": 1002 + "__id__": 1047 }, "__editorExtras__": { "mountedRoot": { - "__id__": 996 + "__id__": 1041 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1001 + "__id__": 1046 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -17062,7 +17671,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 1003 + "__id__": 1048 }, "targetOverrides": null }, @@ -17076,55 +17685,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1004 + "__id__": 1049 }, { - "__id__": 1006 + "__id__": 1051 }, { - "__id__": 1007 + "__id__": 1052 }, { - "__id__": 1008 + "__id__": 1053 }, { - "__id__": 1009 + "__id__": 1054 }, { - "__id__": 1011 + "__id__": 1056 }, { - "__id__": 1013 + "__id__": 1058 }, { - "__id__": 1014 + "__id__": 1059 }, { - "__id__": 1016 + "__id__": 1061 }, { - "__id__": 1018 + "__id__": 1063 }, { - "__id__": 1020 + "__id__": 1065 }, { - "__id__": 1021 + "__id__": 1066 }, { - "__id__": 1023 + "__id__": 1068 }, { - "__id__": 1024 + "__id__": 1069 }, { - "__id__": 1025 + "__id__": 1070 }, { - "__id__": 1027 + "__id__": 1072 }, { - "__id__": 1028 + "__id__": 1073 } ], "removedComponents": [] @@ -17132,7 +17741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1050 }, "propertyPath": [ "_name" @@ -17148,7 +17757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1050 }, "propertyPath": [ "_lpos" @@ -17163,7 +17772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1050 }, "propertyPath": [ "_lrot" @@ -17179,7 +17788,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1050 }, "propertyPath": [ "_euler" @@ -17194,7 +17803,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1010 + "__id__": 1055 }, "propertyPath": [ "_top" @@ -17210,7 +17819,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1012 + "__id__": 1057 }, "propertyPath": [ "_active" @@ -17226,7 +17835,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1010 + "__id__": 1055 }, "propertyPath": [ "_left" @@ -17236,7 +17845,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1015 + "__id__": 1060 }, "propertyPath": [ "_contentSize" @@ -17256,7 +17865,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1062 }, "propertyPath": [ "_contentSize" @@ -17276,7 +17885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1019 + "__id__": 1064 }, "propertyPath": [ "_contentSize" @@ -17296,7 +17905,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1010 + "__id__": 1055 }, "propertyPath": [ "_right" @@ -17306,7 +17915,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1067 }, "propertyPath": [ "_alignFlags" @@ -17322,7 +17931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1067 }, "propertyPath": [ "_top" @@ -17332,7 +17941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1067 }, "propertyPath": [ "_bottom" @@ -17342,7 +17951,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1026 + "__id__": 1071 }, "propertyPath": [ "_lpos" @@ -17363,7 +17972,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1010 + "__id__": 1055 }, "propertyPath": [ "_alignFlags" @@ -17373,7 +17982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1010 + "__id__": 1055 }, "propertyPath": [ "_bottom" @@ -17383,7 +17992,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1030 + "__id__": 1075 }, "propertyPath": [ "_name" @@ -17399,7 +18008,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1030 + "__id__": 1075 }, "propertyPath": [ "_lpos" @@ -17414,7 +18023,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1030 + "__id__": 1075 }, "propertyPath": [ "_lrot" @@ -17430,7 +18039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1030 + "__id__": 1075 }, "propertyPath": [ "_euler" @@ -17445,7 +18054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1035 + "__id__": 1080 }, "propertyPath": [ "_contentSize" @@ -17465,7 +18074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1082 }, "propertyPath": [ "_contentSize" @@ -17485,7 +18094,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1039 + "__id__": 1084 }, "propertyPath": [ "_contentSize" @@ -17505,7 +18114,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1041 + "__id__": 1086 }, "propertyPath": [ "_contentSize" @@ -17525,7 +18134,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1043 + "__id__": 1088 }, "propertyPath": [ "_active" @@ -17541,7 +18150,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1030 + "__id__": 1075 }, "propertyPath": [ "_active" @@ -17554,23 +18163,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 987 + "__id__": 1032 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1046 + "__id__": 1091 }, { - "__id__": 1048 + "__id__": 1093 }, { - "__id__": 1050 + "__id__": 1095 } ], "_prefab": { - "__id__": 1052 + "__id__": 1097 }, "_lpos": { "__type__": "cc.Vec3", @@ -17607,11 +18216,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1045 + "__id__": 1090 }, "_enabled": true, "__prefab": { - "__id__": 1047 + "__id__": 1092 }, "_contentSize": { "__type__": "cc.Size", @@ -17635,11 +18244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1045 + "__id__": 1090 }, "_enabled": true, "__prefab": { - "__id__": 1049 + "__id__": 1094 }, "_alignFlags": 18, "_target": null, @@ -17671,11 +18280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1045 + "__id__": 1090 }, "_enabled": false, "__prefab": { - "__id__": 1051 + "__id__": 1096 }, "_resizeMode": 0, "_layoutType": 1, @@ -17720,17 +18329,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 987 + "__id__": 1032 }, "_prefab": { - "__id__": 1054 + "__id__": 1099 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1053 + "__id__": 1098 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -17738,7 +18347,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1055 + "__id__": 1100 }, "targetOverrides": null }, @@ -17751,40 +18360,40 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1056 + "__id__": 1101 } ], "propertyOverrides": [ { - "__id__": 1060 + "__id__": 1105 }, { - "__id__": 1062 + "__id__": 1107 }, { - "__id__": 1063 + "__id__": 1108 }, { - "__id__": 1064 + "__id__": 1109 } ], "removedComponents": [ { - "__id__": 1065 + "__id__": 1110 }, { - "__id__": 1066 + "__id__": 1111 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1057 + "__id__": 1102 }, "components": [ { - "__id__": 1058 + "__id__": 1103 } ] }, @@ -17800,15 +18409,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1053 + "__id__": 1098 } }, "node": { - "__id__": 1053 + "__id__": 1098 }, "_enabled": true, "__prefab": { - "__id__": 1059 + "__id__": 1104 }, "_alignFlags": 2, "_target": null, @@ -17837,7 +18446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1106 }, "propertyPath": [ "_name" @@ -17853,7 +18462,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1106 }, "propertyPath": [ "_lpos" @@ -17868,7 +18477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1106 }, "propertyPath": [ "_lrot" @@ -17884,7 +18493,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1106 }, "propertyPath": [ "_euler" @@ -17914,11 +18523,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 987 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1068 + "__id__": 1113 }, "_contentSize": { "__type__": "cc.Size", @@ -17942,11 +18551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 987 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1070 + "__id__": 1115 }, "_alignFlags": 45, "_target": null, @@ -17978,11 +18587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 987 + "__id__": 1032 }, "_enabled": false, "__prefab": { - "__id__": 1072 + "__id__": 1117 }, "_resizeMode": 1, "_layoutType": 1, @@ -18016,11 +18625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 987 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1074 + "__id__": 1119 }, "_id": "" }, @@ -18051,35 +18660,35 @@ }, "_children": [ { - "__id__": 1077 + "__id__": 1122 }, { - "__id__": 1085 + "__id__": 1130 }, { - "__id__": 1134 + "__id__": 1179 }, { - "__id__": 1142 + "__id__": 1187 } ], "_active": false, "_components": [ { - "__id__": 1154 + "__id__": 1199 }, { - "__id__": 1156 + "__id__": 1201 }, { - "__id__": 1158 + "__id__": 1203 }, { - "__id__": 1160 + "__id__": 1205 } ], "_prefab": { - "__id__": 1162 + "__id__": 1207 }, "_lpos": { "__type__": "cc.Vec3", @@ -18116,23 +18725,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1076 + "__id__": 1121 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1078 + "__id__": 1123 }, { - "__id__": 1080 + "__id__": 1125 }, { - "__id__": 1082 + "__id__": 1127 } ], "_prefab": { - "__id__": 1084 + "__id__": 1129 }, "_lpos": { "__type__": "cc.Vec3", @@ -18169,11 +18778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1077 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1079 + "__id__": 1124 }, "_contentSize": { "__type__": "cc.Size", @@ -18197,11 +18806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1077 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1081 + "__id__": 1126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18242,11 +18851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1077 + "__id__": 1122 }, "_enabled": true, "__prefab": { - "__id__": 1083 + "__id__": 1128 }, "_alignFlags": 45, "_target": null, @@ -18289,17 +18898,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1076 + "__id__": 1121 }, "_prefab": { - "__id__": 1086 + "__id__": 1131 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1085 + "__id__": 1130 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -18307,7 +18916,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 1087 + "__id__": 1132 }, "targetOverrides": null }, @@ -18319,40 +18928,40 @@ }, "mountedChildren": [ { - "__id__": 1088 + "__id__": 1133 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1118 + "__id__": 1163 }, { - "__id__": 1120 + "__id__": 1165 }, { - "__id__": 1121 + "__id__": 1166 }, { - "__id__": 1122 + "__id__": 1167 }, { - "__id__": 1123 + "__id__": 1168 }, { - "__id__": 1125 + "__id__": 1170 }, { - "__id__": 1127 + "__id__": 1172 }, { - "__id__": 1129 + "__id__": 1174 }, { - "__id__": 1131 + "__id__": 1176 }, { - "__id__": 1133 + "__id__": 1178 } ], "removedComponents": [] @@ -18360,11 +18969,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 1089 + "__id__": 1134 }, "nodes": [ { - "__id__": 1090 + "__id__": 1135 } ] }, @@ -18378,21 +18987,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1085 + "__id__": 1130 }, "_prefab": { - "__id__": 1091 + "__id__": 1136 }, "__editorExtras__": { "mountedRoot": { - "__id__": 1085 + "__id__": 1130 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1090 + "__id__": 1135 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -18400,7 +19009,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 1092 + "__id__": 1137 }, "targetOverrides": null }, @@ -18414,55 +19023,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1093 + "__id__": 1138 }, { - "__id__": 1095 + "__id__": 1140 }, { - "__id__": 1096 + "__id__": 1141 }, { - "__id__": 1097 + "__id__": 1142 }, { - "__id__": 1098 + "__id__": 1143 }, { - "__id__": 1100 + "__id__": 1145 }, { - "__id__": 1102 + "__id__": 1147 }, { - "__id__": 1103 + "__id__": 1148 }, { - "__id__": 1105 + "__id__": 1150 }, { - "__id__": 1107 + "__id__": 1152 }, { - "__id__": 1109 + "__id__": 1154 }, { - "__id__": 1110 + "__id__": 1155 }, { - "__id__": 1112 + "__id__": 1157 }, { - "__id__": 1113 + "__id__": 1158 }, { - "__id__": 1114 + "__id__": 1159 }, { - "__id__": 1116 + "__id__": 1161 }, { - "__id__": 1117 + "__id__": 1162 } ], "removedComponents": [] @@ -18470,7 +19079,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1139 }, "propertyPath": [ "_name" @@ -18486,7 +19095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1139 }, "propertyPath": [ "_lpos" @@ -18501,7 +19110,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1139 }, "propertyPath": [ "_lrot" @@ -18517,7 +19126,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1139 }, "propertyPath": [ "_euler" @@ -18532,7 +19141,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1144 }, "propertyPath": [ "_top" @@ -18548,7 +19157,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1101 + "__id__": 1146 }, "propertyPath": [ "_active" @@ -18564,7 +19173,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1144 }, "propertyPath": [ "_left" @@ -18574,7 +19183,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1104 + "__id__": 1149 }, "propertyPath": [ "_contentSize" @@ -18594,7 +19203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1106 + "__id__": 1151 }, "propertyPath": [ "_contentSize" @@ -18614,7 +19223,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1108 + "__id__": 1153 }, "propertyPath": [ "_contentSize" @@ -18634,7 +19243,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1144 }, "propertyPath": [ "_right" @@ -18644,7 +19253,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1156 }, "propertyPath": [ "_alignFlags" @@ -18660,7 +19269,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1156 }, "propertyPath": [ "_top" @@ -18670,7 +19279,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1156 }, "propertyPath": [ "_bottom" @@ -18680,7 +19289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1115 + "__id__": 1160 }, "propertyPath": [ "_lpos" @@ -18701,7 +19310,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1144 }, "propertyPath": [ "_alignFlags" @@ -18711,7 +19320,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1144 }, "propertyPath": [ "_bottom" @@ -18721,7 +19330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1119 + "__id__": 1164 }, "propertyPath": [ "_name" @@ -18737,7 +19346,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1119 + "__id__": 1164 }, "propertyPath": [ "_lpos" @@ -18752,7 +19361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1119 + "__id__": 1164 }, "propertyPath": [ "_lrot" @@ -18768,7 +19377,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1119 + "__id__": 1164 }, "propertyPath": [ "_euler" @@ -18783,7 +19392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1124 + "__id__": 1169 }, "propertyPath": [ "_contentSize" @@ -18803,7 +19412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1126 + "__id__": 1171 }, "propertyPath": [ "_contentSize" @@ -18823,7 +19432,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1128 + "__id__": 1173 }, "propertyPath": [ "_contentSize" @@ -18843,7 +19452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1130 + "__id__": 1175 }, "propertyPath": [ "_contentSize" @@ -18863,7 +19472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1132 + "__id__": 1177 }, "propertyPath": [ "_active" @@ -18879,7 +19488,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1119 + "__id__": 1164 }, "propertyPath": [ "_active" @@ -18892,23 +19501,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1076 + "__id__": 1121 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1135 + "__id__": 1180 }, { - "__id__": 1137 + "__id__": 1182 }, { - "__id__": 1139 + "__id__": 1184 } ], "_prefab": { - "__id__": 1141 + "__id__": 1186 }, "_lpos": { "__type__": "cc.Vec3", @@ -18945,11 +19554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1134 + "__id__": 1179 }, "_enabled": true, "__prefab": { - "__id__": 1136 + "__id__": 1181 }, "_contentSize": { "__type__": "cc.Size", @@ -18973,11 +19582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1134 + "__id__": 1179 }, "_enabled": true, "__prefab": { - "__id__": 1138 + "__id__": 1183 }, "_alignFlags": 18, "_target": null, @@ -19009,11 +19618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1134 + "__id__": 1179 }, "_enabled": false, "__prefab": { - "__id__": 1140 + "__id__": 1185 }, "_resizeMode": 0, "_layoutType": 1, @@ -19058,17 +19667,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1076 + "__id__": 1121 }, "_prefab": { - "__id__": 1143 + "__id__": 1188 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1142 + "__id__": 1187 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -19076,7 +19685,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1144 + "__id__": 1189 }, "targetOverrides": null }, @@ -19089,21 +19698,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1145 + "__id__": 1190 } ], "propertyOverrides": [ { - "__id__": 1149 + "__id__": 1194 }, { - "__id__": 1151 + "__id__": 1196 }, { - "__id__": 1152 + "__id__": 1197 }, { - "__id__": 1153 + "__id__": 1198 } ], "removedComponents": [] @@ -19111,11 +19720,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1146 + "__id__": 1191 }, "components": [ { - "__id__": 1147 + "__id__": 1192 } ] }, @@ -19131,15 +19740,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1142 + "__id__": 1187 } }, "node": { - "__id__": 1142 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1148 + "__id__": 1193 }, "_alignFlags": 2, "_target": null, @@ -19168,7 +19777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1150 + "__id__": 1195 }, "propertyPath": [ "_name" @@ -19184,7 +19793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1150 + "__id__": 1195 }, "propertyPath": [ "_lpos" @@ -19199,7 +19808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1150 + "__id__": 1195 }, "propertyPath": [ "_lrot" @@ -19215,7 +19824,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1150 + "__id__": 1195 }, "propertyPath": [ "_euler" @@ -19233,11 +19842,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1076 + "__id__": 1121 }, "_enabled": true, "__prefab": { - "__id__": 1155 + "__id__": 1200 }, "_contentSize": { "__type__": "cc.Size", @@ -19261,11 +19870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1076 + "__id__": 1121 }, "_enabled": true, "__prefab": { - "__id__": 1157 + "__id__": 1202 }, "_alignFlags": 45, "_target": null, @@ -19297,11 +19906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1076 + "__id__": 1121 }, "_enabled": false, "__prefab": { - "__id__": 1159 + "__id__": 1204 }, "_resizeMode": 1, "_layoutType": 1, @@ -19335,11 +19944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1076 + "__id__": 1121 }, "_enabled": true, "__prefab": { - "__id__": 1161 + "__id__": 1206 }, "_id": "" }, @@ -19370,26 +19979,26 @@ }, "_children": [ { - "__id__": 1164 + "__id__": 1209 }, { - "__id__": 1170 + "__id__": 1215 }, { - "__id__": 1178 + "__id__": 1223 } ], "_active": true, "_components": [ { - "__id__": 1188 + "__id__": 1233 }, { - "__id__": 1190 + "__id__": 1235 } ], "_prefab": { - "__id__": 1192 + "__id__": 1237 }, "_lpos": { "__type__": "cc.Vec3", @@ -19426,20 +20035,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1163 + "__id__": 1208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1165 + "__id__": 1210 }, { - "__id__": 1167 + "__id__": 1212 } ], "_prefab": { - "__id__": 1169 + "__id__": 1214 }, "_lpos": { "__type__": "cc.Vec3", @@ -19476,11 +20085,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1164 + "__id__": 1209 }, "_enabled": true, "__prefab": { - "__id__": 1166 + "__id__": 1211 }, "_contentSize": { "__type__": "cc.Size", @@ -19504,11 +20113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1164 + "__id__": 1209 }, "_enabled": true, "__prefab": { - "__id__": 1168 + "__id__": 1213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19562,23 +20171,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1163 + "__id__": 1208 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1171 + "__id__": 1216 }, { - "__id__": 1173 + "__id__": 1218 }, { - "__id__": 1175 + "__id__": 1220 } ], "_prefab": { - "__id__": 1177 + "__id__": 1222 }, "_lpos": { "__type__": "cc.Vec3", @@ -19615,11 +20224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1215 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1217 }, "_contentSize": { "__type__": "cc.Size", @@ -19643,11 +20252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1215 }, "_enabled": true, "__prefab": { - "__id__": 1174 + "__id__": 1219 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19691,11 +20300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1215 }, "_enabled": true, "__prefab": { - "__id__": 1176 + "__id__": 1221 }, "_alignFlags": 40, "_target": null, @@ -19740,26 +20349,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1163 + "__id__": 1208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1179 + "__id__": 1224 }, { - "__id__": 1181 + "__id__": 1226 }, { - "__id__": 1183 + "__id__": 1228 }, { - "__id__": 1185 + "__id__": 1230 } ], "_prefab": { - "__id__": 1187 + "__id__": 1232 }, "_lpos": { "__type__": "cc.Vec3", @@ -19796,11 +20405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1178 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1180 + "__id__": 1225 }, "_contentSize": { "__type__": "cc.Size", @@ -19824,11 +20433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1178 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1182 + "__id__": 1227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19892,11 +20501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1178 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1184 + "__id__": 1229 }, "_params": [], "_dataID": "", @@ -19912,11 +20521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1178 + "__id__": 1223 }, "_enabled": true, "__prefab": { - "__id__": 1186 + "__id__": 1231 }, "_alignFlags": 45, "_target": null, @@ -19961,11 +20570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1208 }, "_enabled": true, "__prefab": { - "__id__": 1189 + "__id__": 1234 }, "_contentSize": { "__type__": "cc.Size", @@ -19989,11 +20598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1208 }, "_enabled": true, "__prefab": { - "__id__": 1191 + "__id__": 1236 }, "_alignFlags": 1, "_target": null, @@ -20042,26 +20651,26 @@ }, "_children": [ { - "__id__": 1194 + "__id__": 1239 }, { - "__id__": 1210 + "__id__": 1255 }, { - "__id__": 1220 + "__id__": 1265 } ], "_active": true, "_components": [ { - "__id__": 1232 + "__id__": 1277 }, { - "__id__": 1234 + "__id__": 1279 } ], "_prefab": { - "__id__": 1236 + "__id__": 1281 }, "_lpos": { "__type__": "cc.Vec3", @@ -20098,24 +20707,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1193 + "__id__": 1238 }, "_children": [ { - "__id__": 1195 + "__id__": 1240 }, { - "__id__": 1201 + "__id__": 1246 } ], "_active": true, "_components": [ { - "__id__": 1207 + "__id__": 1252 } ], "_prefab": { - "__id__": 1209 + "__id__": 1254 }, "_lpos": { "__type__": "cc.Vec3", @@ -20152,20 +20761,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1194 + "__id__": 1239 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1196 + "__id__": 1241 }, { - "__id__": 1198 + "__id__": 1243 } ], "_prefab": { - "__id__": 1200 + "__id__": 1245 }, "_lpos": { "__type__": "cc.Vec3", @@ -20202,11 +20811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1240 }, "_enabled": true, "__prefab": { - "__id__": 1197 + "__id__": 1242 }, "_contentSize": { "__type__": "cc.Size", @@ -20230,11 +20839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1240 }, "_enabled": true, "__prefab": { - "__id__": 1199 + "__id__": 1244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20291,20 +20900,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1194 + "__id__": 1239 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1202 + "__id__": 1247 }, { - "__id__": 1204 + "__id__": 1249 } ], "_prefab": { - "__id__": 1206 + "__id__": 1251 }, "_lpos": { "__type__": "cc.Vec3", @@ -20341,11 +20950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1201 + "__id__": 1246 }, "_enabled": true, "__prefab": { - "__id__": 1203 + "__id__": 1248 }, "_contentSize": { "__type__": "cc.Size", @@ -20369,11 +20978,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1201 + "__id__": 1246 }, "_enabled": true, "__prefab": { - "__id__": 1205 + "__id__": 1250 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20450,11 +21059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1194 + "__id__": 1239 }, "_enabled": true, "__prefab": { - "__id__": 1208 + "__id__": 1253 }, "_contentSize": { "__type__": "cc.Size", @@ -20491,21 +21100,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1193 + "__id__": 1238 }, "_children": [ { - "__id__": 1211 + "__id__": 1256 } ], "_active": false, "_components": [ { - "__id__": 1217 + "__id__": 1262 } ], "_prefab": { - "__id__": 1219 + "__id__": 1264 }, "_lpos": { "__type__": "cc.Vec3", @@ -20542,20 +21151,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1210 + "__id__": 1255 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1212 + "__id__": 1257 }, { - "__id__": 1214 + "__id__": 1259 } ], "_prefab": { - "__id__": 1216 + "__id__": 1261 }, "_lpos": { "__type__": "cc.Vec3", @@ -20592,11 +21201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1211 + "__id__": 1256 }, "_enabled": true, "__prefab": { - "__id__": 1213 + "__id__": 1258 }, "_contentSize": { "__type__": "cc.Size", @@ -20620,11 +21229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1211 + "__id__": 1256 }, "_enabled": true, "__prefab": { - "__id__": 1215 + "__id__": 1260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20701,11 +21310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1210 + "__id__": 1255 }, "_enabled": true, "__prefab": { - "__id__": 1218 + "__id__": 1263 }, "_contentSize": { "__type__": "cc.Size", @@ -20742,24 +21351,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1193 + "__id__": 1238 }, "_children": [ { - "__id__": 1221 + "__id__": 1266 } ], "_active": true, "_components": [ { - "__id__": 1227 + "__id__": 1272 }, { - "__id__": 1229 + "__id__": 1274 } ], "_prefab": { - "__id__": 1231 + "__id__": 1276 }, "_lpos": { "__type__": "cc.Vec3", @@ -20796,20 +21405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1220 + "__id__": 1265 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1222 + "__id__": 1267 }, { - "__id__": 1224 + "__id__": 1269 } ], "_prefab": { - "__id__": 1226 + "__id__": 1271 }, "_lpos": { "__type__": "cc.Vec3", @@ -20846,11 +21455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1221 + "__id__": 1266 }, "_enabled": true, "__prefab": { - "__id__": 1223 + "__id__": 1268 }, "_contentSize": { "__type__": "cc.Size", @@ -20874,11 +21483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1221 + "__id__": 1266 }, "_enabled": true, "__prefab": { - "__id__": 1225 + "__id__": 1270 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20935,11 +21544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1220 + "__id__": 1265 }, "_enabled": true, "__prefab": { - "__id__": 1228 + "__id__": 1273 }, "_contentSize": { "__type__": "cc.Size", @@ -20963,11 +21572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1220 + "__id__": 1265 }, "_enabled": true, "__prefab": { - "__id__": 1230 + "__id__": 1275 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21044,11 +21653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1193 + "__id__": 1238 }, "_enabled": true, "__prefab": { - "__id__": 1233 + "__id__": 1278 }, "_contentSize": { "__type__": "cc.Size", @@ -21072,11 +21681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1193 + "__id__": 1238 }, "_enabled": true, "__prefab": { - "__id__": 1235 + "__id__": 1280 }, "_alignFlags": 41, "_target": null, @@ -21125,7 +21734,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1238 + "__id__": 1283 }, "_contentSize": { "__type__": "cc.Size", @@ -21153,7 +21762,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1240 + "__id__": 1285 }, "_alignFlags": 21, "_target": null, @@ -21189,16 +21798,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 1242 + "__id__": 1287 }, "debugMode": false, "showMemoryPanel": true, "start_btn": null, "time_node": { - "__id__": 1193 + "__id__": 1238 }, "tooltip": { - "__id__": 1163 + "__id__": 1208 }, "_id": "" }, @@ -21216,23 +21825,23 @@ }, "_enabled": true, "__prefab": { - "__id__": 1244 + "__id__": 1289 }, "cardPanNode": { - "__id__": 868 + "__id__": 913 }, "cards_node": { - "__id__": 926 + "__id__": 971 }, "cardPrefab": { "__uuid__": "f2f9a3e0-d0f5-46f4-84bd-dd54c2248470", "__expectedType__": "cc.Prefab" }, "closeCards": { - "__id__": 945 + "__id__": 990 }, "nock_node": { - "__id__": 741 + "__id__": 786 }, "showHeros": { "__id__": 421 @@ -21247,64 +21856,64 @@ "__id__": 453 }, "showEquips": { - "__id__": 498 + "__id__": 509 }, "equipsPanNode": { - "__id__": 781 + "__id__": 826 }, "equipsBoxNode": { - "__id__": 839 + "__id__": 884 }, "equipPrefab": { "__uuid__": "f30f91b1-3100-4d9e-befb-cdde5f86e6f8", "__expectedType__": "cc.Prefab" }, "showEquipsCost": { - "__id__": 530 + "__id__": 541 }, "showSkills": { - "__id__": 578 + "__id__": 600 }, "skillPanNode": { - "__id__": 987 + "__id__": 1032 }, "skillBoxNode": { - "__id__": 1045 + "__id__": 1090 }, "sCardPrefab": { "__uuid__": "78a5b2d1-a34b-4190-895d-7d0aa22037cc", "__expectedType__": "cc.Prefab" }, "showSkillsCost": { - "__id__": 610 + "__id__": 632 }, "showShop": { - "__id__": 655 + "__id__": 688 }, "shopPanNode": { - "__id__": 1076 + "__id__": 1121 }, "shopBoxNode": { - "__id__": 1134 + "__id__": 1179 }, "itemPrefab": { "__uuid__": "abae16b3-c2a2-4971-95b1-fc121f769554", "__expectedType__": "cc.Prefab" }, "showShopCost": { - "__id__": 687 + "__id__": 720 }, "skill_refresh": { - "__id__": 1053 + "__id__": 1098 }, "equip_refresh": { - "__id__": 847 + "__id__": 892 }, "shop_refresh": { - "__id__": 1142 + "__id__": 1187 }, "cards_chou": { - "__id__": 935 + "__id__": 980 }, "coins_node": { "__id__": 172 @@ -21331,7 +21940,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1246 + "__id__": 1291 }, "_id": "" }, @@ -21349,7 +21958,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1248 + "__id__": 1293 }, "debugMode": false, "_id": "" @@ -21368,7 +21977,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1250 + "__id__": 1295 }, "skill_box": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -21390,7 +21999,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1252 + "__id__": 1297 }, "equip_box": { "__uuid__": "66d7902d-2a85-43d5-8cbb-671cc7dbb275", @@ -21414,70 +22023,82 @@ "instance": null, "targetOverrides": [ { - "__id__": 1254 + "__id__": 1299 }, { - "__id__": 1256 + "__id__": 1301 }, { - "__id__": 1258 + "__id__": 1303 }, { - "__id__": 1260 + "__id__": 1305 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1142 + "__id__": 1187 }, { - "__id__": 1085 + "__id__": 1130 }, { - "__id__": 1090 + "__id__": 1135 }, { - "__id__": 1053 + "__id__": 1098 }, { - "__id__": 996 + "__id__": 1041 }, { - "__id__": 1001 + "__id__": 1046 }, { - "__id__": 945 + "__id__": 990 }, { - "__id__": 935 + "__id__": 980 }, { - "__id__": 877 + "__id__": 922 }, { - "__id__": 882 + "__id__": 927 }, { - "__id__": 847 + "__id__": 892 }, { - "__id__": 790 + "__id__": 835 }, { - "__id__": 795 + "__id__": 840 }, { - "__id__": 655 + "__id__": 688 }, { - "__id__": 578 + "__id__": 733 }, { - "__id__": 498 + "__id__": 600 + }, + { + "__id__": 645 + }, + { + "__id__": 509 + }, + { + "__id__": 554 }, { "__id__": 421 }, + { + "__id__": 466 + }, { "__id__": 379 }, @@ -21525,7 +22146,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1243 + "__id__": 1288 }, "sourceInfo": null, "propertyPath": [ @@ -21535,7 +22156,7 @@ "__id__": 421 }, "targetInfo": { - "__id__": 1255 + "__id__": 1300 } }, { @@ -21547,17 +22168,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1243 + "__id__": 1288 }, "sourceInfo": null, "propertyPath": [ "showEquipsCost" ], "target": { - "__id__": 498 + "__id__": 509 }, "targetInfo": { - "__id__": 1257 + "__id__": 1302 } }, { @@ -21569,17 +22190,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1243 + "__id__": 1288 }, "sourceInfo": null, "propertyPath": [ "showSkillsCost" ], "target": { - "__id__": 578 + "__id__": 600 }, "targetInfo": { - "__id__": 1259 + "__id__": 1304 } }, { @@ -21591,17 +22212,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1243 + "__id__": 1288 }, "sourceInfo": null, "propertyPath": [ "showShopCost" ], "target": { - "__id__": 655 + "__id__": 688 }, "targetInfo": { - "__id__": 1261 + "__id__": 1306 } }, { diff --git a/assets/script/game/map/MissEquipComp.ts b/assets/script/game/map/MissEquipComp.ts index b5db69ac..727b0b47 100644 --- a/assets/script/game/map/MissEquipComp.ts +++ b/assets/script/game/map/MissEquipComp.ts @@ -55,6 +55,19 @@ export class MissEquipComp extends CCComp { /** 调试日志开关 */ private debugMode: boolean = true; + /** 当前活跃实例(供其他系统查询槽位占用,避免直接 find 强引用) */ + private static instance: MissEquipComp | null = null; + + /** + * 查询场上装备槽是否已全部占用。 + * @returns 无空闲槽位时返回 true;实例不存在时返回 false + */ + public static isFull(): boolean { + const inst = MissEquipComp.instance; + if (!inst) return false; + return inst.slots.every(slot => slot.used); + } + /** 技能卡 Prefab(在编辑器中赋值) */ @property({ type: Prefab }) private equip_box: Prefab = null; @@ -62,16 +75,17 @@ export class MissEquipComp extends CCComp { * 预定义的 6 个槽位坐标(单行): */ private slots: SkillBoxSlot[] = [ - { x: -310, y: BoxSet.GAME_LINE-70, used: false, node: null }, - { x: -230, y: BoxSet.GAME_LINE-70, used: false, node: null }, - { x: -150, y: BoxSet.GAME_LINE-70, used: false, node: null }, - { x: -70, y: BoxSet.GAME_LINE-70, used: false, node: null }, - { x: 10, y: BoxSet.GAME_LINE-70, used: false, node: null }, - { x: 90, y: BoxSet.GAME_LINE-70, used: false, node: null }, + { x: -310, y: BoxSet.GAME_LINE - 70, used: false, node: null }, + { x: -230, y: BoxSet.GAME_LINE - 70, used: false, node: null }, + { x: -150, y: BoxSet.GAME_LINE - 70, used: false, node: null }, + { x: -70, y: BoxSet.GAME_LINE - 70, used: false, node: null }, + { x: 10, y: BoxSet.GAME_LINE - 70, used: false, node: null }, + { x: 90, y: BoxSet.GAME_LINE - 70, used: false, node: null }, ]; /** 注册事件监听 */ onLoad() { + MissEquipComp.instance = this; oops.message.on(GameEvent.UseEquipCard, this.onUseEquipCard, this); oops.message.on(GameEvent.RemoveEquipBox, this.onRemoveEquipBox, this); } @@ -79,6 +93,9 @@ export class MissEquipComp extends CCComp { /** 移除事件监听 */ onDestroy() { super.onDestroy(); + if (MissEquipComp.instance === this) { + MissEquipComp.instance = null; + } oops.message.off(GameEvent.UseEquipCard, this.onUseEquipCard, this); oops.message.off(GameEvent.RemoveEquipBox, this.onRemoveEquipBox, this); } diff --git a/assets/script/game/map/MissSkillsComp.ts b/assets/script/game/map/MissSkillsComp.ts index 6da0031c..e9fa4189 100644 --- a/assets/script/game/map/MissSkillsComp.ts +++ b/assets/script/game/map/MissSkillsComp.ts @@ -57,6 +57,19 @@ export class MissSkillsComp extends CCComp { /** 调试日志开关 */ private debugMode: boolean = true; + /** 当前活跃实例(供其他系统查询槽位占用,避免直接 find 强引用) */ + private static instance: MissSkillsComp | null = null; + + /** + * 查询场上技能槽是否已全部占用。 + * @returns 无空闲槽位时返回 true;实例不存在时返回 false + */ + public static isFull(): boolean { + const inst = MissSkillsComp.instance; + if (!inst) return false; + return inst.slots.every(slot => slot.used); + } + /** 技能卡 Prefab(在编辑器中赋值) */ @property({ type: Prefab }) private skill_box: Prefab = null; @@ -65,16 +78,17 @@ export class MissSkillsComp extends CCComp { * 预定义的 6 个槽位坐标(单行): */ private slots: SkillBoxSlot[] = [ - { x: -310, y: BoxSet.GAME_LINE+300, used: false, node: null }, - { x: -240, y: BoxSet.GAME_LINE+300, used: false, node: null }, - { x: -170, y: BoxSet.GAME_LINE+300, used: false, node: null }, - { x: -100, y: BoxSet.GAME_LINE+300, used: false, node: null }, - { x: -30, y: BoxSet.GAME_LINE+300, used: false, node: null }, - { x: 40, y: BoxSet.GAME_LINE+300, used: false, node: null }, + { x: -310, y: BoxSet.GAME_LINE + 300, used: false, node: null }, + { x: -240, y: BoxSet.GAME_LINE + 300, used: false, node: null }, + { x: -170, y: BoxSet.GAME_LINE + 300, used: false, node: null }, + { x: -100, y: BoxSet.GAME_LINE + 300, used: false, node: null }, + { x: -30, y: BoxSet.GAME_LINE + 300, used: false, node: null }, + { x: 40, y: BoxSet.GAME_LINE + 300, used: false, node: null }, ]; /** 注册事件监听 */ onLoad() { + MissSkillsComp.instance = this; oops.message.on(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.on(GameEvent.UseItemCard, this.onUseItemCard, this); oops.message.on(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this); @@ -83,6 +97,9 @@ export class MissSkillsComp extends CCComp { /** 移除事件监听 */ onDestroy() { super.onDestroy(); + if (MissSkillsComp.instance === this) { + MissSkillsComp.instance = null; + } oops.message.off(GameEvent.UseSkillCard, this.onUseSkillCard, this); oops.message.off(GameEvent.UseItemCard, this.onUseItemCard, this); oops.message.off(GameEvent.RemoveSkillBox, this.onRemoveSkillBox, this); diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index f170e2ef..03e5abde 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -47,6 +47,8 @@ import { CHeroComp } from "./CHeroComp"; import { EquipListComp } from "./EquipListComp"; import { HeroBoxComp } from "./HeroBoxComp"; import { SCardComp } from "./SCardComp"; +import { MissEquipComp } from "./MissEquipComp"; +import { MissSkillsComp } from "./MissSkillsComp"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; import { smc } from "../common/SingletonModuleComp"; @@ -474,9 +476,12 @@ export class MissionCardComp extends CCComp { /** * 在目标节点上弹出 smalltip 气泡(缩放动画)。 * @param type 提示类型(决定挂载到哪个节点) + * - refresh_coin / buy_coin / hero_full:挂在抽卡按钮 / 金币节点 / 英雄数量节点 + * - panel_hero_full / panel_equip_full / panel_skill_full / panel_shop_full: + * 挂在 showHeros / showEquips / showSkills / showShop 按钮节点(按钮下需预置 smalltip 子节点) * @param text 可选:覆盖气泡文字(默认读 prefab 中配置的文本) */ - public showSmallTip(type: "refresh_coin" | "buy_coin" | "hero_full", text?: string) { + public showSmallTip(type: "refresh_coin" | "buy_coin" | "hero_full" | "panel_hero_full" | "panel_equip_full" | "panel_skill_full" | "panel_shop_full", text?: string) { let targetNode: Node | null = null; switch (type) { case "refresh_coin": @@ -488,6 +493,18 @@ export class MissionCardComp extends CCComp { case "hero_full": targetNode = this.hero_num_node; break; + case "panel_hero_full": + targetNode = this.showHeros; + break; + case "panel_equip_full": + targetNode = this.showEquips; + break; + case "panel_skill_full": + targetNode = this.showSkills; + break; + case "panel_shop_full": + targetNode = this.showShop; + break; } if (targetNode && targetNode.isValid) { const tipNode = targetNode.getChildByName("smalltip"); @@ -529,6 +546,11 @@ export class MissionCardComp extends CCComp { private onShowSkillsClick() { oops.audio.playEffect("music/button"); if (this.isOverlayPanelShown(2)) return; + // 技能槽位已满:气泡提示并中止,不再展开三选一,也不扣开启费用 + if (MissSkillsComp.isFull()) { + this.showSmallTip("panel_skill_full", "技能槽已满"); + return; + } // 开启技能面板需支付金币,金币不足则提示并中止 if (!this.tryPayPanelOpenCost(2)) return; this.slideToPanel(2); @@ -1037,6 +1059,11 @@ export class MissionCardComp extends CCComp { oops.audio.playEffect("music/button"); // 已展开则不重复开启(不重复扣费) if (this.isCardPanelShown) return; + // 英雄槽位已满:气泡提示并中止,不再展开三选一,也不扣开启费用 + if (this.getAliveHeroCount() >= this.getMissionHeroMaxNum()) { + this.showSmallTip("panel_hero_full", "英雄槽已满"); + return; + } // 开启英雄抽卡面板需支付金币,金币不足则提示并中止 if (!this.tryPayPanelOpenCost(0)) return; // 收起装备/技能/药品覆盖面板 @@ -1218,6 +1245,11 @@ export class MissionCardComp extends CCComp { private onShowEquipsClick() { oops.audio.playEffect("music/button"); if (this.isOverlayPanelShown(1)) return; + // 装备槽位已满:气泡提示并中止,不再展开三选一,也不扣开启费用 + if (MissEquipComp.isFull()) { + this.showSmallTip("panel_equip_full", "装备槽已满"); + return; + } // 开启装备面板需支付金币,金币不足则提示并中止 if (!this.tryPayPanelOpenCost(1)) return; this.slideToPanel(1);