From f7622202f84e1d632c2e732bd7d70792dadb6d08 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 4 Jan 2026 18:42:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(map):=20=E6=96=B0=E5=A2=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=A1=E7=89=87=E7=BB=84=E4=BB=B6=E5=8F=8AUI?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 MissionCardComp.ts 组件用于处理任务卡片逻辑 在 card.prefab 中新增名称标签及相关UI组件 组件支持卡片数据更新和显示控制 --- assets/resources/gui/role_controller.prefab | 2153 +++++++++-------- assets/resources/gui/uis/bgs/card.prefab | 214 +- assets/script/game/map/MissionCardComp.ts | 76 + .../script/game/map/MissionCardComp.ts.meta | 9 + 4 files changed, 1386 insertions(+), 1066 deletions(-) create mode 100644 assets/script/game/map/MissionCardComp.ts create mode 100644 assets/script/game/map/MissionCardComp.ts.meta diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index c7ffdf2c..25b5334b 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 486 + "__id__": 488 }, { - "__id__": 995 + "__id__": 997 }, { - "__id__": 1004 + "__id__": 1006 } ], "_active": true, "_components": [ - { - "__id__": 1050 - }, { "__id__": 1052 }, { "__id__": 1054 + }, + { + "__id__": 1056 } ], "_prefab": { - "__id__": 1056 + "__id__": 1058 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,14 +91,11 @@ "__id__": 23 }, { - "__id__": 428 + "__id__": 430 } ], "_active": true, "_components": [ - { - "__id__": 475 - }, { "__id__": 477 }, @@ -110,10 +107,13 @@ }, { "__id__": 483 + }, + { + "__id__": 485 } ], "_prefab": { - "__id__": 485 + "__id__": 487 }, "_lpos": { "__type__": "cc.Vec3", @@ -634,20 +634,20 @@ "__id__": 313 }, { - "__id__": 371 + "__id__": 373 } ], "_active": true, "_components": [ { - "__id__": 423 + "__id__": 425 }, { - "__id__": 425 + "__id__": 427 } ], "_prefab": { - "__id__": 427 + "__id__": 429 }, "_lpos": { "__type__": "cc.Vec3", @@ -6961,10 +6961,13 @@ }, { "__id__": 368 + }, + { + "__id__": 370 } ], "_prefab": { - "__id__": 370 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -7716,6 +7719,36 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9cO6DcvLFAlLwJFdtQZP+t" }, + { + "__type__": "b3d6eSQ8ulPP79kPpPIytqU", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 313 + }, + "_enabled": true, + "__prefab": { + "__id__": 371 + }, + "card1": { + "__id__": 314 + }, + "card2": { + "__id__": 330 + }, + "card3": { + "__id__": 342 + }, + "card4": { + "__id__": 354 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7FgjuWbdEQZp5572wepXg" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -7739,32 +7772,32 @@ }, "_children": [ { - "__id__": 372 + "__id__": 374 }, { - "__id__": 380 + "__id__": 382 }, { - "__id__": 388 + "__id__": 390 }, { - "__id__": 396 + "__id__": 398 } ], "_active": true, "_components": [ - { - "__id__": 416 - }, { "__id__": 418 }, { "__id__": 420 + }, + { + "__id__": 422 } ], "_prefab": { - "__id__": 422 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -7801,23 +7834,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 373 - }, { "__id__": 375 }, { "__id__": 377 + }, + { + "__id__": 379 } ], "_prefab": { - "__id__": 379 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -7854,11 +7887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -7882,11 +7915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 378 }, "_alignFlags": 36, "_target": null, @@ -7918,11 +7951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 372 + "__id__": 374 }, "_enabled": false, "__prefab": { - "__id__": 378 + "__id__": 380 }, "_id": "" }, @@ -7949,23 +7982,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 381 - }, { "__id__": 383 }, { "__id__": 385 + }, + { + "__id__": 387 } ], "_prefab": { - "__id__": 387 + "__id__": 389 }, "_lpos": { "__type__": "cc.Vec3", @@ -8002,11 +8035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -8030,11 +8063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 386 }, "_alignFlags": 36, "_target": null, @@ -8066,11 +8099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 382 }, "_enabled": false, "__prefab": { - "__id__": 386 + "__id__": 388 }, "_id": "" }, @@ -8097,23 +8130,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 389 - }, { "__id__": 391 }, { "__id__": 393 + }, + { + "__id__": 395 } ], "_prefab": { - "__id__": 395 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -8150,11 +8183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 392 }, "_contentSize": { "__type__": "cc.Size", @@ -8178,11 +8211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 394 }, "_alignFlags": 36, "_target": null, @@ -8214,11 +8247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 390 }, "_enabled": false, "__prefab": { - "__id__": 394 + "__id__": 396 }, "_id": "" }, @@ -8245,27 +8278,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 371 + "__id__": 373 }, "_children": [ { - "__id__": 397 + "__id__": 399 } ], "_active": true, "_components": [ - { - "__id__": 409 - }, { "__id__": 411 }, { "__id__": 413 + }, + { + "__id__": 415 } ], "_prefab": { - "__id__": 415 + "__id__": 417 }, "_lpos": { "__type__": "cc.Vec3", @@ -8302,24 +8335,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 396 + "__id__": 398 }, "_children": [ { - "__id__": 398 + "__id__": 400 } ], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 406 }, { - "__id__": 406 + "__id__": 408 } ], "_prefab": { - "__id__": 408 + "__id__": 410 }, "_lpos": { "__type__": "cc.Vec3", @@ -8356,20 +8389,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 397 + "__id__": 399 }, "_children": [], "_active": true, "_components": [ { - "__id__": 399 + "__id__": 401 }, { - "__id__": 401 + "__id__": 403 } ], "_prefab": { - "__id__": 403 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -8406,11 +8439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 402 }, "_contentSize": { "__type__": "cc.Size", @@ -8434,11 +8467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 404 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8515,11 +8548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 399 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 407 }, "_contentSize": { "__type__": "cc.Size", @@ -8543,11 +8576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 399 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 409 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8604,11 +8637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 412 }, "_contentSize": { "__type__": "cc.Size", @@ -8632,11 +8665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 412 + "__id__": 414 }, "_alignFlags": 36, "_target": null, @@ -8668,11 +8701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 398 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 416 }, "_id": "" }, @@ -8699,11 +8732,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 419 }, "_contentSize": { "__type__": "cc.Size", @@ -8727,11 +8760,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 421 }, "_alignFlags": 40, "_target": null, @@ -8763,11 +8796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 423 }, "_resizeMode": 0, "_layoutType": 1, @@ -8818,7 +8851,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -8846,7 +8879,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 428 }, "_alignFlags": 44, "_target": null, @@ -8895,38 +8928,38 @@ }, "_children": [ { - "__id__": 429 + "__id__": 431 }, { - "__id__": 437 + "__id__": 439 }, { - "__id__": 443 + "__id__": 445 }, { - "__id__": 449 + "__id__": 451 }, { - "__id__": 455 + "__id__": 457 }, { - "__id__": 461 + "__id__": 463 } ], "_active": true, "_components": [ - { - "__id__": 467 - }, { "__id__": 469 }, { - "__id__": 472 + "__id__": 471 + }, + { + "__id__": 474 } ], "_prefab": { - "__id__": 474 + "__id__": 476 }, "_lpos": { "__type__": "cc.Vec3", @@ -8963,23 +8996,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 430 - }, { "__id__": 432 }, { "__id__": 434 + }, + { + "__id__": 436 } ], "_prefab": { - "__id__": 436 + "__id__": 438 }, "_lpos": { "__type__": "cc.Vec3", @@ -9016,11 +9049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 433 }, "_contentSize": { "__type__": "cc.Size", @@ -9044,11 +9077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 435 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9092,11 +9125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 437 }, "_alignFlags": 45, "_target": null, @@ -9141,20 +9174,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": false, "_components": [ { - "__id__": 438 + "__id__": 440 }, { - "__id__": 440 + "__id__": 442 } ], "_prefab": { - "__id__": 442 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", @@ -9191,11 +9224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 441 }, "_contentSize": { "__type__": "cc.Size", @@ -9219,11 +9252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 443 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9277,20 +9310,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": false, "_components": [ { - "__id__": 444 + "__id__": 446 }, { - "__id__": 446 + "__id__": 448 } ], "_prefab": { - "__id__": 448 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", @@ -9327,11 +9360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -9355,11 +9388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9413,20 +9446,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": false, "_components": [ { - "__id__": 450 + "__id__": 452 }, { - "__id__": 452 + "__id__": 454 } ], "_prefab": { - "__id__": 454 + "__id__": 456 }, "_lpos": { "__type__": "cc.Vec3", @@ -9463,11 +9496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -9491,11 +9524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9549,20 +9582,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 456 + "__id__": 458 }, { - "__id__": 458 + "__id__": 460 } ], "_prefab": { - "__id__": 460 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -9599,11 +9632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 459 }, "_contentSize": { "__type__": "cc.Size", @@ -9627,11 +9660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 461 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9685,20 +9718,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 462 + "__id__": 464 }, { - "__id__": 464 + "__id__": 466 } ], "_prefab": { - "__id__": 466 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -9735,11 +9768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 461 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 465 }, "_contentSize": { "__type__": "cc.Size", @@ -9763,11 +9796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 461 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 467 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9844,11 +9877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 470 }, "_contentSize": { "__type__": "cc.Size", @@ -9872,15 +9905,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 472 }, "clickEvents": [ { - "__id__": 471 + "__id__": 473 } ], "_interactable": true, @@ -9920,7 +9953,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 428 + "__id__": 430 }, "_id": "" }, @@ -9944,11 +9977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 473 + "__id__": 475 }, "_alignFlags": 12, "_target": null, @@ -9997,7 +10030,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 476 + "__id__": 478 }, "_contentSize": { "__type__": "cc.Size", @@ -10025,7 +10058,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 480 }, "_alignFlags": 21, "_target": null, @@ -10061,7 +10094,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 482 }, "_id": "" }, @@ -10079,7 +10112,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 484 }, "_id": "" }, @@ -10097,7 +10130,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 486 }, "_id": "" }, @@ -10128,35 +10161,32 @@ }, "_children": [ { - "__id__": 487 + "__id__": 489 }, { - "__id__": 495 + "__id__": 497 }, { - "__id__": 501 + "__id__": 503 }, { - "__id__": 529 + "__id__": 531 }, { - "__id__": 882 + "__id__": 884 }, { - "__id__": 899 + "__id__": 901 }, { - "__id__": 940 + "__id__": 942 }, { - "__id__": 963 + "__id__": 965 } ], "_active": false, "_components": [ - { - "__id__": 986 - }, { "__id__": 988 }, @@ -10165,10 +10195,13 @@ }, { "__id__": 992 + }, + { + "__id__": 994 } ], "_prefab": { - "__id__": 994 + "__id__": 996 }, "_lpos": { "__type__": "cc.Vec3", @@ -10205,23 +10238,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 488 - }, { "__id__": 490 }, { "__id__": 492 + }, + { + "__id__": 494 } ], "_prefab": { - "__id__": 494 + "__id__": 496 }, "_lpos": { "__type__": "cc.Vec3", @@ -10258,11 +10291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 489 + "__id__": 491 }, "_contentSize": { "__type__": "cc.Size", @@ -10286,11 +10319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 491 + "__id__": 493 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10334,11 +10367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 489 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 495 }, "_alignFlags": 4, "_target": null, @@ -10383,20 +10416,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [], "_active": true, "_components": [ { - "__id__": 496 + "__id__": 498 }, { - "__id__": 498 + "__id__": 500 } ], "_prefab": { - "__id__": 500 + "__id__": 502 }, "_lpos": { "__type__": "cc.Vec3", @@ -10433,11 +10466,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 495 + "__id__": 497 }, "_enabled": true, "__prefab": { - "__id__": 497 + "__id__": 499 }, "_contentSize": { "__type__": "cc.Size", @@ -10461,11 +10494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 495 + "__id__": 497 }, "_enabled": true, "__prefab": { - "__id__": 499 + "__id__": 501 }, "_alignFlags": 20, "_target": null, @@ -10510,33 +10543,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [ { - "__id__": 502 + "__id__": 504 }, { - "__id__": 508 + "__id__": 510 }, { - "__id__": 516 + "__id__": 518 } ], "_active": true, "_components": [ - { - "__id__": 522 - }, { "__id__": 524 }, { "__id__": 526 + }, + { + "__id__": 528 } ], "_prefab": { - "__id__": 528 + "__id__": 530 }, "_lpos": { "__type__": "cc.Vec3", @@ -10573,20 +10606,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 501 + "__id__": 503 }, "_children": [], "_active": true, "_components": [ { - "__id__": 503 + "__id__": 505 }, { - "__id__": 505 + "__id__": 507 } ], "_prefab": { - "__id__": 507 + "__id__": 509 }, "_lpos": { "__type__": "cc.Vec3", @@ -10623,11 +10656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 504 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 506 }, "_contentSize": { "__type__": "cc.Size", @@ -10651,11 +10684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 504 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 508 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10712,23 +10745,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 501 + "__id__": 503 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 509 - }, { "__id__": 511 }, { "__id__": 513 + }, + { + "__id__": 515 } ], "_prefab": { - "__id__": 515 + "__id__": 517 }, "_lpos": { "__type__": "cc.Vec3", @@ -10765,11 +10798,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 510 + "__id__": 512 }, "_contentSize": { "__type__": "cc.Size", @@ -10793,11 +10826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 514 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10861,11 +10894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 508 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 516 }, "_alignFlags": 1, "_target": null, @@ -10910,20 +10943,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 501 + "__id__": 503 }, "_children": [], "_active": true, "_components": [ { - "__id__": 517 + "__id__": 519 }, { - "__id__": 519 + "__id__": 521 } ], "_prefab": { - "__id__": 521 + "__id__": 523 }, "_lpos": { "__type__": "cc.Vec3", @@ -10960,11 +10993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 516 + "__id__": 518 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 520 }, "_contentSize": { "__type__": "cc.Size", @@ -10988,11 +11021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 516 + "__id__": 518 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 522 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11069,11 +11102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 501 + "__id__": 503 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 525 }, "_contentSize": { "__type__": "cc.Size", @@ -11097,11 +11130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 501 + "__id__": 503 }, "_enabled": false, "__prefab": { - "__id__": 525 + "__id__": 527 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11139,11 +11172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 501 + "__id__": 503 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 529 }, "_alignFlags": 20, "_target": null, @@ -11188,27 +11221,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [ { - "__id__": 530 + "__id__": 532 }, { - "__id__": 538 + "__id__": 540 } ], "_active": true, "_components": [ { - "__id__": 877 + "__id__": 879 }, { - "__id__": 879 + "__id__": 881 } ], "_prefab": { - "__id__": 881 + "__id__": 883 }, "_lpos": { "__type__": "cc.Vec3", @@ -11245,23 +11278,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 529 + "__id__": 531 }, "_children": [], "_active": false, "_components": [ - { - "__id__": 531 - }, { "__id__": 533 }, { "__id__": 535 + }, + { + "__id__": 537 } ], "_prefab": { - "__id__": 537 + "__id__": 539 }, "_lpos": { "__type__": "cc.Vec3", @@ -11298,11 +11331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 534 }, "_contentSize": { "__type__": "cc.Size", @@ -11326,11 +11359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 536 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11374,11 +11407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 532 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 538 }, "_alignFlags": 45, "_target": null, @@ -11423,30 +11456,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 529 + "__id__": 531 }, "_children": [ { - "__id__": 539 + "__id__": 541 }, { - "__id__": 558 + "__id__": 560 }, { - "__id__": 788 + "__id__": 790 }, { - "__id__": 794 + "__id__": 796 } ], "_active": true, "_components": [ { - "__id__": 874 + "__id__": 876 } ], "_prefab": { - "__id__": 876 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -11481,17 +11514,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 538 + "__id__": 540 }, "_prefab": { - "__id__": 540 + "__id__": 542 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 539 + "__id__": 541 }, "asset": { "__uuid__": "e6194357-1151-49a8-ba79-224f45ed688c", @@ -11499,7 +11532,7 @@ }, "fileId": "05DREFeeFN3J6MVw6Ib9Zw", "instance": { - "__id__": 541 + "__id__": 543 }, "targetOverrides": null }, @@ -11512,21 +11545,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 542 - }, { "__id__": 544 }, - { - "__id__": 545 - }, { "__id__": 546 }, { "__id__": 547 }, + { + "__id__": 548 + }, { "__id__": 549 }, @@ -11536,14 +11566,17 @@ { "__id__": 553 }, - { - "__id__": 554 - }, { "__id__": 555 }, { "__id__": 556 + }, + { + "__id__": 557 + }, + { + "__id__": 558 } ], "removedComponents": [] @@ -11551,7 +11584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 545 }, "propertyPath": [ "_name" @@ -11567,7 +11600,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 545 }, "propertyPath": [ "_lpos" @@ -11582,7 +11615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 545 }, "propertyPath": [ "_lrot" @@ -11598,7 +11631,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 545 }, "propertyPath": [ "_euler" @@ -11613,7 +11646,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 550 }, "propertyPath": [ "_contentSize" @@ -11633,7 +11666,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 550 + "__id__": 552 }, "propertyPath": [ "_contentSize" @@ -11653,7 +11686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 554 }, "propertyPath": [ "_left" @@ -11669,7 +11702,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 554 }, "propertyPath": [ "_right" @@ -11679,7 +11712,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 554 }, "propertyPath": [ "_top" @@ -11689,7 +11722,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 554 }, "propertyPath": [ "_bottom" @@ -11699,7 +11732,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 557 + "__id__": 559 }, "propertyPath": [ "_spriteFrame" @@ -11721,42 +11754,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 538 + "__id__": 540 }, "_children": [ { - "__id__": 559 + "__id__": 561 }, { - "__id__": 597 + "__id__": 599 }, { - "__id__": 635 + "__id__": 637 }, { - "__id__": 667 + "__id__": 669 }, { - "__id__": 705 + "__id__": 707 }, { - "__id__": 745 + "__id__": 747 } ], "_active": true, "_components": [ - { - "__id__": 781 - }, { "__id__": 783 }, { "__id__": 785 + }, + { + "__id__": 787 } ], "_prefab": { - "__id__": 787 + "__id__": 789 }, "_lpos": { "__type__": "cc.Vec3", @@ -11793,27 +11826,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 560 + "__id__": 562 }, { - "__id__": 580 + "__id__": 582 }, { - "__id__": 588 + "__id__": 590 } ], "_active": true, "_components": [ { - "__id__": 594 + "__id__": 596 } ], "_prefab": { - "__id__": 596 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -11848,17 +11881,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 559 + "__id__": 561 }, "_prefab": { - "__id__": 561 + "__id__": 563 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 560 + "__id__": 562 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -11866,7 +11899,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 562 + "__id__": 564 }, "targetOverrides": null }, @@ -11879,21 +11912,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 563 - }, { "__id__": 565 }, - { - "__id__": 566 - }, { "__id__": 567 }, { "__id__": 568 }, + { + "__id__": 569 + }, { "__id__": 570 }, @@ -11910,7 +11940,10 @@ "__id__": 578 }, { - "__id__": 579 + "__id__": 580 + }, + { + "__id__": 581 } ], "removedComponents": [] @@ -11918,7 +11951,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 564 + "__id__": 566 }, "propertyPath": [ "_name" @@ -11934,7 +11967,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 564 + "__id__": 566 }, "propertyPath": [ "_lpos" @@ -11949,7 +11982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 564 + "__id__": 566 }, "propertyPath": [ "_lrot" @@ -11965,7 +11998,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 564 + "__id__": 566 }, "propertyPath": [ "_euler" @@ -11980,7 +12013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 569 + "__id__": 571 }, "propertyPath": [ "_contentSize" @@ -12000,7 +12033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 571 + "__id__": 573 }, "propertyPath": [ "_progress" @@ -12016,7 +12049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 573 + "__id__": 575 }, "propertyPath": [ "_right" @@ -12032,7 +12065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 577 }, "propertyPath": [ "_contentSize" @@ -12052,7 +12085,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 579 }, "propertyPath": [ "_lpos" @@ -12073,7 +12106,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 577 }, "propertyPath": [ "_anchorPoint" @@ -12087,7 +12120,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 571 + "__id__": 573 }, "propertyPath": [ "_totalLength" @@ -12100,23 +12133,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 559 + "__id__": 561 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 581 - }, { "__id__": 583 }, { "__id__": 585 + }, + { + "__id__": 587 } ], "_prefab": { - "__id__": 587 + "__id__": 589 }, "_lpos": { "__type__": "cc.Vec3", @@ -12153,11 +12186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 580 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 584 }, "_contentSize": { "__type__": "cc.Size", @@ -12181,11 +12214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 580 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 586 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12249,11 +12282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 580 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 588 }, "_alignFlags": 32, "_target": null, @@ -12298,20 +12331,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 559 + "__id__": 561 }, "_children": [], "_active": true, "_components": [ { - "__id__": 589 + "__id__": 591 }, { - "__id__": 591 + "__id__": 593 } ], "_prefab": { - "__id__": 593 + "__id__": 595 }, "_lpos": { "__type__": "cc.Vec3", @@ -12348,11 +12381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 588 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 590 + "__id__": 592 }, "_contentSize": { "__type__": "cc.Size", @@ -12376,11 +12409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 588 + "__id__": 590 }, "_enabled": true, "__prefab": { - "__id__": 592 + "__id__": 594 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12457,11 +12490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 561 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 597 }, "_contentSize": { "__type__": "cc.Size", @@ -12498,27 +12531,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 598 + "__id__": 600 }, { - "__id__": 618 + "__id__": 620 }, { - "__id__": 626 + "__id__": 628 } ], "_active": true, "_components": [ { - "__id__": 632 + "__id__": 634 } ], "_prefab": { - "__id__": 634 + "__id__": 636 }, "_lpos": { "__type__": "cc.Vec3", @@ -12553,17 +12586,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 597 + "__id__": 599 }, "_prefab": { - "__id__": 599 + "__id__": 601 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 598 + "__id__": 600 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -12571,7 +12604,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 600 + "__id__": 602 }, "targetOverrides": null }, @@ -12584,21 +12617,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 601 - }, { "__id__": 603 }, - { - "__id__": 604 - }, { "__id__": 605 }, { "__id__": 606 }, + { + "__id__": 607 + }, { "__id__": 608 }, @@ -12609,13 +12639,16 @@ "__id__": 612 }, { - "__id__": 613 + "__id__": 614 }, { "__id__": 615 }, { "__id__": 617 + }, + { + "__id__": 619 } ], "removedComponents": [] @@ -12623,7 +12656,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 602 + "__id__": 604 }, "propertyPath": [ "_name" @@ -12639,7 +12672,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 602 + "__id__": 604 }, "propertyPath": [ "_lpos" @@ -12654,7 +12687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 602 + "__id__": 604 }, "propertyPath": [ "_lrot" @@ -12670,7 +12703,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 602 + "__id__": 604 }, "propertyPath": [ "_euler" @@ -12685,7 +12718,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 607 + "__id__": 609 }, "propertyPath": [ "_contentSize" @@ -12705,7 +12738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 611 }, "propertyPath": [ "_contentSize" @@ -12725,7 +12758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 611 + "__id__": 613 }, "propertyPath": [ "_lpos" @@ -12746,7 +12779,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 607 + "__id__": 609 }, "propertyPath": [ "_anchorPoint" @@ -12760,7 +12793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 614 + "__id__": 616 }, "propertyPath": [ "_totalLength" @@ -12776,7 +12809,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 616 + "__id__": 618 }, "propertyPath": [ "_right" @@ -12792,7 +12825,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 614 + "__id__": 616 }, "propertyPath": [ "_progress" @@ -12805,23 +12838,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 597 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 619 - }, { "__id__": 621 }, { "__id__": 623 + }, + { + "__id__": 625 } ], "_prefab": { - "__id__": 625 + "__id__": 627 }, "_lpos": { "__type__": "cc.Vec3", @@ -12858,11 +12891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 618 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 620 + "__id__": 622 }, "_contentSize": { "__type__": "cc.Size", @@ -12886,11 +12919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 618 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 624 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12954,11 +12987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 618 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 626 }, "_alignFlags": 32, "_target": null, @@ -13003,20 +13036,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 597 + "__id__": 599 }, "_children": [], "_active": true, "_components": [ { - "__id__": 627 + "__id__": 629 }, { - "__id__": 629 + "__id__": 631 } ], "_prefab": { - "__id__": 631 + "__id__": 633 }, "_lpos": { "__type__": "cc.Vec3", @@ -13053,11 +13086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 630 }, "_contentSize": { "__type__": "cc.Size", @@ -13081,11 +13114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 626 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 630 + "__id__": 632 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13162,11 +13195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 597 + "__id__": 599 }, "_enabled": true, "__prefab": { - "__id__": 633 + "__id__": 635 }, "_contentSize": { "__type__": "cc.Size", @@ -13203,27 +13236,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 636 + "__id__": 638 }, { - "__id__": 652 + "__id__": 654 }, { - "__id__": 658 + "__id__": 660 } ], "_active": false, "_components": [ { - "__id__": 664 + "__id__": 666 } ], "_prefab": { - "__id__": 666 + "__id__": 668 }, "_lpos": { "__type__": "cc.Vec3", @@ -13258,17 +13291,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 635 + "__id__": 637 }, "_prefab": { - "__id__": 637 + "__id__": 639 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 636 + "__id__": 638 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -13276,7 +13309,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 638 + "__id__": 640 }, "targetOverrides": null }, @@ -13289,32 +13322,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 639 - }, { "__id__": 641 }, - { - "__id__": 642 - }, { "__id__": 643 }, { "__id__": 644 }, + { + "__id__": 645 + }, { "__id__": 646 }, { - "__id__": 647 + "__id__": 648 }, { "__id__": 649 }, { "__id__": 651 + }, + { + "__id__": 653 } ], "removedComponents": [] @@ -13322,7 +13355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 640 + "__id__": 642 }, "propertyPath": [ "_name" @@ -13338,7 +13371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 640 + "__id__": 642 }, "propertyPath": [ "_lpos" @@ -13353,7 +13386,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 640 + "__id__": 642 }, "propertyPath": [ "_lrot" @@ -13369,7 +13402,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 640 + "__id__": 642 }, "propertyPath": [ "_euler" @@ -13384,7 +13417,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 645 + "__id__": 647 }, "propertyPath": [ "_contentSize" @@ -13404,7 +13437,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 645 + "__id__": 647 }, "propertyPath": [ "_anchorPoint" @@ -13418,7 +13451,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 648 + "__id__": 650 }, "propertyPath": [ "_contentSize" @@ -13438,7 +13471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 650 + "__id__": 652 }, "propertyPath": [ "_totalLength" @@ -13454,7 +13487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 650 + "__id__": 652 }, "propertyPath": [ "_progress" @@ -13467,20 +13500,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 635 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 653 + "__id__": 655 }, { - "__id__": 655 + "__id__": 657 } ], "_prefab": { - "__id__": 657 + "__id__": 659 }, "_lpos": { "__type__": "cc.Vec3", @@ -13517,11 +13550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 652 + "__id__": 654 }, "_enabled": true, "__prefab": { - "__id__": 654 + "__id__": 656 }, "_contentSize": { "__type__": "cc.Size", @@ -13545,11 +13578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 652 + "__id__": 654 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 658 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13626,20 +13659,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 635 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 659 + "__id__": 661 }, { - "__id__": 661 + "__id__": 663 } ], "_prefab": { - "__id__": 663 + "__id__": 665 }, "_lpos": { "__type__": "cc.Vec3", @@ -13676,11 +13709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 660 }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 662 }, "_contentSize": { "__type__": "cc.Size", @@ -13704,11 +13737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 660 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 664 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13785,11 +13818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 635 + "__id__": 637 }, "_enabled": true, "__prefab": { - "__id__": 665 + "__id__": 667 }, "_contentSize": { "__type__": "cc.Size", @@ -13826,27 +13859,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 668 + "__id__": 670 }, { - "__id__": 688 + "__id__": 690 }, { - "__id__": 696 + "__id__": 698 } ], "_active": true, "_components": [ { - "__id__": 702 + "__id__": 704 } ], "_prefab": { - "__id__": 704 + "__id__": 706 }, "_lpos": { "__type__": "cc.Vec3", @@ -13881,17 +13914,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 667 + "__id__": 669 }, "_prefab": { - "__id__": 669 + "__id__": 671 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 668 + "__id__": 670 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -13899,7 +13932,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 670 + "__id__": 672 }, "targetOverrides": null }, @@ -13912,21 +13945,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 671 - }, { "__id__": 673 }, - { - "__id__": 674 - }, { "__id__": 675 }, { "__id__": 676 }, + { + "__id__": 677 + }, { "__id__": 678 }, @@ -13937,13 +13967,16 @@ "__id__": 682 }, { - "__id__": 683 + "__id__": 684 }, { "__id__": 685 }, { "__id__": 687 + }, + { + "__id__": 689 } ], "removedComponents": [] @@ -13951,7 +13984,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 672 + "__id__": 674 }, "propertyPath": [ "_name" @@ -13967,7 +14000,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 672 + "__id__": 674 }, "propertyPath": [ "_lpos" @@ -13982,7 +14015,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 672 + "__id__": 674 }, "propertyPath": [ "_lrot" @@ -13998,7 +14031,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 672 + "__id__": 674 }, "propertyPath": [ "_euler" @@ -14013,7 +14046,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 677 + "__id__": 679 }, "propertyPath": [ "_contentSize" @@ -14033,7 +14066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 679 + "__id__": 681 }, "propertyPath": [ "_contentSize" @@ -14053,7 +14086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 681 + "__id__": 683 }, "propertyPath": [ "_lpos" @@ -14074,7 +14107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 677 + "__id__": 679 }, "propertyPath": [ "_anchorPoint" @@ -14088,7 +14121,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 686 }, "propertyPath": [ "_totalLength" @@ -14104,7 +14137,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 686 + "__id__": 688 }, "propertyPath": [ "_right" @@ -14120,7 +14153,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 686 }, "propertyPath": [ "_progress" @@ -14133,23 +14166,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 667 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 689 - }, { "__id__": 691 }, { "__id__": 693 + }, + { + "__id__": 695 } ], "_prefab": { - "__id__": 695 + "__id__": 697 }, "_lpos": { "__type__": "cc.Vec3", @@ -14186,11 +14219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 688 + "__id__": 690 }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 692 }, "_contentSize": { "__type__": "cc.Size", @@ -14214,11 +14247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 688 + "__id__": 690 }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 694 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14282,11 +14315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 688 + "__id__": 690 }, "_enabled": true, "__prefab": { - "__id__": 694 + "__id__": 696 }, "_alignFlags": 32, "_target": null, @@ -14331,20 +14364,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 667 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ { - "__id__": 697 + "__id__": 699 }, { - "__id__": 699 + "__id__": 701 } ], "_prefab": { - "__id__": 701 + "__id__": 703 }, "_lpos": { "__type__": "cc.Vec3", @@ -14381,11 +14414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 698 + "__id__": 700 }, "_contentSize": { "__type__": "cc.Size", @@ -14409,11 +14442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 700 + "__id__": 702 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14490,11 +14523,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 669 }, "_enabled": true, "__prefab": { - "__id__": 703 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -14531,27 +14564,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 706 + "__id__": 708 }, { - "__id__": 726 + "__id__": 728 }, { - "__id__": 736 + "__id__": 738 } ], "_active": true, "_components": [ { - "__id__": 742 + "__id__": 744 } ], "_prefab": { - "__id__": 744 + "__id__": 746 }, "_lpos": { "__type__": "cc.Vec3", @@ -14586,17 +14619,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 705 + "__id__": 707 }, "_prefab": { - "__id__": 707 + "__id__": 709 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 706 + "__id__": 708 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -14604,7 +14637,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 708 + "__id__": 710 }, "targetOverrides": null }, @@ -14617,21 +14650,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 709 - }, { "__id__": 711 }, - { - "__id__": 712 - }, { "__id__": 713 }, { "__id__": 714 }, + { + "__id__": 715 + }, { "__id__": 716 }, @@ -14642,13 +14672,16 @@ "__id__": 720 }, { - "__id__": 721 + "__id__": 722 }, { "__id__": 723 }, { "__id__": 725 + }, + { + "__id__": 727 } ], "removedComponents": [] @@ -14656,7 +14689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 712 }, "propertyPath": [ "_name" @@ -14672,7 +14705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 712 }, "propertyPath": [ "_lpos" @@ -14687,7 +14720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 712 }, "propertyPath": [ "_lrot" @@ -14703,7 +14736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 712 }, "propertyPath": [ "_euler" @@ -14718,7 +14751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 715 + "__id__": 717 }, "propertyPath": [ "_contentSize" @@ -14738,7 +14771,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 717 + "__id__": 719 }, "propertyPath": [ "_contentSize" @@ -14758,7 +14791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 719 + "__id__": 721 }, "propertyPath": [ "_lpos" @@ -14779,7 +14812,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 715 + "__id__": 717 }, "propertyPath": [ "_anchorPoint" @@ -14793,7 +14826,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 722 + "__id__": 724 }, "propertyPath": [ "_totalLength" @@ -14809,7 +14842,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 724 + "__id__": 726 }, "propertyPath": [ "_right" @@ -14825,7 +14858,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 722 + "__id__": 724 }, "propertyPath": [ "_progress" @@ -14838,14 +14871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 705 + "__id__": 707 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 727 - }, { "__id__": 729 }, @@ -14854,10 +14884,13 @@ }, { "__id__": 733 + }, + { + "__id__": 735 } ], "_prefab": { - "__id__": 735 + "__id__": 737 }, "_lpos": { "__type__": "cc.Vec3", @@ -14894,11 +14927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 728 + "__id__": 730 }, "_contentSize": { "__type__": "cc.Size", @@ -14922,11 +14955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 730 + "__id__": 732 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14990,11 +15023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 732 + "__id__": 734 }, "_alignFlags": 34, "_target": null, @@ -15026,11 +15059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 734 + "__id__": 736 }, "_alignFlags": 0, "_target": null, @@ -15075,20 +15108,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 705 + "__id__": 707 }, "_children": [], "_active": true, "_components": [ { - "__id__": 737 + "__id__": 739 }, { - "__id__": 739 + "__id__": 741 } ], "_prefab": { - "__id__": 741 + "__id__": 743 }, "_lpos": { "__type__": "cc.Vec3", @@ -15125,11 +15158,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 738 }, "_enabled": true, "__prefab": { - "__id__": 738 + "__id__": 740 }, "_contentSize": { "__type__": "cc.Size", @@ -15153,11 +15186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 738 }, "_enabled": true, "__prefab": { - "__id__": 740 + "__id__": 742 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15234,11 +15267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 705 + "__id__": 707 }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 745 }, "_contentSize": { "__type__": "cc.Size", @@ -15275,27 +15308,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 560 }, "_children": [ { - "__id__": 746 + "__id__": 748 }, { - "__id__": 762 + "__id__": 764 }, { - "__id__": 772 + "__id__": 774 } ], "_active": false, "_components": [ { - "__id__": 778 + "__id__": 780 } ], "_prefab": { - "__id__": 780 + "__id__": 782 }, "_lpos": { "__type__": "cc.Vec3", @@ -15330,17 +15363,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 745 + "__id__": 747 }, "_prefab": { - "__id__": 747 + "__id__": 749 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 746 + "__id__": 748 }, "asset": { "__uuid__": "5674600e-6428-4c31-9433-d5e8cdeeb9ac", @@ -15348,7 +15381,7 @@ }, "fileId": "a93vi9kpZL3rMNveBNKF4B", "instance": { - "__id__": 748 + "__id__": 750 }, "targetOverrides": null }, @@ -15361,32 +15394,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 749 - }, { "__id__": 751 }, - { - "__id__": 752 - }, { "__id__": 753 }, { "__id__": 754 }, + { + "__id__": 755 + }, { "__id__": 756 }, { - "__id__": 757 + "__id__": 758 }, { "__id__": 759 }, { "__id__": 761 + }, + { + "__id__": 763 } ], "removedComponents": [] @@ -15394,7 +15427,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 750 + "__id__": 752 }, "propertyPath": [ "_name" @@ -15410,7 +15443,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 750 + "__id__": 752 }, "propertyPath": [ "_lpos" @@ -15425,7 +15458,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 750 + "__id__": 752 }, "propertyPath": [ "_lrot" @@ -15441,7 +15474,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 750 + "__id__": 752 }, "propertyPath": [ "_euler" @@ -15456,7 +15489,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 755 + "__id__": 757 }, "propertyPath": [ "_contentSize" @@ -15476,7 +15509,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 755 + "__id__": 757 }, "propertyPath": [ "_anchorPoint" @@ -15490,7 +15523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 758 + "__id__": 760 }, "propertyPath": [ "_contentSize" @@ -15510,7 +15543,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 760 + "__id__": 762 }, "propertyPath": [ "_totalLength" @@ -15526,7 +15559,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 760 + "__id__": 762 }, "propertyPath": [ "_progress" @@ -15539,14 +15572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 745 + "__id__": 747 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 763 - }, { "__id__": 765 }, @@ -15555,10 +15585,13 @@ }, { "__id__": 769 + }, + { + "__id__": 771 } ], "_prefab": { - "__id__": 771 + "__id__": 773 }, "_lpos": { "__type__": "cc.Vec3", @@ -15595,11 +15628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 764 + "__id__": 766 }, "_contentSize": { "__type__": "cc.Size", @@ -15623,11 +15656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 766 + "__id__": 768 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15691,11 +15724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 768 + "__id__": 770 }, "_alignFlags": 34, "_target": null, @@ -15727,11 +15760,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 770 + "__id__": 772 }, "_alignFlags": 0, "_target": null, @@ -15776,20 +15809,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 745 + "__id__": 747 }, "_children": [], "_active": true, "_components": [ { - "__id__": 773 + "__id__": 775 }, { - "__id__": 775 + "__id__": 777 } ], "_prefab": { - "__id__": 777 + "__id__": 779 }, "_lpos": { "__type__": "cc.Vec3", @@ -15826,11 +15859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 772 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 776 }, "_contentSize": { "__type__": "cc.Size", @@ -15854,11 +15887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 772 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 778 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15935,11 +15968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 779 + "__id__": 781 }, "_contentSize": { "__type__": "cc.Size", @@ -15976,11 +16009,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 560 }, "_enabled": true, "__prefab": { - "__id__": 782 + "__id__": 784 }, "_contentSize": { "__type__": "cc.Size", @@ -16004,11 +16037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 560 }, "_enabled": true, "__prefab": { - "__id__": 784 + "__id__": 786 }, "_alignFlags": 45, "_target": null, @@ -16040,11 +16073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 560 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 788 }, "_resizeMode": 0, "_layoutType": 3, @@ -16091,20 +16124,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 538 + "__id__": 540 }, "_children": [], "_active": true, "_components": [ { - "__id__": 789 + "__id__": 791 }, { - "__id__": 791 + "__id__": 793 } ], "_prefab": { - "__id__": 793 + "__id__": 795 }, "_lpos": { "__type__": "cc.Vec3", @@ -16141,11 +16174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 788 + "__id__": 790 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 792 }, "_contentSize": { "__type__": "cc.Size", @@ -16169,11 +16202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 788 + "__id__": 790 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 794 }, "_alignFlags": 40, "_target": null, @@ -16218,36 +16251,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 538 + "__id__": 540 }, "_children": [ { - "__id__": 795 + "__id__": 797 }, { - "__id__": 803 + "__id__": 805 }, { - "__id__": 811 + "__id__": 813 }, { - "__id__": 839 + "__id__": 841 } ], "_active": true, "_components": [ - { - "__id__": 867 - }, { "__id__": 869 }, { "__id__": 871 + }, + { + "__id__": 873 } ], "_prefab": { - "__id__": 873 + "__id__": 875 }, "_lpos": { "__type__": "cc.Vec3", @@ -16284,23 +16317,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 796 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 796 - }, { "__id__": 798 }, { "__id__": 800 + }, + { + "__id__": 802 } ], "_prefab": { - "__id__": 802 + "__id__": 804 }, "_lpos": { "__type__": "cc.Vec3", @@ -16337,11 +16370,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 797 + "__id__": 799 }, "_contentSize": { "__type__": "cc.Size", @@ -16365,11 +16398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 799 + "__id__": 801 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16410,11 +16443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 801 + "__id__": 803 }, "_alignFlags": 45, "_target": null, @@ -16459,23 +16492,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 796 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 804 - }, { "__id__": 806 }, { "__id__": 808 + }, + { + "__id__": 810 } ], "_prefab": { - "__id__": 810 + "__id__": 812 }, "_lpos": { "__type__": "cc.Vec3", @@ -16512,11 +16545,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 803 + "__id__": 805 }, "_enabled": true, "__prefab": { - "__id__": 805 + "__id__": 807 }, "_contentSize": { "__type__": "cc.Size", @@ -16540,11 +16573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 803 + "__id__": 805 }, "_enabled": true, "__prefab": { - "__id__": 807 + "__id__": 809 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16585,11 +16618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 803 + "__id__": 805 }, "_enabled": true, "__prefab": { - "__id__": 809 + "__id__": 811 }, "_alignFlags": 42, "_target": null, @@ -16634,27 +16667,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 796 }, "_children": [ { - "__id__": 812 + "__id__": 814 }, { - "__id__": 820 + "__id__": 822 } ], "_active": true, "_components": [ { - "__id__": 834 + "__id__": 836 }, { - "__id__": 836 + "__id__": 838 } ], "_prefab": { - "__id__": 838 + "__id__": 840 }, "_lpos": { "__type__": "cc.Vec3", @@ -16691,23 +16724,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 811 + "__id__": 813 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 813 - }, { "__id__": 815 }, { "__id__": 817 + }, + { + "__id__": 819 } ], "_prefab": { - "__id__": 819 + "__id__": 821 }, "_lpos": { "__type__": "cc.Vec3", @@ -16744,11 +16777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 814 }, "_enabled": true, "__prefab": { - "__id__": 814 + "__id__": 816 }, "_contentSize": { "__type__": "cc.Size", @@ -16772,11 +16805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 814 }, "_enabled": true, "__prefab": { - "__id__": 816 + "__id__": 818 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16820,11 +16853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 812 + "__id__": 814 }, "_enabled": true, "__prefab": { - "__id__": 818 + "__id__": 820 }, "_alignFlags": 12, "_target": null, @@ -16869,24 +16902,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 811 + "__id__": 813 }, "_children": [ { - "__id__": 821 + "__id__": 823 } ], "_active": true, "_components": [ { - "__id__": 829 + "__id__": 831 }, { - "__id__": 831 + "__id__": 833 } ], "_prefab": { - "__id__": 833 + "__id__": 835 }, "_lpos": { "__type__": "cc.Vec3", @@ -16923,23 +16956,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 822 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 822 - }, { "__id__": 824 }, { "__id__": 826 + }, + { + "__id__": 828 } ], "_prefab": { - "__id__": 828 + "__id__": 830 }, "_lpos": { "__type__": "cc.Vec3", @@ -16976,11 +17009,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 825 }, "_contentSize": { "__type__": "cc.Size", @@ -17004,11 +17037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 827 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17072,11 +17105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 827 + "__id__": 829 }, "_alignFlags": 45, "_target": null, @@ -17121,11 +17154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 820 + "__id__": 822 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 832 }, "_contentSize": { "__type__": "cc.Size", @@ -17149,11 +17182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 820 + "__id__": 822 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 834 }, "_alignFlags": 45, "_target": null, @@ -17198,11 +17231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 811 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 837 }, "_contentSize": { "__type__": "cc.Size", @@ -17226,11 +17259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 811 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 837 + "__id__": 839 }, "_alignFlags": 41, "_target": null, @@ -17275,27 +17308,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 796 }, "_children": [ { - "__id__": 840 + "__id__": 842 }, { - "__id__": 848 + "__id__": 850 } ], "_active": true, "_components": [ { - "__id__": 862 + "__id__": 864 }, { - "__id__": 864 + "__id__": 866 } ], "_prefab": { - "__id__": 866 + "__id__": 868 }, "_lpos": { "__type__": "cc.Vec3", @@ -17332,23 +17365,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 839 + "__id__": 841 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 841 - }, { "__id__": 843 }, { "__id__": 845 + }, + { + "__id__": 847 } ], "_prefab": { - "__id__": 847 + "__id__": 849 }, "_lpos": { "__type__": "cc.Vec3", @@ -17385,11 +17418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 840 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 844 }, "_contentSize": { "__type__": "cc.Size", @@ -17413,11 +17446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 840 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 844 + "__id__": 846 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17461,11 +17494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 840 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 846 + "__id__": 848 }, "_alignFlags": 9, "_target": null, @@ -17510,24 +17543,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 839 + "__id__": 841 }, "_children": [ { - "__id__": 849 + "__id__": 851 } ], "_active": true, "_components": [ { - "__id__": 857 + "__id__": 859 }, { - "__id__": 859 + "__id__": 861 } ], "_prefab": { - "__id__": 861 + "__id__": 863 }, "_lpos": { "__type__": "cc.Vec3", @@ -17564,23 +17597,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 850 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 850 - }, { "__id__": 852 }, { "__id__": 854 + }, + { + "__id__": 856 } ], "_prefab": { - "__id__": 856 + "__id__": 858 }, "_lpos": { "__type__": "cc.Vec3", @@ -17617,11 +17650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 851 + "__id__": 853 }, "_contentSize": { "__type__": "cc.Size", @@ -17645,11 +17678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 853 + "__id__": 855 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17713,11 +17746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 855 + "__id__": 857 }, "_alignFlags": 45, "_target": null, @@ -17762,11 +17795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 848 + "__id__": 850 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 860 }, "_contentSize": { "__type__": "cc.Size", @@ -17790,11 +17823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 848 + "__id__": 850 }, "_enabled": true, "__prefab": { - "__id__": 860 + "__id__": 862 }, "_alignFlags": 45, "_target": null, @@ -17839,11 +17872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 865 }, "_contentSize": { "__type__": "cc.Size", @@ -17867,11 +17900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 867 }, "_alignFlags": 44, "_target": null, @@ -17916,11 +17949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 868 + "__id__": 870 }, "_contentSize": { "__type__": "cc.Size", @@ -17944,11 +17977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 796 }, "_enabled": false, "__prefab": { - "__id__": 870 + "__id__": 872 }, "_resizeMode": 0, "_layoutType": 1, @@ -17982,11 +18015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 874 }, "_alignFlags": 44, "_target": null, @@ -18031,11 +18064,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 538 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 877 }, "_contentSize": { "__type__": "cc.Size", @@ -18072,11 +18105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 878 + "__id__": 880 }, "_contentSize": { "__type__": "cc.Size", @@ -18100,11 +18133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 882 }, "_alignFlags": 44, "_target": null, @@ -18147,17 +18180,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 486 + "__id__": 488 }, "_prefab": { - "__id__": 883 + "__id__": 885 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 882 + "__id__": 884 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -18165,7 +18198,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 884 + "__id__": 886 }, "targetOverrides": null }, @@ -18178,21 +18211,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 885 - }, { "__id__": 887 }, - { - "__id__": 888 - }, { "__id__": 889 }, { "__id__": 890 }, + { + "__id__": 891 + }, { "__id__": 892 }, @@ -18200,10 +18230,13 @@ "__id__": 894 }, { - "__id__": 895 + "__id__": 896 }, { "__id__": 897 + }, + { + "__id__": 899 } ], "removedComponents": [] @@ -18211,7 +18244,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 888 }, "propertyPath": [ "_name" @@ -18227,7 +18260,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 888 }, "propertyPath": [ "_lpos" @@ -18242,7 +18275,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 888 }, "propertyPath": [ "_lrot" @@ -18258,7 +18291,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 886 + "__id__": 888 }, "propertyPath": [ "_euler" @@ -18273,7 +18306,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 893 }, "propertyPath": [ "clickEvents", @@ -18290,20 +18323,20 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 893 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 893 + "__id__": 895 } }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 486 + "__id__": 488 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -18313,19 +18346,19 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 891 + "__id__": 893 }, "propertyPath": [ "_target" ], "value": { - "__id__": 882 + "__id__": 884 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 896 + "__id__": 898 }, "propertyPath": [ "_bottom" @@ -18341,7 +18374,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 898 + "__id__": 900 }, "propertyPath": [ "_spriteFrame" @@ -18363,36 +18396,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [ { - "__id__": 900 + "__id__": 902 }, { - "__id__": 908 + "__id__": 910 }, { - "__id__": 916 + "__id__": 918 } ], "_active": true, "_components": [ - { - "__id__": 930 - }, { "__id__": 932 }, { - "__id__": 935 + "__id__": 934 }, { "__id__": 937 + }, + { + "__id__": 939 } ], "_prefab": { - "__id__": 939 + "__id__": 941 }, "_lpos": { "__type__": "cc.Vec3", @@ -18429,23 +18462,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 899 + "__id__": 901 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 901 - }, { "__id__": 903 }, { "__id__": 905 + }, + { + "__id__": 907 } ], "_prefab": { - "__id__": 907 + "__id__": 909 }, "_lpos": { "__type__": "cc.Vec3", @@ -18482,11 +18515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 902 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 904 }, "_contentSize": { "__type__": "cc.Size", @@ -18510,11 +18543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 902 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 906 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18558,11 +18591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 902 }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 908 }, "_alignFlags": 45, "_target": null, @@ -18607,23 +18640,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 899 + "__id__": 901 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 909 - }, { "__id__": 911 }, { "__id__": 913 + }, + { + "__id__": 915 } ], "_prefab": { - "__id__": 915 + "__id__": 917 }, "_lpos": { "__type__": "cc.Vec3", @@ -18660,11 +18693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 908 + "__id__": 910 }, "_enabled": true, "__prefab": { - "__id__": 910 + "__id__": 912 }, "_contentSize": { "__type__": "cc.Size", @@ -18688,11 +18721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 908 + "__id__": 910 }, "_enabled": true, "__prefab": { - "__id__": 912 + "__id__": 914 }, "_alignFlags": 32, "_target": null, @@ -18724,11 +18757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 908 + "__id__": 910 }, "_enabled": true, "__prefab": { - "__id__": 914 + "__id__": 916 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18805,27 +18838,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 899 + "__id__": 901 }, "_children": [ { - "__id__": 917 + "__id__": 919 } ], "_active": true, "_components": [ - { - "__id__": 923 - }, { "__id__": 925 }, { "__id__": 927 + }, + { + "__id__": 929 } ], "_prefab": { - "__id__": 929 + "__id__": 931 }, "_lpos": { "__type__": "cc.Vec3", @@ -18862,20 +18895,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 916 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 918 + "__id__": 920 }, { - "__id__": 920 + "__id__": 922 } ], "_prefab": { - "__id__": 922 + "__id__": 924 }, "_lpos": { "__type__": "cc.Vec3", @@ -18912,11 +18945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 919 + "__id__": 921 }, "_contentSize": { "__type__": "cc.Size", @@ -18940,11 +18973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 923 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19021,11 +19054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 916 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 926 }, "_contentSize": { "__type__": "cc.Size", @@ -19049,11 +19082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 916 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 926 + "__id__": 928 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19094,11 +19127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 916 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 930 }, "_alignFlags": 8, "_target": null, @@ -19143,11 +19176,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 931 + "__id__": 933 }, "_contentSize": { "__type__": "cc.Size", @@ -19171,15 +19204,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 933 + "__id__": 935 }, "clickEvents": [ { - "__id__": 934 + "__id__": 936 } ], "_interactable": true, @@ -19219,7 +19252,7 @@ "_duration": 0.3, "_zoomScale": 1.3, "_target": { - "__id__": 899 + "__id__": 901 }, "_id": "" }, @@ -19230,7 +19263,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 486 + "__id__": 488 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -19243,11 +19276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 936 + "__id__": 938 }, "_alignFlags": 4, "_target": null, @@ -19279,11 +19312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 938 + "__id__": 940 }, "_id": "" }, @@ -19310,27 +19343,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [ { - "__id__": 941 + "__id__": 943 } ], "_active": true, "_components": [ - { - "__id__": 955 - }, { "__id__": 957 }, { - "__id__": 960 + "__id__": 959 + }, + { + "__id__": 962 } ], "_prefab": { - "__id__": 962 + "__id__": 964 }, "_lpos": { "__type__": "cc.Vec3", @@ -19367,27 +19400,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 940 + "__id__": 942 }, "_children": [ { - "__id__": 942 + "__id__": 944 } ], "_active": true, "_components": [ - { - "__id__": 948 - }, { "__id__": 950 }, { "__id__": 952 + }, + { + "__id__": 954 } ], "_prefab": { - "__id__": 954 + "__id__": 956 }, "_lpos": { "__type__": "cc.Vec3", @@ -19424,20 +19457,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 941 + "__id__": 943 }, "_children": [], "_active": true, "_components": [ { - "__id__": 943 + "__id__": 945 }, { - "__id__": 945 + "__id__": 947 } ], "_prefab": { - "__id__": 947 + "__id__": 949 }, "_lpos": { "__type__": "cc.Vec3", @@ -19474,11 +19507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 944 }, "_enabled": true, "__prefab": { - "__id__": 944 + "__id__": 946 }, "_contentSize": { "__type__": "cc.Size", @@ -19502,11 +19535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 944 }, "_enabled": true, "__prefab": { - "__id__": 946 + "__id__": 948 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19560,11 +19593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 949 + "__id__": 951 }, "_contentSize": { "__type__": "cc.Size", @@ -19588,11 +19621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 951 + "__id__": 953 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19636,11 +19669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 953 + "__id__": 955 }, "_alignFlags": 45, "_target": null, @@ -19685,11 +19718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 940 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 956 + "__id__": 958 }, "_contentSize": { "__type__": "cc.Size", @@ -19713,15 +19746,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 940 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 958 + "__id__": 960 }, "clickEvents": [ { - "__id__": 959 + "__id__": 961 } ], "_interactable": true, @@ -19761,7 +19794,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 940 + "__id__": 942 }, "_id": "" }, @@ -19772,7 +19805,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 486 + "__id__": 488 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -19785,11 +19818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 940 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 961 + "__id__": 963 }, "_alignFlags": 4, "_target": null, @@ -19834,27 +19867,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 486 + "__id__": 488 }, "_children": [ { - "__id__": 964 + "__id__": 966 } ], "_active": true, "_components": [ - { - "__id__": 978 - }, { "__id__": 980 }, { - "__id__": 983 + "__id__": 982 + }, + { + "__id__": 985 } ], "_prefab": { - "__id__": 985 + "__id__": 987 }, "_lpos": { "__type__": "cc.Vec3", @@ -19891,27 +19924,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 963 + "__id__": 965 }, "_children": [ { - "__id__": 965 + "__id__": 967 } ], "_active": true, "_components": [ - { - "__id__": 971 - }, { "__id__": 973 }, { "__id__": 975 + }, + { + "__id__": 977 } ], "_prefab": { - "__id__": 977 + "__id__": 979 }, "_lpos": { "__type__": "cc.Vec3", @@ -19948,20 +19981,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 964 + "__id__": 966 }, "_children": [], "_active": true, "_components": [ { - "__id__": 966 + "__id__": 968 }, { - "__id__": 968 + "__id__": 970 } ], "_prefab": { - "__id__": 970 + "__id__": 972 }, "_lpos": { "__type__": "cc.Vec3", @@ -19998,11 +20031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 965 + "__id__": 967 }, "_enabled": true, "__prefab": { - "__id__": 967 + "__id__": 969 }, "_contentSize": { "__type__": "cc.Size", @@ -20026,11 +20059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 965 + "__id__": 967 }, "_enabled": true, "__prefab": { - "__id__": 969 + "__id__": 971 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20084,11 +20117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 964 + "__id__": 966 }, "_enabled": true, "__prefab": { - "__id__": 972 + "__id__": 974 }, "_contentSize": { "__type__": "cc.Size", @@ -20112,11 +20145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 964 + "__id__": 966 }, "_enabled": true, "__prefab": { - "__id__": 974 + "__id__": 976 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20160,11 +20193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 964 + "__id__": 966 }, "_enabled": true, "__prefab": { - "__id__": 976 + "__id__": 978 }, "_alignFlags": 45, "_target": null, @@ -20209,11 +20242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 981 }, "_contentSize": { "__type__": "cc.Size", @@ -20237,15 +20270,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 981 + "__id__": 983 }, "clickEvents": [ { - "__id__": 982 + "__id__": 984 } ], "_interactable": true, @@ -20285,7 +20318,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 963 + "__id__": 965 }, "_id": "" }, @@ -20296,7 +20329,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 486 + "__id__": 488 }, "component": "", "_componentId": "f8dd2ODYatM+Zh5DQ/izWwv", @@ -20309,11 +20342,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 984 + "__id__": 986 }, "_alignFlags": 4, "_target": null, @@ -20358,11 +20391,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 987 + "__id__": 989 }, "_contentSize": { "__type__": "cc.Size", @@ -20386,11 +20419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 989 + "__id__": 991 }, "_alignFlags": 21, "_target": null, @@ -20422,11 +20455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 991 + "__id__": 993 }, "_id": "" }, @@ -20440,11 +20473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 993 + "__id__": 995 }, "_id": "" }, @@ -20472,14 +20505,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 996 + "__id__": 998 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 995 + "__id__": 997 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -20487,7 +20520,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 997 + "__id__": 999 }, "targetOverrides": null }, @@ -20500,20 +20533,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 998 - }, { "__id__": 1000 }, - { - "__id__": 1001 - }, { "__id__": 1002 }, { "__id__": 1003 + }, + { + "__id__": 1004 + }, + { + "__id__": 1005 } ], "removedComponents": [] @@ -20521,7 +20554,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1001 }, "propertyPath": [ "_name" @@ -20537,7 +20570,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1001 }, "propertyPath": [ "_lpos" @@ -20552,7 +20585,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1001 }, "propertyPath": [ "_lrot" @@ -20568,7 +20601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1001 }, "propertyPath": [ "_euler" @@ -20583,7 +20616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 1001 }, "propertyPath": [ "_active" @@ -20600,23 +20633,23 @@ }, "_children": [ { - "__id__": 1005 + "__id__": 1007 } ], "_active": true, "_components": [ - { - "__id__": 1043 - }, { "__id__": 1045 }, { "__id__": 1047 + }, + { + "__id__": 1049 } ], "_prefab": { - "__id__": 1049 + "__id__": 1051 }, "_lpos": { "__type__": "cc.Vec3", @@ -20653,18 +20686,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1004 + "__id__": 1006 }, "_children": [ { - "__id__": 1006 + "__id__": 1008 } ], "_active": true, "_components": [ - { - "__id__": 1034 - }, { "__id__": 1036 }, @@ -20673,10 +20703,13 @@ }, { "__id__": 1040 + }, + { + "__id__": 1042 } ], "_prefab": { - "__id__": 1042 + "__id__": 1044 }, "_lpos": { "__type__": "cc.Vec3", @@ -20713,27 +20746,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1005 + "__id__": 1007 }, "_children": [ { - "__id__": 1007 + "__id__": 1009 }, { - "__id__": 1015 + "__id__": 1017 }, { - "__id__": 1021 + "__id__": 1023 } ], "_active": true, "_components": [ { - "__id__": 1031 + "__id__": 1033 } ], "_prefab": { - "__id__": 1033 + "__id__": 1035 }, "_lpos": { "__type__": "cc.Vec3", @@ -20770,23 +20803,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1006 + "__id__": 1008 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1008 - }, { "__id__": 1010 }, { "__id__": 1012 + }, + { + "__id__": 1014 } ], "_prefab": { - "__id__": 1014 + "__id__": 1016 }, "_lpos": { "__type__": "cc.Vec3", @@ -20823,11 +20856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1007 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1009 + "__id__": 1011 }, "_contentSize": { "__type__": "cc.Size", @@ -20851,11 +20884,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1007 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1011 + "__id__": 1013 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20899,11 +20932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1007 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 1013 + "__id__": 1015 }, "_alignFlags": 40, "_target": null, @@ -20948,20 +20981,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1006 + "__id__": 1008 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1016 + "__id__": 1018 }, { - "__id__": 1018 + "__id__": 1020 } ], "_prefab": { - "__id__": 1020 + "__id__": 1022 }, "_lpos": { "__type__": "cc.Vec3", @@ -20998,11 +21031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1015 + "__id__": 1017 }, "_enabled": true, "__prefab": { - "__id__": 1017 + "__id__": 1019 }, "_contentSize": { "__type__": "cc.Size", @@ -21026,11 +21059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1015 + "__id__": 1017 }, "_enabled": true, "__prefab": { - "__id__": 1019 + "__id__": 1021 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21087,14 +21120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1006 + "__id__": 1008 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1022 - }, { "__id__": 1024 }, @@ -21103,10 +21133,13 @@ }, { "__id__": 1028 + }, + { + "__id__": 1030 } ], "_prefab": { - "__id__": 1030 + "__id__": 1032 }, "_lpos": { "__type__": "cc.Vec3", @@ -21143,11 +21176,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1021 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1023 + "__id__": 1025 }, "_contentSize": { "__type__": "cc.Size", @@ -21171,11 +21204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1021 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1025 + "__id__": 1027 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21239,11 +21272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1021 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1027 + "__id__": 1029 }, "_alignFlags": 10, "_target": null, @@ -21275,11 +21308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1021 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1029 + "__id__": 1031 }, "templateMode": true, "watchPath": "data.data.gold", @@ -21312,11 +21345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1006 + "__id__": 1008 }, "_enabled": true, "__prefab": { - "__id__": 1032 + "__id__": 1034 }, "_contentSize": { "__type__": "cc.Size", @@ -21353,11 +21386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1005 + "__id__": 1007 }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1037 }, "_contentSize": { "__type__": "cc.Size", @@ -21381,11 +21414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1005 + "__id__": 1007 }, "_enabled": true, "__prefab": { - "__id__": 1037 + "__id__": 1039 }, "_alignFlags": 8, "_target": null, @@ -21417,11 +21450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1005 + "__id__": 1007 }, "_enabled": true, "__prefab": { - "__id__": 1039 + "__id__": 1041 }, "_resizeMode": 0, "_layoutType": 1, @@ -21455,11 +21488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1005 + "__id__": 1007 }, "_enabled": true, "__prefab": { - "__id__": 1041 + "__id__": 1043 }, "_alignFlags": 40, "_target": null, @@ -21504,11 +21537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1004 + "__id__": 1006 }, "_enabled": true, "__prefab": { - "__id__": 1044 + "__id__": 1046 }, "_contentSize": { "__type__": "cc.Size", @@ -21532,11 +21565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1004 + "__id__": 1006 }, "_enabled": true, "__prefab": { - "__id__": 1046 + "__id__": 1048 }, "_alignFlags": 17, "_target": null, @@ -21568,11 +21601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1004 + "__id__": 1006 }, "_enabled": true, "__prefab": { - "__id__": 1048 + "__id__": 1050 }, "_id": "" }, @@ -21603,7 +21636,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1051 + "__id__": 1053 }, "_contentSize": { "__type__": "cc.Size", @@ -21631,7 +21664,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1053 + "__id__": 1055 }, "_alignFlags": 45, "_target": null, @@ -21667,7 +21700,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1055 + "__id__": 1057 }, "_id": "" }, @@ -21687,51 +21720,51 @@ "instance": null, "targetOverrides": [ { - "__id__": 1057 + "__id__": 1059 }, { - "__id__": 1060 + "__id__": 1062 }, { - "__id__": 1063 + "__id__": 1065 }, { - "__id__": 1066 + "__id__": 1068 }, { - "__id__": 1069 + "__id__": 1071 }, { - "__id__": 1072 + "__id__": 1074 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 995 + "__id__": 997 }, { - "__id__": 882 + "__id__": 884 }, { - "__id__": 746 + "__id__": 748 }, { - "__id__": 706 + "__id__": 708 }, { - "__id__": 668 + "__id__": 670 }, { - "__id__": 636 + "__id__": 638 }, { - "__id__": 598 + "__id__": 600 }, { - "__id__": 560 + "__id__": 562 }, { - "__id__": 539 + "__id__": 541 }, { "__id__": 354 @@ -21768,49 +21801,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 560 + "__id__": 562 }, "sourceInfo": { - "__id__": 1058 + "__id__": 1060 }, "propertyPath": [ "_barSprite" ], "target": { - "__id__": 560 + "__id__": 562 }, "targetInfo": { - "__id__": 1059 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "e2/huQDfhNt6fiJiNRbwSN" - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "334GMK/IFMX7WWZHRi/+UF" - ] - }, - { - "__type__": "cc.TargetOverrideInfo", - "source": { - "__id__": 598 - }, - "sourceInfo": { "__id__": 1061 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 598 - }, - "targetInfo": { - "__id__": 1062 } }, { @@ -21828,19 +21831,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 668 + "__id__": 600 }, "sourceInfo": { + "__id__": 1063 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 600 + }, + "targetInfo": { "__id__": 1064 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 668 - }, - "targetInfo": { - "__id__": 1065 } }, { @@ -21858,19 +21861,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 706 + "__id__": 670 }, "sourceInfo": { + "__id__": 1066 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 670 + }, + "targetInfo": { "__id__": 1067 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 706 - }, - "targetInfo": { - "__id__": 1068 } }, { @@ -21888,19 +21891,19 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 636 + "__id__": 708 }, "sourceInfo": { + "__id__": 1069 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 708 + }, + "targetInfo": { "__id__": 1070 - }, - "propertyPath": [ - "_barSprite" - ], - "target": { - "__id__": 636 - }, - "targetInfo": { - "__id__": 1071 } }, { @@ -21918,19 +21921,49 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 746 + "__id__": 638 }, "sourceInfo": { - "__id__": 1073 + "__id__": 1072 }, "propertyPath": [ "_barSprite" ], "target": { - "__id__": 746 + "__id__": 638 }, "targetInfo": { - "__id__": 1074 + "__id__": 1073 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e2/huQDfhNt6fiJiNRbwSN" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "334GMK/IFMX7WWZHRi/+UF" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 748 + }, + "sourceInfo": { + "__id__": 1075 + }, + "propertyPath": [ + "_barSprite" + ], + "target": { + "__id__": 748 + }, + "targetInfo": { + "__id__": 1076 } }, { diff --git a/assets/resources/gui/uis/bgs/card.prefab b/assets/resources/gui/uis/bgs/card.prefab index c190d8f3..b52b0076 100644 --- a/assets/resources/gui/uis/bgs/card.prefab +++ b/assets/resources/gui/uis/bgs/card.prefab @@ -35,19 +35,22 @@ }, { "__id__": 40 + }, + { + "__id__": 56 } ], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 64 }, { - "__id__": 58 + "__id__": 66 } ], "_prefab": { - "__id__": 60 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", @@ -1291,6 +1294,204 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "name", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 57 + }, + { + "__id__": 59 + }, + { + "__id__": 61 + } + ], + "_prefab": { + "__id__": 63 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 30.826, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 58 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 140, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dQYmqYYJHLpc1xcwyas4Y" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "名称", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6bfuLK/8VER4qubR8ZLq68" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 62 + }, + "_alignFlags": 40, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 140, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "28XYCB76tOIogUI2LVTgNB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7d/tbgttdAXbLj144ca4ZW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1301,7 +1502,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", @@ -1329,7 +1530,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 59 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1373,6 +1574,7 @@ "__id__": 0 }, "fileId": "c3ePn06YJC6YTe2BxAPPm2", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts new file mode 100644 index 00000000..9652c3b5 --- /dev/null +++ b/assets/script/game/map/MissionCardComp.ts @@ -0,0 +1,76 @@ +import { _decorator, Label, Node } from "cc"; +import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; +import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; + +const { ccclass, property } = _decorator; + +/** 视图层对象 */ +@ccclass('ModuleViewComp') +@ecs.register('ModuleView', false) +export class ModuleViewComp extends CCComp { + /** 视图层逻辑代码分离演示 */ + @property(Node) + card1:Node = null + @property(Node) + card2:Node = null + @property(Node) + card3:Node = null + @property(Node) + card4:Node = null + + card1_data:any = {} + card2_data:any = {} + card3_data:any = {} + card4_data:any = {} + start() { + this.card1.active=true + this.card2.active=true + this.card3.active=true + this.card4.active=true + } + refCards(){ + + } + updateCardInfo(card:Node,data:any){ + if(!card) return + let name = card.getChildByName("name") + if(name){ + name.getComponent(Label).string = data.name + } + let info = card.getChildByName("info").getChildByName("Label") + if(info){ + info.getComponent(Label).string = data.info + } + } + updateCardData(index:number,data:any){ + switch (index) { + case 1: + this.card1_data = data + break; + case 2: + this.card2_data = data + break; + case 3: + this.card3_data = data + break; + case 4: + this.card4_data = data + break; + } + } + selectCard(index:number){ + + } + /** 全局消息逻辑处理 */ + // private onHandler(event: string, args: any) { + // switch (event) { + // case ModuleEvent.Cmd: + // break; + // } + // } + + /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ + reset() { + this.node.destroy(); + } +} \ No newline at end of file diff --git a/assets/script/game/map/MissionCardComp.ts.meta b/assets/script/game/map/MissionCardComp.ts.meta new file mode 100644 index 00000000..81427149 --- /dev/null +++ b/assets/script/game/map/MissionCardComp.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "b3d6e490-f2e9-4f3f-bf64-3e93c8cada94", + "files": [], + "subMetas": {}, + "userData": {} +}