pan/pixelheros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 统一调整UI文本样式与buff描述措辞

Browse Source 
1. 修正多个prefab文件的文本控件尺寸、行高和字体大小，统一UI显示效果
2. 将所有英雄属性buff描述从"英雄XX"调整为"全体XX"，匹配实际全局生效的效果
This commit is contained in:
pan
2026-08-03 15:13:32 +08:00
parent ee6eec459d
commit a46577fd45
7 changed files with 1965 additions and 3397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
assets/resources/gui/element/cEquip.prefab
View File

@@ -3396,7 +3396,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 189.9,
"height": 26.46
"height": 25.2
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3421,11 +3421,11 @@
"__prefab": {
"__id__": 225
},
"_lineHeight": 21,
"_lineHeight": 20,
"_string": "<color=#00ff00>Rich</color><color=#0fffff>Text</color>",
"_horizontalAlign": 0,
"_verticalAlign": 0,
"_fontSize": 20,
"_fontSize": 18,
"_fontColor": {
"__type__": "cc.Color",
"r": 32,
@@ -4016,8 +4016,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.9,
"y": 0.9,
"x": 0.8,
"y": 0.8,
"z": 1
},
"_mobility": 0,
@@ -4805,8 +4805,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 88.88888888888889,
"height": 88.88888888888889
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",

4
assets/resources/gui/element/cHero.prefab
View File

@@ -3960,7 +3960,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 190,
"height": 23.94
"height": 25.2
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3985,7 +3985,7 @@
"__prefab": {
"__id__": 272
},
"_lineHeight": 19,
"_lineHeight": 20,
"_string": "<color=#00ff00>Rich</color><color=#0fffff>Text</color>",
"_horizontalAlign": 0,
"_verticalAlign": 0,

6
assets/resources/gui/element/cItem.prefab
View File

@@ -2759,7 +2759,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 189.9,
"height": 26.46
"height": 25.2
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -2784,11 +2784,11 @@
"__prefab": {
"__id__": 171
},
"_lineHeight": 21,
"_lineHeight": 20,
"_string": "<color=#00ff00>Rich</color><color=#0fffff>Text</color>",
"_horizontalAlign": 0,
"_verticalAlign": 0,
"_fontSize": 20,
"_fontSize": 18,
"_fontColor": {
"__type__": "cc.Color",
"r": 32,

4
assets/resources/gui/element/cSkill.prefab
View File

@@ -3244,7 +3244,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 190,
"height": 26.46
"height": 25.2
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -3269,7 +3269,7 @@
"__prefab": {
"__id__": 211
},
"_lineHeight": 21,
"_lineHeight": 20,
"_string": "<color=#00ff00>Rich</color><color=#0fffff>Text</color>",
"_horizontalAlign": 0,
"_verticalAlign": 0,

5262
assets/resources/gui/element/herobox.prefab
View File

File diff suppressed because it is too large Load Diff

54
assets/script/game/common/config/EquipSet.ts
View File

@@ -37,45 +37,45 @@ interface EquipRawData {
const EquipRawList: EquipRawData[] = [
// ==================== wave 1 档（基础强度） ====================
{ uuid: 8701, wave: SKILL_CARD_WAVES[0], icon: "Helmet-FA_Helmet_021_Gray", name: "战后恢复", info: "战斗结束生命回复量+10%", field: [7001] },
{ uuid: 8702, wave: SKILL_CARD_WAVES[0], icon: "Sword-FA_WP_Main_Sword_003_GrayGold", name: "攻击加成", info: "英雄攻击力+10%", field: [7002] },
{ uuid: 8703, wave: SKILL_CARD_WAVES[0], icon: "Blunt-FA_WP_Main_Blunt_002_Wood", name: "击晕加成", info: "英雄击晕概率+10%", field: [7003] },
{ uuid: 8704, wave: SKILL_CARD_WAVES[0], icon: "Axe-FA_WP_Main_Axe_001_WoodGray", name: "暴击加成", info: "英雄暴击率+10%", field: [7004] },
{ uuid: 8705, wave: SKILL_CARD_WAVES[0], icon: "Bow-FA_WP_Main_Bow_003_WoodGreen", name: "暴伤加成", info: "英雄暴击伤害+20%", field: [7005] },
{ uuid: 8706, wave: SKILL_CARD_WAVES[0], icon: "Crossbow-FA_WP_Main_Crossbow_001_WoodWhite", name: "攻速加成", info: "英雄攻击速度+10%", field: [7006] },
{ uuid: 8707, wave: SKILL_CARD_WAVES[0], icon: "Chest-FA_Chest_014_Gray", name: "生命加成", info: "英雄最大生命+10%", field: [7007] },
{ uuid: 8708, wave: SKILL_CARD_WAVES[0], icon: "Wand-FA_WP_Main_Wand_001_GrayGreen", name: "风怒加成", info: "英雄风怒概率+10%", field: [7008] },
{ uuid: 8709, wave: SKILL_CARD_WAVES[0], icon: "Spear-FA_WP_Main_Spear_004_WoodBlue", name: "穿刺加成", info: "英雄穿刺概率+10%", field: [7009] },
{ uuid: 8702, wave: SKILL_CARD_WAVES[0], icon: "Sword-FA_WP_Main_Sword_003_GrayGold", name: "攻击加成", info: "全体攻击力+10%", field: [7002] },
{ uuid: 8703, wave: SKILL_CARD_WAVES[0], icon: "Blunt-FA_WP_Main_Blunt_002_Wood", name: "击晕加成", info: "全体击晕概率+10%", field: [7003] },
{ uuid: 8704, wave: SKILL_CARD_WAVES[0], icon: "Axe-FA_WP_Main_Axe_001_WoodGray", name: "暴击加成", info: "全体暴击率+10%", field: [7004] },
{ uuid: 8705, wave: SKILL_CARD_WAVES[0], icon: "Bow-FA_WP_Main_Bow_003_WoodGreen", name: "暴伤加成", info: "全体暴击伤害+20%", field: [7005] },
{ uuid: 8706, wave: SKILL_CARD_WAVES[0], icon: "Crossbow-FA_WP_Main_Crossbow_001_WoodWhite", name: "攻速加成", info: "全体攻击速度+10%", field: [7006] },
{ uuid: 8707, wave: SKILL_CARD_WAVES[0], icon: "Chest-FA_Chest_014_Gray", name: "生命加成", info: "全体最大生命+10%", field: [7007] },
{ uuid: 8708, wave: SKILL_CARD_WAVES[0], icon: "Wand-FA_WP_Main_Wand_001_GrayGreen", name: "风怒加成", info: "全体风怒概率+10%", field: [7008] },
{ uuid: 8709, wave: SKILL_CARD_WAVES[0], icon: "Spear-FA_WP_Main_Spear_004_WoodBlue", name: "穿刺加成", info: "全体穿刺概率+10%", field: [7009] },
{ uuid: 8710, wave: SKILL_CARD_WAVES[0], icon: "Shield-FA_WP_Sub_Shield_007_GoldGray", name: "金币收益", info: "每回合金币收益+1", field: [7010] },
{ uuid: 8711, wave: SKILL_CARD_WAVES[0], icon: "Staff-FA_WP_Main_Staff_003_WoodSkyblue", name: "出售强化", info: "卖出英雄金币+1", field: [7011] },
// 多词条装备
{ uuid: 8720, wave: SKILL_CARD_WAVES[0], icon: "Shield-FA_WP_Sub_Shield_007_GoldGray", name: "勇者护符", info: "英雄攻击力+10%, 暴击率+10%, 暴击伤害+20%", field: [7002, 7004, 7005] },
{ uuid: 8720, wave: SKILL_CARD_WAVES[0], icon: "Shield-FA_WP_Sub_Shield_007_GoldGray", name: "勇者护符", info: "全体攻击力+10%, 暴击率+10%, 暴击伤害+20%", field: [7002, 7004, 7005] },
// ==================== wave 5 档（强度 ×2） ====================
{ uuid: 8751, wave: SKILL_CARD_WAVES[1], icon: "Helmet-FA_Helmet_022_DarkBlue", name: "战后恢复+", info: "战斗结束生命回复量+20%", field: [7201] },
{ uuid: 8752, wave: SKILL_CARD_WAVES[1], icon: "Sword-FA_WP_Main_Sword_007_Blue", name: "攻击加成+", info: "英雄攻击力+20%", field: [7202] },
{ uuid: 8753, wave: SKILL_CARD_WAVES[1], icon: "Blunt-FA_WP_Main_Blunt_004_Gray", name: "击晕加成+", info: "英雄击晕概率+20%", field: [7203] },
{ uuid: 8754, wave: SKILL_CARD_WAVES[1], icon: "Axe-FA_WP_Main_Axe_006_WoodBronze", name: "暴击加成+", info: "英雄暴击率+20%", field: [7204] },
{ uuid: 8755, wave: SKILL_CARD_WAVES[1], icon: "Bow-FA_WP_Main_Bow_010_Blue", name: "暴伤加成+", info: "英雄暴击伤害+40%", field: [7205] },
{ uuid: 8756, wave: SKILL_CARD_WAVES[1], icon: "Crossbow-FA_WP_Main_Crossbow_004_Gray", name: "攻速加成+", info: "英雄攻击速度+20%", field: [7206] },
{ uuid: 8757, wave: SKILL_CARD_WAVES[1], icon: "Chest-FA_Chest_014_BlueGold", name: "生命加成+", info: "英雄最大生命+20%", field: [7207] },
{ uuid: 8758, wave: SKILL_CARD_WAVES[1], icon: "Wand-FA_WP_Main_Wand_003_BlueWood", name: "风怒加成+", info: "英雄风怒概率+20%", field: [7208] },
{ uuid: 8759, wave: SKILL_CARD_WAVES[1], icon: "Spear-FA_WP_Main_Spear_007_GraySkyblue", name: "穿刺加成+", info: "英雄穿刺概率+20%", field: [7209] },
{ uuid: 8752, wave: SKILL_CARD_WAVES[1], icon: "Sword-FA_WP_Main_Sword_007_Blue", name: "攻击加成+", info: "全体攻击力+20%", field: [7202] },
{ uuid: 8753, wave: SKILL_CARD_WAVES[1], icon: "Blunt-FA_WP_Main_Blunt_004_Gray", name: "击晕加成+", info: "全体击晕概率+20%", field: [7203] },
{ uuid: 8754, wave: SKILL_CARD_WAVES[1], icon: "Axe-FA_WP_Main_Axe_006_WoodBronze", name: "暴击加成+", info: "全体暴击率+20%", field: [7204] },
{ uuid: 8755, wave: SKILL_CARD_WAVES[1], icon: "Bow-FA_WP_Main_Bow_010_Blue", name: "暴伤加成+", info: "全体暴击伤害+40%", field: [7205] },
{ uuid: 8756, wave: SKILL_CARD_WAVES[1], icon: "Crossbow-FA_WP_Main_Crossbow_004_Gray", name: "攻速加成+", info: "全体攻击速度+20%", field: [7206] },
{ uuid: 8757, wave: SKILL_CARD_WAVES[1], icon: "Chest-FA_Chest_014_BlueGold", name: "生命加成+", info: "全体最大生命+20%", field: [7207] },
{ uuid: 8758, wave: SKILL_CARD_WAVES[1], icon: "Wand-FA_WP_Main_Wand_003_BlueWood", name: "风怒加成+", info: "全体风怒概率+20%", field: [7208] },
{ uuid: 8759, wave: SKILL_CARD_WAVES[1], icon: "Spear-FA_WP_Main_Spear_007_GraySkyblue", name: "穿刺加成+", info: "全体穿刺概率+20%", field: [7209] },
{ uuid: 8760, wave: SKILL_CARD_WAVES[1], icon: "Shield-FA_WP_Sub_Shield_008_BlueGold", name: "金币收益+", info: "每回合金币收益+2", field: [7210] },
{ uuid: 8761, wave: SKILL_CARD_WAVES[1], icon: "Shield-FA_WP_Sub_Shield_008_BlueGold", name: "购买优惠+", info: "购买卡牌费用-2金币", field: [7212] },
{ uuid: 8762, wave: SKILL_CARD_WAVES[1], icon: "Staff-FA_WP_Main_Staff_007_WoodGray", name: "刷新优惠", info: "刷新卡牌费用-1金币", field: [7213] },
// 多词条装备
{ uuid: 8770, wave: SKILL_CARD_WAVES[1], icon: "Chest-FA_Chest_014_BlueGold", name: "守卫护甲", info: "英雄最大生命+20%, 战后生命回复+20%, 攻速+20%", field: [7207, 7201, 7206] },
{ uuid: 8770, wave: SKILL_CARD_WAVES[1], icon: "Chest-FA_Chest_014_BlueGold", name: "守卫护甲", info: "全体最大生命+20%, 战后生命回复+20%, 攻速+20%", field: [7207, 7201, 7206] },
// ==================== wave 8 档（强度 ×3） ====================
{ uuid: 8801, wave: SKILL_CARD_WAVES[2], icon: "Helmet-FA_Helmet_021_RedGold", name: "战后恢复++", info: "战斗结束生命回复量+30%", field: [7401] },
{ uuid: 8802, wave: SKILL_CARD_WAVES[2], icon: "Sword-FA_WP_Main_Sword_001_Gold", name: "攻击加成++", info: "英雄攻击力+30%", field: [7402] },
{ uuid: 8803, wave: SKILL_CARD_WAVES[2], icon: "Blunt-FA_WP_Main_Blunt_006_OrangeGray", name: "击晕加成++", info: "英雄击晕概率+30%", field: [7403] },
{ uuid: 8804, wave: SKILL_CARD_WAVES[2], icon: "Axe-FA_WP_Main_Axe_012_WoodGold", name: "暴击加成++", info: "英雄暴击率+30%", field: [7404] },
{ uuid: 8805, wave: SKILL_CARD_WAVES[2], icon: "Bow-FA_WP_Main_Bow_010_Gold", name: "暴伤加成++", info: "英雄暴击伤害+60%", field: [7405] },
{ uuid: 8806, wave: SKILL_CARD_WAVES[2], icon: "Crossbow-FA_WP_Main_Crossbow_005_WoodGold", name: "攻速加成++", info: "英雄攻击速度+30%", field: [7406] },
{ uuid: 8807, wave: SKILL_CARD_WAVES[2], icon: "Chest-FA_Chest_015_RedGold", name: "生命加成++", info: "英雄最大生命+30%", field: [7407] },
{ uuid: 8808, wave: SKILL_CARD_WAVES[2], icon: "Wand-FA_WP_Main_Wand_004_WoodGold", name: "风怒加成++", info: "英雄风怒概率+30%", field: [7408] },
{ uuid: 8809, wave: SKILL_CARD_WAVES[2], icon: "Spear-FA_WP_Main_Spear_008_GrayGold", name: "穿刺加成++", info: "英雄穿刺概率+30%", field: [7409] },
{ uuid: 8802, wave: SKILL_CARD_WAVES[2], icon: "Sword-FA_WP_Main_Sword_001_Gold", name: "攻击加成++", info: "全体攻击力+30%", field: [7402] },
{ uuid: 8803, wave: SKILL_CARD_WAVES[2], icon: "Blunt-FA_WP_Main_Blunt_006_OrangeGray", name: "击晕加成++", info: "全体击晕概率+30%", field: [7403] },
{ uuid: 8804, wave: SKILL_CARD_WAVES[2], icon: "Axe-FA_WP_Main_Axe_012_WoodGold", name: "暴击加成++", info: "全体暴击率+30%", field: [7404] },
{ uuid: 8805, wave: SKILL_CARD_WAVES[2], icon: "Bow-FA_WP_Main_Bow_010_Gold", name: "暴伤加成++", info: "全体暴击伤害+60%", field: [7405] },
{ uuid: 8806, wave: SKILL_CARD_WAVES[2], icon: "Crossbow-FA_WP_Main_Crossbow_005_WoodGold", name: "攻速加成++", info: "全体攻击速度+30%", field: [7406] },
{ uuid: 8807, wave: SKILL_CARD_WAVES[2], icon: "Chest-FA_Chest_015_RedGold", name: "生命加成++", info: "全体最大生命+30%", field: [7407] },
{ uuid: 8808, wave: SKILL_CARD_WAVES[2], icon: "Wand-FA_WP_Main_Wand_004_WoodGold", name: "风怒加成++", info: "全体风怒概率+30%", field: [7408] },
{ uuid: 8809, wave: SKILL_CARD_WAVES[2], icon: "Spear-FA_WP_Main_Spear_008_GrayGold", name: "穿刺加成++", info: "全体穿刺概率+30%", field: [7409] },
{ uuid: 8810, wave: SKILL_CARD_WAVES[2], icon: "Shield-FA_WP_Sub_Shield_009_RedGold", name: "金币收益++", info: "每回合金币收益+3", field: [7410] },
// 触发次数强化
{ uuid: 8811, wave: SKILL_CARD_WAVES[2], icon: "Wand-FA_WP_Main_Wand_004_WoodGold", name: "召唤强化++", info: "召唤触发技能次数+1", field: [7014] },
@@ -85,7 +85,7 @@ const EquipRawList: EquipRawData[] = [
{ uuid: 8815, wave: SKILL_CARD_WAVES[2], icon: "Sword-FA_WP_Main_Sword_001_Gold", name: "攻击强化++", info: "攻击触发技能次数+1", field: [7018] },
{ uuid: 8816, wave: SKILL_CARD_WAVES[2], icon: "Shield-FA_WP_Sub_Shield_009_RedGold", name: "受击强化++", info: "被攻击触发技能次数+1", field: [7019] },
// 多词条装备
{ uuid: 8820, wave: SKILL_CARD_WAVES[2], icon: "Sword-FA_WP_Main_Sword_001_Gold", name: "神圣之刃", info: "英雄攻击力+30%, 暴击率+30%, 暴击伤害+60%, 攻速+30%", field: [7402, 7404, 7405, 7406] },
{ uuid: 8820, wave: SKILL_CARD_WAVES[2], icon: "Sword-FA_WP_Main_Sword_001_Gold", name: "神圣之刃", info: "全体攻击力+30%, 暴击率+30%, 暴击伤害+60%, 攻速+30%", field: [7402, 7404, 7405, 7406] },
];
/**

18
assets/script/game/common/config/SkillDescSet.ts
View File

@@ -273,7 +273,7 @@ export enum FieldValueFmt {
* 单个驻场光环的结构化描述配置（文字表达标准层统一称谓）
*/
export interface FieldDescConfig {
/** 效果动词，如 "英雄攻击力"/"召唤触发技能次数" */
/** 效果动词，如 "全体攻击力"/"召唤触发技能次数" */
verb: string;
/** 数值格式（决定 value 如何渲染为高亮片段） */
fmt: FieldValueFmt;
@@ -291,16 +291,16 @@ export const FieldDescSet: Record<number, FieldDescConfig> = {
[FieldSkillType.WaveGold]: { verb: "每回合金币收益", fmt: FieldValueFmt.Int },
[FieldSkillType.SellGold]: { verb: "卖出英雄金币", fmt: FieldValueFmt.Int },
[FieldSkillType.WaveHeal]: { verb: "战斗结束生命回复量", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroAtk]: { verb: "英雄攻击力", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroStun]: { verb: "英雄击晕概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroCrit]: { verb: "英雄暴击率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroCritDamage]: { verb: "英雄暴击伤害", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroSpeed]: { verb: "英雄攻击速度", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroAtk]: { verb: "全体攻击力", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroStun]: { verb: "全体击晕概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroCrit]: { verb: "全体暴击率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroCritDamage]: { verb: "全体暴击伤害", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroSpeed]: { verb: "全体攻击速度", fmt: FieldValueFmt.Percent },
[FieldSkillType.BuyDiscount]: { verb: "购买卡牌费用", fmt: FieldValueFmt.IntMinus },
[FieldSkillType.RefreshDiscount]: { verb: "刷新卡牌费用", fmt: FieldValueFmt.IntMinus },
[FieldSkillType.HeroHp]: { verb: "英雄最大生命", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroWindFury]: { verb: "英雄风怒概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroPuncture]: { verb: "英雄穿刺概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroHp]: { verb: "全体最大生命", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroWindFury]: { verb: "全体风怒概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.HeroPuncture]: { verb: "全体穿刺概率", fmt: FieldValueFmt.Percent },
[FieldSkillType.AtkCount]: { verb: "攻击触发技能次数", fmt: FieldValueFmt.Int },
[FieldSkillType.BeAtkCount]: { verb: "被攻击触发技能次数", fmt: FieldValueFmt.Int },
};