From dbe376033dc9869789d40be73e150f5874ed645b Mon Sep 17 00:00:00 2001 From: walkpan Date: Sat, 14 Mar 2026 09:09:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8D=A1=E7=89=8C=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 MissionCardComp 中未使用的接口定义和注释代码 - 移除 MissionComp 中未实现的英雄死亡、升级和复活相关事件处理 - 重构 CardSet 中的 getCardPoolByLv 和 getCardsByLv 方法,增加类型过滤和等级模式参数 - 清理 MissionComp 中的冗余代码和注释,简化局内数据初始化逻辑 --- assets/resources/gui/role_controller.prefab | 1770 ++++++++--------- assets/script/game/common/config/CardSet.ts | 31 +- .../script/game/common/config/CardSet.ts.meta | 9 + assets/script/game/map/MissionCardComp.ts | 18 +- assets/script/game/map/MissionComp.ts | 54 +- 5 files changed, 827 insertions(+), 1055 deletions(-) create mode 100644 assets/script/game/common/config/CardSet.ts.meta diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 1138eaaf..f3f64a91 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 411 + "__id__": 395 }, { - "__id__": 547 + "__id__": 531 }, { - "__id__": 556 + "__id__": 540 } ], "_active": true, "_components": [ { - "__id__": 602 + "__id__": 586 }, { - "__id__": 604 + "__id__": 588 }, { - "__id__": 606 + "__id__": 590 } ], "_prefab": { - "__id__": 608 + "__id__": 592 }, "_lpos": { "__type__": "cc.Vec3", @@ -100,26 +100,26 @@ "_active": true, "_components": [ { - "__id__": 398 + "__id__": 382 }, { - "__id__": 400 + "__id__": 384 }, { - "__id__": 402 + "__id__": 386 }, { - "__id__": 404 + "__id__": 388 }, { - "__id__": 406 + "__id__": 390 }, { - "__id__": 408 + "__id__": 392 } ], "_prefab": { - "__id__": 410 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -5728,7 +5728,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 190, "height": 80 }, "_anchorPoint": { @@ -5804,8 +5804,8 @@ }, "_alignFlags": 45, "_target": null, - "_left": -90, - "_right": -90, + "_left": 0, + "_right": 0, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -6725,7 +6725,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 20, + "width": 190, "height": 80 }, "_anchorPoint": { @@ -7076,8 +7076,6 @@ "__id__": 0 }, "fileId": "5aMCdIWc5OmJF+7Y1vMDAV", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7272,8 +7270,6 @@ "__id__": 0 }, "fileId": "57ozFIFb9ETJnSg6jZ4keY", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7411,8 +7407,6 @@ "__id__": 0 }, "fileId": "80R6KCqF1MUotJRCKCOAB1", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7570,8 +7564,6 @@ "__id__": 0 }, "fileId": "4b2ngPxLNPTLyKGNy8mqMw", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7653,8 +7645,6 @@ "__id__": 0 }, "fileId": "658QGyYfxEyJvkxOrsGTX4", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7812,8 +7802,6 @@ "__id__": 0 }, "fileId": "8eSy9TOKJMi4sjqRA6RoQk", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7853,8 +7841,6 @@ "__id__": 0 }, "fileId": "63FHyGP9BOaqAuH4RtPSZ0", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7968,8 +7954,6 @@ "__id__": 0 }, "fileId": "46VgrHm5VNH5UNmq7bgAi+", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8062,29 +8046,29 @@ "__id__": 343 }, { - "__id__": 355 + "__id__": 351 + }, + { + "__id__": 359 }, { "__id__": 367 - }, - { - "__id__": 379 } ], "_active": true, "_components": [ { - "__id__": 391 + "__id__": 375 }, { - "__id__": 393 + "__id__": 377 }, { - "__id__": 395 + "__id__": 379 } ], "_prefab": { - "__id__": 397 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -8161,12 +8145,6 @@ }, { "__id__": 350 - }, - { - "__id__": 351 - }, - { - "__id__": 353 } ], "removedComponents": [] @@ -8233,46 +8211,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 352 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 112, - "height": 96 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "echbIL321NULA+TdS2I5DY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 354 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 108, - "height": 108 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b4OssxKxFNiaAHverAg/TM" - ] - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -8280,14 +8218,14 @@ "__id__": 342 }, "_prefab": { - "__id__": 356 + "__id__": 352 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 355 + "__id__": 351 }, "asset": { "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", @@ -8295,7 +8233,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 357 + "__id__": 353 }, "targetOverrides": null }, @@ -8308,23 +8246,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 354 + }, + { + "__id__": 356 + }, + { + "__id__": 357 + }, { "__id__": 358 - }, - { - "__id__": 360 - }, - { - "__id__": 361 - }, - { - "__id__": 362 - }, - { - "__id__": 363 - }, - { - "__id__": 365 } ], "removedComponents": [] @@ -8332,7 +8264,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 355 }, "propertyPath": [ "_name" @@ -8348,7 +8280,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 355 }, "propertyPath": [ "_lpos" @@ -8363,7 +8295,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 355 }, "propertyPath": [ "_lrot" @@ -8379,7 +8311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 359 + "__id__": 355 }, "propertyPath": [ "_euler" @@ -8391,45 +8323,117 @@ "z": 0 } }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 342 + }, + "_prefab": { + "__id__": 360 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 359 + }, + "asset": { + "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", + "__expectedType__": "cc.Prefab" + }, + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", + "instance": { + "__id__": 361 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "4cPPEpiDZJhZvrA5oXzk89", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 362 + }, + { + "__id__": 364 + }, + { + "__id__": 365 + }, + { + "__id__": 366 + } + ], + "removedComponents": [] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 364 + "__id__": 363 }, "propertyPath": [ - "_contentSize" + "_name" ], - "value": { - "__type__": "cc.Size", - "width": 112, - "height": 96 - } + "value": "card" }, { "__type__": "cc.TargetInfo", "localID": [ - "echbIL321NULA+TdS2I5DY" + "24rlgXRJ9AHLGpMW+aYyEx" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 366 + "__id__": 363 }, "propertyPath": [ - "_contentSize" + "_lpos" ], "value": { - "__type__": "cc.Size", - "width": 108, - "height": 108 + "__type__": "cc.Vec3", + "x": 89, + "y": 0, + "z": 0 } }, { - "__type__": "cc.TargetInfo", - "localID": [ - "b4OssxKxFNiaAHverAg/TM" - ] + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 363 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 363 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } }, { "__type__": "cc.Node", @@ -8459,7 +8463,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4cPPEpiDZJhZvrA5oXzk89", + "fileId": "90BK+SmEJJgYbA//C2jnYF", "prefabRootNode": { "__id__": 1 }, @@ -8477,12 +8481,6 @@ }, { "__id__": 374 - }, - { - "__id__": 375 - }, - { - "__id__": 377 } ], "removedComponents": [] @@ -8511,164 +8509,6 @@ "propertyPath": [ "_lpos" ], - "value": { - "__type__": "cc.Vec3", - "x": 89, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 371 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 371 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 376 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 112, - "height": 96 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "echbIL321NULA+TdS2I5DY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 378 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 108, - "height": 108 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b4OssxKxFNiaAHverAg/TM" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 342 - }, - "_prefab": { - "__id__": 380 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 379 - }, - "asset": { - "__uuid__": "8aaff904-8c27-4173-9716-7161893b336e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "24rlgXRJ9AHLGpMW+aYyEx", - "instance": { - "__id__": 381 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "90BK+SmEJJgYbA//C2jnYF", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 382 - }, - { - "__id__": 384 - }, - { - "__id__": 385 - }, - { - "__id__": 386 - }, - { - "__id__": 387 - }, - { - "__id__": 389 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 383 - }, - "propertyPath": [ - "_name" - ], - "value": "card" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "24rlgXRJ9AHLGpMW+aYyEx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 383 - }, - "propertyPath": [ - "_lpos" - ], "value": { "__type__": "cc.Vec3", "x": 267, @@ -8679,7 +8519,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 383 + "__id__": 371 }, "propertyPath": [ "_lrot" @@ -8695,7 +8535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 383 + "__id__": 371 }, "propertyPath": [ "_euler" @@ -8707,46 +8547,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 388 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 112, - "height": 96 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "echbIL321NULA+TdS2I5DY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 390 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 108, - "height": 108 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b4OssxKxFNiaAHverAg/TM" - ] - }, { "__type__": "cc.UITransform", "_name": "", @@ -8757,7 +8557,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -8785,7 +8585,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 378 }, "_alignFlags": 44, "_target": null, @@ -8821,7 +8621,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 380 }, "_resizeMode": 1, "_layoutType": 1, @@ -8872,7 +8672,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -8900,7 +8700,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 385 }, "_alignFlags": 21, "_target": null, @@ -8936,7 +8736,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 387 }, "debugMode": false, "coins_node": null, @@ -8963,7 +8763,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 389 }, "_id": "" }, @@ -8981,7 +8781,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 391 }, "debugMode": false, "_id": "" @@ -9000,24 +8800,24 @@ }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 393 }, "card1": { "__id__": 343 }, "card2": { - "__id__": 355 + "__id__": 351 }, "card3": { - "__id__": 367 + "__id__": 359 }, "card4": { - "__id__": 379 + "__id__": 367 }, - "btnClose": null, - "Lock": null, - "unLock": null, - "noStop": null, + "cards_chou": { + "__id__": 288 + }, + "cards_up": null, "_id": "" }, { @@ -9046,30 +8846,30 @@ "__id__": 1 }, "_children": [ + { + "__id__": 396 + }, { "__id__": 412 }, { - "__id__": 428 - }, - { - "__id__": 464 + "__id__": 448 } ], "_active": false, "_components": [ { - "__id__": 540 + "__id__": 524 }, { - "__id__": 542 + "__id__": 526 }, { - "__id__": 544 + "__id__": 528 } ], "_prefab": { - "__id__": 546 + "__id__": 530 }, "_lpos": { "__type__": "cc.Vec3", @@ -9106,27 +8906,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 411 + "__id__": 395 }, "_children": [ { - "__id__": 413 + "__id__": 397 } ], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 405 }, { - "__id__": 423 + "__id__": 407 }, { - "__id__": 425 + "__id__": 409 } ], "_prefab": { - "__id__": 427 + "__id__": 411 }, "_lpos": { "__type__": "cc.Vec3", @@ -9163,23 +8963,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 412 + "__id__": 396 }, "_children": [], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 398 }, { - "__id__": 416 + "__id__": 400 }, { - "__id__": 418 + "__id__": 402 } ], "_prefab": { - "__id__": 420 + "__id__": 404 }, "_lpos": { "__type__": "cc.Vec3", @@ -9216,11 +9016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 399 }, "_contentSize": { "__type__": "cc.Size", @@ -9244,11 +9044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 401 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9292,11 +9092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 397 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 403 }, "_alignFlags": 45, "_target": null, @@ -9341,11 +9141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 406 }, "_contentSize": { "__type__": "cc.Size", @@ -9369,11 +9169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 408 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9417,11 +9217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 412 + "__id__": 396 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 410 }, "_alignFlags": 45, "_target": null, @@ -9464,17 +9264,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 411 + "__id__": 395 }, "_prefab": { - "__id__": 429 + "__id__": 413 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 428 + "__id__": 412 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -9482,7 +9282,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 430 + "__id__": 414 }, "targetOverrides": null }, @@ -9496,52 +9296,52 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 431 + "__id__": 415 }, { - "__id__": 433 + "__id__": 417 }, { - "__id__": 435 + "__id__": 419 }, { - "__id__": 437 + "__id__": 421 }, { - "__id__": 439 + "__id__": 423 }, { - "__id__": 441 + "__id__": 425 + }, + { + "__id__": 428 + }, + { + "__id__": 430 + }, + { + "__id__": 432 + }, + { + "__id__": 434 + }, + { + "__id__": 436 + }, + { + "__id__": 438 + }, + { + "__id__": 440 + }, + { + "__id__": 442 }, { "__id__": 444 }, { "__id__": 446 - }, - { - "__id__": 448 - }, - { - "__id__": 450 - }, - { - "__id__": 452 - }, - { - "__id__": 454 - }, - { - "__id__": 456 - }, - { - "__id__": 458 - }, - { - "__id__": 460 - }, - { - "__id__": 462 } ], "removedComponents": [] @@ -9549,7 +9349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 432 + "__id__": 416 }, "propertyPath": [ "_name" @@ -9565,7 +9365,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 434 + "__id__": 418 }, "propertyPath": [ "_lpos" @@ -9586,7 +9386,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 436 + "__id__": 420 }, "propertyPath": [ "_lrot" @@ -9608,7 +9408,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 438 + "__id__": 422 }, "propertyPath": [ "_euler" @@ -9629,7 +9429,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 424 }, "propertyPath": [ "clickEvents", @@ -9646,14 +9446,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 442 + "__id__": 426 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 443 + "__id__": 427 } }, { @@ -9665,7 +9465,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 411 + "__id__": 395 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -9675,13 +9475,13 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 445 + "__id__": 429 }, "propertyPath": [ "_target" ], "value": { - "__id__": 428 + "__id__": 412 } }, { @@ -9693,7 +9493,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 447 + "__id__": 431 }, "propertyPath": [ "_bottom" @@ -9709,7 +9509,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 449 + "__id__": 433 }, "propertyPath": [ "_spriteFrame" @@ -9728,7 +9528,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 435 }, "propertyPath": [ "_contentSize" @@ -9748,7 +9548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 437 }, "propertyPath": [ "_contentSize" @@ -9768,7 +9568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 439 }, "propertyPath": [ "_lineHeight" @@ -9784,7 +9584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 457 + "__id__": 441 }, "propertyPath": [ "_contentSize" @@ -9804,7 +9604,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 459 + "__id__": 443 }, "propertyPath": [ "_fontSize" @@ -9820,7 +9620,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 461 + "__id__": 445 }, "propertyPath": [ "_actualFontSize" @@ -9836,7 +9636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 447 }, "propertyPath": [ "_outlineWidth" @@ -9855,33 +9655,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 411 + "__id__": 395 }, "_children": [ { - "__id__": 465 + "__id__": 449 }, { - "__id__": 487 + "__id__": 471 }, { - "__id__": 511 + "__id__": 495 } ], "_active": true, "_components": [ { - "__id__": 533 + "__id__": 517 }, { - "__id__": 535 + "__id__": 519 }, { - "__id__": 537 + "__id__": 521 } ], "_prefab": { - "__id__": 539 + "__id__": 523 }, "_lpos": { "__type__": "cc.Vec3", @@ -9918,27 +9718,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 464 + "__id__": 448 }, "_children": [ { - "__id__": 466 + "__id__": 450 }, { - "__id__": 472 + "__id__": 456 }, { - "__id__": 478 + "__id__": 462 } ], "_active": true, "_components": [ { - "__id__": 484 + "__id__": 468 } ], "_prefab": { - "__id__": 486 + "__id__": 470 }, "_lpos": { "__type__": "cc.Vec3", @@ -9975,20 +9775,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 465 + "__id__": 449 }, "_children": [], "_active": true, "_components": [ { - "__id__": 467 + "__id__": 451 }, { - "__id__": 469 + "__id__": 453 } ], "_prefab": { - "__id__": 471 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", @@ -10025,11 +9825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 466 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 452 }, "_contentSize": { "__type__": "cc.Size", @@ -10053,11 +9853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 466 + "__id__": 450 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 454 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10111,10 +9911,383 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 465 + "__id__": 449 }, "_children": [], "_active": false, + "_components": [ + { + "__id__": 457 + }, + { + "__id__": 459 + } + ], + "_prefab": { + "__id__": 461 + }, + "_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__": 456 + }, + "_enabled": true, + "__prefab": { + "__id__": 458 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 107 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bgV1CDytP15zzyXaA+HPd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 456 + }, + "_enabled": true, + "__prefab": { + "__id__": 460 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7eac7", + "__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": "77ETeE2AxMt4sY4/KVQJiP" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b2FyCNMJdNbK8KuRd4V+h4", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 449 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 463 + }, + { + "__id__": 465 + } + ], + "_prefab": { + "__id__": 467 + }, + "_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": 0.7, + "y": 0.7, + "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__": 462 + }, + "_enabled": true, + "__prefab": { + "__id__": 464 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 116, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36SARH0vtPoJBTuG99LXPv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 462 + }, + "_enabled": true, + "__prefab": { + "__id__": 466 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@23d2e", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35x9I9q81L76T3ZxlF1JRV" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2d9leUPv9PDrR5A8UmWlZZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 449 + }, + "_enabled": true, + "__prefab": { + "__id__": 469 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "00UgJ3OodEa7IfNZrOAVg2" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d0gdbftb5MGYarmjYn6tGQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "btn2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 448 + }, + "_children": [ + { + "__id__": 472 + }, + { + "__id__": 478 + }, + { + "__id__": 484 + } + ], + "_active": true, + "_components": [ + { + "__id__": 490 + }, + { + "__id__": 492 + } + ], + "_prefab": { + "__id__": 494 + }, + "_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.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 471 + }, + "_children": [], + "_active": true, "_components": [ { "__id__": 473 @@ -10167,379 +10340,6 @@ "__prefab": { "__id__": 474 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 144, - "height": 107 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0bgV1CDytP15zzyXaA+HPd" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 472 - }, - "_enabled": true, - "__prefab": { - "__id__": 476 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7eac7", - "__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": "77ETeE2AxMt4sY4/KVQJiP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b2FyCNMJdNbK8KuRd4V+h4", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 465 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 479 - }, - { - "__id__": 481 - } - ], - "_prefab": { - "__id__": 483 - }, - "_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": 0.7, - "y": 0.7, - "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__": 478 - }, - "_enabled": true, - "__prefab": { - "__id__": 480 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 116, - "height": 96 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "36SARH0vtPoJBTuG99LXPv" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 478 - }, - "_enabled": true, - "__prefab": { - "__id__": 482 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@23d2e", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "35x9I9q81L76T3ZxlF1JRV" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2d9leUPv9PDrR5A8UmWlZZ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 465 - }, - "_enabled": true, - "__prefab": { - "__id__": 485 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 144, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "00UgJ3OodEa7IfNZrOAVg2" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d0gdbftb5MGYarmjYn6tGQ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "btn2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 464 - }, - "_children": [ - { - "__id__": 488 - }, - { - "__id__": 494 - }, - { - "__id__": 500 - } - ], - "_active": true, - "_components": [ - { - "__id__": 506 - }, - { - "__id__": 508 - } - ], - "_prefab": { - "__id__": 510 - }, - "_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.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 487 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 489 - }, - { - "__id__": 491 - } - ], - "_prefab": { - "__id__": 493 - }, - "_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__": 488 - }, - "_enabled": true, - "__prefab": { - "__id__": 490 - }, "_contentSize": { "__type__": "cc.Size", "width": 144, @@ -10562,11 +10362,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 472 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 476 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10620,20 +10420,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 471 }, "_children": [], "_active": true, "_components": [ { - "__id__": 495 + "__id__": 479 }, { - "__id__": 497 + "__id__": 481 } ], "_prefab": { - "__id__": 499 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -10670,11 +10470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 480 }, "_contentSize": { "__type__": "cc.Size", @@ -10698,11 +10498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 494 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 498 + "__id__": 482 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10756,20 +10556,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 471 }, "_children": [], "_active": true, "_components": [ { - "__id__": 501 + "__id__": 485 }, { - "__id__": 503 + "__id__": 487 } ], "_prefab": { - "__id__": 505 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -10806,11 +10606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -10834,11 +10634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10892,11 +10692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 491 }, "_contentSize": { "__type__": "cc.Size", @@ -10920,11 +10720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 471 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 493 }, "clickEvents": [], "_interactable": true, @@ -10989,27 +10789,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 464 + "__id__": 448 }, "_children": [ { - "__id__": 512 + "__id__": 496 }, { - "__id__": 518 + "__id__": 502 }, { - "__id__": 524 + "__id__": 508 } ], "_active": true, "_components": [ { - "__id__": 530 + "__id__": 514 } ], "_prefab": { - "__id__": 532 + "__id__": 516 }, "_lpos": { "__type__": "cc.Vec3", @@ -11046,20 +10846,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 511 + "__id__": 495 }, "_children": [], "_active": true, "_components": [ { - "__id__": 513 + "__id__": 497 }, { - "__id__": 515 + "__id__": 499 } ], "_prefab": { - "__id__": 517 + "__id__": 501 }, "_lpos": { "__type__": "cc.Vec3", @@ -11096,11 +10896,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 512 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 498 }, "_contentSize": { "__type__": "cc.Size", @@ -11124,11 +10924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 512 + "__id__": 496 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 500 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11182,20 +10982,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 511 + "__id__": 495 }, "_children": [], "_active": false, "_components": [ { - "__id__": 519 + "__id__": 503 }, { - "__id__": 521 + "__id__": 505 } ], "_prefab": { - "__id__": 523 + "__id__": 507 }, "_lpos": { "__type__": "cc.Vec3", @@ -11232,11 +11032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 518 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 504 }, "_contentSize": { "__type__": "cc.Size", @@ -11260,11 +11060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 518 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 522 + "__id__": 506 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11318,20 +11118,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 511 + "__id__": 495 }, "_children": [], "_active": true, "_components": [ { - "__id__": 525 + "__id__": 509 }, { - "__id__": 527 + "__id__": 511 } ], "_prefab": { - "__id__": 529 + "__id__": 513 }, "_lpos": { "__type__": "cc.Vec3", @@ -11368,11 +11168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -11396,11 +11196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 508 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 512 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11454,11 +11254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 511 + "__id__": 495 }, "_enabled": true, "__prefab": { - "__id__": 531 + "__id__": 515 }, "_contentSize": { "__type__": "cc.Size", @@ -11495,11 +11295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 518 }, "_contentSize": { "__type__": "cc.Size", @@ -11523,11 +11323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 520 }, "_alignFlags": 44, "_target": null, @@ -11559,11 +11359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 448 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 522 }, "_resizeMode": 1, "_layoutType": 1, @@ -11610,11 +11410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 411 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 525 }, "_contentSize": { "__type__": "cc.Size", @@ -11638,11 +11438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 411 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 543 + "__id__": 527 }, "_alignFlags": 21, "_target": null, @@ -11674,11 +11474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 411 + "__id__": 395 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 529 }, "_id": "" }, @@ -11706,14 +11506,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 548 + "__id__": 532 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 547 + "__id__": 531 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -11721,7 +11521,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 549 + "__id__": 533 }, "targetOverrides": null }, @@ -11735,19 +11535,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 550 + "__id__": 534 }, { - "__id__": 552 + "__id__": 536 }, { - "__id__": 553 + "__id__": 537 }, { - "__id__": 554 + "__id__": 538 }, { - "__id__": 555 + "__id__": 539 } ], "removedComponents": [] @@ -11755,7 +11555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 535 }, "propertyPath": [ "_name" @@ -11771,7 +11571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 535 }, "propertyPath": [ "_lpos" @@ -11786,7 +11586,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 535 }, "propertyPath": [ "_lrot" @@ -11802,7 +11602,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 535 }, "propertyPath": [ "_euler" @@ -11817,7 +11617,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 551 + "__id__": 535 }, "propertyPath": [ "_active" @@ -11834,23 +11634,23 @@ }, "_children": [ { - "__id__": 557 + "__id__": 541 } ], "_active": true, "_components": [ { - "__id__": 595 + "__id__": 579 }, { - "__id__": 597 + "__id__": 581 }, { - "__id__": 599 + "__id__": 583 } ], "_prefab": { - "__id__": 601 + "__id__": 585 }, "_lpos": { "__type__": "cc.Vec3", @@ -11887,30 +11687,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 556 + "__id__": 540 }, "_children": [ { - "__id__": 558 + "__id__": 542 } ], "_active": true, "_components": [ { - "__id__": 586 + "__id__": 570 }, { - "__id__": 588 + "__id__": 572 }, { - "__id__": 590 + "__id__": 574 }, { - "__id__": 592 + "__id__": 576 } ], "_prefab": { - "__id__": 594 + "__id__": 578 }, "_lpos": { "__type__": "cc.Vec3", @@ -11947,27 +11747,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 557 + "__id__": 541 }, "_children": [ { - "__id__": 559 + "__id__": 543 }, { - "__id__": 567 + "__id__": 551 }, { - "__id__": 573 + "__id__": 557 } ], "_active": true, "_components": [ { - "__id__": 583 + "__id__": 567 } ], "_prefab": { - "__id__": 585 + "__id__": 569 }, "_lpos": { "__type__": "cc.Vec3", @@ -12004,23 +11804,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 542 }, "_children": [], "_active": true, "_components": [ { - "__id__": 560 + "__id__": 544 }, { - "__id__": 562 + "__id__": 546 }, { - "__id__": 564 + "__id__": 548 } ], "_prefab": { - "__id__": 566 + "__id__": 550 }, "_lpos": { "__type__": "cc.Vec3", @@ -12057,11 +11857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 545 }, "_contentSize": { "__type__": "cc.Size", @@ -12085,11 +11885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 547 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12133,11 +11933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 559 + "__id__": 543 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 549 }, "_alignFlags": 40, "_target": null, @@ -12182,20 +11982,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 542 }, "_children": [], "_active": true, "_components": [ { - "__id__": 568 + "__id__": 552 }, { - "__id__": 570 + "__id__": 554 } ], "_prefab": { - "__id__": 572 + "__id__": 556 }, "_lpos": { "__type__": "cc.Vec3", @@ -12232,11 +12032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 567 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -12260,11 +12060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 567 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 555 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12321,26 +12121,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 558 + "__id__": 542 }, "_children": [], "_active": true, "_components": [ { - "__id__": 574 + "__id__": 558 }, { - "__id__": 576 + "__id__": 560 }, { - "__id__": 578 + "__id__": 562 }, { - "__id__": 580 + "__id__": 564 } ], "_prefab": { - "__id__": 582 + "__id__": 566 }, "_lpos": { "__type__": "cc.Vec3", @@ -12377,11 +12177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 575 + "__id__": 559 }, "_contentSize": { "__type__": "cc.Size", @@ -12405,11 +12205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 577 + "__id__": 561 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12473,11 +12273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 563 }, "_alignFlags": 10, "_target": null, @@ -12509,11 +12309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 565 }, "templateMode": true, "watchPath": "data.data.gold", @@ -12546,11 +12346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 558 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 568 }, "_contentSize": { "__type__": "cc.Size", @@ -12587,11 +12387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 587 + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -12615,11 +12415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 573 }, "_alignFlags": 8, "_target": null, @@ -12651,11 +12451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 575 }, "_resizeMode": 0, "_layoutType": 1, @@ -12689,11 +12489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 577 }, "_alignFlags": 40, "_target": null, @@ -12738,11 +12538,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 580 }, "_contentSize": { "__type__": "cc.Size", @@ -12766,11 +12566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 582 }, "_alignFlags": 17, "_target": null, @@ -12802,11 +12602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 556 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 584 }, "_id": "" }, @@ -12837,7 +12637,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 603 + "__id__": 587 }, "_contentSize": { "__type__": "cc.Size", @@ -12865,7 +12665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 605 + "__id__": 589 }, "_alignFlags": 45, "_target": null, @@ -12901,7 +12701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 607 + "__id__": 591 }, "debugMode": false, "_id": "" @@ -12923,19 +12723,19 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 547 + "__id__": 531 }, { - "__id__": 428 - }, - { - "__id__": 379 + "__id__": 412 }, { "__id__": 367 }, { - "__id__": 355 + "__id__": 359 + }, + { + "__id__": 351 }, { "__id__": 343 diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index cb16291e..63a465fe 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -146,15 +146,36 @@ const pickCards = (cards: CardConfig[], count: number): CardConfig[] => { return selected } -/** 获取指定等级可出现的基础卡池(英雄+技能) */ -export const getCardPoolByLv = (lv: number): CardConfig[] => { +/** 获取指定等级可出现的基础卡池 */ +export const getCardPoolByLv = (lv: number, onlyCurrentLv: boolean = false): CardConfig[] => { const cardLv = clampCardLv(lv) + if (onlyCurrentLv) { + return CardPoolList.filter(card => card.lv === cardLv) + } return CardPoolList.filter(card => card.lv <= cardLv) } -/** 常规发牌:前 2 英雄 + 后 2 其他 */ -export const getCardsByLv = (lv: number): CardConfig[] => { - const pool = getCardPoolByLv(lv) +const normalizeTypeFilter = (type: CardType | CardType[]): Set => { + const list = Array.isArray(type) ? type : [type] + const hasBuffLike = list.includes(CardType.Buff) || list.includes(CardType.Debuff) + if (hasBuffLike) { + return new Set([...list, CardType.Buff, CardType.Debuff]) + } + return new Set(list) +} + +/** 常规发牌:前 2 英雄 + 后 2 其他;支持按类型和等级模式过滤 */ +export const getCardsByLv = ( + lv: number, + type?: CardType | CardType[], + onlyCurrentLv: boolean = false +): CardConfig[] => { + const pool = getCardPoolByLv(lv, onlyCurrentLv) + if (type !== undefined) { + const typeSet = normalizeTypeFilter(type) + const filteredPool = pool.filter(card => typeSet.has(card.type)) + return pickCards(filteredPool, 4) + } const heroPool = pool.filter(card => card.type === CardType.Hero) const otherPool = pool.filter(card => card.type !== CardType.Hero) const heroes = pickCards(heroPool, 2) diff --git a/assets/script/game/common/config/CardSet.ts.meta b/assets/script/game/common/config/CardSet.ts.meta new file mode 100644 index 00000000..12f1c3e2 --- /dev/null +++ b/assets/script/game/common/config/CardSet.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "9bb78f05-447e-4b26-b2ec-4ac1341d390b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 9f4f5817..c3667c28 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -12,10 +12,6 @@ import { CardType } from "../common/config/CardSet"; const { ccclass, property } = _decorator; -interface ICardEvent { - type?: CardType; - level?: number; -} /** 视图层对象 */ @ccclass('MissionCardComp') @@ -31,12 +27,10 @@ export class MissionCardComp extends CCComp { card3:Node = null! @property(Node) card4:Node = null! - - // card1_data: ICardInfo = null! - // card2_data: ICardInfo = null! - // card3_data: ICardInfo = null! - // card4_data: ICardInfo = null! - + @property(Node) + cards_chou:Node = null! + @property(Node) + cards_up:Node = null! private uiconsAtlas: SpriteAtlas | null = null; @@ -64,9 +58,7 @@ export class MissionCardComp extends CCComp { } - private resetCardStates() { - - } + /** diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 45308147..b27036cf 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -57,12 +57,10 @@ export class MissionComp extends CCComp { onLoad(){ this.on(GameEvent.MissionStart,this.mission_start,this) this.on(GameEvent.MonDead,this.do_mon_dead,this) - this.on(GameEvent.HeroDead,this.do_hero_dead,this) + // this.on(GameEvent.HeroDead,this.do_hero_dead,this) // this.on(GameEvent.FightEnd,this.fight_end,this) this.on(GameEvent.MissionEnd,this.mission_end,this) this.on(GameEvent.DO_AD_BACK,this.do_ad,this) - this.on(GameEvent.CanUpdateLv,this.onLevelUp,this) - this.on(GameEvent.ReviveSuccess, this.onReviveSuccess, this) } protected update(dt: number): void { @@ -102,20 +100,6 @@ export class MissionComp extends CCComp { }); } - // 升级奖励触发 - onLevelUp(event: string, args: any) { - mLogger.log(this.debugMode, 'MissionComp', ` 英雄升级到 ${args.lv} 级!`); - // 默认每级都触发属性选择 - // oops.message.dispatchEvent(GameEvent.AttrSelect); - this.call_cards(args.lv) - } - call_cards(lv:number){ - - } - showLevelUpReward() { - // TODO: 显示三选一技能/属性奖励界面 - mLogger.log(this.debugMode, 'MissionComp', " 显示升级奖励界面 (TODO)"); - } //奖励发放 do_reward(){ @@ -156,9 +140,7 @@ export class MissionComp extends CCComp { } do_hero_dead(event:any,data:any){ - // 收到 HeroDead 说明已经没有复活次数了,打开失败界面,等待玩家选择(复活或结束) - // oops.message.dispatchEvent(GameEvent.FightEnd,{victory:false}) // 暂时不分发结束事件 - this.open_Victory(null,true) + } do_ad(){ if(this.ad_back()){ @@ -216,13 +198,6 @@ do_ad(){ }) } - /** 复活成功回调,扣除次数 */ - onReviveSuccess() { - if (this.revive_times > 0) { - this.revive_times--; - mLogger.log(this.debugMode, 'MissionComp', ` 玩家复活,剩余次数: ${this.revive_times}`); - } - } fight_end(){ @@ -239,7 +214,6 @@ do_ad(){ // 合并 FightEnd 逻辑:清理组件、停止游戏循环 smc.mission.play=false this.cleanComponents() - this.node.active=false } @@ -262,30 +236,6 @@ do_ad(){ // smc.role = null; // 重置英雄数据,确保新一局是初始状态 - smc.vmdata.hero = { - name:'', - path:'', - as:0, - type:0, - lv:1, - exp:0, - exp_max: getLevelExp(1), - exp_pre:0, - hp:50, - hp_max:100, - mp:50, - mp_max:100, - def:0, - ap:0, - dis:0, - crt:0, - speed:0, - skills:[], - buff:[], - tal:[], - info:'', - }; - // mLogger.log(this.debugMode, 'MissionComp', "局内数据初始化",smc.vmdata.mission_data) }