diff --git a/assets/bundles/battleGame/prefab/BattleGame.prefab b/assets/bundles/battleGame/prefab/BattleGame.prefab index d4886e8..8948f8f 100644 --- a/assets/bundles/battleGame/prefab/BattleGame.prefab +++ b/assets/bundles/battleGame/prefab/BattleGame.prefab @@ -46,32 +46,35 @@ "__id__": 189 }, { - "__id__": 698 + "__id__": 696 }, { - "__id__": 774 + "__id__": 772 }, { - "__id__": 780 + "__id__": 778 }, { - "__id__": 784 + "__id__": 782 }, { - "__id__": 798 + "__id__": 796 }, { - "__id__": 826 + "__id__": 824 }, { - "__id__": 854 + "__id__": 852 }, { - "__id__": 886 + "__id__": 884 } ], "_active": true, "_components": [ + { + "__id__": 916 + }, { "__id__": 918 }, @@ -86,13 +89,10 @@ }, { "__id__": 926 - }, - { - "__id__": 928 } ], "_prefab": { - "__id__": 930 + "__id__": 928 }, "_lpos": { "__type__": "cc.Vec3", @@ -951,7 +951,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 100, + "y": 150, "z": 0 }, "_lrot": { @@ -3949,19 +3949,19 @@ "_active": true, "_components": [ { - "__id__": 693 + "__id__": 691 }, { - "__id__": 695 + "__id__": 693 } ], "_prefab": { - "__id__": 697 + "__id__": 695 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -800, + "y": -685, "z": 0 }, "_lrot": { @@ -4009,41 +4009,41 @@ "__id__": 223 }, { - "__id__": 409 + "__id__": 425 }, { - "__id__": 415 + "__id__": 431 }, { - "__id__": 477 + "__id__": 475 }, { - "__id__": 517 + "__id__": 515 }, { - "__id__": 556 + "__id__": 554 }, { - "__id__": 602 + "__id__": 600 }, { - "__id__": 622 + "__id__": 620 }, { - "__id__": 642 + "__id__": 640 }, { - "__id__": 648 + "__id__": 646 } ], "_active": true, "_components": [ { - "__id__": 690 + "__id__": 688 } ], "_prefab": { - "__id__": 692 + "__id__": 690 }, "_lpos": { "__type__": "cc.Vec3", @@ -4867,19 +4867,25 @@ }, { "__id__": 396 + }, + { + "__id__": 404 + }, + { + "__id__": 412 } ], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 420 }, { - "__id__": 406 + "__id__": 422 } ], "_prefab": { - "__id__": 408 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -6828,7 +6834,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.TargetInfo", @@ -6844,7 +6850,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.TargetInfo", @@ -7412,6 +7418,230 @@ "z": 0 } }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 223 + }, + "_prefab": { + "__id__": 405 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 404 + }, + "asset": { + "__uuid__": "f4048a63-6fe1-441c-9449-c69076b953de", + "__expectedType__": "cc.Prefab" + }, + "fileId": "6bd0awS7RFtK42rXtq0akC", + "instance": { + "__id__": 406 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "cd/oWJZYFIS5YrChZg/FH6", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 407 + }, + { + "__id__": 409 + }, + { + "__id__": 410 + }, + { + "__id__": 411 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 408 + }, + "propertyPath": [ + "_name" + ], + "value": "grid23" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6bd0awS7RFtK42rXtq0akC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 408 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 201.5, + "y": -81, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 408 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 408 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 223 + }, + "_prefab": { + "__id__": 413 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 412 + }, + "asset": { + "__uuid__": "f4048a63-6fe1-441c-9449-c69076b953de", + "__expectedType__": "cc.Prefab" + }, + "fileId": "6bd0awS7RFtK42rXtq0akC", + "instance": { + "__id__": 414 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "9atHehqXJJzrsYHErD6lpt", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 415 + }, + { + "__id__": 417 + }, + { + "__id__": 418 + }, + { + "__id__": 419 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_name" + ], + "value": "grid24" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6bd0awS7RFtK42rXtq0akC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 282.5, + "y": -81, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 416 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -7422,7 +7652,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 421 }, "_contentSize": { "__type__": "cc.Size", @@ -7450,7 +7680,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 423 }, "_resizeMode": 1, "_layoutType": 3, @@ -7503,19 +7733,19 @@ "_active": true, "_components": [ { - "__id__": 410 + "__id__": 426 }, { - "__id__": 412 + "__id__": 428 } ], "_prefab": { - "__id__": 414 + "__id__": 430 }, "_lpos": { "__type__": "cc.Vec3", - "x": -284.634, - "y": 68.825, + "x": -172.126, + "y": -45.154, "z": 0 }, "_lrot": { @@ -7547,11 +7777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 425 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 427 }, "_contentSize": { "__type__": "cc.Size", @@ -7575,11 +7805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 409 + "__id__": 425 }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 429 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7637,46 +7867,37 @@ }, "_children": [ { - "__id__": 416 - }, - { - "__id__": 422 - }, - { - "__id__": 428 - }, - { - "__id__": 434 + "__id__": 432 }, { - "__id__": 440 + "__id__": 438 }, { - "__id__": 446 + "__id__": 444 }, { - "__id__": 452 + "__id__": 450 } ], "_active": true, "_components": [ { - "__id__": 470 + "__id__": 468 }, { - "__id__": 472 + "__id__": 470 }, { - "__id__": 474 + "__id__": 472 } ], "_prefab": { - "__id__": 476 + "__id__": 474 }, "_lpos": { "__type__": "cc.Vec3", - "x": 239.081, - "y": 64.841, + "x": 6.308, + "y": -42.298, "z": 0 }, "_lrot": { @@ -7708,20 +7929,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 431 }, "_children": [], "_active": true, "_components": [ { - "__id__": 417 + "__id__": 433 }, { - "__id__": 419 + "__id__": 435 } ], "_prefab": { - "__id__": 421 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -7758,16 +7979,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 434 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 87 + "width": 208, + "height": 97 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7786,11 +8007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 436 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7803,7 +8024,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "58f3d519-fd0a-484c-947b-79a5b1f74307@f9941", + "__uuid__": "9b0b19fe-bf16-49b2-a553-41ad91b99e85@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -7844,20 +8065,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 431 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 423 + "__id__": 439 }, { - "__id__": 425 + "__id__": 441 } ], "_prefab": { - "__id__": 427 + "__id__": 443 }, "_lpos": { "__type__": "cc.Vec3", @@ -7894,11 +8115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 422 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 440 }, "_contentSize": { "__type__": "cc.Size", @@ -7922,11 +8143,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 422 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 442 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7980,20 +8201,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 431 }, "_children": [], "_active": false, "_components": [ { - "__id__": 429 + "__id__": 445 }, { - "__id__": 431 + "__id__": 447 } ], "_prefab": { - "__id__": 433 + "__id__": 449 }, "_lpos": { "__type__": "cc.Vec3", @@ -8030,11 +8251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 446 }, "_contentSize": { "__type__": "cc.Size", @@ -8058,11 +8279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 448 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8110,446 +8331,38 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "召唤", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 415 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 435 - }, - { - "__id__": 437 - } - ], - "_prefab": { - "__id__": 439 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -3, - "y": 13.249, - "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__": 434 - }, - "_enabled": true, - "__prefab": { - "__id__": 436 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 58, - "height": 29 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2bTryg8xKF5MRT/idGFwS" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 434 - }, - "_enabled": true, - "__prefab": { - "__id__": 438 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "9b0b19fe-bf16-49b2-a553-41ad91b99e85@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": "a33KZKkaROToMPHefapFUJ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "aedTLyz4VCeKO4EhqZNmzP", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "iconBg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 415 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 441 - }, - { - "__id__": 443 - } - ], - "_prefab": { - "__id__": 445 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -16.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.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 440 - }, - "_enabled": true, - "__prefab": { - "__id__": 442 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 79, - "height": 24 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "06qWqh2XNKRKExkL/uYGwh" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 440 - }, - "_enabled": true, - "__prefab": { - "__id__": 444 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "a715d5e0-1382-4423-a14d-cd8adbe8aa1f@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": "cau8LRwutISq5t5EwsQMUR" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d7KGKD3zxBsJxew98W+Bdm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "召唤icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 415 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 447 - }, - { - "__id__": 449 - } - ], - "_prefab": { - "__id__": 451 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 70.63, - "y": 27, - "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__": 446 - }, - "_enabled": true, - "__prefab": { - "__id__": 448 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 48, - "height": 49 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0b3bG8mhRBEJKYqC+dEo6B" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 446 - }, - "_enabled": true, - "__prefab": { - "__id__": 450 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "95339c7d-4211-4d61-994e-276be03485c6@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": "fewG7V0b9EcLCKJRoX7Qn3" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c69rAxtVZO3bsWcPbyOFAn", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "lay", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 431 }, "_children": [ { - "__id__": 453 + "__id__": 451 }, { - "__id__": 459 + "__id__": 457 } ], "_active": true, "_components": [ { - "__id__": 465 + "__id__": 463 }, { - "__id__": 467 + "__id__": 465 } ], "_prefab": { - "__id__": 469 + "__id__": 467 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -16.453, + "x": -10, + "y": -23.453, "z": 0 }, "_lrot": { @@ -8581,20 +8394,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 452 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 454 + "__id__": 452 }, { - "__id__": 456 + "__id__": 454 } ], "_prefab": { - "__id__": 458 + "__id__": 456 }, "_lpos": { "__type__": "cc.Vec3", @@ -8631,11 +8444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -8659,11 +8472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 453 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8717,20 +8530,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 452 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 460 + "__id__": 458 }, { - "__id__": 462 + "__id__": 460 } ], "_prefab": { - "__id__": 464 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -8767,11 +8580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 459 }, "_contentSize": { "__type__": "cc.Size", @@ -8795,11 +8608,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 457 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 461 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8876,11 +8689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 452 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 464 }, "_contentSize": { "__type__": "cc.Size", @@ -8904,11 +8717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 452 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 466 }, "_resizeMode": 1, "_layoutType": 1, @@ -8955,16 +8768,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 469 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 87 + "width": 208, + "height": 97 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8983,11 +8796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 473 + "__id__": 471 }, "clickEvents": [], "_interactable": true, @@ -9039,11 +8852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 473 }, "_id": "" }, @@ -9074,23 +8887,26 @@ }, "_children": [ { - "__id__": 478 + "__id__": 476 }, { - "__id__": 484 + "__id__": 482 }, { - "__id__": 490 + "__id__": 488 }, { - "__id__": 496 + "__id__": 494 }, { - "__id__": 502 + "__id__": 500 } ], "_active": true, "_components": [ + { + "__id__": 506 + }, { "__id__": 508 }, @@ -9099,13 +8915,10 @@ }, { "__id__": 512 - }, - { - "__id__": 514 } ], "_prefab": { - "__id__": 516 + "__id__": 514 }, "_lpos": { "__type__": "cc.Vec3", @@ -9142,20 +8955,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 477 + "__id__": 475 }, "_children": [], "_active": true, "_components": [ { - "__id__": 479 + "__id__": 477 }, { - "__id__": 481 + "__id__": 479 } ], "_prefab": { - "__id__": 483 + "__id__": 481 }, "_lpos": { "__type__": "cc.Vec3", @@ -9192,11 +9005,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 478 }, "_contentSize": { "__type__": "cc.Size", @@ -9220,11 +9033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 480 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9278,20 +9091,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 477 + "__id__": 475 }, "_children": [], "_active": true, "_components": [ { - "__id__": 485 + "__id__": 483 }, { - "__id__": 487 + "__id__": 485 } ], "_prefab": { - "__id__": 489 + "__id__": 487 }, "_lpos": { "__type__": "cc.Vec3", @@ -9328,11 +9141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 484 }, "_contentSize": { "__type__": "cc.Size", @@ -9356,11 +9169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 484 + "__id__": 482 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 486 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9437,20 +9250,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 477 + "__id__": 475 }, "_children": [], "_active": true, "_components": [ { - "__id__": 491 + "__id__": 489 }, { - "__id__": 493 + "__id__": 491 } ], "_prefab": { - "__id__": 495 + "__id__": 493 }, "_lpos": { "__type__": "cc.Vec3", @@ -9487,11 +9300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 490 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 490 }, "_contentSize": { "__type__": "cc.Size", @@ -9515,11 +9328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 490 + "__id__": 488 }, "_enabled": true, "__prefab": { - "__id__": 494 + "__id__": 492 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9573,20 +9386,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 477 + "__id__": 475 }, "_children": [], "_active": true, "_components": [ { - "__id__": 497 + "__id__": 495 }, { - "__id__": 499 + "__id__": 497 } ], "_prefab": { - "__id__": 501 + "__id__": 499 }, "_lpos": { "__type__": "cc.Vec3", @@ -9623,11 +9436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 496 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 496 }, "_contentSize": { "__type__": "cc.Size", @@ -9651,11 +9464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 496 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 498 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9732,20 +9545,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 477 + "__id__": 475 }, "_children": [], "_active": true, "_components": [ { - "__id__": 503 + "__id__": 501 }, { - "__id__": 505 + "__id__": 503 } ], "_prefab": { - "__id__": 507 + "__id__": 505 }, "_lpos": { "__type__": "cc.Vec3", @@ -9782,11 +9595,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 500 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 502 }, "_contentSize": { "__type__": "cc.Size", @@ -9810,11 +9623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 502 + "__id__": 500 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 504 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9891,11 +9704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 477 + "__id__": 475 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 507 }, "_contentSize": { "__type__": "cc.Size", @@ -9919,11 +9732,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 477 + "__id__": 475 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 509 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9964,11 +9777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 477 + "__id__": 475 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 511 }, "clickEvents": [], "_interactable": true, @@ -10020,11 +9833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 477 + "__id__": 475 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 513 }, "_id": "" }, @@ -10055,20 +9868,20 @@ }, "_children": [ { - "__id__": 518 + "__id__": 516 }, { - "__id__": 545 + "__id__": 543 } ], "_active": true, "_components": [ { - "__id__": 553 + "__id__": 551 } ], "_prefab": { - "__id__": 555 + "__id__": 553 }, "_lpos": { "__type__": "cc.Vec3", @@ -10103,17 +9916,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 517 + "__id__": 515 }, "_prefab": { - "__id__": 519 + "__id__": 517 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 518 + "__id__": 516 }, "asset": { "__uuid__": "af9aa6b3-9c54-4fa4-b599-0c91f7442ed2", @@ -10121,7 +9934,7 @@ }, "fileId": "1aMAzMzc5NTribLGuHEoWV", "instance": { - "__id__": 520 + "__id__": 518 }, "targetOverrides": null }, @@ -10134,6 +9947,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 519 + }, { "__id__": 521 }, @@ -10166,9 +9982,6 @@ }, { "__id__": 541 - }, - { - "__id__": 543 } ], "removedComponents": [] @@ -10176,7 +9989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 522 + "__id__": 520 }, "propertyPath": [ "_name" @@ -10192,7 +10005,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 524 + "__id__": 522 }, "propertyPath": [ "_lpos" @@ -10213,7 +10026,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 526 + "__id__": 524 }, "propertyPath": [ "_lrot" @@ -10235,7 +10048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 528 + "__id__": 526 }, "propertyPath": [ "_euler" @@ -10256,7 +10069,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 530 + "__id__": 528 }, "propertyPath": [ "_active" @@ -10272,7 +10085,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 530 }, "propertyPath": [ "_fillStart" @@ -10288,7 +10101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 534 + "__id__": 532 }, "propertyPath": [ "_fillRange" @@ -10304,7 +10117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 536 + "__id__": 534 }, "propertyPath": [ "_lrot" @@ -10326,7 +10139,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 538 + "__id__": 536 }, "propertyPath": [ "_euler" @@ -10347,7 +10160,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 540 + "__id__": 538 }, "propertyPath": [ "_lscale" @@ -10368,7 +10181,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 542 + "__id__": 540 }, "propertyPath": [ "_fillCenter" @@ -10388,7 +10201,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 544 + "__id__": 542 }, "propertyPath": [ "_fillType" @@ -10405,17 +10218,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 517 + "__id__": 515 }, "_prefab": { - "__id__": 546 + "__id__": 544 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 545 + "__id__": 543 }, "asset": { "__uuid__": "af9aa6b3-9c54-4fa4-b599-0c91f7442ed2", @@ -10423,7 +10236,7 @@ }, "fileId": "1aMAzMzc5NTribLGuHEoWV", "instance": { - "__id__": 547 + "__id__": 545 }, "targetOverrides": null }, @@ -10437,16 +10250,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 548 + "__id__": 546 }, { - "__id__": 550 + "__id__": 548 }, { - "__id__": 551 + "__id__": 549 }, { - "__id__": 552 + "__id__": 550 } ], "removedComponents": [] @@ -10454,7 +10267,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 549 + "__id__": 547 }, "propertyPath": [ "_name" @@ -10470,7 +10283,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 549 + "__id__": 547 }, "propertyPath": [ "_lpos" @@ -10485,7 +10298,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 549 + "__id__": 547 }, "propertyPath": [ "_lrot" @@ -10501,7 +10314,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 549 + "__id__": 547 }, "propertyPath": [ "_euler" @@ -10519,11 +10332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 517 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 554 + "__id__": 552 }, "_contentSize": { "__type__": "cc.Size", @@ -10564,29 +10377,29 @@ }, "_children": [ { - "__id__": 557 + "__id__": 555 }, { - "__id__": 563 + "__id__": 561 }, { - "__id__": 575 + "__id__": 573 } ], "_active": false, "_components": [ { - "__id__": 595 + "__id__": 593 }, { - "__id__": 597 + "__id__": 595 }, { - "__id__": 599 + "__id__": 597 } ], "_prefab": { - "__id__": 601 + "__id__": 599 }, "_lpos": { "__type__": "cc.Vec3", @@ -10623,20 +10436,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 554 }, "_children": [], "_active": true, "_components": [ { - "__id__": 558 + "__id__": 556 }, { - "__id__": 560 + "__id__": 558 } ], "_prefab": { - "__id__": 562 + "__id__": 560 }, "_lpos": { "__type__": "cc.Vec3", @@ -10673,11 +10486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 557 }, "_contentSize": { "__type__": "cc.Size", @@ -10701,11 +10514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 559 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10759,24 +10572,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 554 }, "_children": [ { - "__id__": 564 + "__id__": 562 } ], "_active": true, "_components": [ { - "__id__": 570 + "__id__": 568 }, { - "__id__": 572 + "__id__": 570 } ], "_prefab": { - "__id__": 574 + "__id__": 572 }, "_lpos": { "__type__": "cc.Vec3", @@ -10813,20 +10626,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 563 + "__id__": 561 }, "_children": [], "_active": true, "_components": [ { - "__id__": 565 + "__id__": 563 }, { - "__id__": 567 + "__id__": 565 } ], "_prefab": { - "__id__": 569 + "__id__": 567 }, "_lpos": { "__type__": "cc.Vec3", @@ -10863,11 +10676,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 562 }, "_enabled": true, "__prefab": { - "__id__": 566 + "__id__": 564 }, "_contentSize": { "__type__": "cc.Size", @@ -10891,11 +10704,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 562 }, "_enabled": true, "__prefab": { - "__id__": 568 + "__id__": 566 }, "_lineHeight": 40, "_string": "", @@ -10942,11 +10755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 561 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 569 }, "_contentSize": { "__type__": "cc.Size", @@ -10970,11 +10783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 561 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 571 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11026,17 +10839,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 556 + "__id__": 554 }, "_prefab": { - "__id__": 576 + "__id__": 574 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 575 + "__id__": 573 }, "asset": { "__uuid__": "834225e5-0107-4dc8-98b5-e203873774ae", @@ -11044,7 +10857,7 @@ }, "fileId": "50SV7PXetCj5ArE9+5F3+9", "instance": { - "__id__": 577 + "__id__": 575 }, "targetOverrides": null }, @@ -11057,17 +10870,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 576 + }, { "__id__": 578 }, { - "__id__": 580 + "__id__": 579 }, { - "__id__": 581 + "__id__": 580 }, { - "__id__": 582 + "__id__": 581 }, { "__id__": 583 @@ -11075,6 +10891,9 @@ { "__id__": 585 }, + { + "__id__": 586 + }, { "__id__": 587 }, @@ -11084,17 +10903,11 @@ { "__id__": 589 }, - { - "__id__": 590 - }, { "__id__": 591 }, { - "__id__": 593 - }, - { - "__id__": 594 + "__id__": 592 } ], "removedComponents": [] @@ -11102,7 +10915,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 579 + "__id__": 577 }, "propertyPath": [ "_name" @@ -11118,7 +10931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 579 + "__id__": 577 }, "propertyPath": [ "_lpos" @@ -11133,7 +10946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 579 + "__id__": 577 }, "propertyPath": [ "_lrot" @@ -11149,7 +10962,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 579 + "__id__": 577 }, "propertyPath": [ "_euler" @@ -11164,7 +10977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_string" @@ -11180,7 +10993,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 586 + "__id__": 584 }, "propertyPath": [ "_contentSize" @@ -11200,7 +11013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_color" @@ -11216,7 +11029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_outlineColor" @@ -11232,7 +11045,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_fontSize" @@ -11242,7 +11055,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_actualFontSize" @@ -11252,7 +11065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 592 + "__id__": 590 }, "propertyPath": [ "key" @@ -11268,7 +11081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_outlineWidth" @@ -11278,7 +11091,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 582 }, "propertyPath": [ "_isItalic" @@ -11291,11 +11104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 594 }, "_contentSize": { "__type__": "cc.Size", @@ -11319,11 +11132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 596 }, "clickEvents": [], "_interactable": true, @@ -11375,11 +11188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 598 }, "_id": "" }, @@ -11410,26 +11223,26 @@ }, "_children": [ { - "__id__": 603 + "__id__": 601 }, { - "__id__": 609 + "__id__": 607 } ], "_active": false, "_components": [ { - "__id__": 615 + "__id__": 613 }, { - "__id__": 617 + "__id__": 615 }, { - "__id__": 619 + "__id__": 617 } ], "_prefab": { - "__id__": 621 + "__id__": 619 }, "_lpos": { "__type__": "cc.Vec3", @@ -11466,20 +11279,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 602 + "__id__": 600 }, "_children": [], "_active": true, "_components": [ { - "__id__": 604 + "__id__": 602 }, { - "__id__": 606 + "__id__": 604 } ], "_prefab": { - "__id__": 608 + "__id__": 606 }, "_lpos": { "__type__": "cc.Vec3", @@ -11516,11 +11329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 603 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 605 + "__id__": 603 }, "_contentSize": { "__type__": "cc.Size", @@ -11544,11 +11357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 603 + "__id__": 601 }, "_enabled": true, "__prefab": { - "__id__": 607 + "__id__": 605 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11602,20 +11415,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 602 + "__id__": 600 }, "_children": [], "_active": false, "_components": [ { - "__id__": 610 + "__id__": 608 }, { - "__id__": 612 + "__id__": 610 } ], "_prefab": { - "__id__": 614 + "__id__": 612 }, "_lpos": { "__type__": "cc.Vec3", @@ -11652,11 +11465,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 609 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 611 + "__id__": 609 }, "_contentSize": { "__type__": "cc.Size", @@ -11680,11 +11493,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 609 + "__id__": 607 }, "_enabled": true, "__prefab": { - "__id__": 613 + "__id__": 611 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11738,11 +11551,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 616 + "__id__": 614 }, "_contentSize": { "__type__": "cc.Size", @@ -11766,11 +11579,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 616 }, "clickEvents": [], "_interactable": true, @@ -11810,7 +11623,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 602 + "__id__": 600 }, "_id": "" }, @@ -11824,11 +11637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 600 }, "_enabled": true, "__prefab": { - "__id__": 620 + "__id__": 618 }, "_id": "" }, @@ -11859,20 +11672,20 @@ }, "_children": [ { - "__id__": 623 + "__id__": 621 } ], "_active": true, "_components": [ { - "__id__": 637 + "__id__": 635 }, { - "__id__": 639 + "__id__": 637 } ], "_prefab": { - "__id__": 641 + "__id__": 639 }, "_lpos": { "__type__": "cc.Vec3", @@ -11907,17 +11720,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 622 + "__id__": 620 }, "_prefab": { - "__id__": 624 + "__id__": 622 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 623 + "__id__": 621 }, "asset": { "__uuid__": "8c3b6798-7d6f-413a-8294-42d192319365", @@ -11925,7 +11738,7 @@ }, "fileId": "72a/87Jc9HLoBBUpzMZMyg", "instance": { - "__id__": 625 + "__id__": 623 }, "targetOverrides": null }, @@ -11938,9 +11751,15 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 624 + }, { "__id__": 626 }, + { + "__id__": 627 + }, { "__id__": 628 }, @@ -11950,17 +11769,11 @@ { "__id__": 630 }, - { - "__id__": 631 - }, { "__id__": 632 }, { "__id__": 634 - }, - { - "__id__": 636 } ], "removedComponents": [] @@ -11968,7 +11781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_name" @@ -11984,7 +11797,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_lpos" @@ -11999,7 +11812,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_lrot" @@ -12015,7 +11828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_euler" @@ -12030,7 +11843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_active" @@ -12040,7 +11853,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 631 }, "propertyPath": [ "_active" @@ -12056,7 +11869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 635 + "__id__": 633 }, "propertyPath": [ "_lscale" @@ -12077,7 +11890,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 625 }, "propertyPath": [ "_lscale" @@ -12095,11 +11908,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 636 }, "_contentSize": { "__type__": "cc.Size", @@ -12123,11 +11936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 638 }, "_resizeMode": 1, "_layoutType": 1, @@ -12180,14 +11993,14 @@ "_active": false, "_components": [ { - "__id__": 643 + "__id__": 641 }, { - "__id__": 645 + "__id__": 643 } ], "_prefab": { - "__id__": 647 + "__id__": 645 }, "_lpos": { "__type__": "cc.Vec3", @@ -12224,11 +12037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 642 }, "_contentSize": { "__type__": "cc.Size", @@ -12252,11 +12065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 640 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 644 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12314,35 +12127,35 @@ }, "_children": [ { - "__id__": 649 + "__id__": 647 }, { - "__id__": 655 + "__id__": 653 }, { - "__id__": 661 + "__id__": 659 }, { - "__id__": 667 + "__id__": 665 }, { - "__id__": 673 + "__id__": 671 }, { - "__id__": 679 + "__id__": 677 } ], "_active": true, "_components": [ { - "__id__": 685 + "__id__": 683 }, { - "__id__": 687 + "__id__": 685 } ], "_prefab": { - "__id__": 689 + "__id__": 687 }, "_lpos": { "__type__": "cc.Vec3", @@ -12379,20 +12192,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": true, "_components": [ { - "__id__": 650 + "__id__": 648 }, { - "__id__": 652 + "__id__": 650 } ], "_prefab": { - "__id__": 654 + "__id__": 652 }, "_lpos": { "__type__": "cc.Vec3", @@ -12429,11 +12242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 649 + "__id__": 647 }, "_enabled": true, "__prefab": { - "__id__": 651 + "__id__": 649 }, "_contentSize": { "__type__": "cc.Size", @@ -12457,11 +12270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 649 + "__id__": 647 }, "_enabled": true, "__prefab": { - "__id__": 653 + "__id__": 651 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12515,20 +12328,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": false, "_components": [ { - "__id__": 656 + "__id__": 654 }, { - "__id__": 658 + "__id__": 656 } ], "_prefab": { - "__id__": 660 + "__id__": 658 }, "_lpos": { "__type__": "cc.Vec3", @@ -12565,11 +12378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 655 + "__id__": 653 }, "_enabled": true, "__prefab": { - "__id__": 657 + "__id__": 655 }, "_contentSize": { "__type__": "cc.Size", @@ -12593,11 +12406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 655 + "__id__": 653 }, "_enabled": true, "__prefab": { - "__id__": 659 + "__id__": 657 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12651,20 +12464,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": true, "_components": [ { - "__id__": 662 + "__id__": 660 }, { - "__id__": 664 + "__id__": 662 } ], "_prefab": { - "__id__": 666 + "__id__": 664 }, "_lpos": { "__type__": "cc.Vec3", @@ -12701,11 +12514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 659 }, "_enabled": true, "__prefab": { - "__id__": 663 + "__id__": 661 }, "_contentSize": { "__type__": "cc.Size", @@ -12729,11 +12542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 659 }, "_enabled": true, "__prefab": { - "__id__": 665 + "__id__": 663 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12787,20 +12600,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": true, "_components": [ { - "__id__": 668 + "__id__": 666 }, { - "__id__": 670 + "__id__": 668 } ], "_prefab": { - "__id__": 672 + "__id__": 670 }, "_lpos": { "__type__": "cc.Vec3", @@ -12837,11 +12650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 667 }, "_contentSize": { "__type__": "cc.Size", @@ -12865,11 +12678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 665 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 669 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12923,20 +12736,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": true, "_components": [ { - "__id__": 674 + "__id__": 672 }, { - "__id__": 676 + "__id__": 674 } ], "_prefab": { - "__id__": 678 + "__id__": 676 }, "_lpos": { "__type__": "cc.Vec3", @@ -12973,11 +12786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 671 }, "_enabled": true, "__prefab": { - "__id__": 675 + "__id__": 673 }, "_contentSize": { "__type__": "cc.Size", @@ -13001,11 +12814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 671 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 675 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13059,20 +12872,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 648 + "__id__": 646 }, "_children": [], "_active": true, "_components": [ { - "__id__": 680 + "__id__": 678 }, { - "__id__": 682 + "__id__": 680 } ], "_prefab": { - "__id__": 684 + "__id__": 682 }, "_lpos": { "__type__": "cc.Vec3", @@ -13109,11 +12922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 679 + "__id__": 677 }, "_enabled": true, "__prefab": { - "__id__": 681 + "__id__": 679 }, "_contentSize": { "__type__": "cc.Size", @@ -13137,11 +12950,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 679 + "__id__": 677 }, "_enabled": true, "__prefab": { - "__id__": 683 + "__id__": 681 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13218,11 +13031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 646 }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 684 }, "_contentSize": { "__type__": "cc.Size", @@ -13246,11 +13059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 646 }, "_enabled": true, "__prefab": { - "__id__": 688 + "__id__": 686 }, "clickEvents": [], "_interactable": true, @@ -13319,7 +13132,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 691 + "__id__": 689 }, "_contentSize": { "__type__": "cc.Size", @@ -13360,7 +13173,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 694 + "__id__": 692 }, "_contentSize": { "__type__": "cc.Size", @@ -13388,7 +13201,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 696 + "__id__": 694 }, "_alignFlags": 4, "_target": null, @@ -13437,41 +13250,44 @@ }, "_children": [ { - "__id__": 699 + "__id__": 697 }, { - "__id__": 705 + "__id__": 703 }, { - "__id__": 711 + "__id__": 709 }, { - "__id__": 717 + "__id__": 715 }, { - "__id__": 723 + "__id__": 721 }, { - "__id__": 729 + "__id__": 727 }, { - "__id__": 735 + "__id__": 733 }, { - "__id__": 741 + "__id__": 739 }, { - "__id__": 747 + "__id__": 745 }, { - "__id__": 753 + "__id__": 751 }, { - "__id__": 759 + "__id__": 757 } ], "_active": false, "_components": [ + { + "__id__": 763 + }, { "__id__": 765 }, @@ -13480,13 +13296,10 @@ }, { "__id__": 769 - }, - { - "__id__": 771 } ], "_prefab": { - "__id__": 773 + "__id__": 771 }, "_lpos": { "__type__": "cc.Vec3", @@ -13523,20 +13336,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 700 + "__id__": 698 }, { - "__id__": 702 + "__id__": 700 } ], "_prefab": { - "__id__": 704 + "__id__": 702 }, "_lpos": { "__type__": "cc.Vec3", @@ -13573,11 +13386,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 697 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 699 }, "_contentSize": { "__type__": "cc.Size", @@ -13601,11 +13414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 699 + "__id__": 697 }, "_enabled": true, "__prefab": { - "__id__": 703 + "__id__": 701 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13659,20 +13472,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 706 + "__id__": 704 }, { - "__id__": 708 + "__id__": 706 } ], "_prefab": { - "__id__": 710 + "__id__": 708 }, "_lpos": { "__type__": "cc.Vec3", @@ -13709,11 +13522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 705 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 707 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -13737,11 +13550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 705 + "__id__": 703 }, "_enabled": true, "__prefab": { - "__id__": 709 + "__id__": 707 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13795,20 +13608,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 712 + "__id__": 710 }, { - "__id__": 714 + "__id__": 712 } ], "_prefab": { - "__id__": 716 + "__id__": 714 }, "_lpos": { "__type__": "cc.Vec3", @@ -13845,11 +13658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 711 }, "_contentSize": { "__type__": "cc.Size", @@ -13873,11 +13686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 709 }, "_enabled": true, "__prefab": { - "__id__": 715 + "__id__": 713 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13931,20 +13744,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 718 + "__id__": 716 }, { - "__id__": 720 + "__id__": 718 } ], "_prefab": { - "__id__": 722 + "__id__": 720 }, "_lpos": { "__type__": "cc.Vec3", @@ -13981,11 +13794,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 717 + "__id__": 715 }, "_enabled": true, "__prefab": { - "__id__": 719 + "__id__": 717 }, "_contentSize": { "__type__": "cc.Size", @@ -14009,11 +13822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 717 + "__id__": 715 }, "_enabled": true, "__prefab": { - "__id__": 721 + "__id__": 719 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14067,20 +13880,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 724 + "__id__": 722 }, { - "__id__": 726 + "__id__": 724 } ], "_prefab": { - "__id__": 728 + "__id__": 726 }, "_lpos": { "__type__": "cc.Vec3", @@ -14117,11 +13930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 723 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 725 + "__id__": 723 }, "_contentSize": { "__type__": "cc.Size", @@ -14145,11 +13958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 723 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 725 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14203,20 +14016,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 730 + "__id__": 728 }, { - "__id__": 732 + "__id__": 730 } ], "_prefab": { - "__id__": 734 + "__id__": 732 }, "_lpos": { "__type__": "cc.Vec3", @@ -14253,11 +14066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 729 }, "_contentSize": { "__type__": "cc.Size", @@ -14281,11 +14094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 733 + "__id__": 731 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14339,20 +14152,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 736 + "__id__": 734 }, { - "__id__": 738 + "__id__": 736 } ], "_prefab": { - "__id__": 740 + "__id__": 738 }, "_lpos": { "__type__": "cc.Vec3", @@ -14389,11 +14202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 735 }, "_contentSize": { "__type__": "cc.Size", @@ -14417,11 +14230,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 737 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14475,20 +14288,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 742 + "__id__": 740 }, { - "__id__": 744 + "__id__": 742 } ], "_prefab": { - "__id__": 746 + "__id__": 744 }, "_lpos": { "__type__": "cc.Vec3", @@ -14525,11 +14338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 739 }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 741 }, "_contentSize": { "__type__": "cc.Size", @@ -14553,11 +14366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 739 }, "_enabled": true, "__prefab": { - "__id__": 745 + "__id__": 743 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14611,20 +14424,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 748 + "__id__": 746 }, { - "__id__": 750 + "__id__": 748 } ], "_prefab": { - "__id__": 752 + "__id__": 750 }, "_lpos": { "__type__": "cc.Vec3", @@ -14661,11 +14474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 747 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 749 + "__id__": 747 }, "_contentSize": { "__type__": "cc.Size", @@ -14689,11 +14502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 747 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 751 + "__id__": 749 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14747,20 +14560,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 754 + "__id__": 752 }, { - "__id__": 756 + "__id__": 754 } ], "_prefab": { - "__id__": 758 + "__id__": 756 }, "_lpos": { "__type__": "cc.Vec3", @@ -14797,11 +14610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 751 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 753 }, "_contentSize": { "__type__": "cc.Size", @@ -14825,11 +14638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 751 }, "_enabled": true, "__prefab": { - "__id__": 757 + "__id__": 755 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14883,20 +14696,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 696 }, "_children": [], "_active": true, "_components": [ { - "__id__": 760 + "__id__": 758 }, { - "__id__": 762 + "__id__": 760 } ], "_prefab": { - "__id__": 764 + "__id__": 762 }, "_lpos": { "__type__": "cc.Vec3", @@ -14933,11 +14746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 759 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 761 + "__id__": 759 }, "_contentSize": { "__type__": "cc.Size", @@ -14961,11 +14774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 759 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 763 + "__id__": 761 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15019,11 +14832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 696 }, "_enabled": true, "__prefab": { - "__id__": 766 + "__id__": 764 }, "_contentSize": { "__type__": "cc.Size", @@ -15047,11 +14860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 696 }, "_enabled": true, "__prefab": { - "__id__": 768 + "__id__": 766 }, "_type": 0, "_inverted": false, @@ -15069,11 +14882,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 696 }, "_enabled": true, "__prefab": { - "__id__": 770 + "__id__": 768 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15115,11 +14928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 696 }, "_enabled": false, "__prefab": { - "__id__": 772 + "__id__": 770 }, "_resizeMode": 0, "_layoutType": 1, @@ -15172,14 +14985,14 @@ "_active": false, "_components": [ { - "__id__": 775 + "__id__": 773 }, { - "__id__": 777 + "__id__": 775 } ], "_prefab": { - "__id__": 779 + "__id__": 777 }, "_lpos": { "__type__": "cc.Vec3", @@ -15216,11 +15029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 772 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 774 }, "_contentSize": { "__type__": "cc.Size", @@ -15244,11 +15057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 772 }, "_enabled": true, "__prefab": { - "__id__": 778 + "__id__": 776 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15308,11 +15121,11 @@ "_active": true, "_components": [ { - "__id__": 781 + "__id__": 779 } ], "_prefab": { - "__id__": 783 + "__id__": 781 }, "_lpos": { "__type__": "cc.Vec3", @@ -15349,11 +15162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 778 }, "_enabled": true, "__prefab": { - "__id__": 782 + "__id__": 780 }, "_contentSize": { "__type__": "cc.Size", @@ -15394,23 +15207,23 @@ }, "_children": [ { - "__id__": 785 + "__id__": 783 } ], "_active": false, "_components": [ { - "__id__": 791 + "__id__": 789 }, { - "__id__": 793 + "__id__": 791 }, { - "__id__": 795 + "__id__": 793 } ], "_prefab": { - "__id__": 797 + "__id__": 795 }, "_lpos": { "__type__": "cc.Vec3", @@ -15447,20 +15260,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 784 + "__id__": 782 }, "_children": [], "_active": true, "_components": [ { - "__id__": 786 + "__id__": 784 }, { - "__id__": 788 + "__id__": 786 } ], "_prefab": { - "__id__": 790 + "__id__": 788 }, "_lpos": { "__type__": "cc.Vec3", @@ -15497,11 +15310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 785 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 787 + "__id__": 785 }, "_contentSize": { "__type__": "cc.Size", @@ -15525,11 +15338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 785 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 789 + "__id__": 787 }, "_lineHeight": 40, "_string": "Rich", @@ -15576,11 +15389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 784 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 790 }, "_contentSize": { "__type__": "cc.Size", @@ -15604,11 +15417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 784 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 794 + "__id__": 792 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15649,11 +15462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 784 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 796 + "__id__": 794 }, "_resizeMode": 1, "_layoutType": 1, @@ -15704,23 +15517,23 @@ }, "_children": [ { - "__id__": 799 + "__id__": 797 } ], "_active": false, "_components": [ { - "__id__": 819 + "__id__": 817 }, { - "__id__": 821 + "__id__": 819 }, { - "__id__": 823 + "__id__": 821 } ], "_prefab": { - "__id__": 825 + "__id__": 823 }, "_lpos": { "__type__": "cc.Vec3", @@ -15757,30 +15570,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 798 + "__id__": 796 }, "_children": [ { - "__id__": 800 + "__id__": 798 }, { - "__id__": 806 + "__id__": 804 } ], "_active": true, "_components": [ { - "__id__": 812 + "__id__": 810 }, { - "__id__": 814 + "__id__": 812 }, { - "__id__": 816 + "__id__": 814 } ], "_prefab": { - "__id__": 818 + "__id__": 816 }, "_lpos": { "__type__": "cc.Vec3", @@ -15817,20 +15630,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 799 + "__id__": 797 }, "_children": [], "_active": true, "_components": [ { - "__id__": 801 + "__id__": 799 }, { - "__id__": 803 + "__id__": 801 } ], "_prefab": { - "__id__": 805 + "__id__": 803 }, "_lpos": { "__type__": "cc.Vec3", @@ -15867,11 +15680,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 800 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 800 }, "_contentSize": { "__type__": "cc.Size", @@ -15895,11 +15708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 800 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 804 + "__id__": 802 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15976,20 +15789,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 799 + "__id__": 797 }, "_children": [], "_active": true, "_components": [ { - "__id__": 807 + "__id__": 805 }, { - "__id__": 809 + "__id__": 807 } ], "_prefab": { - "__id__": 811 + "__id__": 809 }, "_lpos": { "__type__": "cc.Vec3", @@ -16026,11 +15839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 804 }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 806 }, "_contentSize": { "__type__": "cc.Size", @@ -16054,11 +15867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 804 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 808 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16135,11 +15948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 799 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 813 + "__id__": 811 }, "_contentSize": { "__type__": "cc.Size", @@ -16163,11 +15976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 799 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 813 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16208,11 +16021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 799 + "__id__": 797 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 815 }, "_id": "" }, @@ -16239,11 +16052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 820 + "__id__": 818 }, "_contentSize": { "__type__": "cc.Size", @@ -16267,11 +16080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 822 + "__id__": 820 }, "_alignFlags": 45, "_target": null, @@ -16303,11 +16116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 824 + "__id__": 822 }, "_id": "" }, @@ -16338,23 +16151,23 @@ }, "_children": [ { - "__id__": 827 + "__id__": 825 } ], "_active": false, "_components": [ { - "__id__": 847 + "__id__": 845 }, { - "__id__": 849 + "__id__": 847 }, { - "__id__": 851 + "__id__": 849 } ], "_prefab": { - "__id__": 853 + "__id__": 851 }, "_lpos": { "__type__": "cc.Vec3", @@ -16391,30 +16204,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 826 + "__id__": 824 }, "_children": [ { - "__id__": 828 + "__id__": 826 }, { - "__id__": 834 + "__id__": 832 } ], "_active": true, "_components": [ { - "__id__": 840 + "__id__": 838 }, { - "__id__": 842 + "__id__": 840 }, { - "__id__": 844 + "__id__": 842 } ], "_prefab": { - "__id__": 846 + "__id__": 844 }, "_lpos": { "__type__": "cc.Vec3", @@ -16451,20 +16264,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 827 + "__id__": 825 }, "_children": [], "_active": true, "_components": [ { - "__id__": 829 + "__id__": 827 }, { - "__id__": 831 + "__id__": 829 } ], "_prefab": { - "__id__": 833 + "__id__": 831 }, "_lpos": { "__type__": "cc.Vec3", @@ -16501,11 +16314,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 828 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 828 }, "_contentSize": { "__type__": "cc.Size", @@ -16529,11 +16342,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 828 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 830 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16610,20 +16423,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 827 + "__id__": 825 }, "_children": [], "_active": true, "_components": [ { - "__id__": 835 + "__id__": 833 }, { - "__id__": 837 + "__id__": 835 } ], "_prefab": { - "__id__": 839 + "__id__": 837 }, "_lpos": { "__type__": "cc.Vec3", @@ -16660,11 +16473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 834 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 836 + "__id__": 834 }, "_contentSize": { "__type__": "cc.Size", @@ -16688,11 +16501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 834 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 838 + "__id__": 836 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16769,11 +16582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 839 }, "_contentSize": { "__type__": "cc.Size", @@ -16797,11 +16610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 841 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16842,11 +16655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 825 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 843 }, "_id": "" }, @@ -16873,11 +16686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 848 + "__id__": 846 }, "_contentSize": { "__type__": "cc.Size", @@ -16901,11 +16714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 848 }, "_alignFlags": 45, "_target": null, @@ -16937,11 +16750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 850 }, "_id": "" }, @@ -16972,23 +16785,23 @@ }, "_children": [ { - "__id__": 855 + "__id__": 853 } ], "_active": false, "_components": [ { - "__id__": 879 + "__id__": 877 }, { - "__id__": 881 + "__id__": 879 }, { - "__id__": 883 + "__id__": 881 } ], "_prefab": { - "__id__": 885 + "__id__": 883 }, "_lpos": { "__type__": "cc.Vec3", @@ -17025,30 +16838,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 852 }, "_children": [ { - "__id__": 856 + "__id__": 854 }, { - "__id__": 862 + "__id__": 860 }, { - "__id__": 868 + "__id__": 866 } ], "_active": true, "_components": [ { - "__id__": 874 + "__id__": 872 }, { - "__id__": 876 + "__id__": 874 } ], "_prefab": { - "__id__": 878 + "__id__": 876 }, "_lpos": { "__type__": "cc.Vec3", @@ -17085,20 +16898,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 855 + "__id__": 853 }, "_children": [], "_active": true, "_components": [ { - "__id__": 857 + "__id__": 855 }, { - "__id__": 859 + "__id__": 857 } ], "_prefab": { - "__id__": 861 + "__id__": 859 }, "_lpos": { "__type__": "cc.Vec3", @@ -17135,11 +16948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 856 }, "_contentSize": { "__type__": "cc.Size", @@ -17163,11 +16976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 860 + "__id__": 858 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17221,20 +17034,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 855 + "__id__": 853 }, "_children": [], "_active": true, "_components": [ { - "__id__": 863 + "__id__": 861 }, { - "__id__": 865 + "__id__": 863 } ], "_prefab": { - "__id__": 867 + "__id__": 865 }, "_lpos": { "__type__": "cc.Vec3", @@ -17271,11 +17084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 862 + "__id__": 860 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 862 }, "_contentSize": { "__type__": "cc.Size", @@ -17299,11 +17112,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 862 + "__id__": 860 }, "_enabled": true, "__prefab": { - "__id__": 866 + "__id__": 864 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17380,20 +17193,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 855 + "__id__": 853 }, "_children": [], "_active": true, "_components": [ { - "__id__": 869 + "__id__": 867 }, { - "__id__": 871 + "__id__": 869 } ], "_prefab": { - "__id__": 873 + "__id__": 871 }, "_lpos": { "__type__": "cc.Vec3", @@ -17430,11 +17243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 866 }, "_enabled": true, "__prefab": { - "__id__": 870 + "__id__": 868 }, "_contentSize": { "__type__": "cc.Size", @@ -17458,11 +17271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 866 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 870 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17539,11 +17352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 853 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 873 }, "_contentSize": { "__type__": "cc.Size", @@ -17567,11 +17380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 853 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 875 }, "_id": "" }, @@ -17598,11 +17411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 878 }, "_contentSize": { "__type__": "cc.Size", @@ -17626,11 +17439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 882 + "__id__": 880 }, "_alignFlags": 45, "_target": null, @@ -17662,11 +17475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 884 + "__id__": 882 }, "_id": "" }, @@ -17697,23 +17510,23 @@ }, "_children": [ { - "__id__": 887 + "__id__": 885 }, { - "__id__": 893 + "__id__": 891 }, { - "__id__": 909 + "__id__": 907 } ], "_active": false, "_components": [ { - "__id__": 915 + "__id__": 913 } ], "_prefab": { - "__id__": 917 + "__id__": 915 }, "_lpos": { "__type__": "cc.Vec3", @@ -17750,20 +17563,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 884 }, "_children": [], "_active": true, "_components": [ { - "__id__": 888 + "__id__": 886 }, { - "__id__": 890 + "__id__": 888 } ], "_prefab": { - "__id__": 892 + "__id__": 890 }, "_lpos": { "__type__": "cc.Vec3", @@ -17800,11 +17613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 887 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 889 + "__id__": 887 }, "_contentSize": { "__type__": "cc.Size", @@ -17828,11 +17641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 887 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 891 + "__id__": 889 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17886,24 +17699,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 884 }, "_children": [ { - "__id__": 894 + "__id__": 892 }, { - "__id__": 900 + "__id__": 898 } ], "_active": true, "_components": [ { - "__id__": 906 + "__id__": 904 } ], "_prefab": { - "__id__": 908 + "__id__": 906 }, "_lpos": { "__type__": "cc.Vec3", @@ -17940,20 +17753,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 893 + "__id__": 891 }, "_children": [], "_active": true, "_components": [ { - "__id__": 895 + "__id__": 893 }, { - "__id__": 897 + "__id__": 895 } ], "_prefab": { - "__id__": 899 + "__id__": 897 }, "_lpos": { "__type__": "cc.Vec3", @@ -17990,11 +17803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 892 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 894 }, "_contentSize": { "__type__": "cc.Size", @@ -18018,11 +17831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 892 }, "_enabled": true, "__prefab": { - "__id__": 898 + "__id__": 896 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18076,20 +17889,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 893 + "__id__": 891 }, "_children": [], "_active": false, "_components": [ { - "__id__": 901 + "__id__": 899 }, { - "__id__": 903 + "__id__": 901 } ], "_prefab": { - "__id__": 905 + "__id__": 903 }, "_lpos": { "__type__": "cc.Vec3", @@ -18126,11 +17939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 898 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 900 }, "_contentSize": { "__type__": "cc.Size", @@ -18154,11 +17967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 898 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 902 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18212,11 +18025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 893 + "__id__": 891 }, "_enabled": true, "__prefab": { - "__id__": 907 + "__id__": 905 }, "_contentSize": { "__type__": "cc.Size", @@ -18253,20 +18066,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 886 + "__id__": 884 }, "_children": [], "_active": true, "_components": [ { - "__id__": 910 + "__id__": 908 }, { - "__id__": 912 + "__id__": 910 } ], "_prefab": { - "__id__": 914 + "__id__": 912 }, "_lpos": { "__type__": "cc.Vec3", @@ -18303,11 +18116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 909 + "__id__": 907 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 909 }, "_contentSize": { "__type__": "cc.Size", @@ -18331,11 +18144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 909 + "__id__": 907 }, "_enabled": true, "__prefab": { - "__id__": 913 + "__id__": 911 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18389,11 +18202,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 886 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 916 + "__id__": 914 }, "_contentSize": { "__type__": "cc.Size", @@ -18434,7 +18247,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 919 + "__id__": 917 }, "_contentSize": { "__type__": "cc.Size", @@ -18462,7 +18275,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 919 }, "_alignFlags": 45, "_target": null, @@ -18498,7 +18311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 923 + "__id__": 921 }, "_id": "" }, @@ -18516,7 +18329,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 925 + "__id__": 923 }, "_type": 0, "_inverted": false, @@ -18538,7 +18351,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 927 + "__id__": 925 }, "_id": "" }, @@ -18556,7 +18369,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 929 + "__id__": 927 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18605,16 +18418,22 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 623 + "__id__": 621 + }, + { + "__id__": 573 + }, + { + "__id__": 543 }, { - "__id__": 575 + "__id__": 516 }, { - "__id__": 545 + "__id__": 412 }, { - "__id__": 518 + "__id__": 404 }, { "__id__": 396 diff --git a/assets/bundles/first/config/Battlebuff.json b/assets/bundles/first/config/Battlebuff.json index 9defeb2..0d25d69 100644 --- a/assets/bundles/first/config/Battlebuff.json +++ b/assets/bundles/first/config/Battlebuff.json @@ -345,7 +345,7 @@ "target": 1, "targetpar": "1,1,13", "functiontype": 102, - "functionpar": 50, + "functionpar": 5000, "weight": 1, "price": 0 }, @@ -373,7 +373,7 @@ "target": 1, "targetpar": "1,1,13", "functiontype": 104, - "functionpar": 40, + "functionpar": 4000, "weight": 1, "price": 0 }, @@ -513,7 +513,7 @@ "target": 2, "targetpar": "1,1,13", "functiontype": 102, - "functionpar": 50, + "functionpar": 5000, "weight": 1, "price": 0 }, @@ -541,7 +541,7 @@ "target": 2, "targetpar": "1,1,13", "functiontype": 104, - "functionpar": 40, + "functionpar": 4000, "weight": 1, "price": 0 }, @@ -681,7 +681,7 @@ "target": 3, "targetpar": "1,1,13", "functiontype": 102, - "functionpar": 50, + "functionpar": 5000, "weight": 1, "price": 0 }, @@ -709,7 +709,7 @@ "target": 3, "targetpar": "1,1,13", "functiontype": 104, - "functionpar": 40, + "functionpar": 4000, "weight": 1, "price": 0 }, @@ -849,7 +849,7 @@ "target": 4, "targetpar": "1,1,13", "functiontype": 102, - "functionpar": 50, + "functionpar": 5000, "weight": 1, "price": 0 }, @@ -877,7 +877,7 @@ "target": 4, "targetpar": "1,1,13", "functiontype": 104, - "functionpar": 40, + "functionpar": 4000, "weight": 1, "price": 0 }, @@ -1017,7 +1017,7 @@ "target": 5, "targetpar": "1,1,13", "functiontype": 102, - "functionpar": 50, + "functionpar": 5000, "weight": 1, "price": 0 }, @@ -1045,7 +1045,7 @@ "target": 5, "targetpar": "1,1,13", "functiontype": 104, - "functionpar": 40, + "functionpar": 4000, "weight": 1, "price": 0 } diff --git a/assets/res/battleGame/texture/ui/召唤.png b/assets/res/battleGame/texture/ui/召唤.png index f52d28c..6b81942 100644 Binary files a/assets/res/battleGame/texture/ui/召唤.png and b/assets/res/battleGame/texture/ui/召唤.png differ diff --git a/assets/res/battleGame/texture/ui/召唤.png.meta b/assets/res/battleGame/texture/ui/召唤.png.meta index 8050a89..1fec7d7 100644 --- a/assets/res/battleGame/texture/ui/召唤.png.meta +++ b/assets/res/battleGame/texture/ui/召唤.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 58, - "height": 29, - "rawWidth": 58, - "rawHeight": 29, + "width": 208, + "height": 97, + "rawWidth": 208, + "rawHeight": 97, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -29, - -14.5, + -104, + -48.5, 0, - 29, - -14.5, + 104, + -48.5, 0, - -29, - 14.5, + -104, + 48.5, 0, - 29, - 14.5, + 104, + 48.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 29, - 58, - 29, + 97, + 208, + 97, 0, 0, - 58, + 208, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -29, - -14.5, + -104, + -48.5, 0 ], "maxPos": [ - 29, - 14.5, + 104, + 48.5, 0 ] }, diff --git a/assets/script/battle/bag/BattleBagSession.ts b/assets/script/battle/bag/BattleBagSession.ts index 84bbd97..968473f 100644 --- a/assets/script/battle/bag/BattleBagSession.ts +++ b/assets/script/battle/bag/BattleBagSession.ts @@ -312,7 +312,7 @@ export class BattleBagSession { /** * 开局只给 tolockland（待解锁）填随机字。 - * normalland 开启但留空；未解锁与 grid17 不填。不占刷新次数；玩家/AI 各自 bag 独立调用。 + * normalland 开启但留空；未解锁不填。不占刷新次数；玩家/AI 各自 bag 独立调用。 */ autoFillOpenSlots(): void { if (!this.landStateOf) { @@ -851,7 +851,7 @@ export class BattleBagSession { } /** - * 地图字拖到空装饰格时删掉，不退回字池。 + * 地图字拖到 ui_delete 时删掉，不退回字池。 * @param gridIndex 来源地图格 */ discardMapGlyph(gridIndex: number): boolean { @@ -870,7 +870,7 @@ export class BattleBagSession { } /** - * 背包字拖到空装饰格时删掉，不退回字池。 + * 背包字拖到 ui_delete 时删掉，不退回字池。 * @param slotIndex 来源槽 */ discardBagSlot(slotIndex: number): boolean { diff --git a/assets/script/battle/view/CocosBagBoardView.ts b/assets/script/battle/view/CocosBagBoardView.ts index c16b217..6c03bed 100644 --- a/assets/script/battle/view/CocosBagBoardView.ts +++ b/assets/script/battle/view/CocosBagBoardView.ts @@ -135,6 +135,8 @@ export class CocosBagBoardView { private _deploySync: DeploySync | null = null; private _map: MapManager | null = null; private _bagList: Node | null = null; + /** 拖字删除落点（BattleGame ui_delete） */ + private _deleteNode: Node | null = null; /** ui_textList 开启 / 待解锁 / 未解锁 */ private readonly _land = new TextListLandHost(); /** 开格展示字块补显重试帧计数（textGrid 预制体异步加载未就绪时留空格） */ @@ -1250,6 +1252,14 @@ export class CocosBagBoardView { this._otherBagAnchor = node?.isValid ? node : null; } + /** + * 绑定拖字删除节点（BattleGame ui_delete）。 + * @param node 删除落点；无效则不能拖字删除 + */ + setDeleteNode(node: Node | null | undefined): void { + this._deleteNode = node?.isValid ? node : null; + } + bind( battle: ProjectBattleHandle, map: MapManager, @@ -1306,7 +1316,7 @@ export class CocosBagBoardView { this._bindMapGridClicks(); this._warmTextGridPool(); - // 开局只给 tolockland 放字；normalland 留空；grid17 不出字 + // 开局只给 tolockland 放字；normalland 留空 this._bagSession.autoFillOpenSlots(); this._rebuildBagFromSession(true); this._refreshDragEnabled(); @@ -1431,6 +1441,7 @@ export class CocosBagBoardView { this.disarmBagEntrance(); this.setInkstoneWorldPosProvider(null); this.setOtherBagAnchor(null); + this.setDeleteNode(null); this.setBagEntranceHandler(null, null); this.setSkillPeachFlyHandler(null); this._unbindMapGridClicks(); @@ -3308,6 +3319,20 @@ export class CocosBagBoardView { const fromSlot = drag?.source.kind === 'bag' ? drag.source.slotIndex : -1; const fromMapIndex = this._mapDragFromIndex(drag); + if (this._isOverDelete(uiPos)) { + this._setDragSelectTarget(null); + const del = this._deleteNode; + if (lineFrom && del?.isValid) { + this._linePresenter.show(lineFrom, del.worldPosition); + } else { + this._linePresenter.hide(); + } + if (drag && this._isType3Drag(grid, drag)) { + this._updateType3PathPreview(null, drag); + } + return; + } + const bagSlotIndex = this._resolveBagSlotAt(uiPos); if (bagSlotIndex != null) { const bagSwap = fromSlot >= 0 && bagSlotIndex !== fromSlot; @@ -3419,8 +3444,8 @@ export class CocosBagBoardView { } const target = this._resolveDropTarget(event, drag.source); - if (target.kind === 'bag' && this._land.isBlank(target.slotIndex)) { - this._discardGlyphToBlank(grid, drag); + if (this._isOverDelete(event.getUILocation())) { + this._discardGlyphToDelete(grid, drag); return; } if (target.kind === 'bag' && this._interceptLandDrop(target.slotIndex)) { @@ -3510,8 +3535,8 @@ export class CocosBagBoardView { } const bagSlotIndex = this._resolveBagSlotAt(uiPos); - if (bagSlotIndex != null && this._land.isBlank(bagSlotIndex)) { - this._discardGlyphToBlank(grid, drag); + if (this._isOverDelete(uiPos)) { + this._discardGlyphToDelete(grid, drag); return; } if (bagSlotIndex != null && this._interceptLandDrop(bagSlotIndex)) { @@ -4116,17 +4141,22 @@ export class CocosBagBoardView { } /** - * 背包或地图上的字拖到空装饰格：飞到 grid17 后消失，不留在格子上。 + * 背包或地图上的字拖到 ui_delete：飞到该节点后消失，不留在格子上。 * @param grid 被拖的字 * @param drag 本次拖拽 */ - private _discardGlyphToBlank(grid: TextGrid, drag: NonNullable): void { + private _discardGlyphToDelete(grid: TextGrid, drag: NonNullable): void { const session = this._bagSession; - const blank = this._blankLandNode(); + const del = this._deleteNode; const layer = this._dragLayer; - if (!session || !blank?.isValid || !layer?.isValid || !grid.node?.isValid) { - this._discardGlyphData(drag); - if (grid.node?.isValid) this._forceRecycleTextGrid(grid); + if (!del?.isValid || !del.activeInHierarchy) { + console.log('[CocosBagBoardView] ui_delete 不可用，取消删除'); + this._lineDragCancel(grid, drag); + return; + } + if (!session || !layer?.isValid || !grid.node?.isValid) { + console.log('[CocosBagBoardView] 删除字块缺少拖拽层或会话'); + this._lineDragCancel(grid, drag); return; } const from: GridDetachSource = drag.source.kind === 'bag' @@ -4154,7 +4184,7 @@ export class CocosBagBoardView { this._lineDragCancel(grid, drag); return; } - const target = blank.worldPosition.clone(); + const target = del.worldPosition.clone(); BagToMapPlaceAnimator.play(grid, target, layer, () => { this._finishDiscardFlight(grid); }, { showTrail: DeviceProfile.enableBoardPlaceTrail }); @@ -4176,7 +4206,7 @@ export class CocosBagBoardView { } /** - * 飞到空装饰格后回收字块，并补上推迟的盘面刷新。 + * 飞到 ui_delete 后回收字块，并补上推迟的盘面刷新。 * @param grid 飞行中的字 */ private _finishDiscardFlight(grid: TextGrid): void { @@ -4188,7 +4218,17 @@ export class CocosBagBoardView { this._refreshCanUpgradeHints(); } - /** 空装饰格节点（grid17） */ + /** + * 手指是否在 ui_delete 上。 + * @param uiPos 屏幕坐标 + */ + private _isOverDelete(uiPos: { x: number; y: number }): boolean { + const node = this._deleteNode; + if (!node?.isValid || !node.activeInHierarchy) return false; + return this._hitNode(node, uiPos); + } + + /** 空装饰格节点。当前没有这种格子 */ private _blankLandNode(): Node | null { const list = this._bagList; if (!list?.isValid) return null; diff --git a/assets/script/battle/view/TextListLandHost.ts b/assets/script/battle/view/TextListLandHost.ts index bc3d41f..92d585e 100644 --- a/assets/script/battle/view/TextListLandHost.ts +++ b/assets/script/battle/view/TextListLandHost.ts @@ -10,7 +10,7 @@ export enum TextListCellState { OpenNoDrag = 2, /** 未解锁：不可拖、不可落字 */ Locked = 3, - /** 空装饰格：不刷底、不出字、不可拖放 */ + /** 空装饰格：不刷底、不出字、不可拖放。当前没有这种格子 */ Blank = 4, } @@ -23,9 +23,6 @@ const GATE_NODE = '待开启'; /** 模板节点，不参与状态 */ const TEMP_NODE = 'temp'; -/** 空装饰格下标（grid17）：预制体底图保持关闭，逻辑不处理 */ -const BLANK_INDEX = 17; - /** 一次待开启推进：新生待解锁格，以及本次要累加到这些格子数字上的等级 */ export interface TextListPromoteResult { /** 新变成待开启、需要出字的格子 */ @@ -40,7 +37,7 @@ export interface TextListPromoteResult { * 待开启被合成后自身变为开启，上下左右的未解锁格变为待开启。其余为未解锁。 * 每局记录解锁次数，bind 时清零。第 1 次读 Const 39 的 index 0，依次类推；超出则用最后一项。 * 该加值累加到本次上下左右新待解锁格的数字等级上。 - * grid17 是空装饰格，不刷底、不出字、不可拖放。名为 temp 的节点跳过。 + * grid1-24 都是普通地块（含 grid17、grid23、grid24）。名为 temp 的节点跳过。 * 格子上的字块是背包槽位数据（BattleBagSession），由视图按槽位记录生成标准 TextGrid； * 拖拽预览、合成解锁走既有背包管线，本类只负责格子底图状态与解锁规则。 */ @@ -109,8 +106,6 @@ export class TextListLandHost { this._useTable = true; this._fill(this._open, normal, 'normalland'); this._fill(this._gate, gate, 'tolockland'); - this._stripBlank(this._open, 'normalland'); - this._stripBlank(this._gate, 'tolockland'); for (let i = this._gate.length - 1; i >= 0; i--) { if (!this._has(this._open, this._gate[i])) continue; console.log('[TextListLand] 下标同时在开启与待解锁，按开启', this._gate[i]); @@ -131,7 +126,7 @@ export class TextListLandHost { } /** - * 节点对应的格子下标。命名 gridN → N（grid1-23），temp 跳过，其余名字打日志返回 null。 + * 节点对应的格子下标。命名 gridN → N（grid1-24），temp 跳过，其余名字打日志返回 null。 * @param node ui_textList 子节点 */ static indexOfNode(node: Node | null | undefined): number | null { @@ -163,11 +158,11 @@ export class TextListLandHost { } /** - * 是否空装饰格（grid17）。 + * 是否空装饰格。当前没有这种格子，grid17 起都按普通地块。 * @param index 格子下标 */ - isBlank(index: number): boolean { - return index === BLANK_INDEX; + isBlank(_index: number): boolean { + return false; } /** @@ -347,18 +342,6 @@ export class TextListLandHost { return null; } - /** - * 配表若写了空装饰格，去掉并打日志。 - * @param arr 下标数组 - * @param label 字段名 - */ - private _stripBlank(arr: number[], label: string): void { - const idx = arr.indexOf(BLANK_INDEX); - if (idx < 0) return; - console.log('[TextListLand] 空装饰格不参与地块配置', label, BLANK_INDEX); - arr.splice(idx, 1); - } - /** 数组是否包含 */ private _has(arr: readonly number[], value: number): boolean { return arr.indexOf(value) >= 0; diff --git a/assets/script/ui/BattleGame/BattlePeachCoinFlyPresenter.ts b/assets/script/ui/BattleGame/BattlePeachCoinFlyPresenter.ts index 6671a56..d10c69c 100644 --- a/assets/script/ui/BattleGame/BattlePeachCoinFlyPresenter.ts +++ b/assets/script/ui/BattleGame/BattlePeachCoinFlyPresenter.ts @@ -10,7 +10,7 @@ const FLY_STAGGER_SEC = 0.05; /** 波次结算每枚金币的冒出间隔（秒） */ const WAVE_COIN_SPAWN_GAP_SEC = 0.15; /** 波次结算金币起点相对屏幕中心的世界 Y 偏移 */ -const WAVE_COIN_START_OFFSET_Y = 100; +const WAVE_COIN_START_OFFSET_Y = 150; /** 波次金币冒出时的水平散开（世界像素） */ const WAVE_POP_SPREAD_X = 140; /** 波次金币冒出时的垂直散开（世界像素） */ diff --git a/assets/script/ui/BattleGame/UIBattleGame.ts b/assets/script/ui/BattleGame/UIBattleGame.ts index 1749550..07315d8 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, Sprite, Tween, tween, v3, Vec3, sp } from 'cc'; +import { _decorator, find, game, Label, Node, 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'; @@ -64,10 +64,6 @@ import { WeaponComposeConfigProvider } from '../../battle/bag/WeaponComposeConfi const { ccclass } = _decorator; -/** 召唤按钮 bg fillRange 变化 tween 时长（秒） */ -const REFRESH_FILL_TWEEN_SEC = 0.2; -/** btnRefresh/bg2 fillRange 下限（负值，接近凑够时不再小于 -0.1） */ -const REFRESH_FILL_RANGE_MIN = -0.1; /** 召唤按钮进度满后 Q 弹第一下相对缩放增量 */ const REFRESH_BOUNCE_AMP = 0.1; /** 单段弹起/回落时长（秒） */ @@ -95,12 +91,6 @@ export class UIBattleGame extends Auto_BattleGame { private _bagView: CocosBagBoardView | null = null; /** 普攻/技能表现：监听 PresentationCue → HeroActor */ private _skillController: SkillController | null = null; - /** 召唤按钮填充进度（btnRefresh/bg2，水平从右到左） */ - private _refreshFill: Sprite | null = null; - /** 召唤按钮 bg2 目标 fillRange（= -(1 - 桃子进度)） */ - private _refreshFillTarget = 0; - /** 召唤按钮可刷新态（bg3） */ - private _refreshBg3: Node | null = null; /** 召唤按钮基准缩放 */ private readonly _refreshBtnScaleHome = new Vec3(1, 1, 1); /** 本段「桃子足够」是否已播过满进度 Q 弹 */ @@ -276,13 +266,9 @@ export class UIBattleGame extends Auto_BattleGame { this._ensureOwnedDesc(); this._ensureOtherOwnedDesc(); this._linkSkillDescPeers(); - this._refreshFill = this.btnRefresh?.getChildByName('bg2')?.getComponent(Sprite) - ?? this.btnRefresh?.getChildByName('bg')?.getComponent(Sprite) - ?? null; - this._refreshBg3 = this.btnRefresh?.getChildByName('bg3') ?? null; + this._showRefreshBg1(); this._disableRefreshBreathe(); this.btnRefresh?.getScale(this._refreshBtnScaleHome); - this._setupRefreshFillSprite(); this._lbWaveTip = this.ui_nextWaveTime?.getChildByName('lb1')?.getComponent(Label) ?? null; this._lbWaveTipTime = this.ui_nextWaveTime?.getChildByName('lb2')?.getComponent(Label) ?? null; if (!this.ui_nextWaveTime?.isValid) { @@ -711,6 +697,10 @@ export class UIBattleGame extends Auto_BattleGame { rangeNode, this.ui_textGrids, ); + if (!this.ui_delete?.isValid) { + console.log('[UIBattleGame] ui_delete 缺失，无法拖字删除'); + } + this._bagView.setDeleteNode(this.ui_delete); // bind() 开头会 unbind，入场回调必须在 bind 之后再挂 this._bagView.setOtherBagAnchor(this.ui_otherBag); this._bagView.setInkstoneWorldPosProvider(this._inkstoneWorldPos); @@ -1074,27 +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; - if (this._refreshBg3?.isValid) { - this._refreshBg3.active = enough; - } - if (this._refreshFill?.isValid) { - const fillNode = this._refreshFill.node; - if (enough) { - if (fillNode.active) { - this._tweenRefreshFillRange(0, this._hideRefreshFill.bind(this)); - } else { - this._stopRefreshFillTween(); - this._refreshFillTarget = 0; - this._refreshFill.fillRange = 0; - } - } else { - fillNode.active = true; - const progress = cost > 0 ? Math.min(1, Math.max(0, gold / cost)) : 1; - const fillRange = Math.min(REFRESH_FILL_RANGE_MIN, -(1 - progress)); - this._tweenRefreshFillRange(fillRange); - } - } this._syncRefreshBounce(enough); } @@ -1127,47 +1098,20 @@ export class UIBattleGame extends Auto_BattleGame { if (node?.isValid && node.active !== active) node.active = active; } - /** btnRefresh/bg2：水平从右到左；fillRange = min(-0.1, -(1 - 桃子/消耗))，凑够为 0 */ - private _setupRefreshFillSprite(): void { - const sprite = this._refreshFill; - if (!sprite?.isValid) return; - sprite.type = Sprite.Type.FILLED; - sprite.fillType = Sprite.FillType.HORIZONTAL; - sprite.fillStart = 1; - sprite.fillRange = -1; - this._refreshFillTarget = -1; - } - - /** btnRefresh/bg2：fillRange 0.2s tween 到目标（不足时为负，凑够为 0） */ - private _tweenRefreshFillRange(target: number, onComplete?: () => void): void { - const sprite = this._refreshFill; - if (!sprite?.isValid) return; - if (Math.abs(target - this._refreshFillTarget) < 1e-4) { - onComplete?.(); - return; - } - this._refreshFillTarget = target; - Tween.stopAllByTarget(sprite); - const tw = tween(sprite).to(REFRESH_FILL_TWEEN_SEC, { fillRange: target }); - if (onComplete) { - tw.call(onComplete); - } - tw.start(); - } - - /** 桃子已够：fillRange 到 0 后隐藏 bg2 */ - private _hideRefreshFill(): void { - const fillNode = this._refreshFill?.node; - if (fillNode?.isValid) { - fillNode.active = false; - } - } - - /** 停止召唤按钮 bg fillRange tween */ - private _stopRefreshFillTween(): void { - if (this._refreshFill?.isValid) { - Tween.stopAllByTarget(this._refreshFill); + /** btnRefresh 只显示 bg1，隐藏进度底 bg2 和可刷新底 bg3 */ + private _showRefreshBg1(): void { + const btn = this.btnRefresh; + if (!btn?.isValid) return; + const bg1 = btn.getChildByName('bg1'); + const bg2 = btn.getChildByName('bg2'); + const bg3 = btn.getChildByName('bg3'); + if (!bg1?.isValid) { + console.log('[UIBattleGame] btnRefresh 缺少 bg1'); } + this._setNodeActive(bg1, true); + if (bg2?.isValid) Tween.stopAllByTarget(bg2); + this._setNodeActive(bg2, false); + this._setNodeActive(bg3, false); } /** 关掉预制体上的 TweenBreathe，避免与 Q 弹抢缩放 */ @@ -1368,10 +1312,6 @@ export class UIBattleGame extends Auto_BattleGame { this._mapHost = null; this._battle = null; this._combatStarted = false; - this._stopRefreshFillTween(); - this._refreshFill = null; - this._refreshBg3 = null; - this._refreshFillTarget = 0; this._stopRefreshBounce(); this._refreshBounceHinted = false; this._illustratedHintShownThisBattle = false;