From e422844717d05d983c013a1bc930c2d3d85a9b04 Mon Sep 17 00:00:00 2001 From: panFD Date: Sat, 20 Jun 2026 00:01:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(skillConfig&prefab):=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=8A=80=E8=83=BD=E9=85=8D=E7=BD=AE=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=B8=8EUI=E6=8E=A7=E5=88=B6=E5=99=A8=E5=B0=BA=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 重构技能卡牌配置表，调整技能波次分组逻辑 2. 更新角色控制器预制体的尺寸与目标覆盖配置 --- assets/resources/gui/role_controller.prefab | 172 +++++++++++++++++++- assets/script/game/common/config/CardSet.ts | 60 +++---- 2 files changed, 190 insertions(+), 42 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 24aba0d8..0f9496ff 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -438,8 +438,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 286, - "height": 118.66666666666667 + "width": 429, + "height": 178 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10084,7 +10084,23 @@ }, "fileId": "6514ysgfJNtIx/ak03+nce", "instance": null, - "targetOverrides": [], + "targetOverrides": [ + { + "__id__": 458 + }, + { + "__id__": 461 + }, + { + "__id__": 464 + }, + { + "__id__": 467 + }, + { + "__id__": 470 + } + ], "nestedPrefabInstanceRoots": [ { "__id__": 438 @@ -10105,5 +10121,155 @@ "__id__": 3 } ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 3 + }, + "sourceInfo": { + "__id__": 459 + }, + "propertyPath": [ + "hero1" + ], + "target": { + "__id__": 3 + }, + "targetInfo": { + "__id__": 460 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "86bacQ+jZMOokmXQGUf5Ed" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b7CXK9ttxDz5mrJpDB4qA4" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 3 + }, + "sourceInfo": { + "__id__": 462 + }, + "propertyPath": [ + "hero2" + ], + "target": { + "__id__": 3 + }, + "targetInfo": { + "__id__": 463 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "86bacQ+jZMOokmXQGUf5Ed" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "36Na+WXPtJRbtR9UQnCyaj" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 3 + }, + "sourceInfo": { + "__id__": 465 + }, + "propertyPath": [ + "hero3" + ], + "target": { + "__id__": 3 + }, + "targetInfo": { + "__id__": 466 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "86bacQ+jZMOokmXQGUf5Ed" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f2j7DYVutESIJc8Q7SiM91" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 3 + }, + "sourceInfo": { + "__id__": 468 + }, + "propertyPath": [ + "hero4" + ], + "target": { + "__id__": 3 + }, + "targetInfo": { + "__id__": 469 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "86bacQ+jZMOokmXQGUf5Ed" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "06y3o47t5NjZX9yks6rQWL" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 3 + }, + "sourceInfo": { + "__id__": 471 + }, + "propertyPath": [ + "hero5" + ], + "target": { + "__id__": 3 + }, + "targetInfo": { + "__id__": 472 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "86bacQ+jZMOokmXQGUf5Ed" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cdrD/D+WdDiZtHCrbPOfP7" + ] } ] \ No newline at end of file diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index bcecc47a..773e0a04 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -183,49 +183,31 @@ const waveToPoolLv: Record = { }; const SkillCardData: any[] = [ - // === 1波技能 === - { uuid: 8301, skill: 6301, wave: 1, name: "护盾", info: "为伙伴/自己添加护盾，可抵挡3次伤害", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8302, skill: 6302, wave: 1, name: "治疗", info: "治疗伙伴/自己", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, + { uuid: 8705, skill: 0, wave: 1, name: "金币收益", info: "每回合金币收益+1", is_inst: false, keep_waves: -1, field: [7005], trigger_type: CardTriggerType.Field }, { uuid: 8706, skill: 0, wave: 1, name: "出售强化", info: "卖出英雄金币+1", is_inst: false, keep_waves: -1, field: [7006], trigger_type: CardTriggerType.Field }, { uuid: 8707, skill: 0, wave: 1, name: "战后恢复", info: "战斗结束生命回复量+10%", is_inst: false, keep_waves: -1, field: [7007], trigger_type: CardTriggerType.Field }, + { uuid: 8708, skill: 0, wave: 1, name: "攻击加成", info: "英雄攻击力+10%", is_inst: false, keep_waves: -1, field: [7008], trigger_type: CardTriggerType.Field }, + { uuid: 8709, skill: 0, wave: 1, name: "击晕加成", info: "英雄击晕概率+10%", is_inst: false, keep_waves: -1, field: [7009], trigger_type: CardTriggerType.Field }, + { uuid: 8710, skill: 0, wave: 1, name: "暴击加成", info: "英雄暴击率+10%", is_inst: false, keep_waves: -1, field: [7010], trigger_type: CardTriggerType.Field }, + { uuid: 8711, skill: 0, wave: 1, name: "暴伤加成", info: "英雄暴击伤害+20%", is_inst: false, keep_waves: -1, field: [7011], trigger_type: CardTriggerType.Field }, + { uuid: 8712, skill: 0, wave: 1, name: "攻速加成", info: "英雄攻击速度+10%", is_inst: false, keep_waves: -1, field: [7012], trigger_type: CardTriggerType.Field }, + { uuid: 8713, skill: 0, wave: 1, name: "购买优惠", info: "购买卡牌费用-1金币", is_inst: false, keep_waves: -1, field: [7013], trigger_type: CardTriggerType.Field }, + { uuid: 8714, skill: 0, wave: 1, name: "刷新优惠", info: "刷新卡牌费用-1金币", is_inst: false, keep_waves: -1, field: [7014], trigger_type: CardTriggerType.Field }, + { uuid: 8716, skill: 0, wave: 1, name: "生命加成", info: "英雄最大生命+10%", is_inst: false, keep_waves: -1, field: [7016], trigger_type: CardTriggerType.Field }, + { uuid: 8717, skill: 0, wave: 1, name: "风怒加成", info: "英雄风怒概率+10%", is_inst: false, keep_waves: -1, field: [7017], trigger_type: CardTriggerType.Field }, + { uuid: 8718, skill: 0, wave: 1, name: "穿刺加成", info: "英雄穿刺概率+10%", is_inst: false, keep_waves: -1, field: [7018], trigger_type: CardTriggerType.Field }, + // { uuid: 8701, skill: 0, wave: 1, name: "召唤强化", info: "召唤触发技能次数+1", is_inst: false, keep_waves: -1, field: [7001], trigger_type: CardTriggerType.Field }, + { uuid: 8702, skill: 0, wave: 1, name: "死亡强化", info: "死亡触发技能次数+1", is_inst: false, keep_waves: -1, field: [7002], trigger_type: CardTriggerType.Field }, + { uuid: 8703, skill: 0, wave: 1, name: "开场强化", info: "战斗开始触发技能次数+1", is_inst: false, keep_waves: -1, field: [7003], trigger_type: CardTriggerType.Field }, + { uuid: 8704, skill: 0, wave: 1, name: "结束强化", info: "战斗结束触发技能次数+1", is_inst: false, keep_waves: -1, field: [7004], trigger_type: CardTriggerType.Field }, - // === 5波技能 === - { uuid: 8303, skill: 6303, wave: 5, name: "获取金币", info: "增加一定数量的金币", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8401, skill: 6401, wave: 5, name: "攻击强化", info: "全体友方攻击力提升5点，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8402, skill: 6402, wave: 5, name: "生命强化", info: "全体友方最大生命值提升20点，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8403, skill: 6403, wave: 5, name: "暴击强化", info: "全体友方暴击率提升10%，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8404, skill: 6404, wave: 5, name: "暴伤强化", info: "全体友方暴击伤害提升20%，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8405, skill: 6405, wave: 5, name: "击晕强化", info: "全体友方击晕概率提升10%，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8408, skill: 6408, wave: 5, name: "穿刺强化", info: "全体友方穿透概率提升20%，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - { uuid: 8409, skill: 6409, wave: 5, name: "风怒强化", info: "全体友方风怒次数提升1次，持续1次", is_inst: true, keep_waves: -1, trigger_type: CardTriggerType.Instant }, - // { uuid: 8501, skill: 6501, wave: 5, name: "复活", info: "ap 代表复活的生命值百分比", is_inst: true, keep_waves: -1 }, - - // === 10波技能 === - { uuid: 8708, skill: 0, wave: 10, name: "攻击加成", info: "英雄攻击力+10%", is_inst: false, keep_waves: -1, field: [7008], trigger_type: CardTriggerType.Field }, - { uuid: 8709, skill: 0, wave: 10, name: "击晕加成", info: "英雄击晕概率+10%", is_inst: false, keep_waves: -1, field: [7009], trigger_type: CardTriggerType.Field }, - { uuid: 8710, skill: 0, wave: 10, name: "暴击加成", info: "英雄暴击率+10%", is_inst: false, keep_waves: -1, field: [7010], trigger_type: CardTriggerType.Field }, - { uuid: 8711, skill: 0, wave: 10, name: "暴伤加成", info: "英雄暴击伤害+20%", is_inst: false, keep_waves: -1, field: [7011], trigger_type: CardTriggerType.Field }, - { uuid: 8712, skill: 0, wave: 10, name: "攻速加成", info: "英雄攻击速度+10%", is_inst: false, keep_waves: -1, field: [7012], trigger_type: CardTriggerType.Field }, - { uuid: 8713, skill: 0, wave: 10, name: "购买优惠", info: "购买卡牌费用-1金币", is_inst: false, keep_waves: -1, field: [7013], trigger_type: CardTriggerType.Field }, - { uuid: 8714, skill: 0, wave: 10, name: "刷新优惠", info: "刷新卡牌费用-1金币", is_inst: false, keep_waves: -1, field: [7014], trigger_type: CardTriggerType.Field }, - { uuid: 8716, skill: 0, wave: 10, name: "生命加成", info: "英雄最大生命+10%", is_inst: false, keep_waves: -1, field: [7016], trigger_type: CardTriggerType.Field }, - { uuid: 8717, skill: 0, wave: 10, name: "风怒加成", info: "英雄风怒概率+10%", is_inst: false, keep_waves: -1, field: [7017], trigger_type: CardTriggerType.Field }, - { uuid: 8718, skill: 0, wave: 10, name: "穿刺加成", info: "英雄穿刺概率+10%", is_inst: false, keep_waves: -1, field: [7018], trigger_type: CardTriggerType.Field }, - - // === 15波技能 === - { uuid: 8701, skill: 0, wave: 15, name: "召唤强化", info: "召唤触发技能次数+1", is_inst: false, keep_waves: -1, field: [7001], trigger_type: CardTriggerType.Field }, - { uuid: 8702, skill: 0, wave: 15, name: "死亡强化", info: "死亡触发技能次数+1", is_inst: false, keep_waves: -1, field: [7002], trigger_type: CardTriggerType.Field }, - { uuid: 8703, skill: 0, wave: 15, name: "开场强化", info: "战斗开始触发技能次数+1", is_inst: false, keep_waves: -1, field: [7003], trigger_type: CardTriggerType.Field }, - { uuid: 8704, skill: 0, wave: 15, name: "结束强化", info: "战斗结束触发技能次数+1", is_inst: false, keep_waves: -1, field: [7004], trigger_type: CardTriggerType.Field }, - - // === 20波技能 === - { uuid: 8201, skill: 6201, wave: 20, name: "雷墙", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, - { uuid: 8202, skill: 6202, wave: 20, name: "火墙", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, - { uuid: 8203, skill: 6203, wave: 20, name: "飓风", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, - { uuid: 8204, skill: 6204, wave: 20, name: "水墙", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, - { uuid: 8205, skill: 6205, wave: 20, name: "风墙", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, - { uuid: 8206, skill: 6206, wave: 20, name: "陨石术", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8201, skill: 6201, wave: 5, name: "雷墙", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8202, skill: 6202, wave: 5, name: "火墙", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8203, skill: 6203, wave: 5, name: "飓风", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8204, skill: 6204, wave: 5, name: "水墙", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8205, skill: 6205, wave: 5, name: "风墙", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, + { uuid: 8206, skill: 6206, wave: 5, name: "陨石术", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 999, t_inv: 5, keep_waves: -1, trigger_type: CardTriggerType.Interval }, ]; SkillCardData.forEach(data => {