diff --git a/src/widgets/EquipList/equip-conponents/ETag.vue b/src/widgets/EquipList/equip-conponents/ETag.vue index 1783d31..2b900e7 100644 --- a/src/widgets/EquipList/equip-conponents/ETag.vue +++ b/src/widgets/EquipList/equip-conponents/ETag.vue @@ -1,6 +1,4 @@ diff --git a/src/widgets/EquipList/equip-conponents/Equip.vue b/src/widgets/EquipList/equip-conponents/Equip.vue index bc35f22..56056f0 100644 --- a/src/widgets/EquipList/equip-conponents/Equip.vue +++ b/src/widgets/EquipList/equip-conponents/Equip.vue @@ -222,8 +222,7 @@ const locale = getLanguage();
-   - +
@@ -264,8 +263,7 @@ const locale = getLanguage();
-   - +
@@ -287,6 +285,7 @@ const locale = getLanguage(); + {{ customLabel[locale].equipString.nomission }} diff --git a/src/widgets/EquipList/equipData.ts b/src/widgets/EquipList/equipData.ts index e8ed34e..6f6cbf6 100644 --- a/src/widgets/EquipList/equipData.ts +++ b/src/widgets/EquipList/equipData.ts @@ -72,13 +72,13 @@ export async function getEquipDataAll(): Promise< other: other[0] ?? "", other2: other[1] ?? "", other3: other[2] ?? "", - add: e.add, + add: e.traitadd, trait: recoverHTML(e.trait ?? ""), talent2: recoverHTML(e.talent2 ?? ""), talent3: recoverHTML(e.talent3 ?? ""), mission1: recoverHTML(e.mission1 ?? ""), mission2: recoverHTML(e.mission2 ?? ""), - mission2opt: e.mission2opt ?? "", + mission2opt: e.mission2Operation ?? "", mat: recoverHTML(e.mat ?? ""), mat2: recoverHTML(e.mat2 ?? ""), mat3: recoverHTML(e.mat3 ?? ""), diff --git a/src/widgets/EquipList/i18n.ts b/src/widgets/EquipList/i18n.ts index f8fda91..5f195f2 100644 --- a/src/widgets/EquipList/i18n.ts +++ b/src/widgets/EquipList/i18n.ts @@ -2,151 +2,6 @@ import { LANGUAGES } from "@/utils/i18n"; export const customSubtype: Record> = { zh: {}, - "zh-tw": {}, - en: { - 先锋: "Vangurad", - 近卫: "Guard", - 重装: "Defender", - 狙击: "Sniper", - 术师: "Caster", - 医疗: "Medic", - 辅助: "Supporter", - 特种: "Specialist", - 尖兵: "Pioneer", - 冲锋手: "Charger", - 执旗手: "Standard Bearer", - 战术家: "Tactician", - 情报官: "Agent", - 无畏者: "Dreadnought", - 强攻手: "Centurion", - 领主: "Lord", - 术战者: "Arts Fighter", - 教官: "Instructor", - 斗士: "Fighter", - 剑豪: "Swordmaster", - 武者: "Soloblade", - 解放者: "Liberator", - 收割者: "Reaper", - 重剑手: "Crusher", - 撼地者: "Earthshaker", - 铁卫: "Protector", - 守护者: "Guardian", - 不屈者: "Juggernaut", - 驭法铁卫: "Arts Protector", - 决战者: "Duelist", - 要塞: "Fortress", - 哨戒铁卫: "Sentinel Protector", - 速射手: "Marksman", - 炮手: "Artilleryman", - 神射手: "Deadeye Sniper", - 重射手: "Heavyshooter", - 散射手: "Spreadshooter", - 攻城手: "Besieger", - 投掷手: "Flinger", - 中坚术师: "Core Caster", - 扩散术师: "Splash Caster", - 轰击术师: "Blast Caster", - 链术师: "Chain Caster", - 驭械术师: "Mech-Accord Caster", - 阵法术师: "Phalanx Caster", - 秘术师: "Mystic Caster", - 本源术师: "Primal Caster", - 医师: "Medic", - 群愈师: "Multi-target Medic", - 疗养师: "Therapist", - 行医: "Wandering Medic", - 咒愈师: "Incantation Medic", - 链愈师: "Chain Medic", - 凝滞师: "Decel Binder", - 召唤师: "Summoner", - 削弱者: "Hexer", - 吟游者: "Bard", - 护佑者: "Abjurer", - 工匠: "Artificer", - 巫役: "Ritualist", - 推击手: "Push Stroker", - 钩索师: "Hookmaster", - 处决者: "Executor", - 伏击客: "Ambusher", - 怪杰: "Geek", - 行商: "Merchant", - 陷阱师: "Trapmaster", - 傀儡师: "Dollkeeper", - 猎手: "Hunter", - 回环射手: "Loopshooter", - 炼金师: "Alchemist", - }, - ja: { - 先锋: "先鋒", - 近卫: "近衛", - 重装: "重装", - 狙击: "狙撃", - 术师: "術師", - 医疗: "医療", - 辅助: "補助", - 特种: "特殊", - 尖兵: "先駆兵", - 冲锋手: "突擊兵", - 执旗手: "旗手", - 战术家: "戦術家", - 情报官: "偵察兵", - 无畏者: "勇士", - 强攻手: "強襲者", - 领主: "領主", - 术战者: "術戰士", - 教官: "教官", - 斗士: "闘士", - 剑豪: "剣豪", - 武者: "武者", - 解放者: "解放者", - 收割者: "鐮擊士", - 重剑手: "重剣士", - //撼地者: "Earthshaker", - 铁卫: "重盾衛士", - 守护者: "庇護衛士", - 不屈者: "破壞者", - 驭法铁卫: "術技衛士", - 决战者: "決闘者", - 要塞: "堅城砲手", - 哨戒铁卫: "哨戒衛士", - 速射手: "速射手", - 炮手: "榴弾射手", - 神射手: "戦術射手", - 重射手: "精密射手", - 散射手: "散弾射手", - 攻城手: "破城射手", - 投掷手: "投擲手", - 中坚术师: "中堅術師", - 扩散术师: "拡散術師", - 轰击术师: "爆擊術師", - 链术师: "連鎖術師", - 驭械术师: "操機術師", - 阵法术师: "法陣術師", - 秘术师: "秘術師", - //本源术师: "Primal Caster", - 医师: "医師", - 群愈师: "群癒師", - 疗养师: "療養師", - 行医: "放浪医", - 咒愈师: "呪癒師", - 链愈师: "連鎖癒師", - 凝滞师: "緩速師", - 召唤师: "召喚師", - 削弱者: "呪詛師", - 吟游者: "吟遊者", - 护佑者: "祈祷師", - 工匠: "工匠", - //巫役: "Ritualist", - 推击手: "推擊手", - 钩索师: "鉤縄師", - 处决者: "執行者", - 伏击客: "潜伏者", - 怪杰: "鬼才", - 行商: "行商人", - 陷阱师: "罠師", - 傀儡师: "傀儡師", - //炼金师: alchemist, - }, }; const customPages = { @@ -276,13 +131,9 @@ export const customLabel = { nomission: "该模组无解锁任务", condition: "解锁需求与材料消耗", upgrade: "模组升级消耗", - condStats: [ - "完成该模组所有模组解锁任务", - "达到精英阶段2", - "级", - "信赖值达到", - "%", - ], + condTrust: "需要信赖值(%)", + condLv: "需要达到等级\n(精英2阶段)", + condMission: "完成本模组所有\n模组解锁任务", }, tableTitle: { name: "模组", @@ -301,7 +152,7 @@ export const customLabel = { tableCollapse: "模組排序和篩選", subPlaceholder: "鍵入或在選單中選擇", subtypeLabel: "職業分支", - subtypeMap: customSubtype["zh-tw"], + subtypeMap: customSubtype.zh, typeOptions: [ "先鋒", "近衛", @@ -341,13 +192,9 @@ export const customLabel = { nomission: "該模組無解鎖任務", condition: "解鎖需求與材料消耗", upgrade: "模組升級消耗", - condStats: [ - "完成該模組所有模組解鎖任務", - "達到精英階段2", - "級", - "信賴值達到", - "%", - ], + condTrust: "需要信賴值(%)", + condLv: "需要達到等級\n(精英2階段)", + condMission: "完成本模組所有\n模組解鎖任務", }, tableTitle: { name: "模組", @@ -366,7 +213,7 @@ export const customLabel = { tableCollapse: "Modules Sorting & Filtering", subPlaceholder: "Input or choose from menu", subtypeLabel: "Branches", - subtypeMap: customSubtype.en, + subtypeMap: customSubtype.zh, typeOptions: [ "Vanguard", "Guard", @@ -403,16 +250,12 @@ export const customLabel = { }, equipString: { mission: "Module Missions", - nomission: "This module has no module missions.", + nomission: "This module has no module missions", condition: "Unlock Conditions & Materials", upgrade: "Upgrade Materials", - condStats: [ - "Complete all Module Missions", - "Raise to Elite 2, Level", - "", - "Have at least", - "% Trust", - ], + condTrust: "Trust (%)", + condLv: "Lv. (Elite 2)", + condMission: "Complete all Module Missions\nof this module", }, tableTitle: { name: "Module", @@ -431,7 +274,7 @@ export const customLabel = { tableCollapse: "モジュール並べ替えと絞り込み", subPlaceholder: "入力または選択してください", subtypeLabel: "クラス細分", - subtypeMap: customSubtype.ja, + subtypeMap: customSubtype.zh, typeOptions: [ "先鋒", "近衛", @@ -471,13 +314,9 @@ export const customLabel = { nomission: "このモジュールは開放任務がありません", condition: "開放条件と必要素材", upgrade: "モジュール強化素材", - condStats: [ - "すべての開放任務を完了", - "昇進段階2 Lv.", - "に到達", - "信頼度", - "%に到達", - ], + condTrust: "必要信頼度(%)", + condLv: "必要レベル\n(昇進2段階)", + condMission: "このモジュールのすべての\n解放任務を完了する", }, tableTitle: { name: "モジュール", @@ -497,7 +336,7 @@ export const customLabel = { tableCollapse: "Module Sorting & Filtering", subPlaceholder: "Input or choose in menu", subtypeLabel: "Branches", - subtypeMap: customSubtype.en, + subtypeMap: customSubtype.zh, typeOptions: [ "Vanguard", "Guard", @@ -537,13 +376,9 @@ export const customLabel = { nomission: "This module has no module missions.", condition: "Unlock Conditions & Materials", upgrade: "Upgrade Materials", - condStats: [ - "Complete all Module Missions", - "Raise to Elite 2, Level", - "", - "Have at least", - "% Trust", - ], + condTrust: "Trust (%)", + condLv: "Lv. (Elite 2)", + condMission: "Complete all Module Missions\nof this module", }, tableTitle: { name: "Module", diff --git a/src/widgets/EquipList/types.ts b/src/widgets/EquipList/types.ts index f7900a5..572fd10 100644 --- a/src/widgets/EquipList/types.ts +++ b/src/widgets/EquipList/types.ts @@ -34,7 +34,7 @@ export interface CargoEquip { cost: string; atkspd: string; other: string; - add: string; + traitadd: string; trait: string; talent2: string; talent3: string; @@ -44,7 +44,7 @@ export interface CargoEquip { mat3: string; mission1: string; mission2: string; - mission2opt: string; + mission2Operation: string; } export interface EquipRow {