From 7427419670631a1b5bedb547ac3c1e4cfae18390 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sat, 25 Apr 2026 23:57:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=BB=98=E8=AE=A4=E5=80=BC=E5=92=8C=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 MissionCardComp 中的合成规则默认值改为从 FightSet 配置读取,避免硬编码 - 修复 VictoryComp 中进度条组件类型错误,将 Sprite 改为 ProgressBar 并更新属性设置 --- assets/resources/gui/element/victory.prefab | 3145 +++++++++---------- assets/script/game/map/MissionCardComp.ts | 8 +- assets/script/game/map/VictoryComp.ts | 8 +- 3 files changed, 1408 insertions(+), 1753 deletions(-) diff --git a/assets/resources/gui/element/victory.prefab b/assets/resources/gui/element/victory.prefab index 40376584..5458aeed 100644 --- a/assets/resources/gui/element/victory.prefab +++ b/assets/resources/gui/element/victory.prefab @@ -28,32 +28,32 @@ "__id__": 24 }, { - "__id__": 853 + "__id__": 837 }, { - "__id__": 906 + "__id__": 890 } ], "_active": true, "_components": [ { - "__id__": 919 + "__id__": 903 }, { - "__id__": 921 + "__id__": 905 }, { - "__id__": 923 + "__id__": 907 }, { - "__id__": 925 + "__id__": 909 }, { - "__id__": 927 + "__id__": 911 } ], "_prefab": { - "__id__": 929 + "__id__": 913 }, "_lpos": { "__type__": "cc.Vec3", @@ -625,23 +625,23 @@ "__id__": 307 }, { - "__id__": 814 + "__id__": 798 }, { - "__id__": 820 + "__id__": 804 } ], "_active": true, "_components": [ { - "__id__": 848 + "__id__": 832 }, { - "__id__": 850 + "__id__": 834 } ], "_prefab": { - "__id__": 852 + "__id__": 836 }, "_lpos": { "__type__": "cc.Vec3", @@ -1824,7 +1824,7 @@ }, { "__type__": "cc.Node", - "_name": "ProgressBar", + "_name": "progress_bar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2845,7 +2845,7 @@ }, { "__type__": "cc.Node", - "_name": "ProgressBar", + "_name": "progress_bar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -3866,7 +3866,7 @@ }, { "__type__": "cc.Node", - "_name": "ProgressBar", + "_name": "progress_bar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -4887,7 +4887,7 @@ }, { "__type__": "cc.Node", - "_name": "ProgressBar", + "_name": "progress_bar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -5908,7 +5908,7 @@ }, { "__type__": "cc.Node", - "_name": "ProgressBar", + "_name": "progress_bar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -7207,17 +7207,17 @@ "_active": true, "_components": [ { - "__id__": 807 + "__id__": 791 }, { - "__id__": 809 + "__id__": 793 }, { - "__id__": 811 + "__id__": 795 } ], "_prefab": { - "__id__": 813 + "__id__": 797 }, "_lpos": { "__type__": "cc.Vec3", @@ -7536,44 +7536,44 @@ "__id__": 405 }, { - "__id__": 429 + "__id__": 413 }, { - "__id__": 437 + "__id__": 421 }, { - "__id__": 443 + "__id__": 427 }, { - "__id__": 451 + "__id__": 435 }, { - "__id__": 522 + "__id__": 506 }, { - "__id__": 544 + "__id__": 528 }, { - "__id__": 574 + "__id__": 558 }, { - "__id__": 736 + "__id__": 720 }, { - "__id__": 764 + "__id__": 748 }, { - "__id__": 792 + "__id__": 776 } ], "_active": true, "_components": [ { - "__id__": 804 + "__id__": 788 } ], "_prefab": { - "__id__": 806 + "__id__": 790 }, "_lpos": { "__type__": "cc.Vec3", @@ -9535,37 +9535,27 @@ }, { "__type__": "cc.Node", - "_name": "Mask", + "_name": "icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 320 }, - "_children": [ + "_children": [], + "_active": true, + "_components": [ { "__id__": 406 }, { - "__id__": 412 - } - ], - "_active": true, - "_components": [ - { - "__id__": 420 + "__id__": 408 }, { - "__id__": 422 - }, - { - "__id__": 424 - }, - { - "__id__": 426 + "__id__": 410 } ], "_prefab": { - "__id__": 428 + "__id__": 412 }, "_lpos": { "__type__": "cc.Vec3", @@ -9582,199 +9572,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Background_01", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 405 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 407 - }, - { - "__id__": 409 - } - ], - "_prefab": { - "__id__": 411 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -127.173, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.5, - "y": 0.5, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 406 - }, - "_enabled": true, - "__prefab": { - "__id__": 408 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 486, - "height": 999 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "05+ANtt5pCMbK4ux4M28ih" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 406 - }, - "_enabled": true, - "__prefab": { - "__id__": 410 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "05WzH1fANAYrRp/2lgr2Le" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d8LS7eqTtMhLCtEpHq76ZP", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 405 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 413 - }, - { - "__id__": 415 - }, - { - "__id__": 417 - } - ], - "_prefab": { - "__id__": 419 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 2.5, + "x": -2.5, "y": 2.5, "z": 1 }, @@ -9794,11 +9592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 405 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 407 }, "_contentSize": { "__type__": "cc.Size", @@ -9822,11 +9620,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 405 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 409 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9870,11 +9668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 405 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 411 }, "playOnLoad": false, "_clips": [], @@ -9898,151 +9696,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 405 - }, - "_enabled": true, - "__prefab": { - "__id__": 421 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220, - "height": 140 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "03C9v38MFG3JxIvGj9BQrP" - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 405 - }, - "_enabled": true, - "__prefab": { - "__id__": 423 - }, - "_type": 0, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "aaNjclX95EuIeQ1zSNPeNN" - }, - { - "__type__": "cc.Graphics", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 405 - }, - "_enabled": true, - "__prefab": { - "__id__": 425 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_lineWidth": 1, - "_strokeColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_lineJoin": 2, - "_lineCap": 0, - "_fillColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 0 - }, - "_miterLimit": 10, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0eczh3VNhBa4Z9Itzp/FEP" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 405 - }, - "_enabled": true, - "__prefab": { - "__id__": 427 - }, - "_alignFlags": 41, - "_target": null, - "_left": 5, - "_right": 5, - "_top": 20, - "_bottom": 133.5725, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 120, - "_originalHeight": 120, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b0Ysn2NXBMdYqGbwg0lPkJ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "3fWpwmcCNLm4qwzWoC4J8s", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "popup", @@ -10055,17 +9708,17 @@ "_active": false, "_components": [ { - "__id__": 430 + "__id__": 414 }, { - "__id__": 432 + "__id__": 416 }, { - "__id__": 434 + "__id__": 418 } ], "_prefab": { - "__id__": 436 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -10102,11 +9755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -10130,11 +9783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 433 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10178,11 +9831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 429 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 435 + "__id__": 419 }, "_alignFlags": 44, "_target": null, @@ -10233,14 +9886,14 @@ "_active": false, "_components": [ { - "__id__": 438 + "__id__": 422 }, { - "__id__": 440 + "__id__": 424 } ], "_prefab": { - "__id__": 442 + "__id__": 426 }, "_lpos": { "__type__": "cc.Vec3", @@ -10277,11 +9930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 423 }, "_contentSize": { "__type__": "cc.Size", @@ -10305,11 +9958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 421 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 425 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10372,17 +10025,17 @@ "_active": true, "_components": [ { - "__id__": 444 + "__id__": 428 }, { - "__id__": 446 + "__id__": 430 }, { - "__id__": 448 + "__id__": 432 } ], "_prefab": { - "__id__": 450 + "__id__": 434 }, "_lpos": { "__type__": "cc.Vec3", @@ -10419,11 +10072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 429 }, "_contentSize": { "__type__": "cc.Size", @@ -10447,11 +10100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 431 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10515,11 +10168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 427 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 433 }, "_alignFlags": 17, "_target": null, @@ -10567,6 +10220,12 @@ "__id__": 320 }, "_children": [ + { + "__id__": 436 + }, + { + "__id__": 444 + }, { "__id__": 452 }, @@ -10584,25 +10243,19 @@ }, { "__id__": 492 - }, - { - "__id__": 500 - }, - { - "__id__": 508 } ], "_active": true, "_components": [ { - "__id__": 517 + "__id__": 501 }, { - "__id__": 519 + "__id__": 503 } ], "_prefab": { - "__id__": 521 + "__id__": 505 }, "_lpos": { "__type__": "cc.Vec3", @@ -10639,8 +10292,364 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { + "__id__": 435 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 437 + }, + { + "__id__": 439 + }, + { + "__id__": 441 + } + ], + "_prefab": { + "__id__": 443 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 436 + }, + "_enabled": true, + "__prefab": { + "__id__": 438 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 170, + "height": 230 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d4Pd5UdRVC16NBMS0cFC50" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 436 + }, + "_enabled": true, + "__prefab": { + "__id__": 440 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fblqHsa8NJHZZQo/MYNr70" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 436 + }, + "_enabled": true, + "__prefab": { + "__id__": 442 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ddhbIlKSxH/ry90mj0MCYP" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "383bE5vX1F26T6EyKXIhM0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Card", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 435 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 445 + }, + { + "__id__": 447 + }, + { + "__id__": 449 + } + ], + "_prefab": { "__id__": 451 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 444 + }, + "_enabled": true, + "__prefab": { + "__id__": 446 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 230, + "height": 330 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dbX1enGTNGaYMLrUPPszhA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 444 + }, + "_enabled": true, + "__prefab": { + "__id__": 448 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@df52c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bdlrrULpVLb7vQ3C70iHA3" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 444 + }, + "_enabled": true, + "__prefab": { + "__id__": 450 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07JpeCZAZGvZT+0JlVxtBR" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "82OCWwPsZLr4QnNIGfNCF1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Hero", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 435 + }, "_children": [], "_active": false, "_components": [ @@ -10700,8 +10709,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, - "height": 230 + "width": 230, + "height": 330 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10712,7 +10721,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d4Pd5UdRVC16NBMS0cFC50" + "fileId": "50xLZPDExM15JebGkPUhrN" }, { "__type__": "cc.Sprite", @@ -10760,7 +10769,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fblqHsa8NJHZZQo/MYNr70" + "fileId": "23VuWJdPNPD5XfRuYmmLwp" }, { "__type__": "cc.Widget", @@ -10796,7 +10805,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ddhbIlKSxH/ry90mj0MCYP" + "fileId": "f0++MTZkxG677yL/ztCNwE" }, { "__type__": "cc.PrefabInfo", @@ -10806,18 +10815,18 @@ "asset": { "__id__": 0 }, - "fileId": "383bE5vX1F26T6EyKXIhM0", + "fileId": "403br0ZFJCiaiTREPrpZEq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Card", + "_name": "Skill", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 451 + "__id__": 435 }, "_children": [], "_active": false, @@ -10878,8 +10887,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 230, - "height": 330 + "width": 170, + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10890,7 +10899,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dbX1enGTNGaYMLrUPPszhA" + "fileId": "d6mgT98DZD34Q3LIfjMbLM" }, { "__type__": "cc.Sprite", @@ -10915,7 +10924,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@df52c", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e19cf", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -10938,7 +10947,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bdlrrULpVLb7vQ3C70iHA3" + "fileId": "55ZdUkQptJd4hxEdx8QB+B" }, { "__type__": "cc.Widget", @@ -10974,7 +10983,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07JpeCZAZGvZT+0JlVxtBR" + "fileId": "49KCCmePNLfIvBM5Oj6UG0" }, { "__type__": "cc.PrefabInfo", @@ -10984,21 +10993,21 @@ "asset": { "__id__": 0 }, - "fileId": "82OCWwPsZLr4QnNIGfNCF1", + "fileId": "4eh6GJfjdBfrVatb5NAc7W", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Hero", + "_name": "Potion", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 451 + "__id__": 435 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 469 @@ -11068,7 +11077,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "50xLZPDExM15JebGkPUhrN" + "fileId": "45fSM4gVRASYktH7u3eAGw" }, { "__type__": "cc.Sprite", @@ -11093,7 +11102,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4cf00", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e9809", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -11116,7 +11125,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23VuWJdPNPD5XfRuYmmLwp" + "fileId": "77NOjdkZpDHqiZMb0ITho+" }, { "__type__": "cc.Widget", @@ -11152,7 +11161,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0++MTZkxG677yL/ztCNwE" + "fileId": "02Lq9iYQZID5FJiETHd5bA" }, { "__type__": "cc.PrefabInfo", @@ -11162,18 +11171,18 @@ "asset": { "__id__": 0 }, - "fileId": "403br0ZFJCiaiTREPrpZEq", + "fileId": "aeVH9mJeBIoZFmTc8MyibA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "Skill", + "_name": "lv5", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 451 + "__id__": 435 }, "_children": [], "_active": false, @@ -11232,362 +11241,6 @@ "__prefab": { "__id__": 478 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 170, - "height": 230 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d6mgT98DZD34Q3LIfjMbLM" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 476 - }, - "_enabled": true, - "__prefab": { - "__id__": 480 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e19cf", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "55ZdUkQptJd4hxEdx8QB+B" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 476 - }, - "_enabled": true, - "__prefab": { - "__id__": 482 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 181, - "_originalHeight": 202, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "49KCCmePNLfIvBM5Oj6UG0" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4eh6GJfjdBfrVatb5NAc7W", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Potion", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 451 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 485 - }, - { - "__id__": 487 - }, - { - "__id__": 489 - } - ], - "_prefab": { - "__id__": 491 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 484 - }, - "_enabled": true, - "__prefab": { - "__id__": 486 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 230, - "height": 330 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "45fSM4gVRASYktH7u3eAGw" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 484 - }, - "_enabled": true, - "__prefab": { - "__id__": 488 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e9809", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "77NOjdkZpDHqiZMb0ITho+" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 484 - }, - "_enabled": true, - "__prefab": { - "__id__": 490 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 181, - "_originalHeight": 202, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "02Lq9iYQZID5FJiETHd5bA" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "aeVH9mJeBIoZFmTc8MyibA", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "lv5", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 451 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 493 - }, - { - "__id__": 495 - }, - { - "__id__": 497 - } - ], - "_prefab": { - "__id__": 499 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 492 - }, - "_enabled": true, - "__prefab": { - "__id__": 494 - }, "_contentSize": { "__type__": "cc.Size", "width": 230, @@ -11610,11 +11263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 480 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11658,11 +11311,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 482 }, "_alignFlags": 45, "_target": null, @@ -11707,23 +11360,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 451 + "__id__": 435 }, "_children": [], "_active": false, "_components": [ { - "__id__": 501 + "__id__": 485 }, { - "__id__": 503 + "__id__": 487 }, { - "__id__": 505 + "__id__": 489 } ], "_prefab": { - "__id__": 507 + "__id__": 491 }, "_lpos": { "__type__": "cc.Vec3", @@ -11760,11 +11413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -11788,11 +11441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11833,11 +11486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 490 }, "_alignFlags": 44, "_target": null, @@ -11880,17 +11533,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 451 + "__id__": 435 }, "_prefab": { - "__id__": 509 + "__id__": 493 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 508 + "__id__": 492 }, "asset": { "__uuid__": "5aae4a6d-b697-4c4b-86d3-8ea91be92be6", @@ -11898,7 +11551,7 @@ }, "fileId": "7347RlFLBEdJZ/A06wfR5f", "instance": { - "__id__": 510 + "__id__": 494 }, "targetOverrides": null }, @@ -11912,19 +11565,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 511 + "__id__": 495 }, { - "__id__": 513 + "__id__": 497 }, { - "__id__": 514 + "__id__": 498 }, { - "__id__": 515 + "__id__": 499 }, { - "__id__": 516 + "__id__": 500 } ], "removedComponents": [] @@ -11932,7 +11585,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 496 }, "propertyPath": [ "_name" @@ -11948,7 +11601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 496 }, "propertyPath": [ "_lpos" @@ -11963,7 +11616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 496 }, "propertyPath": [ "_lrot" @@ -11979,7 +11632,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 496 }, "propertyPath": [ "_euler" @@ -11994,7 +11647,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 496 }, "propertyPath": [ "_active" @@ -12007,11 +11660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 451 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 502 }, "_contentSize": { "__type__": "cc.Size", @@ -12035,11 +11688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 451 + "__id__": 435 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 504 }, "_alignFlags": 45, "_target": null, @@ -12074,6 +11727,8 @@ "__id__": 0 }, "fileId": "c4qHba5wxIZ62FcqmFQ3nd", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -12086,23 +11741,23 @@ }, "_children": [ { - "__id__": 523 + "__id__": 507 }, { - "__id__": 531 + "__id__": 515 } ], "_active": true, "_components": [ { - "__id__": 539 + "__id__": 523 }, { - "__id__": 541 + "__id__": 525 } ], "_prefab": { - "__id__": 543 + "__id__": 527 }, "_lpos": { "__type__": "cc.Vec3", @@ -12139,23 +11794,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 522 + "__id__": 506 }, "_children": [], "_active": true, "_components": [ { - "__id__": 524 + "__id__": 508 }, { - "__id__": 526 + "__id__": 510 }, { - "__id__": 528 + "__id__": 512 } ], "_prefab": { - "__id__": 530 + "__id__": 514 }, "_lpos": { "__type__": "cc.Vec3", @@ -12192,11 +11847,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 507 }, "_enabled": true, "__prefab": { - "__id__": 525 + "__id__": 509 }, "_contentSize": { "__type__": "cc.Size", @@ -12220,11 +11875,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 507 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 511 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12265,11 +11920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 507 }, "_enabled": true, "__prefab": { - "__id__": 529 + "__id__": 513 }, "_alignFlags": 45, "_target": null, @@ -12314,23 +11969,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 522 + "__id__": 506 }, "_children": [], "_active": true, "_components": [ { - "__id__": 532 + "__id__": 516 }, { - "__id__": 534 + "__id__": 518 }, { - "__id__": 536 + "__id__": 520 } ], "_prefab": { - "__id__": 538 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -12367,11 +12022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 517 }, "_contentSize": { "__type__": "cc.Size", @@ -12395,11 +12050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 519 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12463,11 +12118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 531 + "__id__": 515 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 521 }, "_alignFlags": 45, "_target": null, @@ -12512,11 +12167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 506 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 524 }, "_contentSize": { "__type__": "cc.Size", @@ -12540,11 +12195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 506 }, "_enabled": true, "__prefab": { - "__id__": 542 + "__id__": 526 }, "_alignFlags": 16, "_target": null, @@ -12593,29 +12248,29 @@ }, "_children": [ { - "__id__": 545 + "__id__": 529 }, { - "__id__": 551 + "__id__": 535 }, { - "__id__": 557 + "__id__": 541 }, { - "__id__": 563 + "__id__": 547 } ], "_active": false, "_components": [ { - "__id__": 569 + "__id__": 553 }, { - "__id__": 571 + "__id__": 555 } ], "_prefab": { - "__id__": 573 + "__id__": 557 }, "_lpos": { "__type__": "cc.Vec3", @@ -12652,20 +12307,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 544 + "__id__": 528 }, "_children": [], "_active": true, "_components": [ { - "__id__": 546 + "__id__": 530 }, { - "__id__": 548 + "__id__": 532 } ], "_prefab": { - "__id__": 550 + "__id__": 534 }, "_lpos": { "__type__": "cc.Vec3", @@ -12702,11 +12357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 545 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 531 }, "_contentSize": { "__type__": "cc.Size", @@ -12730,11 +12385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 545 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 533 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12788,20 +12443,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 544 + "__id__": 528 }, "_children": [], "_active": true, "_components": [ { - "__id__": 552 + "__id__": 536 }, { - "__id__": 554 + "__id__": 538 } ], "_prefab": { - "__id__": 556 + "__id__": 540 }, "_lpos": { "__type__": "cc.Vec3", @@ -12838,11 +12493,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 551 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 537 }, "_contentSize": { "__type__": "cc.Size", @@ -12866,11 +12521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 551 + "__id__": 535 }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 539 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12927,20 +12582,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 544 + "__id__": 528 }, "_children": [], "_active": true, "_components": [ { - "__id__": 558 + "__id__": 542 }, { - "__id__": 560 + "__id__": 544 } ], "_prefab": { - "__id__": 562 + "__id__": 546 }, "_lpos": { "__type__": "cc.Vec3", @@ -12977,11 +12632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 543 }, "_contentSize": { "__type__": "cc.Size", @@ -13005,11 +12660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 545 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13066,20 +12721,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 544 + "__id__": 528 }, "_children": [], "_active": true, "_components": [ { - "__id__": 564 + "__id__": 548 }, { - "__id__": 566 + "__id__": 550 } ], "_prefab": { - "__id__": 568 + "__id__": 552 }, "_lpos": { "__type__": "cc.Vec3", @@ -13116,11 +12771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 549 }, "_contentSize": { "__type__": "cc.Size", @@ -13144,11 +12799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 547 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 551 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13205,11 +12860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 544 + "__id__": 528 }, "_enabled": true, "__prefab": { - "__id__": 570 + "__id__": 554 }, "_contentSize": { "__type__": "cc.Size", @@ -13233,11 +12888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 544 + "__id__": 528 }, "_enabled": true, "__prefab": { - "__id__": 572 + "__id__": 556 }, "_alignFlags": 33, "_target": null, @@ -13286,43 +12941,43 @@ }, "_children": [ { - "__id__": 575 + "__id__": 559 }, { - "__id__": 581 + "__id__": 565 + }, + { + "__id__": 575 }, { "__id__": 591 }, { - "__id__": 607 + "__id__": 613 }, { - "__id__": 629 + "__id__": 641 }, { - "__id__": 657 - }, - { - "__id__": 691 + "__id__": 675 } ], "_active": true, "_components": [ { - "__id__": 731 + "__id__": 715 }, { - "__id__": 733 + "__id__": 717 } ], "_prefab": { - "__id__": 735 + "__id__": 719 }, "_lpos": { "__type__": "cc.Vec3", - "x": -104.42099999999999, - "y": 132.795, + "x": -94.42099999999999, + "y": 122.79499999999999, "z": 0 }, "_lrot": { @@ -13354,20 +13009,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 }, "_children": [], "_active": true, "_components": [ { - "__id__": 576 + "__id__": 560 }, { - "__id__": 578 + "__id__": 562 } ], "_prefab": { - "__id__": 580 + "__id__": 564 }, "_lpos": { "__type__": "cc.Vec3", @@ -13404,11 +13059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 559 }, "_enabled": true, "__prefab": { - "__id__": 577 + "__id__": 561 }, "_contentSize": { "__type__": "cc.Size", @@ -13432,11 +13087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 559 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 563 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13490,21 +13145,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 }, "_children": [ { - "__id__": 582 + "__id__": 566 } ], "_active": true, "_components": [ { - "__id__": 588 + "__id__": 572 } ], "_prefab": { - "__id__": 590 + "__id__": 574 }, "_lpos": { "__type__": "cc.Vec3", @@ -13541,20 +13196,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 581 + "__id__": 565 }, "_children": [], "_active": true, "_components": [ { - "__id__": 583 + "__id__": 567 }, { - "__id__": 585 + "__id__": 569 } ], "_prefab": { - "__id__": 587 + "__id__": 571 }, "_lpos": { "__type__": "cc.Vec3", @@ -13591,11 +13246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 582 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 568 }, "_contentSize": { "__type__": "cc.Size", @@ -13619,11 +13274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 582 + "__id__": 566 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 570 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13677,11 +13332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 581 + "__id__": 565 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 573 }, "_contentSize": { "__type__": "cc.Size", @@ -13718,7 +13373,374 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 + }, + "_children": [ + { + "__id__": 576 + }, + { + "__id__": 582 + } + ], + "_active": true, + "_components": [ + { + "__id__": 588 + } + ], + "_prefab": { + "__id__": 590 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 9.508, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "ItemIcon_Star", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 575 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 577 + }, + { + "__id__": 579 + } + ], + "_prefab": { + "__id__": 581 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -12, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 576 + }, + "_enabled": true, + "__prefab": { + "__id__": 578 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30, + "height": 29.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "04LWHoMLZCsooNBpZuwGSg" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 576 + }, + "_enabled": true, + "__prefab": { + "__id__": 580 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7e512", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0f8CONizVN+6rvoBasg219" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f23ZLpKCxMAKCX5B341MvW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemIcon_Star-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 575 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 583 + }, + { + "__id__": 585 + } + ], + "_prefab": { + "__id__": 587 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 12, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 582 + }, + "_enabled": true, + "__prefab": { + "__id__": 584 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30, + "height": 29.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60y3FCPfNE5LHqqbgEr9p4" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 582 + }, + "_enabled": true, + "__prefab": { + "__id__": 586 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7e512", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "94Wr15wY1B7ruiDl2Sp1pN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fbLZxncC1LaKnLW3s/SLz5", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 575 + }, + "_enabled": true, + "__prefab": { + "__id__": 589 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 39.333333 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a3PV+OR8tH/YTshCM4qxmT" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a26rNrMptBYrgi+Z68lDjK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lv3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 558 }, "_children": [ { @@ -13726,16 +13748,19 @@ }, { "__id__": 598 + }, + { + "__id__": 604 } ], "_active": true, "_components": [ { - "__id__": 604 + "__id__": 610 } ], "_prefab": { - "__id__": 606 + "__id__": 612 }, "_lpos": { "__type__": "cc.Vec3", @@ -13842,7 +13867,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "04LWHoMLZCsooNBpZuwGSg" + "fileId": "72U40T0ydPxYGhX1Rn9KsH" }, { "__type__": "cc.Sprite", @@ -13887,7 +13912,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0f8CONizVN+6rvoBasg219" + "fileId": "2eNiFIwyhPRYZ6926vDvSY" }, { "__type__": "cc.PrefabInfo", @@ -13897,7 +13922,7 @@ "asset": { "__id__": 0 }, - "fileId": "f23ZLpKCxMAKCX5B341MvW", + "fileId": "7bc3gGp1NGyqKag3GmZjCu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -13978,7 +14003,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "60y3FCPfNE5LHqqbgEr9p4" + "fileId": "032wC1m99A3aUxmprY6j2G" }, { "__type__": "cc.Sprite", @@ -14021,376 +14046,6 @@ "_atlas": null, "_id": "" }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "94Wr15wY1B7ruiDl2Sp1pN" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fbLZxncC1LaKnLW3s/SLz5", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 591 - }, - "_enabled": true, - "__prefab": { - "__id__": 605 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 40, - "height": 39.333333 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a3PV+OR8tH/YTshCM4qxmT" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a26rNrMptBYrgi+Z68lDjK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "lv3", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 574 - }, - "_children": [ - { - "__id__": 608 - }, - { - "__id__": 614 - }, - { - "__id__": 620 - } - ], - "_active": true, - "_components": [ - { - "__id__": 626 - } - ], - "_prefab": { - "__id__": 628 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 9.508, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "ItemIcon_Star", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 607 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 609 - }, - { - "__id__": 611 - } - ], - "_prefab": { - "__id__": 613 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -12, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 608 - }, - "_enabled": true, - "__prefab": { - "__id__": 610 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 30, - "height": 29.5 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "72U40T0ydPxYGhX1Rn9KsH" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 608 - }, - "_enabled": true, - "__prefab": { - "__id__": 612 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7e512", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2eNiFIwyhPRYZ6926vDvSY" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7bc3gGp1NGyqKag3GmZjCu", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemIcon_Star-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 607 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 615 - }, - { - "__id__": 617 - } - ], - "_prefab": { - "__id__": 619 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 12, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 614 - }, - "_enabled": true, - "__prefab": { - "__id__": 616 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 30, - "height": 29.5 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "032wC1m99A3aUxmprY6j2G" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 614 - }, - "_enabled": true, - "__prefab": { - "__id__": 618 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7e512", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, { "__type__": "cc.CompPrefabInfo", "fileId": "c3uouue+JLI55vbzMs71jF" @@ -14414,20 +14069,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 607 + "__id__": 591 }, "_children": [], "_active": true, "_components": [ { - "__id__": 621 + "__id__": 605 }, { - "__id__": 623 + "__id__": 607 } ], "_prefab": { - "__id__": 625 + "__id__": 609 }, "_lpos": { "__type__": "cc.Vec3", @@ -14464,11 +14119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 604 }, "_enabled": true, "__prefab": { - "__id__": 622 + "__id__": 606 }, "_contentSize": { "__type__": "cc.Size", @@ -14492,11 +14147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 620 + "__id__": 604 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 608 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14550,11 +14205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 607 + "__id__": 591 }, "_enabled": true, "__prefab": { - "__id__": 627 + "__id__": 611 }, "_contentSize": { "__type__": "cc.Size", @@ -14591,30 +14246,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 }, "_children": [ { - "__id__": 630 + "__id__": 614 }, { - "__id__": 636 + "__id__": 620 }, { - "__id__": 642 + "__id__": 626 }, { - "__id__": 648 + "__id__": 632 } ], "_active": true, "_components": [ { - "__id__": 654 + "__id__": 638 } ], "_prefab": { - "__id__": 656 + "__id__": 640 }, "_lpos": { "__type__": "cc.Vec3", @@ -14651,20 +14306,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 629 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 631 + "__id__": 615 }, { - "__id__": 633 + "__id__": 617 } ], "_prefab": { - "__id__": 635 + "__id__": 619 }, "_lpos": { "__type__": "cc.Vec3", @@ -14701,11 +14356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 614 }, "_enabled": true, "__prefab": { - "__id__": 632 + "__id__": 616 }, "_contentSize": { "__type__": "cc.Size", @@ -14729,11 +14384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 614 }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 618 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14787,20 +14442,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 629 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 637 + "__id__": 621 }, { - "__id__": 639 + "__id__": 623 } ], "_prefab": { - "__id__": 641 + "__id__": 625 }, "_lpos": { "__type__": "cc.Vec3", @@ -14837,11 +14492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 636 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 638 + "__id__": 622 }, "_contentSize": { "__type__": "cc.Size", @@ -14865,11 +14520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 636 + "__id__": 620 }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 624 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14923,20 +14578,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 629 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 643 + "__id__": 627 }, { - "__id__": 645 + "__id__": 629 } ], "_prefab": { - "__id__": 647 + "__id__": 631 }, "_lpos": { "__type__": "cc.Vec3", @@ -14973,11 +14628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 626 }, "_enabled": true, "__prefab": { - "__id__": 644 + "__id__": 628 }, "_contentSize": { "__type__": "cc.Size", @@ -15001,11 +14656,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 626 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 630 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15059,20 +14714,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 629 + "__id__": 613 }, "_children": [], "_active": true, "_components": [ { - "__id__": 649 + "__id__": 633 }, { - "__id__": 651 + "__id__": 635 } ], "_prefab": { - "__id__": 653 + "__id__": 637 }, "_lpos": { "__type__": "cc.Vec3", @@ -15109,11 +14764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 650 + "__id__": 634 }, "_contentSize": { "__type__": "cc.Size", @@ -15137,11 +14792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 636 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15195,11 +14850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 629 + "__id__": 613 }, "_enabled": true, "__prefab": { - "__id__": 655 + "__id__": 639 }, "_contentSize": { "__type__": "cc.Size", @@ -15236,33 +14891,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 }, "_children": [ { - "__id__": 658 + "__id__": 642 }, { - "__id__": 664 + "__id__": 648 }, { - "__id__": 670 + "__id__": 654 }, { - "__id__": 676 + "__id__": 660 }, { - "__id__": 682 + "__id__": 666 } ], "_active": true, "_components": [ { - "__id__": 688 + "__id__": 672 } ], "_prefab": { - "__id__": 690 + "__id__": 674 }, "_lpos": { "__type__": "cc.Vec3", @@ -15299,20 +14954,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 657 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 659 + "__id__": 643 }, { - "__id__": 661 + "__id__": 645 } ], "_prefab": { - "__id__": 663 + "__id__": 647 }, "_lpos": { "__type__": "cc.Vec3", @@ -15349,11 +15004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 644 }, "_contentSize": { "__type__": "cc.Size", @@ -15377,11 +15032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 646 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15435,20 +15090,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 657 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 665 + "__id__": 649 }, { - "__id__": 667 + "__id__": 651 } ], "_prefab": { - "__id__": 669 + "__id__": 653 }, "_lpos": { "__type__": "cc.Vec3", @@ -15485,11 +15140,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 666 + "__id__": 650 }, "_contentSize": { "__type__": "cc.Size", @@ -15513,11 +15168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 668 + "__id__": 652 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15571,20 +15226,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 657 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 671 + "__id__": 655 }, { - "__id__": 673 + "__id__": 657 } ], "_prefab": { - "__id__": 675 + "__id__": 659 }, "_lpos": { "__type__": "cc.Vec3", @@ -15621,11 +15276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 654 }, "_enabled": true, "__prefab": { - "__id__": 672 + "__id__": 656 }, "_contentSize": { "__type__": "cc.Size", @@ -15649,11 +15304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 654 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 658 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15707,20 +15362,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 657 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 677 + "__id__": 661 }, { - "__id__": 679 + "__id__": 663 } ], "_prefab": { - "__id__": 681 + "__id__": 665 }, "_lpos": { "__type__": "cc.Vec3", @@ -15757,11 +15412,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 660 }, "_enabled": true, "__prefab": { - "__id__": 678 + "__id__": 662 }, "_contentSize": { "__type__": "cc.Size", @@ -15785,11 +15440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 660 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 664 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15843,20 +15498,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 657 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 683 + "__id__": 667 }, { - "__id__": 685 + "__id__": 669 } ], "_prefab": { - "__id__": 687 + "__id__": 671 }, "_lpos": { "__type__": "cc.Vec3", @@ -15893,11 +15548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 682 + "__id__": 666 }, "_enabled": true, "__prefab": { - "__id__": 684 + "__id__": 668 }, "_contentSize": { "__type__": "cc.Size", @@ -15921,11 +15576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 682 + "__id__": 666 }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 670 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15979,11 +15634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 657 + "__id__": 641 }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 673 }, "_contentSize": { "__type__": "cc.Size", @@ -16020,36 +15675,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 574 + "__id__": 558 }, "_children": [ { - "__id__": 692 + "__id__": 676 }, { - "__id__": 698 + "__id__": 682 }, { - "__id__": 704 + "__id__": 688 }, { - "__id__": 710 + "__id__": 694 }, { - "__id__": 716 + "__id__": 700 }, { - "__id__": 722 + "__id__": 706 } ], "_active": true, "_components": [ { - "__id__": 728 + "__id__": 712 } ], "_prefab": { - "__id__": 730 + "__id__": 714 }, "_lpos": { "__type__": "cc.Vec3", @@ -16086,20 +15741,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 693 + "__id__": 677 }, { - "__id__": 695 + "__id__": 679 } ], "_prefab": { - "__id__": 697 + "__id__": 681 }, "_lpos": { "__type__": "cc.Vec3", @@ -16136,11 +15791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 694 + "__id__": 678 }, "_contentSize": { "__type__": "cc.Size", @@ -16164,11 +15819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 680 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16222,20 +15877,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 699 + "__id__": 683 }, { - "__id__": 701 + "__id__": 685 } ], "_prefab": { - "__id__": 703 + "__id__": 687 }, "_lpos": { "__type__": "cc.Vec3", @@ -16272,11 +15927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 682 }, "_enabled": true, "__prefab": { - "__id__": 700 + "__id__": 684 }, "_contentSize": { "__type__": "cc.Size", @@ -16300,11 +15955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 682 }, "_enabled": true, "__prefab": { - "__id__": 702 + "__id__": 686 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16358,20 +16013,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 705 + "__id__": 689 }, { - "__id__": 707 + "__id__": 691 } ], "_prefab": { - "__id__": 709 + "__id__": 693 }, "_lpos": { "__type__": "cc.Vec3", @@ -16408,11 +16063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 704 + "__id__": 688 }, "_enabled": true, "__prefab": { - "__id__": 706 + "__id__": 690 }, "_contentSize": { "__type__": "cc.Size", @@ -16436,11 +16091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 704 + "__id__": 688 }, "_enabled": true, "__prefab": { - "__id__": 708 + "__id__": 692 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16494,20 +16149,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 711 + "__id__": 695 }, { - "__id__": 713 + "__id__": 697 } ], "_prefab": { - "__id__": 715 + "__id__": 699 }, "_lpos": { "__type__": "cc.Vec3", @@ -16544,11 +16199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 712 + "__id__": 696 }, "_contentSize": { "__type__": "cc.Size", @@ -16572,11 +16227,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 694 }, "_enabled": true, "__prefab": { - "__id__": 714 + "__id__": 698 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16630,20 +16285,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 717 + "__id__": 701 }, { - "__id__": 719 + "__id__": 703 } ], "_prefab": { - "__id__": 721 + "__id__": 705 }, "_lpos": { "__type__": "cc.Vec3", @@ -16680,11 +16335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 700 }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 702 }, "_contentSize": { "__type__": "cc.Size", @@ -16708,11 +16363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 700 }, "_enabled": true, "__prefab": { - "__id__": 720 + "__id__": 704 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16766,20 +16421,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 723 + "__id__": 707 }, { - "__id__": 725 + "__id__": 709 } ], "_prefab": { - "__id__": 727 + "__id__": 711 }, "_lpos": { "__type__": "cc.Vec3", @@ -16816,11 +16471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 722 + "__id__": 706 }, "_enabled": true, "__prefab": { - "__id__": 724 + "__id__": 708 }, "_contentSize": { "__type__": "cc.Size", @@ -16844,11 +16499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 722 + "__id__": 706 }, "_enabled": true, "__prefab": { - "__id__": 726 + "__id__": 710 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16902,11 +16557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 729 + "__id__": 713 }, "_contentSize": { "__type__": "cc.Size", @@ -16943,11 +16598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 732 + "__id__": 716 }, "_contentSize": { "__type__": "cc.Size", @@ -16971,11 +16626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 574 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 734 + "__id__": 718 }, "_alignFlags": 9, "_target": null, @@ -17024,29 +16679,29 @@ }, "_children": [ { - "__id__": 737 + "__id__": 721 }, { - "__id__": 745 + "__id__": 729 }, { - "__id__": 751 + "__id__": 735 } ], "_active": true, "_components": [ { - "__id__": 757 + "__id__": 741 }, { - "__id__": 759 + "__id__": 743 }, { - "__id__": 761 + "__id__": 745 } ], "_prefab": { - "__id__": 763 + "__id__": 747 }, "_lpos": { "__type__": "cc.Vec3", @@ -17083,23 +16738,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 736 + "__id__": 720 }, "_children": [], "_active": true, "_components": [ { - "__id__": 738 + "__id__": 722 }, { - "__id__": 740 + "__id__": 724 }, { - "__id__": 742 + "__id__": 726 } ], "_prefab": { - "__id__": 744 + "__id__": 728 }, "_lpos": { "__type__": "cc.Vec3", @@ -17136,11 +16791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 723 }, "_contentSize": { "__type__": "cc.Size", @@ -17164,11 +16819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 721 }, "_enabled": false, "__prefab": { - "__id__": 741 + "__id__": 725 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17209,11 +16864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 721 }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 727 }, "_alignFlags": 45, "_target": null, @@ -17258,20 +16913,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 736 + "__id__": 720 }, "_children": [], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 730 }, { - "__id__": 748 + "__id__": 732 } ], "_prefab": { - "__id__": 750 + "__id__": 734 }, "_lpos": { "__type__": "cc.Vec3", @@ -17308,11 +16963,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 729 }, "_enabled": true, "__prefab": { - "__id__": 747 + "__id__": 731 }, "_contentSize": { "__type__": "cc.Size", @@ -17336,11 +16991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 729 }, "_enabled": true, "__prefab": { - "__id__": 749 + "__id__": 733 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17394,20 +17049,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 736 + "__id__": 720 }, "_children": [], "_active": true, "_components": [ { - "__id__": 752 + "__id__": 736 }, { - "__id__": 754 + "__id__": 738 } ], "_prefab": { - "__id__": 756 + "__id__": 740 }, "_lpos": { "__type__": "cc.Vec3", @@ -17444,11 +17099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 753 + "__id__": 737 }, "_contentSize": { "__type__": "cc.Size", @@ -17472,11 +17127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 751 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 739 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17553,11 +17208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 720 }, "_enabled": true, "__prefab": { - "__id__": 758 + "__id__": 742 }, "_contentSize": { "__type__": "cc.Size", @@ -17581,11 +17236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 720 }, "_enabled": false, "__prefab": { - "__id__": 760 + "__id__": 744 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17626,11 +17281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 720 }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 746 }, "_alignFlags": 36, "_target": null, @@ -17679,29 +17334,29 @@ }, "_children": [ { - "__id__": 765 + "__id__": 749 }, { - "__id__": 773 + "__id__": 757 }, { - "__id__": 779 + "__id__": 763 } ], "_active": true, "_components": [ { - "__id__": 785 + "__id__": 769 }, { - "__id__": 787 + "__id__": 771 }, { - "__id__": 789 + "__id__": 773 } ], "_prefab": { - "__id__": 791 + "__id__": 775 }, "_lpos": { "__type__": "cc.Vec3", @@ -17738,23 +17393,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 764 + "__id__": 748 }, "_children": [], "_active": true, "_components": [ { - "__id__": 766 + "__id__": 750 }, { - "__id__": 768 + "__id__": 752 }, { - "__id__": 770 + "__id__": 754 } ], "_prefab": { - "__id__": 772 + "__id__": 756 }, "_lpos": { "__type__": "cc.Vec3", @@ -17791,11 +17446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 765 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 751 }, "_contentSize": { "__type__": "cc.Size", @@ -17819,11 +17474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 765 + "__id__": 749 }, "_enabled": false, "__prefab": { - "__id__": 769 + "__id__": 753 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17864,11 +17519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 765 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 771 + "__id__": 755 }, "_alignFlags": 45, "_target": null, @@ -17913,20 +17568,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 764 + "__id__": 748 }, "_children": [], "_active": true, "_components": [ { - "__id__": 774 + "__id__": 758 }, { - "__id__": 776 + "__id__": 760 } ], "_prefab": { - "__id__": 778 + "__id__": 762 }, "_lpos": { "__type__": "cc.Vec3", @@ -17963,11 +17618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 775 + "__id__": 759 }, "_contentSize": { "__type__": "cc.Size", @@ -17991,11 +17646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 757 }, "_enabled": true, "__prefab": { - "__id__": 777 + "__id__": 761 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18049,20 +17704,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 764 + "__id__": 748 }, "_children": [], "_active": true, "_components": [ { - "__id__": 780 + "__id__": 764 }, { - "__id__": 782 + "__id__": 766 } ], "_prefab": { - "__id__": 784 + "__id__": 768 }, "_lpos": { "__type__": "cc.Vec3", @@ -18099,11 +17754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 763 }, "_enabled": true, "__prefab": { - "__id__": 781 + "__id__": 765 }, "_contentSize": { "__type__": "cc.Size", @@ -18127,11 +17782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 763 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 767 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18208,11 +17863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 770 }, "_contentSize": { "__type__": "cc.Size", @@ -18236,11 +17891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 748 }, "_enabled": false, "__prefab": { - "__id__": 788 + "__id__": 772 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18281,11 +17936,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 774 }, "_alignFlags": 12, "_target": null, @@ -18334,20 +17989,20 @@ }, "_children": [ { - "__id__": 793 + "__id__": 777 } ], "_active": true, "_components": [ { - "__id__": 799 + "__id__": 783 }, { - "__id__": 801 + "__id__": 785 } ], "_prefab": { - "__id__": 803 + "__id__": 787 }, "_lpos": { "__type__": "cc.Vec3", @@ -18384,20 +18039,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 792 + "__id__": 776 }, "_children": [], "_active": true, "_components": [ { - "__id__": 794 + "__id__": 778 }, { - "__id__": 796 + "__id__": 780 } ], "_prefab": { - "__id__": 798 + "__id__": 782 }, "_lpos": { "__type__": "cc.Vec3", @@ -18434,11 +18089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 793 + "__id__": 777 }, "_enabled": true, "__prefab": { - "__id__": 795 + "__id__": 779 }, "_contentSize": { "__type__": "cc.Size", @@ -18462,11 +18117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 793 + "__id__": 777 }, "_enabled": true, "__prefab": { - "__id__": 797 + "__id__": 781 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18543,11 +18198,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 784 }, "_contentSize": { "__type__": "cc.Size", @@ -18571,11 +18226,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 786 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18636,7 +18291,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 805 + "__id__": 789 }, "_contentSize": { "__type__": "cc.Size", @@ -18677,7 +18332,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 792 }, "_contentSize": { "__type__": "cc.Size", @@ -18705,7 +18360,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 794 }, "_alignFlags": 45, "_target": null, @@ -18741,7 +18396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 796 }, "playOnLoad": false, "_clips": [ @@ -18785,14 +18440,14 @@ "_active": true, "_components": [ { - "__id__": 815 + "__id__": 799 }, { - "__id__": 817 + "__id__": 801 } ], "_prefab": { - "__id__": 819 + "__id__": 803 }, "_lpos": { "__type__": "cc.Vec3", @@ -18829,11 +18484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 814 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 816 + "__id__": 800 }, "_contentSize": { "__type__": "cc.Size", @@ -18857,11 +18512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 814 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 818 + "__id__": 802 }, "_alignFlags": 40, "_target": null, @@ -18910,26 +18565,26 @@ }, "_children": [ { - "__id__": 821 + "__id__": 805 }, { - "__id__": 827 + "__id__": 811 }, { - "__id__": 833 + "__id__": 817 }, { - "__id__": 839 + "__id__": 823 } ], "_active": true, "_components": [ { - "__id__": 845 + "__id__": 829 } ], "_prefab": { - "__id__": 847 + "__id__": 831 }, "_lpos": { "__type__": "cc.Vec3", @@ -18966,20 +18621,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 804 }, "_children": [], "_active": true, "_components": [ { - "__id__": 822 + "__id__": 806 }, { - "__id__": 824 + "__id__": 808 } ], "_prefab": { - "__id__": 826 + "__id__": 810 }, "_lpos": { "__type__": "cc.Vec3", @@ -19016,11 +18671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 805 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 807 }, "_contentSize": { "__type__": "cc.Size", @@ -19044,11 +18699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 805 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 809 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19125,20 +18780,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 804 }, "_children": [], "_active": true, "_components": [ { - "__id__": 828 + "__id__": 812 }, { - "__id__": 830 + "__id__": 814 } ], "_prefab": { - "__id__": 832 + "__id__": 816 }, "_lpos": { "__type__": "cc.Vec3", @@ -19175,11 +18830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 811 }, "_enabled": true, "__prefab": { - "__id__": 829 + "__id__": 813 }, "_contentSize": { "__type__": "cc.Size", @@ -19203,11 +18858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 811 }, "_enabled": true, "__prefab": { - "__id__": 831 + "__id__": 815 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19261,20 +18916,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 804 }, "_children": [], "_active": true, "_components": [ { - "__id__": 834 + "__id__": 818 }, { - "__id__": 836 + "__id__": 820 } ], "_prefab": { - "__id__": 838 + "__id__": 822 }, "_lpos": { "__type__": "cc.Vec3", @@ -19311,11 +18966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 833 + "__id__": 817 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 819 }, "_contentSize": { "__type__": "cc.Size", @@ -19339,11 +18994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 833 + "__id__": 817 }, "_enabled": true, "__prefab": { - "__id__": 837 + "__id__": 821 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19420,20 +19075,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 804 }, "_children": [], "_active": true, "_components": [ { - "__id__": 840 + "__id__": 824 }, { - "__id__": 842 + "__id__": 826 } ], "_prefab": { - "__id__": 844 + "__id__": 828 }, "_lpos": { "__type__": "cc.Vec3", @@ -19470,11 +19125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 825 }, "_contentSize": { "__type__": "cc.Size", @@ -19498,11 +19153,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 839 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 827 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19579,11 +19234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 820 + "__id__": 804 }, "_enabled": true, "__prefab": { - "__id__": 846 + "__id__": 830 }, "_contentSize": { "__type__": "cc.Size", @@ -19624,7 +19279,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 849 + "__id__": 833 }, "_contentSize": { "__type__": "cc.Size", @@ -19652,7 +19307,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 851 + "__id__": 835 }, "_alignFlags": 45, "_target": null, @@ -19701,29 +19356,29 @@ }, "_children": [ { - "__id__": 854 + "__id__": 838 }, { - "__id__": 869 + "__id__": 853 }, { - "__id__": 884 + "__id__": 868 } ], "_active": true, "_components": [ { - "__id__": 899 + "__id__": 883 }, { - "__id__": 901 + "__id__": 885 }, { - "__id__": 903 + "__id__": 887 } ], "_prefab": { - "__id__": 905 + "__id__": 889 }, "_lpos": { "__type__": "cc.Vec3", @@ -19760,27 +19415,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 837 }, "_children": [ { - "__id__": 855 + "__id__": 839 } ], "_active": true, "_components": [ { - "__id__": 861 + "__id__": 845 }, { - "__id__": 863 + "__id__": 847 }, { - "__id__": 865 + "__id__": 849 } ], "_prefab": { - "__id__": 868 + "__id__": 852 }, "_lpos": { "__type__": "cc.Vec3", @@ -19817,20 +19472,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 838 }, "_children": [], "_active": true, "_components": [ { - "__id__": 856 + "__id__": 840 }, { - "__id__": 858 + "__id__": 842 } ], "_prefab": { - "__id__": 860 + "__id__": 844 }, "_lpos": { "__type__": "cc.Vec3", @@ -19867,11 +19522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 857 + "__id__": 841 }, "_contentSize": { "__type__": "cc.Size", @@ -19895,11 +19550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 843 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19976,11 +19631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 862 + "__id__": 846 }, "_contentSize": { "__type__": "cc.Size", @@ -20004,11 +19659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 848 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20052,15 +19707,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 866 + "__id__": 850 }, "clickEvents": [ { - "__id__": 867 + "__id__": 851 } ], "_interactable": true, @@ -20135,27 +19790,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 837 }, "_children": [ { - "__id__": 870 + "__id__": 854 } ], "_active": true, "_components": [ { - "__id__": 876 + "__id__": 860 }, { - "__id__": 878 + "__id__": 862 }, { - "__id__": 880 + "__id__": 864 } ], "_prefab": { - "__id__": 883 + "__id__": 867 }, "_lpos": { "__type__": "cc.Vec3", @@ -20192,20 +19847,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 869 + "__id__": 853 }, "_children": [], "_active": true, "_components": [ { - "__id__": 871 + "__id__": 855 }, { - "__id__": 873 + "__id__": 857 } ], "_prefab": { - "__id__": 875 + "__id__": 859 }, "_lpos": { "__type__": "cc.Vec3", @@ -20242,11 +19897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 870 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 856 }, "_contentSize": { "__type__": "cc.Size", @@ -20270,11 +19925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 870 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 874 + "__id__": 858 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20351,11 +20006,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 853 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 861 }, "_contentSize": { "__type__": "cc.Size", @@ -20379,11 +20034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 853 }, "_enabled": true, "__prefab": { - "__id__": 879 + "__id__": 863 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20427,15 +20082,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 853 }, "_enabled": true, "__prefab": { - "__id__": 881 + "__id__": 865 }, "clickEvents": [ { - "__id__": 882 + "__id__": 866 } ], "_interactable": true, @@ -20510,27 +20165,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 837 }, "_children": [ { - "__id__": 885 + "__id__": 869 } ], "_active": false, "_components": [ { - "__id__": 891 + "__id__": 875 }, { - "__id__": 893 + "__id__": 877 }, { - "__id__": 895 + "__id__": 879 } ], "_prefab": { - "__id__": 898 + "__id__": 882 }, "_lpos": { "__type__": "cc.Vec3", @@ -20567,20 +20222,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 884 + "__id__": 868 }, "_children": [], "_active": true, "_components": [ { - "__id__": 886 + "__id__": 870 }, { - "__id__": 888 + "__id__": 872 } ], "_prefab": { - "__id__": 890 + "__id__": 874 }, "_lpos": { "__type__": "cc.Vec3", @@ -20617,11 +20272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 869 }, "_enabled": true, "__prefab": { - "__id__": 887 + "__id__": 871 }, "_contentSize": { "__type__": "cc.Size", @@ -20645,11 +20300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 869 }, "_enabled": true, "__prefab": { - "__id__": 889 + "__id__": 873 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20726,11 +20381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 884 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 892 + "__id__": 876 }, "_contentSize": { "__type__": "cc.Size", @@ -20754,11 +20409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 884 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 878 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20802,15 +20457,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 884 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 880 }, "clickEvents": [ { - "__id__": 897 + "__id__": 881 } ], "_interactable": true, @@ -20885,11 +20540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 900 + "__id__": 884 }, "_contentSize": { "__type__": "cc.Size", @@ -20913,11 +20568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 886 }, "_resizeMode": 1, "_layoutType": 1, @@ -20951,11 +20606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 888 }, "_alignFlags": 4, "_target": null, @@ -21001,14 +20656,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 907 + "__id__": 891 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 906 + "__id__": 890 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -21016,7 +20671,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 908 + "__id__": 892 }, "targetOverrides": null }, @@ -21030,25 +20685,25 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 909 + "__id__": 893 }, { - "__id__": 911 + "__id__": 895 }, { - "__id__": 912 + "__id__": 896 }, { - "__id__": 913 + "__id__": 897 }, { - "__id__": 914 + "__id__": 898 }, { - "__id__": 915 + "__id__": 899 }, { - "__id__": 917 + "__id__": 901 } ], "removedComponents": [] @@ -21056,7 +20711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 894 }, "propertyPath": [ "_name" @@ -21072,7 +20727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 894 }, "propertyPath": [ "_lpos" @@ -21087,7 +20742,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 894 }, "propertyPath": [ "_lrot" @@ -21103,7 +20758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 894 }, "propertyPath": [ "_euler" @@ -21118,7 +20773,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 894 }, "propertyPath": [ "_active" @@ -21128,7 +20783,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 916 + "__id__": 900 }, "propertyPath": [ "_contentSize" @@ -21148,7 +20803,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 918 + "__id__": 902 }, "propertyPath": [ "_contentSize" @@ -21175,7 +20830,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 904 }, "_contentSize": { "__type__": "cc.Size", @@ -21203,7 +20858,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 906 }, "mvp_node": { "__id__": 320 @@ -21227,7 +20882,7 @@ "__id__": 238 }, "highlights_container": { - "__id__": 814 + "__id__": 798 }, "highlight_prefab": { "__uuid__": "12df63de-cda7-4be2-8e23-ea387fbba6f5", @@ -21249,7 +20904,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 908 }, "_alignFlags": 45, "_target": null, @@ -21285,7 +20940,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 926 + "__id__": 910 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21327,7 +20982,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 912 }, "_id": "" }, @@ -21348,10 +21003,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 906 + "__id__": 890 }, { - "__id__": 508 + "__id__": 492 } ] } diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index d40cc6e8..96f33e47 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -45,7 +45,7 @@ import { HInfoComp } from "./HInfoComp"; import { smc } from "../common/SingletonModuleComp"; import { HeroInfo, HType } from "../common/config/heroSet"; import { HeroViewComp } from "../hero/HeroViewComp"; -import { FacSet } from "../common/config/GameSet"; +import { FacSet, FightSet } from "../common/config/GameSet"; import { MoveComp } from "../hero/MoveComp"; import { MissionHeroCompComp } from "./MissionHeroComp"; @@ -454,13 +454,13 @@ export class MissionCardComp extends CCComp { * @returns { needCount: 合成所需数量, maxLv: 最大合成等级 } */ private getMergeRule(): { needCount: number, maxLv: number } { - let needCount = 3; - let maxLv = 2; // 兜底值改为2,与 MissionHeroComp 保持一致 + let needCount = FightSet.MERGE_NEED === 2 ? 2 : 3; + let maxLv = Math.max(1, Math.floor(FightSet.MERGE_MAX ?? 3)); ecs.query(ecs.allOf(MissionHeroCompComp)).forEach((entity: ecs.Entity) => { const comp = entity.get(MissionHeroCompComp); if (!comp) return; needCount = comp.merge_need_count === 2 ? 2 : 3; - maxLv = Math.max(1, Math.floor(comp.merge_max_lv ?? 2)); + maxLv = Math.max(1, Math.floor(comp.merge_max_lv ?? 3)); }); return { needCount, maxLv }; } diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index 1c0ec3b3..a7b790e5 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -18,7 +18,7 @@ * - ScoreWeights(ScoreSet)—— 得分权重配置 * - GameEvent.MissionEnd / MissionStart —— 游戏生命周期事件 */ -import { _decorator, instantiate, Label ,Prefab,Node, Sprite, Animation, AnimationClip, resources, UITransform, Widget } from "cc"; +import { _decorator, instantiate, Label ,Prefab,Node, Sprite, Animation, AnimationClip, resources, UITransform, Widget, ProgressBar } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; @@ -418,12 +418,12 @@ export class VictoryComp extends CCComp { const lab = node.getChildByName("score_label")?.getComponent(Label); if (lab) lab.string = `${score}`; - const bar = node.getChildByName("progress_bar")?.getComponent(Sprite); + const bar = node.getChildByName("progress_bar")?.getComponent(ProgressBar); if (bar) { // 根据该维度得分占“预期满分”的比例设置进度条(fillRange) - bar.fillRange = Math.min(1, Math.max(0, score / maxScore)); + bar.progress = Math.min(1, Math.max(0, score / maxScore)); } - }; + }; // TODO: 进度条的最大值可按设计期望自行调整,目前为占位预估值 renderDim(this.combat_node, s.score_combat, 3000);