From 0ccf8abcf49873cc105b6fa09ab0692fc0b0f2b8 Mon Sep 17 00:00:00 2001 From: pan Date: Tue, 25 Aug 2026 10:55:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(herolist&skillbox):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=9B=BE=E9=89=B4=E6=8A=80=E8=83=BD=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为SSkillBoxComp新增英雄图鉴专用初始化方法，支持区分技能/驻场光环图标来源 2. 扩展技能背景色适配，支持5档英雄技能等级配色 3. 在HerosListComp中实现英雄技能图标列表刷新逻辑，支持大招和各类触发技能展示 4. 按英雄等级动态显示技能解锁状态和对应等级图标 --- assets/resources/gui/element/heros.prefab | 1299 +++++++++------------ assets/script/game/map/HerosListComp.ts | 118 +- assets/script/game/map/SSkillBoxComp.ts | 37 +- 3 files changed, 669 insertions(+), 785 deletions(-) diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 8d940b12..71fc3397 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,29 +25,29 @@ "__id__": 88 }, { - "__id__": 561 + "__id__": 541 }, { - "__id__": 575 + "__id__": 555 } ], "_active": true, "_components": [ { - "__id__": 673 + "__id__": 653 }, { - "__id__": 675 + "__id__": 655 }, { - "__id__": 677 + "__id__": 657 }, { - "__id__": 679 + "__id__": 659 } ], "_prefab": { - "__id__": 681 + "__id__": 661 }, "_lpos": { "__type__": "cc.Vec3", @@ -1260,20 +1260,20 @@ "__id__": 380 }, { - "__id__": 428 + "__id__": 408 } ], "_active": true, "_components": [ { - "__id__": 556 + "__id__": 536 }, { - "__id__": 558 + "__id__": 538 } ], "_prefab": { - "__id__": 560 + "__id__": 540 }, "_lpos": { "__type__": "cc.Vec3", @@ -8049,22 +8049,25 @@ }, { "__id__": 389 + }, + { + "__id__": 397 } ], "_active": true, "_components": [ { - "__id__": 421 + "__id__": 401 }, { - "__id__": 423 + "__id__": 403 }, { - "__id__": 425 + "__id__": 405 } ], "_prefab": { - "__id__": 427 + "__id__": 407 }, "_lpos": { "__type__": "cc.Vec3", @@ -8275,37 +8278,27 @@ }, { "__type__": "cc.Node", - "_name": "Node", + "_name": "skills", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 380 }, - "_children": [ + "_children": [], + "_active": true, + "_components": [ { "__id__": 390 }, { - "__id__": 398 + "__id__": 392 }, { - "__id__": 406 - } - ], - "_active": true, - "_components": [ - { - "__id__": 414 - }, - { - "__id__": 416 - }, - { - "__id__": 418 + "__id__": 394 } ], "_prefab": { - "__id__": 420 + "__id__": 396 }, "_lpos": { "__type__": "cc.Vec3", @@ -8336,342 +8329,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 389 - }, - "_prefab": { - "__id__": 391 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 390 - }, - "asset": { - "__uuid__": "c887ba55-bb80-4c4b-b0e1-0d265b3f58e0", - "__expectedType__": "cc.Prefab" - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": { - "__id__": 392 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "ccSNH2ScRDjp9I9Ob3lWCB", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 393 - }, - { - "__id__": 395 - }, - { - "__id__": 396 - }, - { - "__id__": 397 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 394 - }, - "propertyPath": [ - "_name" - ], - "value": "sibox" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 394 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -105, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 394 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 394 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 389 - }, - "_prefab": { - "__id__": 399 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 398 - }, - "asset": { - "__uuid__": "c887ba55-bb80-4c4b-b0e1-0d265b3f58e0", - "__expectedType__": "cc.Prefab" - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": { - "__id__": 400 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "1aNw3zFOtPkbRcnv6zYp2Y", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 401 - }, - { - "__id__": 403 - }, - { - "__id__": 404 - }, - { - "__id__": 405 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 402 - }, - "propertyPath": [ - "_name" - ], - "value": "sibox" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 402 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 402 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 402 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 389 - }, - "_prefab": { - "__id__": 407 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 406 - }, - "asset": { - "__uuid__": "c887ba55-bb80-4c4b-b0e1-0d265b3f58e0", - "__expectedType__": "cc.Prefab" - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": { - "__id__": 408 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "62da7A8mdCWb4XJFVwRwlT", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 409 - }, - { - "__id__": 411 - }, - { - "__id__": 412 - }, - { - "__id__": 413 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 410 - }, - "propertyPath": [ - "_name" - ], - "value": "sibox" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 410 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 105, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 410 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 410 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.UITransform", "_name": "", @@ -8682,11 +8339,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 391 }, "_contentSize": { "__type__": "cc.Size", - "width": 275, + "width": -40, "height": 100 }, "_anchorPoint": { @@ -8710,12 +8367,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 393 }, "_alignFlags": 45, "_target": null, - "_left": 187.5, - "_right": 187.5, + "_left": 345, + "_right": 345, "_top": -40.57699999999999, "_bottom": 230.577, "_horizontalCenter": 0, @@ -8746,7 +8403,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 395 }, "_resizeMode": 1, "_layoutType": 1, @@ -8787,6 +8444,94 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "infos", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 380 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 398 + } + ], + "_prefab": { + "__id__": 400 + }, + "_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__": 397 + }, + "_enabled": true, + "__prefab": { + "__id__": 399 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c308pOGKtIdrwUzH1bkJSX" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f96itK+DREcoCzxQAIDmdM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -8797,7 +8542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 402 }, "_contentSize": { "__type__": "cc.Size", @@ -8825,7 +8570,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 404 }, "_alignFlags": 45, "_target": null, @@ -8861,7 +8606,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 426 + "__id__": 406 }, "_resizeMode": 1, "_layoutType": 3, @@ -8909,14 +8654,14 @@ "__id__": 88 }, "_prefab": { - "__id__": 429 + "__id__": 409 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 428 + "__id__": 408 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -8924,7 +8669,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 430 + "__id__": 410 }, "targetOverrides": null }, @@ -8936,18 +8681,54 @@ }, "mountedChildren": [ { - "__id__": 431 + "__id__": 411 }, { - "__id__": 491 + "__id__": 471 } ], "mountedComponents": [ { - "__id__": 502 + "__id__": 482 } ], "propertyOverrides": [ + { + "__id__": 486 + }, + { + "__id__": 488 + }, + { + "__id__": 489 + }, + { + "__id__": 490 + }, + { + "__id__": 491 + }, + { + "__id__": 493 + }, + { + "__id__": 495 + }, + { + "__id__": 497 + }, + { + "__id__": 499 + }, + { + "__id__": 500 + }, + { + "__id__": 502 + }, + { + "__id__": 504 + }, { "__id__": 506 }, @@ -8957,9 +8738,6 @@ { "__id__": 509 }, - { - "__id__": 510 - }, { "__id__": 511 }, @@ -8972,6 +8750,9 @@ { "__id__": 517 }, + { + "__id__": 518 + }, { "__id__": 519 }, @@ -8988,7 +8769,7 @@ "__id__": 526 }, { - "__id__": 528 + "__id__": 527 }, { "__id__": 529 @@ -8996,50 +8777,14 @@ { "__id__": 531 }, + { + "__id__": 532 + }, { "__id__": 533 }, { "__id__": 535 - }, - { - "__id__": 537 - }, - { - "__id__": 538 - }, - { - "__id__": 539 - }, - { - "__id__": 540 - }, - { - "__id__": 542 - }, - { - "__id__": 544 - }, - { - "__id__": 546 - }, - { - "__id__": 547 - }, - { - "__id__": 549 - }, - { - "__id__": 551 - }, - { - "__id__": 552 - }, - { - "__id__": 553 - }, - { - "__id__": 555 } ], "removedComponents": [] @@ -9047,11 +8792,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 432 + "__id__": 412 }, "nodes": [ { - "__id__": 433 + "__id__": 413 } ] }, @@ -9065,14 +8810,14 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 434 + "__id__": 414 }, "_prefab": { - "__id__": 484 + "__id__": 464 }, "__editorExtras__": { "mountedRoot": { - "__id__": 428 + "__id__": 408 } } }, @@ -9084,30 +8829,30 @@ "mountedRoot": null }, "_parent": { - "__id__": 435 + "__id__": 415 }, "_children": [ { - "__id__": 467 + "__id__": 447 }, { - "__id__": 473 + "__id__": 453 }, { - "__id__": 433 + "__id__": 413 } ], "_active": true, "_components": [ { - "__id__": 479 + "__id__": 459 }, { - "__id__": 481 + "__id__": 461 } ], "_prefab": { - "__id__": 483 + "__id__": 463 }, "_lpos": { "__type__": "cc.Vec3", @@ -9144,33 +8889,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 428 + "__id__": 408 }, "_children": [ + { + "__id__": 414 + }, + { + "__id__": 416 + }, { "__id__": 434 - }, - { - "__id__": 436 - }, - { - "__id__": 454 } ], "_active": true, "_components": [ { - "__id__": 460 + "__id__": 440 }, { - "__id__": 462 + "__id__": 442 }, { - "__id__": 464 + "__id__": 444 } ], "_prefab": { - "__id__": 466 + "__id__": 446 }, "_lpos": { "__type__": "cc.Vec3", @@ -9209,27 +8954,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 435 + "__id__": 415 }, "_children": [ { - "__id__": 437 + "__id__": 417 }, { - "__id__": 443 + "__id__": 423 } ], "_active": false, "_components": [ { - "__id__": 449 + "__id__": 429 }, { - "__id__": 451 + "__id__": 431 } ], "_prefab": { - "__id__": 453 + "__id__": 433 }, "_lpos": { "__type__": "cc.Vec3", @@ -9266,20 +9011,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 436 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 418 }, { - "__id__": 440 + "__id__": 420 } ], "_prefab": { - "__id__": 442 + "__id__": 422 }, "_lpos": { "__type__": "cc.Vec3", @@ -9316,11 +9061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 419 }, "_contentSize": { "__type__": "cc.Size", @@ -9344,11 +9089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 437 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 421 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9405,20 +9150,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 436 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 444 + "__id__": 424 }, { - "__id__": 446 + "__id__": 426 } ], "_prefab": { - "__id__": 448 + "__id__": 428 }, "_lpos": { "__type__": "cc.Vec3", @@ -9455,11 +9200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 425 }, "_contentSize": { "__type__": "cc.Size", @@ -9483,11 +9228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 427 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9564,11 +9309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 450 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", @@ -9592,11 +9337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 436 + "__id__": 416 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 432 }, "_resizeMode": 1, "_layoutType": 1, @@ -9645,20 +9390,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 435 + "__id__": 415 }, "_children": [], "_active": true, "_components": [ { - "__id__": 455 + "__id__": 435 }, { - "__id__": 457 + "__id__": 437 } ], "_prefab": { - "__id__": 459 + "__id__": 439 }, "_lpos": { "__type__": "cc.Vec3", @@ -9695,11 +9440,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 454 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 456 + "__id__": 436 }, "_contentSize": { "__type__": "cc.Size", @@ -9723,11 +9468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 454 + "__id__": 434 }, "_enabled": true, "__prefab": { - "__id__": 458 + "__id__": 438 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9804,11 +9549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 441 }, "_contentSize": { "__type__": "cc.Size", @@ -9832,11 +9577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 463 + "__id__": 443 }, "_alignFlags": 45, "_target": null, @@ -9868,11 +9613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 435 + "__id__": 415 }, "_enabled": true, "__prefab": { - "__id__": 465 + "__id__": 445 }, "_resizeMode": 1, "_layoutType": 2, @@ -9919,20 +9664,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 434 + "__id__": 414 }, "_children": [], "_active": false, "_components": [ { - "__id__": 468 + "__id__": 448 }, { - "__id__": 470 + "__id__": 450 } ], "_prefab": { - "__id__": 472 + "__id__": 452 }, "_lpos": { "__type__": "cc.Vec3", @@ -9969,11 +9714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 469 + "__id__": 449 }, "_contentSize": { "__type__": "cc.Size", @@ -9997,11 +9742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 467 + "__id__": 447 }, "_enabled": true, "__prefab": { - "__id__": 471 + "__id__": 451 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10055,20 +9800,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 434 + "__id__": 414 }, "_children": [], "_active": true, "_components": [ { - "__id__": 474 + "__id__": 454 }, { - "__id__": 476 + "__id__": 456 } ], "_prefab": { - "__id__": 478 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -10105,11 +9850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 455 }, "_contentSize": { "__type__": "cc.Size", @@ -10133,11 +9878,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 453 }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 457 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10214,11 +9959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 414 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 460 }, "_contentSize": { "__type__": "cc.Size", @@ -10242,11 +9987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 414 }, "_enabled": true, "__prefab": { - "__id__": 482 + "__id__": 462 }, "_resizeMode": 1, "_layoutType": 1, @@ -10290,7 +10035,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 433 + "__id__": 413 }, "asset": { "__uuid__": "4b8fb686-b649-4525-9aae-df0e7369205b", @@ -10298,7 +10043,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 485 + "__id__": 465 }, "targetOverrides": null }, @@ -10312,16 +10057,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 486 + "__id__": 466 }, { - "__id__": 488 + "__id__": 468 }, { - "__id__": 489 + "__id__": 469 }, { - "__id__": 490 + "__id__": 470 } ], "removedComponents": [] @@ -10329,7 +10074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 467 }, "propertyPath": [ "_name" @@ -10345,7 +10090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 467 }, "propertyPath": [ "_lpos" @@ -10360,7 +10105,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 467 }, "propertyPath": [ "_lrot" @@ -10376,7 +10121,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 487 + "__id__": 467 }, "propertyPath": [ "_euler" @@ -10391,11 +10136,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 492 + "__id__": 472 }, "nodes": [ { - "__id__": 493 + "__id__": 473 } ] }, @@ -10409,21 +10154,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 428 + "__id__": 408 }, "_prefab": { - "__id__": 494 + "__id__": 474 }, "__editorExtras__": { "mountedRoot": { - "__id__": 428 + "__id__": 408 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 493 + "__id__": 473 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -10431,7 +10176,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 495 + "__id__": 475 }, "targetOverrides": null }, @@ -10445,19 +10190,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 496 + "__id__": 476 }, { - "__id__": 498 + "__id__": 478 }, { - "__id__": 499 + "__id__": 479 }, { - "__id__": 500 + "__id__": 480 }, { - "__id__": 501 + "__id__": 481 } ], "removedComponents": [] @@ -10465,7 +10210,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 477 }, "propertyPath": [ "_name" @@ -10481,7 +10226,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 477 }, "propertyPath": [ "_lpos" @@ -10496,7 +10241,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 477 }, "propertyPath": [ "_lrot" @@ -10512,7 +10257,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 477 }, "propertyPath": [ "_euler" @@ -10527,7 +10272,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 497 + "__id__": 477 }, "propertyPath": [ "_active" @@ -10537,11 +10282,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 503 + "__id__": 483 }, "components": [ { - "__id__": 504 + "__id__": 484 } ] }, @@ -10557,15 +10302,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 428 + "__id__": 408 } }, "node": { - "__id__": 428 + "__id__": 408 }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 485 }, "_alignFlags": 4, "_target": null, @@ -10594,7 +10339,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 487 }, "propertyPath": [ "_name" @@ -10610,7 +10355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 487 }, "propertyPath": [ "_lpos" @@ -10625,7 +10370,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 487 }, "propertyPath": [ "_lrot" @@ -10641,7 +10386,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 507 + "__id__": 487 }, "propertyPath": [ "_euler" @@ -10656,7 +10401,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 512 + "__id__": 492 }, "propertyPath": [ "_contentSize" @@ -10676,7 +10421,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 514 + "__id__": 494 }, "propertyPath": [ "_contentSize" @@ -10696,7 +10441,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 516 + "__id__": 496 }, "propertyPath": [ "_contentSize" @@ -10716,7 +10461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 518 + "__id__": 498 }, "propertyPath": [ "_top" @@ -10732,7 +10477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 518 + "__id__": 498 }, "propertyPath": [ "_bottom" @@ -10742,7 +10487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 501 }, "propertyPath": [ "_string" @@ -10758,7 +10503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 523 + "__id__": 503 }, "propertyPath": [ "_contentSize" @@ -10778,7 +10523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 525 + "__id__": 505 }, "propertyPath": [ "_name" @@ -10794,7 +10539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 527 + "__id__": 507 }, "propertyPath": [ "_spriteFrame" @@ -10813,7 +10558,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 527 + "__id__": 507 }, "propertyPath": [ "_atlas" @@ -10826,7 +10571,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 530 + "__id__": 510 }, "propertyPath": [ "_spacingY" @@ -10842,7 +10587,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 512 }, "propertyPath": [ "_lpos" @@ -10863,7 +10608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 534 + "__id__": 514 }, "propertyPath": [ "_lpos" @@ -10884,7 +10629,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 536 + "__id__": 516 }, "propertyPath": [ "_lpos" @@ -10905,7 +10650,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 501 }, "propertyPath": [ "_lineHeight" @@ -10915,7 +10660,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 501 }, "propertyPath": [ "_fontSize" @@ -10925,7 +10670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 521 + "__id__": 501 }, "propertyPath": [ "_actualFontSize" @@ -10935,7 +10680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 521 }, "propertyPath": [ "_lpos" @@ -10956,7 +10701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 543 + "__id__": 523 }, "propertyPath": [ "_lpos" @@ -10977,7 +10722,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 545 + "__id__": 525 }, "propertyPath": [ "_contentSize" @@ -10997,7 +10742,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 521 }, "propertyPath": [ "_active" @@ -11007,7 +10752,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 528 }, "propertyPath": [ "_fontSize" @@ -11023,7 +10768,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 550 + "__id__": 530 }, "propertyPath": [ "_contentSize" @@ -11043,7 +10788,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 528 }, "propertyPath": [ "_actualFontSize" @@ -11053,7 +10798,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 528 }, "propertyPath": [ "_string" @@ -11063,7 +10808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 554 + "__id__": 534 }, "propertyPath": [ "_horizontalDirection" @@ -11079,7 +10824,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 554 + "__id__": 534 }, "propertyPath": [ "_spacingX" @@ -11096,7 +10841,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 537 }, "_contentSize": { "__type__": "cc.Size", @@ -11124,7 +10869,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 539 }, "_alignFlags": 45, "_target": null, @@ -11173,20 +10918,20 @@ }, "_children": [ { - "__id__": 562 + "__id__": 542 } ], "_active": true, "_components": [ { - "__id__": 570 + "__id__": 550 }, { - "__id__": 572 + "__id__": 552 } ], "_prefab": { - "__id__": 574 + "__id__": 554 }, "_lpos": { "__type__": "cc.Vec3", @@ -11223,23 +10968,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 561 + "__id__": 541 }, "_children": [], "_active": true, "_components": [ { - "__id__": 563 + "__id__": 543 }, { - "__id__": 565 + "__id__": 545 }, { - "__id__": 567 + "__id__": 547 } ], "_prefab": { - "__id__": 569 + "__id__": 549 }, "_lpos": { "__type__": "cc.Vec3", @@ -11276,11 +11021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 564 + "__id__": 544 }, "_contentSize": { "__type__": "cc.Size", @@ -11304,11 +11049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 566 + "__id__": 546 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11352,11 +11097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 542 }, "_enabled": true, "__prefab": { - "__id__": 568 + "__id__": 548 }, "_alignFlags": 45, "_target": null, @@ -11401,11 +11146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 551 }, "_contentSize": { "__type__": "cc.Size", @@ -11429,11 +11174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 553 }, "_alignFlags": 44, "_target": null, @@ -11482,20 +11227,20 @@ }, "_children": [ { - "__id__": 576 + "__id__": 556 } ], "_active": true, "_components": [ { - "__id__": 668 + "__id__": 648 }, { - "__id__": 670 + "__id__": 650 } ], "_prefab": { - "__id__": 672 + "__id__": 652 }, "_lpos": { "__type__": "cc.Vec3", @@ -11532,33 +11277,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 575 + "__id__": 555 }, "_children": [ { - "__id__": 577 + "__id__": 557 }, { - "__id__": 595 + "__id__": 575 } ], "_active": true, "_components": [ { - "__id__": 661 + "__id__": 641 }, { - "__id__": 663 + "__id__": 643 }, { - "__id__": 592 + "__id__": 572 }, { - "__id__": 665 + "__id__": 645 } ], "_prefab": { - "__id__": 667 + "__id__": 647 }, "_lpos": { "__type__": "cc.Vec3", @@ -11595,30 +11340,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 556 }, "_children": [ { - "__id__": 578 + "__id__": 558 } ], "_active": false, "_components": [ { - "__id__": 584 + "__id__": 564 }, { - "__id__": 586 + "__id__": 566 }, { - "__id__": 588 + "__id__": 568 }, { - "__id__": 590 + "__id__": 570 } ], "_prefab": { - "__id__": 660 + "__id__": 640 }, "_lpos": { "__type__": "cc.Vec3", @@ -11655,20 +11400,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 577 + "__id__": 557 }, "_children": [], "_active": true, "_components": [ { - "__id__": 579 + "__id__": 559 }, { - "__id__": 581 + "__id__": 561 } ], "_prefab": { - "__id__": 583 + "__id__": 563 }, "_lpos": { "__type__": "cc.Vec3", @@ -11705,11 +11450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 580 + "__id__": 560 }, "_contentSize": { "__type__": "cc.Size", @@ -11733,11 +11478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 578 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 582 + "__id__": 562 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11791,11 +11536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 585 + "__id__": 565 }, "_contentSize": { "__type__": "cc.Size", @@ -11819,11 +11564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 587 + "__id__": 567 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11864,11 +11609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 569 }, "_alignFlags": 37, "_target": null, @@ -11900,17 +11645,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 571 }, "_scrollView": { - "__id__": 592 + "__id__": 572 }, "_handle": { - "__id__": 581 + "__id__": 561 }, "_direction": 1, "_enableAutoHide": false, @@ -11927,11 +11672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 573 }, "bounceDuration": 0.23, "brake": 0.75, @@ -11942,11 +11687,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 594 + "__id__": 574 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 590 + "__id__": 570 }, "_id": "" }, @@ -11960,42 +11705,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 595 + "__id__": 575 }, "_children": [ { - "__id__": 605 + "__id__": 585 }, { - "__id__": 613 + "__id__": 593 }, { - "__id__": 621 + "__id__": 601 }, { - "__id__": 629 + "__id__": 609 }, { - "__id__": 637 + "__id__": 617 }, { - "__id__": 645 + "__id__": 625 } ], "_active": true, "_components": [ { - "__id__": 653 + "__id__": 633 }, { - "__id__": 655 + "__id__": 635 }, { - "__id__": 657 + "__id__": 637 } ], "_prefab": { - "__id__": 659 + "__id__": 639 }, "_lpos": { "__type__": "cc.Vec3", @@ -12032,30 +11777,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 556 }, "_children": [ { - "__id__": 594 + "__id__": 574 } ], "_active": true, "_components": [ { - "__id__": 596 + "__id__": 576 }, { - "__id__": 598 + "__id__": 578 }, { - "__id__": 600 + "__id__": 580 }, { - "__id__": 602 + "__id__": 582 } ], "_prefab": { - "__id__": 604 + "__id__": 584 }, "_lpos": { "__type__": "cc.Vec3", @@ -12092,11 +11837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 597 + "__id__": 577 }, "_contentSize": { "__type__": "cc.Size", @@ -12120,11 +11865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 599 + "__id__": 579 }, "_type": 0, "_inverted": false, @@ -12142,11 +11887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 601 + "__id__": 581 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12188,11 +11933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 595 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 603 + "__id__": 583 }, "_alignFlags": 45, "_target": null, @@ -12235,17 +11980,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 606 + "__id__": 586 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 605 + "__id__": 585 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12253,7 +11998,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 607 + "__id__": 587 }, "targetOverrides": null }, @@ -12267,16 +12012,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 608 + "__id__": 588 }, { - "__id__": 610 + "__id__": 590 }, { - "__id__": 611 + "__id__": 591 }, { - "__id__": 612 + "__id__": 592 } ], "removedComponents": [] @@ -12284,7 +12029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 589 }, "propertyPath": [ "_name" @@ -12300,7 +12045,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 589 }, "propertyPath": [ "_lpos" @@ -12315,7 +12060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 589 }, "propertyPath": [ "_lrot" @@ -12331,7 +12076,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 589 }, "propertyPath": [ "_euler" @@ -12347,17 +12092,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 614 + "__id__": 594 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 613 + "__id__": 593 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12365,7 +12110,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 615 + "__id__": 595 }, "targetOverrides": null }, @@ -12379,16 +12124,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 616 + "__id__": 596 }, { - "__id__": 618 + "__id__": 598 }, { - "__id__": 619 + "__id__": 599 }, { - "__id__": 620 + "__id__": 600 } ], "removedComponents": [] @@ -12396,7 +12141,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 597 }, "propertyPath": [ "_name" @@ -12412,7 +12157,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 597 }, "propertyPath": [ "_lpos" @@ -12427,7 +12172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 597 }, "propertyPath": [ "_lrot" @@ -12443,7 +12188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 597 }, "propertyPath": [ "_euler" @@ -12459,17 +12204,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 622 + "__id__": 602 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 621 + "__id__": 601 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12477,7 +12222,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 623 + "__id__": 603 }, "targetOverrides": null }, @@ -12491,16 +12236,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 624 + "__id__": 604 }, { - "__id__": 626 + "__id__": 606 }, { - "__id__": 627 + "__id__": 607 }, { - "__id__": 628 + "__id__": 608 } ], "removedComponents": [] @@ -12508,7 +12253,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 605 }, "propertyPath": [ "_name" @@ -12524,7 +12269,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 605 }, "propertyPath": [ "_lpos" @@ -12539,7 +12284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 605 }, "propertyPath": [ "_lrot" @@ -12555,7 +12300,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 605 }, "propertyPath": [ "_euler" @@ -12571,17 +12316,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 630 + "__id__": 610 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 629 + "__id__": 609 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12589,7 +12334,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 631 + "__id__": 611 }, "targetOverrides": null }, @@ -12603,16 +12348,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 632 + "__id__": 612 }, { - "__id__": 634 + "__id__": 614 }, { - "__id__": 635 + "__id__": 615 }, { - "__id__": 636 + "__id__": 616 } ], "removedComponents": [] @@ -12620,7 +12365,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 613 }, "propertyPath": [ "_name" @@ -12636,7 +12381,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 613 }, "propertyPath": [ "_lpos" @@ -12651,7 +12396,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 613 }, "propertyPath": [ "_lrot" @@ -12667,7 +12412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 633 + "__id__": 613 }, "propertyPath": [ "_euler" @@ -12683,17 +12428,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 638 + "__id__": 618 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 637 + "__id__": 617 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12701,7 +12446,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 639 + "__id__": 619 }, "targetOverrides": null }, @@ -12715,16 +12460,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 640 + "__id__": 620 }, { - "__id__": 642 + "__id__": 622 }, { - "__id__": 643 + "__id__": 623 }, { - "__id__": 644 + "__id__": 624 } ], "removedComponents": [] @@ -12732,7 +12477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 621 }, "propertyPath": [ "_name" @@ -12748,7 +12493,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 621 }, "propertyPath": [ "_lpos" @@ -12763,7 +12508,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 621 }, "propertyPath": [ "_lrot" @@ -12779,7 +12524,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 621 }, "propertyPath": [ "_euler" @@ -12795,17 +12540,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 594 + "__id__": 574 }, "_prefab": { - "__id__": 646 + "__id__": 626 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 645 + "__id__": 625 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -12813,7 +12558,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 647 + "__id__": 627 }, "targetOverrides": null }, @@ -12827,16 +12572,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 648 + "__id__": 628 }, { - "__id__": 650 + "__id__": 630 }, { - "__id__": 651 + "__id__": 631 }, { - "__id__": 652 + "__id__": 632 } ], "removedComponents": [] @@ -12844,7 +12589,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 649 + "__id__": 629 }, "propertyPath": [ "_name" @@ -12860,7 +12605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 649 + "__id__": 629 }, "propertyPath": [ "_lpos" @@ -12875,7 +12620,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 649 + "__id__": 629 }, "propertyPath": [ "_lrot" @@ -12891,7 +12636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 649 + "__id__": 629 }, "propertyPath": [ "_euler" @@ -12909,11 +12654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 654 + "__id__": 634 }, "_contentSize": { "__type__": "cc.Size", @@ -12937,11 +12682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 636 }, "_alignFlags": 13, "_target": null, @@ -12973,11 +12718,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 594 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 638 }, "_resizeMode": 0, "_layoutType": 1, @@ -13037,11 +12782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 642 }, "_contentSize": { "__type__": "cc.Size", @@ -13065,11 +12810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 556 }, "_enabled": false, "__prefab": { - "__id__": 664 + "__id__": 644 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13110,11 +12855,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 666 + "__id__": 646 }, "_alignFlags": 45, "_target": null, @@ -13159,11 +12904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 649 }, "_contentSize": { "__type__": "cc.Size", @@ -13187,11 +12932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 575 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 651 }, "_alignFlags": 44, "_target": null, @@ -13240,7 +12985,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 654 }, "_contentSize": { "__type__": "cc.Size", @@ -13268,7 +13013,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 676 + "__id__": 656 }, "_alignFlags": 45, "_target": null, @@ -13304,7 +13049,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 678 + "__id__": 658 }, "hero_icon": { "__id__": 90 @@ -13331,7 +13076,7 @@ "__id__": 122 }, "cards_node": { - "__id__": 594 + "__id__": 574 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -13344,17 +13089,24 @@ "__id__": 139 }, "upgrade_btn": { - "__id__": 428 + "__id__": 408 }, "fragment_node": { - "__id__": 473 + "__id__": 453 }, "chip_node": { - "__id__": 433 + "__id__": 413 }, "infos_node": { + "__id__": 397 + }, + "skills_node": { "__id__": 389 }, + "skill_icon_prefab": { + "__uuid__": "c887ba55-bb80-4c4b-b0e1-0d265b3f58e0", + "__expectedType__": "cc.Prefab" + }, "upgrade_anim_node": { "__id__": 96 }, @@ -13374,7 +13126,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 660 }, "_id": "" }, @@ -13394,45 +13146,36 @@ "instance": null, "targetOverrides": [ { - "__id__": 682 + "__id__": 662 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 645 + "__id__": 625 }, { - "__id__": 637 + "__id__": 617 }, { - "__id__": 629 + "__id__": 609 }, { - "__id__": 621 + "__id__": 601 }, { - "__id__": 613 + "__id__": 593 }, { - "__id__": 605 + "__id__": 585 }, { - "__id__": 428 + "__id__": 408 }, { - "__id__": 493 + "__id__": 473 }, { - "__id__": 433 - }, - { - "__id__": 406 - }, - { - "__id__": 398 - }, - { - "__id__": 390 + "__id__": 413 }, { "__id__": 105 @@ -13457,17 +13200,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 677 + "__id__": 657 }, "sourceInfo": null, "propertyPath": [ "fragment_node" ], "target": { - "__id__": 428 + "__id__": 408 }, "targetInfo": { - "__id__": 683 + "__id__": 663 } }, { diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index 3b829bcf..aae47611 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -22,12 +22,13 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { oops } from "db://oops-framework/core/Oops"; import { mLogger } from "../common/Logger"; -import { HeroInfo, HeroList } from "../common/config/heroSet"; +import { HeroInfo, HeroList, SkillTriggerType, LvFieldEntry, LvReviveEntry, LvTriggerEntry, TriggerGrouped } from "../common/config/heroSet"; import { buildSkillDesc } from "../common/config/HeroSkillDesc"; import { GameEvent } from "../common/config/GameEvent"; import { HERO_UPGRADE_NEED_FRAGMENTS, CARD_LV_BG_COLORS } from "../common/config/GameSet"; import { CardLiteComp } from "./CardLiteComp"; import { ChipComp } from "./ChipComp"; +import { SSkillBoxComp } from "./SSkillBoxComp"; import { smc } from "../common/SingletonModuleComp"; const { property, ccclass } = _decorator; @@ -90,6 +91,14 @@ export class HerosListComp extends CCComp { /** 技能描述节点（） */ @property(Node) infos_node = null! + + /** 技能图标容器节点（动态挂载 SSkillBoxComp 实例，展示当前英雄技能） */ + @property(Node) + skills_node = null! + + /** 技能小图标预制体（根节点挂 SSkillBoxComp） */ + @property(Prefab) + skill_icon_prefab = null! /** 升级特效动画节点（内含升级效果 Animation，点击升级时从头播放） */ @property(Node) upgrade_anim_node = null! @@ -408,6 +417,7 @@ export class HerosListComp extends CCComp { this.updateTypeDisplay(hero) this.updateHeroAnimation(uuid) this.updateGrowthPanel(uuid) + this.updateSkillIcons(hero) } private updatePoolLvBg(card_lv: number) { @@ -476,6 +486,112 @@ export class HerosListComp extends CCComp { } } + // ======================== 技能图标列表 ======================== + + /** 图鉴面板展示的触发技能类型（heroInfo 触发配置：死亡/战斗开始/光环/攻击后/受击/复活） */ + private static readonly PANEL_TRIGGER_TYPES: SkillTriggerType[] = [ + SkillTriggerType.Dead, + SkillTriggerType.FStart, + SkillTriggerType.Field, + SkillTriggerType.Atking, + SkillTriggerType.Atked, + SkillTriggerType.Revive, + ] + + /** + * 刷新当前英雄的技能图标列表： + * 1. 大招：skills[1] 及以后（首个为普攻，跳过）。 + * 2. 触发技能：Dead/FStart/Field/Atking/Atked/Revive。 + * 以局外等级（getHeroOuterLv）为当前等级，未达解锁档的显示 locked， + * 已激活的显示当前等级对应的技能等级。 + */ + private updateSkillIcons(hero: typeof HeroInfo[number]) { + if (!this.skills_node || !this.skill_icon_prefab) return + + // 清空旧图标（显式销毁，避免节点泄漏） + for (let i = this.skills_node.children.length - 1; i >= 0; i--) { + this.skills_node.children[i].destroy() + } + + const lv = Math.max(1, smc.getHeroOuterLv(hero.uuid)) + + // ---- 大招：skills[1] 及以后 ---- + Object.values(hero.skills).slice(1).forEach(hSkill => { + // 与 Hero.load 同式：技能等级 = 配置 lv + 英雄等级 - 2，> 0 才视为已解锁 + const unlocked = hSkill.lv + lv - 2 > 0 + // 技能等级展示与 buildSkillDesc 同规则：lv_entries 取 ≤lv 最大档的 s_lv + const sLv = hSkill.lv_entries?.length + ? (hSkill.lv_entries.filter(e => e.lv <= lv).pop()?.s_lv ?? hSkill.lv) + : hSkill.lv + this.addSkillIcon(hSkill.uuid, sLv, !unlocked, false) + }) + + // ---- 触发技能：按 PANEL_TRIGGER_TYPES 顺序追加 ---- + for (const type of HerosListComp.PANEL_TRIGGER_TYPES) { + if (type === SkillTriggerType.Field) { + this.addFieldIcons(hero[SkillTriggerType.Field], lv) + } else if (type === SkillTriggerType.Revive) { + this.addReviveIcon(hero[SkillTriggerType.Revive], lv) + } else { + this.addTriggerIcons(hero[type] as TriggerGrouped | undefined, lv) + } + } + } + + /** + * 实例化技能小图标并初始化 + * @param s_uuid 技能 UUID（SkillSet 或 FieldSkillSet） + * @param s_lv 当前等级对应的技能等级（locked 时为解锁预览档） + * @param locked 当前等级未激活 → 显示锁定遮罩 + * @param isField true 表示驻场光环词条（图标取 FieldSkillSet） + */ + private addSkillIcon(s_uuid: number, s_lv: number, locked: boolean, isField: boolean) { + const node = instantiate(this.skill_icon_prefab) + node.name = `skill_${s_uuid}` + const comp = node.getComponent(SSkillBoxComp) || node.addComponent(SSkillBoxComp) + comp.initHeroSkill(s_uuid, s_lv, locked, isField) + this.skills_node.addChild(node) + } + + /** + * 触发技能（dead/fstart/atking/atked）：按 s_uuid 分组，取 ≤lv 最大档判定激活； + * 未激活时预览最低档（与 resolveTriggerByLv 同语义） + */ + private addTriggerIcons(grouped: TriggerGrouped | undefined, lv: number) { + if (!grouped) return + for (const key in grouped) { + const entries = grouped[key] + if (!entries?.length) continue + const sorted = [...entries].sort((a, b) => a.lv - b.lv) + let active: LvTriggerEntry | undefined + for (const e of sorted) { if (e.lv <= lv) active = e } + const pick = active ?? sorted[0] + this.addSkillIcon(Number(key), pick.s_lv ?? 1, !active, false) + } + } + + /** 驻场光环：未激活取最低档预览，激活取 ≤lv 最大档的词条列表 */ + private addFieldIcons(field: LvFieldEntry[] | undefined, lv: number) { + if (!field?.length) return + const sorted = [...field].sort((a, b) => a.lv - b.lv) + let active: LvFieldEntry | undefined + for (const e of sorted) { if (e.lv <= lv) active = e } + const pick = active ?? sorted[0] + for (const entry of pick.uuids) { + this.addSkillIcon(entry.uuid, pick.lv, !active, true) + } + } + + /** 复活技能：未激活取最低档预览，激活取 ≤lv 最大档 */ + private addReviveIcon(revive: LvReviveEntry[] | undefined, lv: number) { + if (!revive?.length) return + const sorted = [...revive].sort((a, b) => a.lv - b.lv) + let active: LvReviveEntry | undefined + for (const e of sorted) { if (e.lv <= lv) active = e } + const pick = active ?? sorted[0] + this.addSkillIcon(pick.s_uuid, pick.lv, !active, false) + } + // ======================== 英雄动画 ======================== private updateHeroAnimation(uuid: number) { diff --git a/assets/script/game/map/SSkillBoxComp.ts b/assets/script/game/map/SSkillBoxComp.ts index 3fe9e79e..87f3b55a 100644 --- a/assets/script/game/map/SSkillBoxComp.ts +++ b/assets/script/game/map/SSkillBoxComp.ts @@ -44,6 +44,8 @@ export class SSkillBoxComp extends CCComp { private trigger_type: CardTriggerType = CardTriggerType.Instant; /** 驻场技能词条列表（uuid 指向 FieldSkillSet 底座，value 为生效数值） */ public field: FieldEntry[] = []; + /** 英雄图鉴模式下的图标来源：skill=SkillSet，field=FieldSkillSet；undefined 表示装备卡模式 */ + private hero_icon_source?: "skill" | "field"; /** * 初始化技能卡效果： @@ -69,6 +71,22 @@ export class SSkillBoxComp extends CCComp { this.updateUI(); } + /** + * 初始化英雄技能图标（英雄图鉴面板专用）： + * 图标按 s_uuid 直接取 SkillSet / FieldSkillSet 配置，不走 EquipPoolList。 + * @param s_uuid 技能 UUID（大招/触发技能指向 SkillSet，光环词条指向 FieldSkillSet） + * @param s_lv 当前英雄等级下生效的技能等级（显示在等级标签） + * @param locked 当前等级未激活时显示锁定遮罩 + * @param isField true 时图标取 FieldSkillSet（驻场光环词条） + */ + initHeroSkill(s_uuid: number, s_lv: number, locked: boolean, isField: boolean = false) { + this.s_uuid = s_uuid; + this.card_lv = s_lv; + this.hero_icon_source = isField ? "field" : "skill"; + this.updateUI(); + this.setLocked(locked); + } + /** * 设置技能激活状态： * - locked = true → 显示锁定遮罩，技能未激活 @@ -82,10 +100,9 @@ export class SSkillBoxComp extends CCComp { /** * 根据技能等级切换 bg_node 下的颜色子节点显示。 - * 等级与颜色对应关系（技能卡 wave 档位）： - * card_lv 1 (wave 1) → green - * card_lv 2 (wave 5) → blue - * card_lv 3 (wave 8) → purple + * 等级与颜色对应关系： + * 技能卡档位：card_lv 1 (wave 1) → green，2 (wave 5) → blue，3 (wave 8) → purple + * 英雄技能等级：s_lv 1~5 → green / blue / purple / red / yellow */ private updateBgNode() { if (!this.bg_node) return; @@ -93,6 +110,8 @@ export class SSkillBoxComp extends CCComp { 1: "green", 2: "blue", 3: "purple", + 4: "red", + 5: "yellow", }; const targetColor = lvToColor[this.card_lv]; this.bg_node.children.forEach(child => { @@ -112,10 +131,16 @@ export class SSkillBoxComp extends CCComp { // 加载技能图标 if (this.icon_node) { - // 优先使用卡牌自定义 icon；未定义则按 trigger_type 自动取 + // 优先使用卡牌自定义 icon；未定义则按图鉴模式 / 装备卡 trigger_type 自动取 let iconId: string | undefined = this.card_icon; if (!iconId) { - if (this.trigger_type === CardTriggerType.Interval) { + if (this.hero_icon_source === "field") { + // 英雄图鉴：驻场光环词条图标取 FieldSkillSet + iconId = this.s_uuid ? FieldSkillSet[this.s_uuid]?.icon : undefined; + } else if (this.hero_icon_source === "skill") { + // 英雄图鉴：大招/触发技能图标取 SkillSet + iconId = this.s_uuid ? SkillSet[this.s_uuid]?.icon : undefined; + } else if (this.trigger_type === CardTriggerType.Interval) { iconId = this.s_uuid ? SkillSet[this.s_uuid]?.icon : undefined; } else if (this.trigger_type === CardTriggerType.Field) { const fieldUuid = this.field?.[0]?.uuid;