From c2f8049358f314b0b74e4af8823af1f79c8d6951 Mon Sep 17 00:00:00 2001 From: chenanghui <220722433@qq.com> Date: Wed, 14 Oct 2026 18:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AC=E5=94=A4=E6=8C=89=E9=92=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battleGame/prefab/BattleGame.prefab | 1732 +++++++---------- .../battleGameResult/prefab/BattleFail.prefab | 2 +- .../res/battleGame/texture/ui/召唤icon.png | Bin 2530 -> 0 bytes .../battleGame/texture/ui/召唤icon.png.meta | 134 -- .../texture/ui/召唤按钮-亮色.png | Bin 2712 -> 0 bytes .../texture/ui/召唤按钮-亮色.png.meta | 134 -- .../texture/ui/召唤按钮-暗色.png | Bin 2750 -> 0 bytes .../texture/ui/召唤按钮-暗色.png.meta | 134 -- .../texture/ui/召唤按钮-橙灰.png | Bin 2750 -> 0 bytes .../texture/ui/召唤按钮-橙灰.png.meta | 134 -- assets/script/ui/BattleGame/UIBattleGame.ts | 35 +- 11 files changed, 757 insertions(+), 1548 deletions(-) delete mode 100644 assets/res/battleGame/texture/ui/召唤icon.png delete mode 100644 assets/res/battleGame/texture/ui/召唤icon.png.meta delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-亮色.png delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-亮色.png.meta delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-暗色.png delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-暗色.png.meta delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-橙灰.png delete mode 100644 assets/res/battleGame/texture/ui/召唤按钮-橙灰.png.meta diff --git a/assets/bundles/battleGame/prefab/BattleGame.prefab b/assets/bundles/battleGame/prefab/BattleGame.prefab index 8948f8f..8c1877e 100644 --- a/assets/bundles/battleGame/prefab/BattleGame.prefab +++ b/assets/bundles/battleGame/prefab/BattleGame.prefab @@ -46,53 +46,53 @@ "__id__": 189 }, { - "__id__": 696 + "__id__": 684 }, { - "__id__": 772 + "__id__": 760 }, { - "__id__": 778 + "__id__": 766 }, { - "__id__": 782 + "__id__": 770 }, { - "__id__": 796 + "__id__": 784 }, { - "__id__": 824 + "__id__": 812 }, { - "__id__": 852 + "__id__": 840 }, { - "__id__": 884 + "__id__": 872 } ], "_active": true, "_components": [ { - "__id__": 916 + "__id__": 904 }, { - "__id__": 918 + "__id__": 906 }, { - "__id__": 920 + "__id__": 908 }, { - "__id__": 922 + "__id__": 910 }, { - "__id__": 924 + "__id__": 912 }, { - "__id__": 926 + "__id__": 914 } ], "_prefab": { - "__id__": 928 + "__id__": 916 }, "_lpos": { "__type__": "cc.Vec3", @@ -3949,14 +3949,14 @@ "_active": true, "_components": [ { - "__id__": 691 + "__id__": 679 }, { - "__id__": 693 + "__id__": 681 } ], "_prefab": { - "__id__": 695 + "__id__": 683 }, "_lpos": { "__type__": "cc.Vec3", @@ -4015,35 +4015,35 @@ "__id__": 431 }, { - "__id__": 475 + "__id__": 463 }, { - "__id__": 515 + "__id__": 503 }, { - "__id__": 554 + "__id__": 542 }, { - "__id__": 600 + "__id__": 588 }, { - "__id__": 620 + "__id__": 608 }, { - "__id__": 640 + "__id__": 628 }, { - "__id__": 646 + "__id__": 634 } ], "_active": true, "_components": [ { - "__id__": 688 + "__id__": 676 } ], "_prefab": { - "__id__": 690 + "__id__": 678 }, "_lpos": { "__type__": "cc.Vec3", @@ -7871,28 +7871,22 @@ }, { "__id__": 438 - }, - { - "__id__": 444 - }, - { - "__id__": 450 } ], "_active": true, "_components": [ { - "__id__": 468 + "__id__": 456 }, { - "__id__": 470 + "__id__": 458 }, { - "__id__": 472 + "__id__": 460 } ], "_prefab": { - "__id__": 474 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -8061,29 +8055,36 @@ }, { "__type__": "cc.Node", - "_name": "bg2", + "_name": "lay", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 431 }, - "_children": [], - "_active": false, - "_components": [ + "_children": [ { "__id__": 439 }, { - "__id__": 441 + "__id__": 445 + } + ], + "_active": true, + "_components": [ + { + "__id__": 451 + }, + { + "__id__": 453 } ], "_prefab": { - "__id__": 443 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -10, + "y": -23.453, "z": 0 }, "_lrot": { @@ -8109,116 +8110,30 @@ }, "_id": "" }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 438 - }, - "_enabled": true, - "__prefab": { - "__id__": 440 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 165, - "height": 87 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23dvXbzLxLHpYq10yWUZNN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 438 - }, - "_enabled": true, - "__prefab": { - "__id__": 442 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 3, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 1, - "_fillRange": -0.2, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "08XT7JT7FJZJaJV1RtD7Gw" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "99QVVHV/lAF45Xsij5heQ3", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", - "_name": "bg3", + "_name": "icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 431 + "__id__": 438 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 445 + "__id__": 440 }, { - "__id__": 447 + "__id__": 442 } ], "_prefab": { - "__id__": 449 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -12.123046875, "y": 0, "z": 0 }, @@ -8251,16 +8166,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 446 + "__id__": 441 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 87 + "width": 19, + "height": 19 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8271,7 +8186,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "51hpHbfhJOJ4GIFZwUwlOS" + "fileId": "ffZITJbrpBkrGH69O7pbrg" }, { "__type__": "cc.Sprite", @@ -8279,11 +8194,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 444 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 448 + "__id__": 443 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8296,7 +8211,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f769484a-5719-4d9e-a862-223c5a7e2aed@f9941", + "__uuid__": "60156c71-14b3-4160-9182-5033fee9e9b8@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -8316,7 +8231,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "71lQ2CmYREMY7/tYk/euKZ" + "fileId": "e4jjMmM6ZGobCpu+x2rBWs" }, { "__type__": "cc.PrefabInfo", @@ -8326,92 +8241,35 @@ "asset": { "__id__": 0 }, - "fileId": "ff16JKUQRNfJlMq08vg4Ec", + "fileId": "b13p6ZEgFAMpVh4DjZWN4o", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "lay", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 431 - }, - "_children": [ - { - "__id__": 451 - }, - { - "__id__": 457 - } - ], - "_active": true, - "_components": [ - { - "__id__": 463 - }, - { - "__id__": 465 - } - ], - "_prefab": { - "__id__": 467 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -10, - "y": -23.453, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "icon", + "_name": "lb_RefreshNeed", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 450 + "__id__": 438 }, "_children": [], "_active": true, "_components": [ { - "__id__": 452 + "__id__": 446 }, { - "__id__": 454 + "__id__": 448 } ], "_prefab": { - "__id__": 456 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", - "x": -12.123046875, + "x": 10.5, "y": 0, "z": 0 }, @@ -8444,16 +8302,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 451 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", - "width": 19, - "height": 19 + "width": 22.24609375, + "height": 50.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8464,19 +8322,19 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ffZITJbrpBkrGH69O7pbrg" + "fileId": "8b2ZFFtTJDq6xrAnN+QnaF" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Label", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 451 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8488,166 +8346,30 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "60156c71-14b3-4160-9182-5033fee9e9b8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e4jjMmM6ZGobCpu+x2rBWs" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b13p6ZEgFAMpVh4DjZWN4o", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "lb_RefreshNeed", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 450 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 458 - }, - { - "__id__": 460 - } - ], - "_prefab": { - "__id__": 462 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 10.5, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 457 - }, - "_enabled": true, - "__prefab": { - "__id__": 459 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 22.24609375, - "height": 50.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8b2ZFFtTJDq6xrAnN+QnaF" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 457 - }, - "_enabled": true, - "__prefab": { - "__id__": 461 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "30", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 + "_string": "30", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 }, "_outlineWidth": 2, "_enableShadow": false, @@ -8689,11 +8411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 464 + "__id__": 452 }, "_contentSize": { "__type__": "cc.Size", @@ -8717,11 +8439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 450 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 454 }, "_resizeMode": 1, "_layoutType": 1, @@ -8772,7 +8494,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 457 }, "_contentSize": { "__type__": "cc.Size", @@ -8800,7 +8522,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 459 }, "clickEvents": [], "_interactable": true, @@ -8856,7 +8578,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 473 + "__id__": 461 }, "_id": "" }, @@ -8887,38 +8609,38 @@ }, "_children": [ { - "__id__": 476 + "__id__": 464 }, { - "__id__": 482 + "__id__": 470 }, { - "__id__": 488 + "__id__": 476 }, { - "__id__": 494 + "__id__": 482 }, { - "__id__": 500 + "__id__": 488 } ], "_active": true, "_components": [ { - "__id__": 506 + "__id__": 494 }, { - "__id__": 508 + "__id__": 496 }, { - "__id__": 510 + "__id__": 498 }, { - "__id__": 512 + "__id__": 500 } ], "_prefab": { - "__id__": 514 + "__id__": 502 }, "_lpos": { "__type__": "cc.Vec3", @@ -8955,20 +8677,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 475 + "__id__": 463 }, "_children": [], "_active": true, "_components": [ { - "__id__": 477 + "__id__": 465 }, { - "__id__": 479 + "__id__": 467 } ], "_prefab": { - "__id__": 481 + "__id__": 469 }, "_lpos": { "__type__": "cc.Vec3", @@ -9005,11 +8727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 464 }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 466 }, "_contentSize": { "__type__": "cc.Size", @@ -9033,11 +8755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 464 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 468 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9091,20 +8813,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 475 + "__id__": 463 }, "_children": [], "_active": true, "_components": [ { - "__id__": 483 + "__id__": 471 }, { - "__id__": 485 + "__id__": 473 } ], "_prefab": { - "__id__": 487 + "__id__": 475 }, "_lpos": { "__type__": "cc.Vec3", @@ -9141,11 +8863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 470 }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 472 }, "_contentSize": { "__type__": "cc.Size", @@ -9169,11 +8891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 470 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 474 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9250,20 +8972,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 475 + "__id__": 463 }, "_children": [], "_active": true, "_components": [ { - "__id__": 489 + "__id__": 477 }, { - "__id__": 491 + "__id__": 479 } ], "_prefab": { - "__id__": 493 + "__id__": 481 }, "_lpos": { "__type__": "cc.Vec3", @@ -9300,11 +9022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 478 }, "_contentSize": { "__type__": "cc.Size", @@ -9328,11 +9050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 480 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9386,20 +9108,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 475 + "__id__": 463 }, "_children": [], "_active": true, "_components": [ { - "__id__": 495 + "__id__": 483 }, { - "__id__": 497 + "__id__": 485 } ], "_prefab": { - "__id__": 499 + "__id__": 487 }, "_lpos": { "__type__": "cc.Vec3", @@ -9436,11 +9158,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 484 }, "_contentSize": { "__type__": "cc.Size", @@ -9464,11 +9186,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 486 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9545,20 +9267,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 475 + "__id__": 463 }, "_children": [], "_active": true, "_components": [ { - "__id__": 501 + "__id__": 489 }, { - "__id__": 503 + "__id__": 491 } ], "_prefab": { - "__id__": 505 + "__id__": 493 }, "_lpos": { "__type__": "cc.Vec3", @@ -9595,11 +9317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 490 }, "_contentSize": { "__type__": "cc.Size", @@ -9623,11 +9345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 492 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9704,11 +9426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 495 }, "_contentSize": { "__type__": "cc.Size", @@ -9732,11 +9454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 497 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9777,11 +9499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 499 }, "clickEvents": [], "_interactable": true, @@ -9833,11 +9555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 475 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 501 }, "_id": "" }, @@ -9868,20 +9590,20 @@ }, "_children": [ { - "__id__": 516 + "__id__": 504 }, { - "__id__": 543 + "__id__": 531 } ], "_active": true, "_components": [ { - "__id__": 551 + "__id__": 539 } ], "_prefab": { - "__id__": 553 + "__id__": 541 }, "_lpos": { "__type__": "cc.Vec3", @@ -9916,17 +9638,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 515 + "__id__": 503 }, "_prefab": { - "__id__": 517 + "__id__": 505 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 516 + "__id__": 504 }, "asset": { "__uuid__": "af9aa6b3-9c54-4fa4-b599-0c91f7442ed2", @@ -9934,7 +9656,7 @@ }, "fileId": "1aMAzMzc5NTribLGuHEoWV", "instance": { - "__id__": 518 + "__id__": 506 }, "targetOverrides": null }, @@ -9948,40 +9670,40 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 519 + "__id__": 507 }, { - "__id__": 521 + "__id__": 509 }, { - "__id__": 523 + "__id__": 511 }, { - "__id__": 525 + "__id__": 513 }, { - "__id__": 527 + "__id__": 515 }, { - "__id__": 529 + "__id__": 517 }, { - "__id__": 531 + "__id__": 519 }, { - "__id__": 533 + "__id__": 521 }, { - "__id__": 535 + "__id__": 523 }, { - "__id__": 537 + "__id__": 525 }, { - "__id__": 539 + "__id__": 527 }, { - "__id__": 541 + "__id__": 529 } ], "removedComponents": [] @@ -9989,7 +9711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 520 + "__id__": 508 }, "propertyPath": [ "_name" @@ -10005,7 +9727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 522 + "__id__": 510 }, "propertyPath": [ "_lpos" @@ -10026,7 +9748,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 524 + "__id__": 512 }, "propertyPath": [ "_lrot" @@ -10048,7 +9770,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 526 + "__id__": 514 }, "propertyPath": [ "_euler" @@ -10069,7 +9791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 516 }, "propertyPath": [ "_active" @@ -10085,7 +9807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 530 + "__id__": 518 }, "propertyPath": [ "_fillStart" @@ -10101,7 +9823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 520 }, "propertyPath": [ "_fillRange" @@ -10117,7 +9839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 534 + "__id__": 522 }, "propertyPath": [ "_lrot" @@ -10139,7 +9861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 536 + "__id__": 524 }, "propertyPath": [ "_euler" @@ -10160,7 +9882,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 538 + "__id__": 526 }, "propertyPath": [ "_lscale" @@ -10181,7 +9903,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 528 }, "propertyPath": [ "_fillCenter" @@ -10201,7 +9923,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 542 + "__id__": 530 }, "propertyPath": [ "_fillType" @@ -10218,17 +9940,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 515 + "__id__": 503 }, "_prefab": { - "__id__": 544 + "__id__": 532 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 543 + "__id__": 531 }, "asset": { "__uuid__": "af9aa6b3-9c54-4fa4-b599-0c91f7442ed2", @@ -10236,7 +9958,7 @@ }, "fileId": "1aMAzMzc5NTribLGuHEoWV", "instance": { - "__id__": 545 + "__id__": 533 }, "targetOverrides": null }, @@ -10250,16 +9972,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 546 + "__id__": 534 }, { - "__id__": 548 + "__id__": 536 }, { - "__id__": 549 + "__id__": 537 }, { - "__id__": 550 + "__id__": 538 } ], "removedComponents": [] @@ -10267,7 +9989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 547 + "__id__": 535 }, "propertyPath": [ "_name" @@ -10283,7 +10005,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 547 + "__id__": 535 }, "propertyPath": [ "_lpos" @@ -10298,7 +10020,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 547 + "__id__": 535 }, "propertyPath": [ "_lrot" @@ -10314,7 +10036,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 547 + "__id__": 535 }, "propertyPath": [ "_euler" @@ -10332,11 +10054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 515 + "__id__": 503 }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 540 }, "_contentSize": { "__type__": "cc.Size", @@ -10377,29 +10099,29 @@ }, "_children": [ { - "__id__": 555 + "__id__": 543 }, { - "__id__": 561 + "__id__": 549 }, { - "__id__": 573 + "__id__": 561 } ], "_active": false, "_components": [ { - "__id__": 593 + "__id__": 581 }, { - "__id__": 595 + "__id__": 583 }, { - "__id__": 597 + "__id__": 585 } ], "_prefab": { - "__id__": 599 + "__id__": 587 }, "_lpos": { "__type__": "cc.Vec3", @@ -10436,20 +10158,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 554 + "__id__": 542 }, "_children": [], "_active": true, "_components": [ { - "__id__": 556 + "__id__": 544 }, { - "__id__": 558 + "__id__": 546 } ], "_prefab": { - "__id__": 560 + "__id__": 548 }, "_lpos": { "__type__": "cc.Vec3", @@ -10486,11 +10208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -10514,11 +10236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10572,24 +10294,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 554 + "__id__": 542 }, "_children": [ { - "__id__": 562 + "__id__": 550 } ], "_active": true, "_components": [ { - "__id__": 568 + "__id__": 556 }, { - "__id__": 570 + "__id__": 558 } ], "_prefab": { - "__id__": 572 + "__id__": 560 }, "_lpos": { "__type__": "cc.Vec3", @@ -10626,20 +10348,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 561 + "__id__": 549 }, "_children": [], "_active": true, "_components": [ { - "__id__": 563 + "__id__": 551 }, { - "__id__": 565 + "__id__": 553 } ], "_prefab": { - "__id__": 567 + "__id__": 555 }, "_lpos": { "__type__": "cc.Vec3", @@ -10676,11 +10398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 550 }, "_enabled": true, "__prefab": { - "__id__": 564 + "__id__": 552 }, "_contentSize": { "__type__": "cc.Size", @@ -10704,11 +10426,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 550 }, "_enabled": true, "__prefab": { - "__id__": 566 + "__id__": 554 }, "_lineHeight": 40, "_string": "", @@ -10755,11 +10477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 557 }, "_contentSize": { "__type__": "cc.Size", @@ -10783,11 +10505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 559 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10839,17 +10561,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 554 + "__id__": 542 }, "_prefab": { - "__id__": 574 + "__id__": 562 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 573 + "__id__": 561 }, "asset": { "__uuid__": "834225e5-0107-4dc8-98b5-e203873774ae", @@ -10857,7 +10579,7 @@ }, "fileId": "50SV7PXetCj5ArE9+5F3+9", "instance": { - "__id__": 575 + "__id__": 563 }, "targetOverrides": null }, @@ -10871,43 +10593,43 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 576 + "__id__": 564 }, { - "__id__": 578 + "__id__": 566 }, { - "__id__": 579 + "__id__": 567 }, { - "__id__": 580 + "__id__": 568 }, { - "__id__": 581 + "__id__": 569 }, { - "__id__": 583 + "__id__": 571 }, { - "__id__": 585 + "__id__": 573 }, { - "__id__": 586 + "__id__": 574 }, { - "__id__": 587 + "__id__": 575 }, { - "__id__": 588 + "__id__": 576 }, { - "__id__": 589 + "__id__": 577 }, { - "__id__": 591 + "__id__": 579 }, { - "__id__": 592 + "__id__": 580 } ], "removedComponents": [] @@ -10915,7 +10637,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 565 }, "propertyPath": [ "_name" @@ -10931,7 +10653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 565 }, "propertyPath": [ "_lpos" @@ -10946,7 +10668,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 565 }, "propertyPath": [ "_lrot" @@ -10962,7 +10684,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 577 + "__id__": 565 }, "propertyPath": [ "_euler" @@ -10977,7 +10699,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_string" @@ -10993,7 +10715,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 572 }, "propertyPath": [ "_contentSize" @@ -11013,7 +10735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_color" @@ -11029,7 +10751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_outlineColor" @@ -11045,7 +10767,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_fontSize" @@ -11055,7 +10777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_actualFontSize" @@ -11065,7 +10787,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 590 + "__id__": 578 }, "propertyPath": [ "key" @@ -11081,7 +10803,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_outlineWidth" @@ -11091,7 +10813,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 582 + "__id__": 570 }, "propertyPath": [ "_isItalic" @@ -11104,11 +10826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 554 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 594 + "__id__": 582 }, "_contentSize": { "__type__": "cc.Size", @@ -11132,11 +10854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 554 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 584 }, "clickEvents": [], "_interactable": true, @@ -11188,11 +10910,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 554 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 586 }, "_id": "" }, @@ -11223,26 +10945,26 @@ }, "_children": [ { - "__id__": 601 + "__id__": 589 }, { - "__id__": 607 + "__id__": 595 } ], "_active": false, "_components": [ { - "__id__": 613 + "__id__": 601 }, { - "__id__": 615 + "__id__": 603 }, { - "__id__": 617 + "__id__": 605 } ], "_prefab": { - "__id__": 619 + "__id__": 607 }, "_lpos": { "__type__": "cc.Vec3", @@ -11279,20 +11001,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 600 + "__id__": 588 }, "_children": [], "_active": true, "_components": [ { - "__id__": 602 + "__id__": 590 }, { - "__id__": 604 + "__id__": 592 } ], "_prefab": { - "__id__": 606 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", @@ -11329,11 +11051,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 603 + "__id__": 591 }, "_contentSize": { "__type__": "cc.Size", @@ -11357,11 +11079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 605 + "__id__": 593 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11415,20 +11137,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 600 + "__id__": 588 }, "_children": [], "_active": false, "_components": [ { - "__id__": 608 + "__id__": 596 }, { - "__id__": 610 + "__id__": 598 } ], "_prefab": { - "__id__": 612 + "__id__": 600 }, "_lpos": { "__type__": "cc.Vec3", @@ -11465,11 +11187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 607 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 609 + "__id__": 597 }, "_contentSize": { "__type__": "cc.Size", @@ -11493,11 +11215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 607 + "__id__": 595 }, "_enabled": true, "__prefab": { - "__id__": 611 + "__id__": 599 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11551,11 +11273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 614 + "__id__": 602 }, "_contentSize": { "__type__": "cc.Size", @@ -11579,11 +11301,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 604 }, "clickEvents": [], "_interactable": true, @@ -11623,7 +11345,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 600 + "__id__": 588 }, "_id": "" }, @@ -11637,11 +11359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 600 + "__id__": 588 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 606 }, "_id": "" }, @@ -11672,20 +11394,20 @@ }, "_children": [ { - "__id__": 621 + "__id__": 609 } ], "_active": true, "_components": [ { - "__id__": 635 + "__id__": 623 }, { - "__id__": 637 + "__id__": 625 } ], "_prefab": { - "__id__": 639 + "__id__": 627 }, "_lpos": { "__type__": "cc.Vec3", @@ -11720,17 +11442,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 620 + "__id__": 608 }, "_prefab": { - "__id__": 622 + "__id__": 610 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 621 + "__id__": 609 }, "asset": { "__uuid__": "8c3b6798-7d6f-413a-8294-42d192319365", @@ -11738,7 +11460,7 @@ }, "fileId": "72a/87Jc9HLoBBUpzMZMyg", "instance": { - "__id__": 623 + "__id__": 611 }, "targetOverrides": null }, @@ -11752,28 +11474,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 624 + "__id__": 612 }, { - "__id__": 626 + "__id__": 614 }, { - "__id__": 627 + "__id__": 615 }, { - "__id__": 628 + "__id__": 616 }, { - "__id__": 629 + "__id__": 617 }, { - "__id__": 630 + "__id__": 618 }, { - "__id__": 632 + "__id__": 620 }, { - "__id__": 634 + "__id__": 622 } ], "removedComponents": [] @@ -11781,7 +11503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_name" @@ -11797,7 +11519,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_lpos" @@ -11812,7 +11534,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_lrot" @@ -11828,7 +11550,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_euler" @@ -11843,7 +11565,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_active" @@ -11853,7 +11575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 631 + "__id__": 619 }, "propertyPath": [ "_active" @@ -11869,7 +11591,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 621 }, "propertyPath": [ "_lscale" @@ -11890,7 +11612,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 613 }, "propertyPath": [ "_lscale" @@ -11908,11 +11630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 608 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 624 }, "_contentSize": { "__type__": "cc.Size", @@ -11936,11 +11658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 608 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 626 }, "_resizeMode": 1, "_layoutType": 1, @@ -11993,14 +11715,14 @@ "_active": false, "_components": [ { - "__id__": 641 + "__id__": 629 }, { - "__id__": 643 + "__id__": 631 } ], "_prefab": { - "__id__": 645 + "__id__": 633 }, "_lpos": { "__type__": "cc.Vec3", @@ -12037,11 +11759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 630 }, "_contentSize": { "__type__": "cc.Size", @@ -12065,11 +11787,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 632 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12127,35 +11849,35 @@ }, "_children": [ { - "__id__": 647 + "__id__": 635 }, { - "__id__": 653 + "__id__": 641 }, { - "__id__": 659 + "__id__": 647 }, { - "__id__": 665 + "__id__": 653 }, { - "__id__": 671 + "__id__": 659 }, { - "__id__": 677 + "__id__": 665 } ], "_active": true, "_components": [ { - "__id__": 683 + "__id__": 671 }, { - "__id__": 685 + "__id__": 673 } ], "_prefab": { - "__id__": 687 + "__id__": 675 }, "_lpos": { "__type__": "cc.Vec3", @@ -12192,20 +11914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": true, "_components": [ { - "__id__": 648 + "__id__": 636 }, { - "__id__": 650 + "__id__": 638 } ], "_prefab": { - "__id__": 652 + "__id__": 640 }, "_lpos": { "__type__": "cc.Vec3", @@ -12242,11 +11964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 647 + "__id__": 635 }, "_enabled": true, "__prefab": { - "__id__": 649 + "__id__": 637 }, "_contentSize": { "__type__": "cc.Size", @@ -12270,11 +11992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 647 + "__id__": 635 }, "_enabled": true, "__prefab": { - "__id__": 651 + "__id__": 639 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12328,20 +12050,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": false, "_components": [ { - "__id__": 654 + "__id__": 642 }, { - "__id__": 656 + "__id__": 644 } ], "_prefab": { - "__id__": 658 + "__id__": 646 }, "_lpos": { "__type__": "cc.Vec3", @@ -12378,11 +12100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 641 }, "_enabled": true, "__prefab": { - "__id__": 655 + "__id__": 643 }, "_contentSize": { "__type__": "cc.Size", @@ -12406,11 +12128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 653 + "__id__": 641 }, "_enabled": true, "__prefab": { - "__id__": 657 + "__id__": 645 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12464,20 +12186,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": true, "_components": [ { - "__id__": 660 + "__id__": 648 }, { - "__id__": 662 + "__id__": 650 } ], "_prefab": { - "__id__": 664 + "__id__": 652 }, "_lpos": { "__type__": "cc.Vec3", @@ -12514,11 +12236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 647 }, "_enabled": true, "__prefab": { - "__id__": 661 + "__id__": 649 }, "_contentSize": { "__type__": "cc.Size", @@ -12542,11 +12264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 647 }, "_enabled": true, "__prefab": { - "__id__": 663 + "__id__": 651 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12600,20 +12322,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": true, "_components": [ { - "__id__": 666 + "__id__": 654 }, { - "__id__": 668 + "__id__": 656 } ], "_prefab": { - "__id__": 670 + "__id__": 658 }, "_lpos": { "__type__": "cc.Vec3", @@ -12650,11 +12372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 653 }, "_enabled": true, "__prefab": { - "__id__": 667 + "__id__": 655 }, "_contentSize": { "__type__": "cc.Size", @@ -12678,11 +12400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 665 + "__id__": 653 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 657 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12736,20 +12458,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": true, "_components": [ { - "__id__": 672 + "__id__": 660 }, { - "__id__": 674 + "__id__": 662 } ], "_prefab": { - "__id__": 676 + "__id__": 664 }, "_lpos": { "__type__": "cc.Vec3", @@ -12786,11 +12508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 659 }, "_enabled": true, "__prefab": { - "__id__": 673 + "__id__": 661 }, "_contentSize": { "__type__": "cc.Size", @@ -12814,11 +12536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 659 }, "_enabled": true, "__prefab": { - "__id__": 675 + "__id__": 663 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12872,20 +12594,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 646 + "__id__": 634 }, "_children": [], "_active": true, "_components": [ { - "__id__": 678 + "__id__": 666 }, { - "__id__": 680 + "__id__": 668 } ], "_prefab": { - "__id__": 682 + "__id__": 670 }, "_lpos": { "__type__": "cc.Vec3", @@ -12922,11 +12644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 667 }, "_contentSize": { "__type__": "cc.Size", @@ -12950,11 +12672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 681 + "__id__": 669 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13031,11 +12753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 646 + "__id__": 634 }, "_enabled": true, "__prefab": { - "__id__": 684 + "__id__": 672 }, "_contentSize": { "__type__": "cc.Size", @@ -13059,11 +12781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 646 + "__id__": 634 }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 674 }, "clickEvents": [], "_interactable": true, @@ -13132,7 +12854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 677 }, "_contentSize": { "__type__": "cc.Size", @@ -13173,7 +12895,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 680 }, "_contentSize": { "__type__": "cc.Size", @@ -13201,7 +12923,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 694 + "__id__": 682 }, "_alignFlags": 4, "_target": null, @@ -13249,6 +12971,12 @@ "__id__": 1 }, "_children": [ + { + "__id__": 685 + }, + { + "__id__": 691 + }, { "__id__": 697 }, @@ -13275,31 +13003,25 @@ }, { "__id__": 745 - }, - { - "__id__": 751 - }, - { - "__id__": 757 } ], "_active": false, "_components": [ { - "__id__": 763 + "__id__": 751 }, { - "__id__": 765 + "__id__": 753 }, { - "__id__": 767 + "__id__": 755 }, { - "__id__": 769 + "__id__": 757 } ], "_prefab": { - "__id__": 771 + "__id__": 759 }, "_lpos": { "__type__": "cc.Vec3", @@ -13336,20 +13058,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 698 + "__id__": 686 }, { - "__id__": 700 + "__id__": 688 } ], "_prefab": { - "__id__": 702 + "__id__": 690 }, "_lpos": { "__type__": "cc.Vec3", @@ -13386,11 +13108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 699 + "__id__": 687 }, "_contentSize": { "__type__": "cc.Size", @@ -13414,11 +13136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 689 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13472,20 +13194,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 704 + "__id__": 692 }, { - "__id__": 706 + "__id__": 694 } ], "_prefab": { - "__id__": 708 + "__id__": 696 }, "_lpos": { "__type__": "cc.Vec3", @@ -13522,11 +13244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 703 + "__id__": 691 }, "_enabled": true, "__prefab": { - "__id__": 705 + "__id__": 693 }, "_contentSize": { "__type__": "cc.Size", @@ -13550,11 +13272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 703 + "__id__": 691 }, "_enabled": true, "__prefab": { - "__id__": 707 + "__id__": 695 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13608,20 +13330,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 710 + "__id__": 698 }, { - "__id__": 712 + "__id__": 700 } ], "_prefab": { - "__id__": 714 + "__id__": 702 }, "_lpos": { "__type__": "cc.Vec3", @@ -13658,11 +13380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 697 }, "_enabled": true, "__prefab": { - "__id__": 711 + "__id__": 699 }, "_contentSize": { "__type__": "cc.Size", @@ -13686,11 +13408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 697 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 701 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13744,20 +13466,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 716 + "__id__": 704 }, { - "__id__": 718 + "__id__": 706 } ], "_prefab": { - "__id__": 720 + "__id__": 708 }, "_lpos": { "__type__": "cc.Vec3", @@ -13794,11 +13516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 715 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 717 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -13822,11 +13544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 715 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 719 + "__id__": 707 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13880,20 +13602,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 722 + "__id__": 710 }, { - "__id__": 724 + "__id__": 712 } ], "_prefab": { - "__id__": 726 + "__id__": 714 }, "_lpos": { "__type__": "cc.Vec3", @@ -13930,11 +13652,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 721 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 723 + "__id__": 711 }, "_contentSize": { "__type__": "cc.Size", @@ -13958,11 +13680,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 721 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 725 + "__id__": 713 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14016,20 +13738,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 728 + "__id__": 716 }, { - "__id__": 730 + "__id__": 718 } ], "_prefab": { - "__id__": 732 + "__id__": 720 }, "_lpos": { "__type__": "cc.Vec3", @@ -14066,11 +13788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 727 + "__id__": 715 }, "_enabled": true, "__prefab": { - "__id__": 729 + "__id__": 717 }, "_contentSize": { "__type__": "cc.Size", @@ -14094,11 +13816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 727 + "__id__": 715 }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 719 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14152,20 +13874,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 734 + "__id__": 722 }, { - "__id__": 736 + "__id__": 724 } ], "_prefab": { - "__id__": 738 + "__id__": 726 }, "_lpos": { "__type__": "cc.Vec3", @@ -14202,11 +13924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 735 + "__id__": 723 }, "_contentSize": { "__type__": "cc.Size", @@ -14230,11 +13952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 725 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14288,20 +14010,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 740 + "__id__": 728 }, { - "__id__": 742 + "__id__": 730 } ], "_prefab": { - "__id__": 744 + "__id__": 732 }, "_lpos": { "__type__": "cc.Vec3", @@ -14338,11 +14060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 739 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 741 + "__id__": 729 }, "_contentSize": { "__type__": "cc.Size", @@ -14366,11 +14088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 739 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 731 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14424,20 +14146,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 734 }, { - "__id__": 748 + "__id__": 736 } ], "_prefab": { - "__id__": 750 + "__id__": 738 }, "_lpos": { "__type__": "cc.Vec3", @@ -14474,11 +14196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 747 + "__id__": 735 }, "_contentSize": { "__type__": "cc.Size", @@ -14502,11 +14224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 749 + "__id__": 737 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14560,20 +14282,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 752 + "__id__": 740 }, { - "__id__": 754 + "__id__": 742 } ], "_prefab": { - "__id__": 756 + "__id__": 744 }, "_lpos": { "__type__": "cc.Vec3", @@ -14610,11 +14332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 739 }, "_enabled": true, "__prefab": { - "__id__": 753 + "__id__": 741 }, "_contentSize": { "__type__": "cc.Size", @@ -14638,11 +14360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 739 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 743 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14696,20 +14418,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 696 + "__id__": 684 }, "_children": [], "_active": true, "_components": [ { - "__id__": 758 + "__id__": 746 }, { - "__id__": 760 + "__id__": 748 } ], "_prefab": { - "__id__": 762 + "__id__": 750 }, "_lpos": { "__type__": "cc.Vec3", @@ -14746,11 +14468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 757 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 759 + "__id__": 747 }, "_contentSize": { "__type__": "cc.Size", @@ -14774,11 +14496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 757 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 761 + "__id__": 749 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14832,11 +14554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 684 }, "_enabled": true, "__prefab": { - "__id__": 764 + "__id__": 752 }, "_contentSize": { "__type__": "cc.Size", @@ -14860,11 +14582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 684 }, "_enabled": true, "__prefab": { - "__id__": 766 + "__id__": 754 }, "_type": 0, "_inverted": false, @@ -14882,11 +14604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 684 }, "_enabled": true, "__prefab": { - "__id__": 768 + "__id__": 756 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14928,11 +14650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 696 + "__id__": 684 }, "_enabled": false, "__prefab": { - "__id__": 770 + "__id__": 758 }, "_resizeMode": 0, "_layoutType": 1, @@ -14985,14 +14707,14 @@ "_active": false, "_components": [ { - "__id__": 773 + "__id__": 761 }, { - "__id__": 775 + "__id__": 763 } ], "_prefab": { - "__id__": 777 + "__id__": 765 }, "_lpos": { "__type__": "cc.Vec3", @@ -15029,11 +14751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 772 + "__id__": 760 }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 762 }, "_contentSize": { "__type__": "cc.Size", @@ -15057,11 +14779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 772 + "__id__": 760 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 764 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15121,11 +14843,11 @@ "_active": true, "_components": [ { - "__id__": 779 + "__id__": 767 } ], "_prefab": { - "__id__": 781 + "__id__": 769 }, "_lpos": { "__type__": "cc.Vec3", @@ -15162,11 +14884,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 766 }, "_enabled": true, "__prefab": { - "__id__": 780 + "__id__": 768 }, "_contentSize": { "__type__": "cc.Size", @@ -15207,23 +14929,23 @@ }, "_children": [ { - "__id__": 783 + "__id__": 771 } ], "_active": false, "_components": [ { - "__id__": 789 + "__id__": 777 }, { - "__id__": 791 + "__id__": 779 }, { - "__id__": 793 + "__id__": 781 } ], "_prefab": { - "__id__": 795 + "__id__": 783 }, "_lpos": { "__type__": "cc.Vec3", @@ -15260,20 +14982,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 782 + "__id__": 770 }, "_children": [], "_active": true, "_components": [ { - "__id__": 784 + "__id__": 772 }, { - "__id__": 786 + "__id__": 774 } ], "_prefab": { - "__id__": 788 + "__id__": 776 }, "_lpos": { "__type__": "cc.Vec3", @@ -15310,11 +15032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 783 + "__id__": 771 }, "_enabled": true, "__prefab": { - "__id__": 785 + "__id__": 773 }, "_contentSize": { "__type__": "cc.Size", @@ -15338,11 +15060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 783 + "__id__": 771 }, "_enabled": true, "__prefab": { - "__id__": 787 + "__id__": 775 }, "_lineHeight": 40, "_string": "Rich", @@ -15389,11 +15111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 770 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 778 }, "_contentSize": { "__type__": "cc.Size", @@ -15417,11 +15139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 770 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 780 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15462,11 +15184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 770 }, "_enabled": true, "__prefab": { - "__id__": 794 + "__id__": 782 }, "_resizeMode": 1, "_layoutType": 1, @@ -15517,23 +15239,23 @@ }, "_children": [ { - "__id__": 797 + "__id__": 785 } ], "_active": false, "_components": [ { - "__id__": 817 + "__id__": 805 }, { - "__id__": 819 + "__id__": 807 }, { - "__id__": 821 + "__id__": 809 } ], "_prefab": { - "__id__": 823 + "__id__": 811 }, "_lpos": { "__type__": "cc.Vec3", @@ -15570,30 +15292,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 796 + "__id__": 784 }, "_children": [ { - "__id__": 798 + "__id__": 786 }, { - "__id__": 804 + "__id__": 792 } ], "_active": true, "_components": [ { - "__id__": 810 + "__id__": 798 }, { - "__id__": 812 + "__id__": 800 }, { - "__id__": 814 + "__id__": 802 } ], "_prefab": { - "__id__": 816 + "__id__": 804 }, "_lpos": { "__type__": "cc.Vec3", @@ -15630,20 +15352,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 785 }, "_children": [], "_active": true, "_components": [ { - "__id__": 799 + "__id__": 787 }, { - "__id__": 801 + "__id__": 789 } ], "_prefab": { - "__id__": 803 + "__id__": 791 }, "_lpos": { "__type__": "cc.Vec3", @@ -15680,11 +15402,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 788 }, "_contentSize": { "__type__": "cc.Size", @@ -15708,11 +15430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 786 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 790 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15789,20 +15511,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 785 }, "_children": [], "_active": true, "_components": [ { - "__id__": 805 + "__id__": 793 }, { - "__id__": 807 + "__id__": 795 } ], "_prefab": { - "__id__": 809 + "__id__": 797 }, "_lpos": { "__type__": "cc.Vec3", @@ -15839,11 +15561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 804 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 806 + "__id__": 794 }, "_contentSize": { "__type__": "cc.Size", @@ -15867,11 +15589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 804 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 796 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15948,11 +15670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 811 + "__id__": 799 }, "_contentSize": { "__type__": "cc.Size", @@ -15976,11 +15698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 813 + "__id__": 801 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16021,11 +15743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 803 }, "_id": "" }, @@ -16052,11 +15774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 818 + "__id__": 806 }, "_contentSize": { "__type__": "cc.Size", @@ -16080,11 +15802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 820 + "__id__": 808 }, "_alignFlags": 45, "_target": null, @@ -16116,11 +15838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 822 + "__id__": 810 }, "_id": "" }, @@ -16151,23 +15873,23 @@ }, "_children": [ { - "__id__": 825 + "__id__": 813 } ], "_active": false, "_components": [ { - "__id__": 845 + "__id__": 833 }, { - "__id__": 847 + "__id__": 835 }, { - "__id__": 849 + "__id__": 837 } ], "_prefab": { - "__id__": 851 + "__id__": 839 }, "_lpos": { "__type__": "cc.Vec3", @@ -16204,30 +15926,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 824 + "__id__": 812 }, "_children": [ { - "__id__": 826 + "__id__": 814 }, { - "__id__": 832 + "__id__": 820 } ], "_active": true, "_components": [ { - "__id__": 838 + "__id__": 826 }, { - "__id__": 840 + "__id__": 828 }, { - "__id__": 842 + "__id__": 830 } ], "_prefab": { - "__id__": 844 + "__id__": 832 }, "_lpos": { "__type__": "cc.Vec3", @@ -16264,20 +15986,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 825 + "__id__": 813 }, "_children": [], "_active": true, "_components": [ { - "__id__": 827 + "__id__": 815 }, { - "__id__": 829 + "__id__": 817 } ], "_prefab": { - "__id__": 831 + "__id__": 819 }, "_lpos": { "__type__": "cc.Vec3", @@ -16314,11 +16036,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 814 }, "_enabled": true, "__prefab": { - "__id__": 828 + "__id__": 816 }, "_contentSize": { "__type__": "cc.Size", @@ -16342,11 +16064,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 814 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 818 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16423,20 +16145,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 825 + "__id__": 813 }, "_children": [], "_active": true, "_components": [ { - "__id__": 833 + "__id__": 821 }, { - "__id__": 835 + "__id__": 823 } ], "_prefab": { - "__id__": 837 + "__id__": 825 }, "_lpos": { "__type__": "cc.Vec3", @@ -16473,11 +16195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 832 + "__id__": 820 }, "_enabled": true, "__prefab": { - "__id__": 834 + "__id__": 822 }, "_contentSize": { "__type__": "cc.Size", @@ -16501,11 +16223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 832 + "__id__": 820 }, "_enabled": true, "__prefab": { - "__id__": 836 + "__id__": 824 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16582,11 +16304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 839 + "__id__": 827 }, "_contentSize": { "__type__": "cc.Size", @@ -16610,11 +16332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 829 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16655,11 +16377,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 813 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 831 }, "_id": "" }, @@ -16686,11 +16408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 812 }, "_enabled": true, "__prefab": { - "__id__": 846 + "__id__": 834 }, "_contentSize": { "__type__": "cc.Size", @@ -16714,11 +16436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 812 }, "_enabled": true, "__prefab": { - "__id__": 848 + "__id__": 836 }, "_alignFlags": 45, "_target": null, @@ -16750,11 +16472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 812 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 838 }, "_id": "" }, @@ -16785,23 +16507,23 @@ }, "_children": [ { - "__id__": 853 + "__id__": 841 } ], "_active": false, "_components": [ { - "__id__": 877 + "__id__": 865 }, { - "__id__": 879 + "__id__": 867 }, { - "__id__": 881 + "__id__": 869 } ], "_prefab": { - "__id__": 883 + "__id__": 871 }, "_lpos": { "__type__": "cc.Vec3", @@ -16838,30 +16560,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 852 + "__id__": 840 }, "_children": [ { - "__id__": 854 + "__id__": 842 }, { - "__id__": 860 + "__id__": 848 }, { - "__id__": 866 + "__id__": 854 } ], "_active": true, "_components": [ { - "__id__": 872 + "__id__": 860 }, { - "__id__": 874 + "__id__": 862 } ], "_prefab": { - "__id__": 876 + "__id__": 864 }, "_lpos": { "__type__": "cc.Vec3", @@ -16898,20 +16620,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 841 }, "_children": [], "_active": true, "_components": [ { - "__id__": 855 + "__id__": 843 }, { - "__id__": 857 + "__id__": 845 } ], "_prefab": { - "__id__": 859 + "__id__": 847 }, "_lpos": { "__type__": "cc.Vec3", @@ -16948,11 +16670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 856 + "__id__": 844 }, "_contentSize": { "__type__": "cc.Size", @@ -16976,11 +16698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 842 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 846 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17034,20 +16756,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 841 }, "_children": [], "_active": true, "_components": [ { - "__id__": 861 + "__id__": 849 }, { - "__id__": 863 + "__id__": 851 } ], "_prefab": { - "__id__": 865 + "__id__": 853 }, "_lpos": { "__type__": "cc.Vec3", @@ -17084,11 +16806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 848 }, "_enabled": true, "__prefab": { - "__id__": 862 + "__id__": 850 }, "_contentSize": { "__type__": "cc.Size", @@ -17112,11 +16834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 848 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 852 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17193,20 +16915,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 841 }, "_children": [], "_active": true, "_components": [ { - "__id__": 867 + "__id__": 855 }, { - "__id__": 869 + "__id__": 857 } ], "_prefab": { - "__id__": 871 + "__id__": 859 }, "_lpos": { "__type__": "cc.Vec3", @@ -17243,11 +16965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 868 + "__id__": 856 }, "_contentSize": { "__type__": "cc.Size", @@ -17271,11 +16993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 870 + "__id__": 858 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17352,11 +17074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 861 }, "_contentSize": { "__type__": "cc.Size", @@ -17380,11 +17102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 841 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 863 }, "_id": "" }, @@ -17411,11 +17133,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 852 + "__id__": 840 }, "_enabled": true, "__prefab": { - "__id__": 878 + "__id__": 866 }, "_contentSize": { "__type__": "cc.Size", @@ -17439,11 +17161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 852 + "__id__": 840 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 868 }, "_alignFlags": 45, "_target": null, @@ -17475,11 +17197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 852 + "__id__": 840 }, "_enabled": true, "__prefab": { - "__id__": 882 + "__id__": 870 }, "_id": "" }, @@ -17510,23 +17232,23 @@ }, "_children": [ { - "__id__": 885 + "__id__": 873 }, { - "__id__": 891 + "__id__": 879 }, { - "__id__": 907 + "__id__": 895 } ], "_active": false, "_components": [ { - "__id__": 913 + "__id__": 901 } ], "_prefab": { - "__id__": 915 + "__id__": 903 }, "_lpos": { "__type__": "cc.Vec3", @@ -17563,20 +17285,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 884 + "__id__": 872 }, "_children": [], "_active": true, "_components": [ { - "__id__": 886 + "__id__": 874 }, { - "__id__": 888 + "__id__": 876 } ], "_prefab": { - "__id__": 890 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -17613,11 +17335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 873 }, "_enabled": true, "__prefab": { - "__id__": 887 + "__id__": 875 }, "_contentSize": { "__type__": "cc.Size", @@ -17641,11 +17363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 873 }, "_enabled": true, "__prefab": { - "__id__": 889 + "__id__": 877 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17699,24 +17421,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 884 + "__id__": 872 }, "_children": [ { - "__id__": 892 + "__id__": 880 }, { - "__id__": 898 + "__id__": 886 } ], "_active": true, "_components": [ { - "__id__": 904 + "__id__": 892 } ], "_prefab": { - "__id__": 906 + "__id__": 894 }, "_lpos": { "__type__": "cc.Vec3", @@ -17753,20 +17475,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 891 + "__id__": 879 }, "_children": [], "_active": true, "_components": [ { - "__id__": 893 + "__id__": 881 }, { - "__id__": 895 + "__id__": 883 } ], "_prefab": { - "__id__": 897 + "__id__": 885 }, "_lpos": { "__type__": "cc.Vec3", @@ -17803,11 +17525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 892 + "__id__": 880 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 882 }, "_contentSize": { "__type__": "cc.Size", @@ -17831,11 +17553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 892 + "__id__": 880 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 884 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17889,20 +17611,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 891 + "__id__": 879 }, "_children": [], "_active": false, "_components": [ { - "__id__": 899 + "__id__": 887 }, { - "__id__": 901 + "__id__": 889 } ], "_prefab": { - "__id__": 903 + "__id__": 891 }, "_lpos": { "__type__": "cc.Vec3", @@ -17939,11 +17661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 898 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 900 + "__id__": 888 }, "_contentSize": { "__type__": "cc.Size", @@ -17967,11 +17689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 898 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 890 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18025,11 +17747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 891 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 905 + "__id__": 893 }, "_contentSize": { "__type__": "cc.Size", @@ -18066,20 +17788,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 884 + "__id__": 872 }, "_children": [], "_active": true, "_components": [ { - "__id__": 908 + "__id__": 896 }, { - "__id__": 910 + "__id__": 898 } ], "_prefab": { - "__id__": 912 + "__id__": 900 }, "_lpos": { "__type__": "cc.Vec3", @@ -18116,11 +17838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 895 }, "_enabled": true, "__prefab": { - "__id__": 909 + "__id__": 897 }, "_contentSize": { "__type__": "cc.Size", @@ -18144,11 +17866,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 895 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 899 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18202,11 +17924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 884 + "__id__": 872 }, "_enabled": true, "__prefab": { - "__id__": 914 + "__id__": 902 }, "_contentSize": { "__type__": "cc.Size", @@ -18247,7 +17969,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 917 + "__id__": 905 }, "_contentSize": { "__type__": "cc.Size", @@ -18275,7 +17997,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 919 + "__id__": 907 }, "_alignFlags": 45, "_target": null, @@ -18311,7 +18033,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 909 }, "_id": "" }, @@ -18329,7 +18051,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 923 + "__id__": 911 }, "_type": 0, "_inverted": false, @@ -18351,7 +18073,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 925 + "__id__": 913 }, "_id": "" }, @@ -18369,7 +18091,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 927 + "__id__": 915 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18418,16 +18140,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 621 + "__id__": 609 }, { - "__id__": 573 + "__id__": 561 }, { - "__id__": 543 + "__id__": 531 }, { - "__id__": 516 + "__id__": 504 }, { "__id__": 412 diff --git a/assets/bundles/popBattle/battleGameResult/prefab/BattleFail.prefab b/assets/bundles/popBattle/battleGameResult/prefab/BattleFail.prefab index 1f4d924..4bdc561 100644 --- a/assets/bundles/popBattle/battleGameResult/prefab/BattleFail.prefab +++ b/assets/bundles/popBattle/battleGameResult/prefab/BattleFail.prefab @@ -2320,7 +2320,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, + "width": 600, "height": 10 }, "_anchorPoint": { diff --git a/assets/res/battleGame/texture/ui/召唤icon.png b/assets/res/battleGame/texture/ui/召唤icon.png deleted file mode 100644 index 845197f97d5ba4c55153d154c1159c352b9d211c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2530 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 kGClbfE|o3>&COAmW4)p+4>e3oIRF3v diff --git a/assets/res/battleGame/texture/ui/召唤按钮-亮色.png.meta b/assets/res/battleGame/texture/ui/召唤按钮-亮色.png.meta deleted file mode 100644 index 4b7cc09..0000000 --- a/assets/res/battleGame/texture/ui/召唤按钮-亮色.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "f769484a-5719-4d9e-a862-223c5a7e2aed", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "f769484a-5719-4d9e-a862-223c5a7e2aed@6c48a", - "displayName": "召唤按钮-亮色", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "f769484a-5719-4d9e-a862-223c5a7e2aed", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "f769484a-5719-4d9e-a862-223c5a7e2aed@f9941", - "displayName": "召唤按钮-亮色", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 165, - "height": 87, - "rawWidth": 165, - "rawHeight": 87, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -82.5, - -43.5, - 0, - 82.5, - -43.5, - 0, - -82.5, - 43.5, - 0, - 82.5, - 43.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 87, - 165, - 87, - 0, - 0, - 165, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -82.5, - -43.5, - 0 - ], - "maxPos": [ - 82.5, - 43.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "f769484a-5719-4d9e-a862-223c5a7e2aed@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "f769484a-5719-4d9e-a862-223c5a7e2aed@6c48a" - } -} diff --git a/assets/res/battleGame/texture/ui/召唤按钮-暗色.png b/assets/res/battleGame/texture/ui/召唤按钮-暗色.png deleted file mode 100644 index 221f4039964d41d66c4c2c1d802af1aca886f1c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2750 zcmdT`i96KY7q^olW%mvu*@f)VU<|_`%OoXBNm)`tnv#)y-_m5seC;#LFccv%mR_)uN zGFJP_pd$vbc^X?AGckQkJ^lM0JA*R^+QT4B75$)PCMH%UTdNzU4CnvLIQhHBkctV_ z!8}(6VoZQoD3D|cq}pI!sA67eV1m^#A)1)ix|lG1OoRatX$V9a0SV?nvK0oYj6q(; zAXP9(Rm=-D%u9x;V_sdsptLa|TA0^*n24*G@T-_eFc57FL_>f$Qy>8b#G3($7C<}< zNQ484mOzRXkYWv_TnAEYFwd2MR9k6jDJT@8p`qT}(>^sh!pC=(fG>7%uy6SC35g7h zi;WZz;3q`st(S%gu zMPKUswKBiGwL+zkd%D}g!(P?meLOwydwAT<1+wyTv#qV+3&#X%WARIeP6+w`@_&79lmj%7W|#Kb9V0X4qiHQkqky!F;m;G3bD`Gr$l z(u#8}qJ74`(S}^1G_K%ue6AY*o3yAHjMeyk1 z^7A8?GkjL9Ao67pGmU;qy@b>}NXk%S3e_k3>26H9>DdYDq(eqfBnJH8Kf7`9l@T+!3!G2T4rKVN6PfkkM{!t zwlYbfx$wq?*-0K7HoMcf zq!<4l;=v!Lm~hU#cu|22AC{5+hZ(9=6P~>jvh_0F$=aitr2sCYmYQp0AY*44*UO^0 zuz&x|wG)-}bT_btktp_5nh6=<##gG*sLUcJ4;LX_@K!rC4Tt~S*ZpCW$m4Xf)v!2h zxz&bi;x9Eq6T?I`;i1sn(P2+!t+=Z5PovBd+3lSF$q#^BgxxUsrNKRDMGTh5L%});nTu3cmkRc)--?xJ}gU7KCbn zfPsDttB`M48t|a`ZaqbrpIbX4t$Y z_fLflhIl9>GQ>;pErZ+qxHtTlsr#1SpGl9iKtC%0yJPEx^2g`jhz`^%D3$Jxxusv2 z;2${h&9BJ$emf6aBP>&bcT{O~o+~H!H>sHSoLXYxyJe1NUe&DMcQJNH7}D>pq#XHz zt@mDAru7S{2f~^Le^j7=*RsW!6_NZGZPJAUQ&Ic&?}W0Wq*kNYuEo-Jv~*z1*FD2%lu9eaq4ZyTRm zX>}}TmRz4$v9q<5eCz%6TYc!zcFe=Q_2zqPA54I&XGPL7DAkLOL%}--JG}N)=h}mb z!{P+9=H5OkX)`DH&0wXQt1IqetO*^2v*WE32q5e2x?0er(X&BZLpQ7L^el^_5@{QW z+b6RzJAI+xX0oH7?~C~L$orVbtB=3@B7sqSG&L+T_$JA)Wb{SK|6lPoN_))YV1&KiJb$7+aK2WQ5Nng2JcQA$eAq{& zm4f+LkfvDCn})RCzdwtYMylxeS>a8^zyy&jLix=mV}~9*4;mQ@!D0 zkRqG*o?p=XAFJK>Gw=S^t;DFg@H1Ybz{fH)TgolP;%L8%p1h_Fi7O7gH)RMF1xZSr fkD<3V$tUdghq@<85h4cv`)FF2UWZmd?ne9v0i+uv diff --git a/assets/res/battleGame/texture/ui/召唤按钮-暗色.png.meta b/assets/res/battleGame/texture/ui/召唤按钮-暗色.png.meta deleted file mode 100644 index 367a005..0000000 --- a/assets/res/battleGame/texture/ui/召唤按钮-暗色.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef@6c48a", - "displayName": "召唤按钮-暗色", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef@f9941", - "displayName": "召唤按钮-暗色", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 165, - "height": 87, - "rawWidth": 165, - "rawHeight": 87, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -82.5, - -43.5, - 0, - 82.5, - -43.5, - 0, - -82.5, - 43.5, - 0, - 82.5, - 43.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 87, - 165, - 87, - 0, - 0, - 165, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -82.5, - -43.5, - 0 - ], - "maxPos": [ - 82.5, - 43.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "35f0a7c9-87e4-45bf-966c-53b46a0fdbef@6c48a" - } -} diff --git a/assets/res/battleGame/texture/ui/召唤按钮-橙灰.png b/assets/res/battleGame/texture/ui/召唤按钮-橙灰.png deleted file mode 100644 index 221f4039964d41d66c4c2c1d802af1aca886f1c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2750 zcmdT`i96KY7q^olW%mvu*@f)VU<|_`%OoXBNm)`tnv#)y-_m5seC;#LFccv%mR_)uN zGFJP_pd$vbc^X?AGckQkJ^lM0JA*R^+QT4B75$)PCMH%UTdNzU4CnvLIQhHBkctV_ z!8}(6VoZQoD3D|cq}pI!sA67eV1m^#A)1)ix|lG1OoRatX$V9a0SV?nvK0oYj6q(; zAXP9(Rm=-D%u9x;V_sdsptLa|TA0^*n24*G@T-_eFc57FL_>f$Qy>8b#G3($7C<}< zNQ484mOzRXkYWv_TnAEYFwd2MR9k6jDJT@8p`qT}(>^sh!pC=(fG>7%uy6SC35g7h zi;WZz;3q`st(S%gu zMPKUswKBiGwL+zkd%D}g!(P?meLOwydwAT<1+wyTv#qV+3&#X%WARIeP6+w`@_&79lmj%7W|#Kb9V0X4qiHQkqky!F;m;G3bD`Gr$l z(u#8}qJ74`(S}^1G_K%ue6AY*o3yAHjMeyk1 z^7A8?GkjL9Ao67pGmU;qy@b>}NXk%S3e_k3>26H9>DdYDq(eqfBnJH8Kf7`9l@T+!3!G2T4rKVN6PfkkM{!t zwlYbfx$wq?*-0K7HoMcf zq!<4l;=v!Lm~hU#cu|22AC{5+hZ(9=6P~>jvh_0F$=aitr2sCYmYQp0AY*44*UO^0 zuz&x|wG)-}bT_btktp_5nh6=<##gG*sLUcJ4;LX_@K!rC4Tt~S*ZpCW$m4Xf)v!2h zxz&bi;x9Eq6T?I`;i1sn(P2+!t+=Z5PovBd+3lSF$q#^BgxxUsrNKRDMGTh5L%});nTu3cmkRc)--?xJ}gU7KCbn zfPsDttB`M48t|a`ZaqbrpIbX4t$Y z_fLflhIl9>GQ>;pErZ+qxHtTlsr#1SpGl9iKtC%0yJPEx^2g`jhz`^%D3$Jxxusv2 z;2${h&9BJ$emf6aBP>&bcT{O~o+~H!H>sHSoLXYxyJe1NUe&DMcQJNH7}D>pq#XHz zt@mDAru7S{2f~^Le^j7=*RsW!6_NZGZPJAUQ&Ic&?}W0Wq*kNYuEo-Jv~*z1*FD2%lu9eaq4ZyTRm zX>}}TmRz4$v9q<5eCz%6TYc!zcFe=Q_2zqPA54I&XGPL7DAkLOL%}--JG}N)=h}mb z!{P+9=H5OkX)`DH&0wXQt1IqetO*^2v*WE32q5e2x?0er(X&BZLpQ7L^el^_5@{QW z+b6RzJAI+xX0oH7?~C~L$orVbtB=3@B7sqSG&L+T_$JA)Wb{SK|6lPoN_))YV1&KiJb$7+aK2WQ5Nng2JcQA$eAq{& zm4f+LkfvDCn})RCzdwtYMylxeS>a8^zyy&jLix=mV}~9*4;mQ@!D0 zkRqG*o?p=XAFJK>Gw=S^t;DFg@H1Ybz{fH)TgolP;%L8%p1h_Fi7O7gH)RMF1xZSr fkD<3V$tUdghq@<85h4cv`)FF2UWZmd?ne9v0i+uv diff --git a/assets/res/battleGame/texture/ui/召唤按钮-橙灰.png.meta b/assets/res/battleGame/texture/ui/召唤按钮-橙灰.png.meta deleted file mode 100644 index 8849507..0000000 --- a/assets/res/battleGame/texture/ui/召唤按钮-橙灰.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "58f3d519-fd0a-484c-947b-79a5b1f74307", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "58f3d519-fd0a-484c-947b-79a5b1f74307@6c48a", - "displayName": "召唤按钮-橙灰", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "58f3d519-fd0a-484c-947b-79a5b1f74307", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "58f3d519-fd0a-484c-947b-79a5b1f74307@f9941", - "displayName": "召唤按钮-橙灰", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 165, - "height": 87, - "rawWidth": 165, - "rawHeight": 87, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -82.5, - -43.5, - 0, - 82.5, - -43.5, - 0, - -82.5, - 43.5, - 0, - 82.5, - 43.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 87, - 165, - 87, - 0, - 0, - 165, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -82.5, - -43.5, - 0 - ], - "maxPos": [ - 82.5, - 43.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "58f3d519-fd0a-484c-947b-79a5b1f74307@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "58f3d519-fd0a-484c-947b-79a5b1f74307@6c48a" - } -} diff --git a/assets/script/ui/BattleGame/UIBattleGame.ts b/assets/script/ui/BattleGame/UIBattleGame.ts index 07315d8..98b76d6 100644 --- a/assets/script/ui/BattleGame/UIBattleGame.ts +++ b/assets/script/ui/BattleGame/UIBattleGame.ts @@ -4,7 +4,7 @@ // time: Tue Aug 18 2026 // desc: 战斗界面 — 地图、出怪、背包刷新（召唤） //********************* -import { _decorator, find, game, Label, Node, Tween, tween, v3, Vec3, sp } from 'cc'; +import { _decorator, find, game, Label, Node, Sprite, Tween, tween, v3, Vec3, sp } from 'cc'; import { Auto_BattleGame } from './Auto_BattleGame'; import { CocosBattleMapHost } from '../../battle/map/CocosBattleMapHost'; import { applyMapTopologyToSession } from '../../battle/map/importTopologyFromMapManager'; @@ -266,7 +266,7 @@ export class UIBattleGame extends Auto_BattleGame { this._ensureOwnedDesc(); this._ensureOtherOwnedDesc(); this._linkSkillDescPeers(); - this._showRefreshBg1(); + this._showRefreshBg1(this._isRefreshGoldEnough()); this._disableRefreshBreathe(); this.btnRefresh?.getScale(this._refreshBtnScaleHome); this._lbWaveTip = this.ui_nextWaveTime?.getChildByName('lb1')?.getComponent(Label) ?? null; @@ -1064,8 +1064,8 @@ export class UIBattleGame extends Auto_BattleGame { if (this.lb_RefreshNeed?.isValid) { this.lb_RefreshNeed.string = `${cost}`; } - this._showRefreshBg1(); const enough = cost <= 0 || gold >= cost; + this._showRefreshBg1(enough); this._syncRefreshBounce(enough); } @@ -1098,8 +1098,24 @@ export class UIBattleGame extends Auto_BattleGame { if (node?.isValid && node.active !== active) node.active = active; } - /** btnRefresh 只显示 bg1，隐藏进度底 bg2 和可刷新底 bg3 */ - private _showRefreshBg1(): void { + /** + * 当前金币是否够付一次召唤。 + */ + private _isRefreshGoldEnough(): boolean { + const battle = this._battle; + if (!battle) return false; + const gold = battle.localGold; + const cost = battle.bagSession + ? battle.bagSession.normalRefreshCost + : getDiscountedBagNormalRefreshCost(0, resolveCarriedSummonCostReduceWan().reduceWan); + return cost <= 0 || gold >= cost; + } + + /** + * btnRefresh 只显示 bg1，隐藏进度底 bg2 和可刷新底 bg3。金币不够时 bg1 置灰。 + * @param enough 金币是否够付一次召唤 + */ + private _showRefreshBg1(enough: boolean): void { const btn = this.btnRefresh; if (!btn?.isValid) return; const bg1 = btn.getChildByName('bg1'); @@ -1107,8 +1123,15 @@ export class UIBattleGame extends Auto_BattleGame { const bg3 = btn.getChildByName('bg3'); if (!bg1?.isValid) { console.log('[UIBattleGame] btnRefresh 缺少 bg1'); + } else { + this._setNodeActive(bg1, true); + const sp = bg1.getComponent(Sprite); + if (!sp) { + console.log('[UIBattleGame] btnRefresh bg1 缺少 Sprite'); + } else if (sp.grayscale === enough) { + sp.grayscale = !enough; + } } - this._setNodeActive(bg1, true); if (bg2?.isValid) Tween.stopAllByTarget(bg2); this._setNodeActive(bg2, false); this._setNodeActive(bg3, false);