Yunzai-Plugin/ZZZ-Plugin
1
0
Fork 0
mirror of https://github.com/ZZZure/ZZZ-Plugin.git synced 2025-12-17 13:47:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

尝试修正数据(1/∞)

Browse source
This commit is contained in:
xyz 2025-04-03 21:24:11 +08:00
parent a57585f48c
commit e01b48145a
1 changed files with 338 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

474
lib/ekapi/enka_to_mys.js
View file

@ -1,5 +1,3 @@
// enka_to_mys.js
// enka_to_mys.js
import { import {
equip_data, equip_data,
weapon_data, weapon_data,
@ -8,112 +6,167 @@ import {
} from './name_convert.js'; } from './name_convert.js';
import _ from 'lodash'; // 引入 lodash (如果需要 get 等方法) import _ from 'lodash'; // 引入 lodash (如果需要 get 等方法)
// --- 日志和数据导入确认 --- // --- 数据导入确认 ---
// logger.debug(`[enka_to_mys.js] 文件顶层: partner_data keys: ${Object.keys(partner_data || {}).length}`); if (typeof partner_data === 'undefined' || Object.keys(partner_data || {}).length === 0) {
// logger.debug(`[enka_to_mys.js] 文件顶层: PartnerId2SkillParam keys: ${Object.keys(PartnerId2SkillParam || {}).length}`); logger.error("[enka_to_mys.js] 错误：partner_data 未定义或为空！");
// 根据需要决定是否抛出错误或使用默认值
}
if (typeof PartnerId2SkillParam === 'undefined' || Object.keys(PartnerId2SkillParam || {}).length === 0) { if (typeof PartnerId2SkillParam === 'undefined' || Object.keys(PartnerId2SkillParam || {}).length === 0) {
console.warn("[enka_to_mys.js] 警告：PartnerId2SkillParam 未定义或为空，技能名称将使用默认值。"); logger.warn("[enka_to_mys.js] 警告：PartnerId2SkillParam 未定义或为空，技能名称将使用默认值。");
PartnerId2SkillParam = {}; // 确保它是个空对象以防万一 PartnerId2SkillParam = {}; // 确保它是个空对象以防万一
} }
// --- 常量和映射定义 --- // --- 常量和映射定义 ---
const ID_TO_PROP_NAME = { const ID_TO_PROP_NAME = {
'11101': '生命值', '11103': '生命值', '11102': '生命值百分比', '11101': '生命值', '11103': '生命值', '11102': '生命值百分比', // Python: 11102 是 '生命值'
'12101': '攻击力', '12103': '攻击力', '12102': '攻击力百分比', '12101': '攻击力', '12103': '攻击力', '12102': '攻击力百分比', // Python: 12102 是 '攻击力'
'13101': '防御力', '13103': '防御力', '13102': '防御力百分比', '13101': '防御力', '13103': '防御力', '13102': '防御力百分比', // Python: 13102 是 '防御力'
'12203': '冲击力', '20103': '暴击率', '21103': '暴击伤害', '12203': '冲击力', '20103': '暴击率', '21103': '暴击伤害',
'31402': '异常掌控', '31403': '异常掌控', '31402': '异常掌控', '31403': '异常掌控',
'31202': '异常精通', '31203': '异常精通', '31202': '异常精通', '31203': '异常精通',
'23103': '穿透率', '23203': '穿透值', '23103': '穿透率', '23203': '穿透值',
'30503': '能量自动回复', '30502': '能量自动回复', // 注意：ID_TO_PROP_NAME 中百分比能量回复的名字也是'能量自动回复' '30503': '能量自动回复', '30502': '能量自动回复', // Python: 30502 是 '能量回复百分比' (但值和30503一样？)
// Python 没有 315, 但有 31503
'31503': '物理伤害加成', '31603': '火属性伤害加成', '31703': '冰属性伤害加成', '31503': '物理伤害加成', '31603': '火属性伤害加成', '31703': '冰属性伤害加成',
'31803': '雷属性伤害加成', '31903': '以太属性伤害加成', '31803': '雷属性伤害加成', '31903': '以太属性伤害加成',
// '315': '伤害加成', // Python 存在此 ID, JS 暂无对应
}; };
// MysApi 返回的 Property ID 映射 (根据日志样本) // MysApi 返回的 Property ID 映射 (根据日志样本)
const MYSAPI_PROP_ID = { const MYSAPI_PROP_ID = {
'生命值': 1, '攻击力': 2, '防御力': 3, '冲击力': 4, '暴击率': 5, '暴击伤害': 6, '生命值': 1, '攻击力': 2, '防御力': 3, '冲击力': 4, '暴击率': 5, '暴击伤害': 6,
'异常掌控': 7, '异常精通': 8, '穿透率': 9, '能量自动回复': 11, '异常掌控': 7, '异常精通': 8, '穿透率': 9, '能量自动回复': 11,
'穿透值': 232, '物理伤害加成': 315, '火属性伤害加成': 316, '冰属性伤害加成': 317, '穿透值': 232, // Python ID: 23203
'雷属性伤害加成': 318, '以太属性伤害加成': 319, '物理伤害加成': 315, // Python ID: 31503
'火属性伤害加成': 316, // Python ID: 31603
'冰属性伤害加成': 317, // Python ID: 31703
'雷属性伤害加成': 318, // Python ID: 31803
'以太属性伤害加成': 319, // Python ID: 31903
// 百分比属性的 MysApi ID 未知，用 0 占位 // 百分比属性的 MysApi ID 未知，用 0 占位
'生命值百分比': 0, '攻击力百分比': 0, '防御力百分比': 0, '生命值百分比': 0, '攻击力百分比': 0, '防御力百分比': 0,
}; };
const ID_TO_EN = { const ID_TO_EN = {
'11101': 'HpMax', '11103': 'HpBase', '11102': 'HpAdd', '11101': 'HpMax', '11103': 'HpBase', '11102': 'HpAdd', // % HP
'12101': 'Attack', '12103': 'AttackBase', '12102': 'AttackAdd', '12101': 'Attack', '12103': 'AttackBase', '12102': 'AttackAdd', // % ATK
'13101': 'Defence', '13103': 'DefenceBase', '13102': 'DefenceAdd', '13101': 'Defence', '13103': 'DefenceBase', '13102': 'DefenceAdd', // % DEF
'12203': 'BreakStun', '20103': 'Crit', '21103': 'CritDmg', '12203': 'BreakStun', '20103': 'Crit', '21103': 'CritDmg',
'31402': 'ElementAbnormalPower', '31403': 'ElementAbnormalPower', '31402': 'ElementAbnormalPower', '31403': 'ElementAbnormalPower',
'31202': 'ElementMystery', '31203': 'ElementMystery', '31202': 'ElementMystery', '31203': 'ElementMystery',
'23103': 'PenRate', '23203': 'PenDelta', '23103': 'PenRate', '23203': 'PenDelta',
'30503': 'SpRecover', '30502': 'SpRecover', '30503': 'SpRecover', '30502': 'SpRecover', // Python calls 30502 '能量回复百分比' but uses same EN key? Let's keep it SpRecover for now.
// '315': 'DmgBonus', // Python has this, maybe map if needed?
'31503': 'PhysDmgBonus', '31603': 'FireDmgBonus', '31703': 'IceDmgBonus', '31503': 'PhysDmgBonus', '31603': 'FireDmgBonus', '31703': 'IceDmgBonus',
'31803': 'ThunderDmgBonus', '31903': 'EtherDmgBonus', '31803': 'ThunderDmgBonus', '31903': 'EtherDmgBonus',
}; };
const EN_TO_ZH = Object.fromEntries(Object.entries(ID_TO_EN).map(([k, v]) => [v, ID_TO_PROP_NAME[k]])); // 修正 EN_TO_ZH 以匹配更新的 ID_TO_PROP_NAME
const EN_TO_ZH = {};
for (const id in ID_TO_EN) {
if (ID_TO_PROP_NAME[id]) {
EN_TO_ZH[ID_TO_EN[id]] = ID_TO_PROP_NAME[id];
}
}
// 手动修正百分比名称，因为 Python 的 ID_TO_PROP_NAME 不区分
EN_TO_ZH['HpAdd'] = '生命值百分比';
EN_TO_ZH['AttackAdd'] = '攻击力百分比';
EN_TO_ZH['DefenceAdd'] = '防御力百分比';
// EN_TO_ZH['SpRecover'] = '能量自动回复'; // 保持不变，因为 Python 两个ID都叫这个
const PERCENT_ID = Object.keys(ID_TO_PROP_NAME).filter(id => ID_TO_PROP_NAME[id].includes('百分比') || ['20103', '21103', '23103', '12203', '31503', '31603', '31703', '31803', '31903'].includes(id)); // *** 新增：从 Python 复制的音擎主属性每阶基础增加值 (单位: 万分位) ***
const PERCENT_NAME = [ 'HpAdd', 'AttackAdd', 'DefenceAdd', 'Crit', 'CritDmg', 'PenRate', 'BreakStun', 'PhysDmgBonus', 'FireDmgBonus', 'IceDmgBonus', 'ThunderDmgBonus', 'EtherDmgBonus', 'SpRecover']; const MAIN_PROP_BASE_INCREASE = {
// 驱动器主属性每阶提升值 (单位：万分位) - 这些值需要根据游戏精确数据进行校准 '11101': 330, // HP Flat
const MAIN_PROP_VALUE_PER_TIER = { '11103': 330, // HP Base (?? unlikely main stat, but matching python)
'11101': 3300, '11103': 3300, '11102': 474, // HP Flat, Base, % (*10) '11102': 47.4, // HP% (value seems low compared to others, maybe *100?) -> Python value IS 47.4 -> This likely means 47.4 per tier = 4.74% increase per tier
'12101': 210, '12103': 210, '12102': 276, // ATK Flat, Base, % (*10) '12101': 47.4, // ATK Flat (?? seems low, maybe python value is wrong or per level?) -> Python value IS 47.4
'13101': 260, '13103': 260, '13102': 360, // DEF Flat, Base, % (*10) '12103': 47.4, // ATK Base (?? unlikely main stat)
'12203': 360, // 冲击力 (*10) '12102': 450, // ATK% -> 45.0% increase per tier? No, python value is 450, likely 45 per tier = 4.5%
'20103': 360, // 暴击率 (*10) '13101': 27.6, // DEF Flat (?? seems low) -> Python value IS 27.6
'21103': 720, // 暴击伤害 (*10) '13103': 27.6, // DEF Base (?? unlikely main stat)
'31402': 45, '31403': 45, // 异常掌控 '13102': 720, // DEF% -> 72 per tier = 7.2%
'31202': 13, '31203': 13, // 异常精通 '12203': 270, // 冲击力 -> 27.0 per tier
'23103': 360, // 穿透率 (*10) '20103': 360, // 暴击率 -> 36.0% per tier? No, 36 per tier = 3.6%
'23203': 36, // 穿透值 (*10) '21103': 720, // 暴击伤害 -> 72.0% per tier? No, 72 per tier = 7.2%
'30503': 540, '30502': 540, // 能量回复 (*10) '31402': 450, // 异常掌控 -> 45.0 per tier
'31503': 450, '31603': 450, '31703': 450, '31803': 450, '31903': 450 // 伤害加成 (*10) '31403': 450, // 异常掌控
'31202': 13, // 异常精通 -> 1.3 per tier? Python value IS 13
'31203': 13, // 异常精通
'23103': 360, // 穿透率 -> 36 per tier = 3.6%
'23203': 36, // 穿透值 -> 3.6 per tier
'30503': 900, // 能量自动回复 -> 90 per tier = 9.0% (or 0.9 rate?)
'30502': 900, // 能量回复百分比 (Python mapping) -> 90 per tier = 9.0%
// '315': 450, // 伤害加成 (General? Python has this)
'31503': 450, // 物理伤害加成 -> 45 per tier = 4.5%
'31603': 450, // 火 -> 4.5%
'31703': 450, // 冰 -> 4.5%
'31803': 450, // 雷 -> 4.5%
'31903': 450, // 以太 -> 4.5%
}; };
const PERCENT_ID_LIST = Object.keys(ID_TO_PROP_NAME).filter(id =>
ID_TO_PROP_NAME[id].includes('百分比') || // Based on JS name
['20103', '21103', '23103', // Crit, CritDmg, PenRate
'12203', // Impact (Python lists it, check if it's % in game) - Assume % based on Python's PERCENT_ID
'31503', '31603', '31703', '31803', '31903', // Element Dmg Bonus
'11102', '12102', '13102', // Explicit % stats from Python ID mapping
'30502', // Energy Regen % from Python ID mapping
// Note: Python's PERCENT_ID includes 31603, 12203, 31703 etc. which are also Dmg Bonuses
].includes(id)
);
const ELEMENT_TO_EN = { '203': 'Thunder', '205': 'Ether', '202': 'Ice', '200': 'Phys', '201': 'Fire' }; const ELEMENT_TO_EN = { '203': 'Thunder', '205': 'Ether', '202': 'Ice', '200': 'Phys', '201': 'Fire' };
// --- 辅助函数 --- // --- 辅助函数 ---
// 格式化函数保持不变，它处理的是显示格式
function _format_value_str(value, prop_id) { function _format_value_str(value, prop_id) {
const idStr = String(prop_id); const idStr = String(prop_id);
const name = ID_TO_PROP_NAME[idStr] || ''; const isPercentProp = PERCENT_ID_LIST.includes(idStr);
// 检查 ID 是否代表百分比或元素加成 (使用更精确的判断)
const isPercentProp = idStr.endsWith('2') || ['20103', '21103', '23103', '12203', '31503', '31603', '31703', '31803', '31903'].includes(idStr);
if (isPercentProp) { if (isPercentProp) {
// Enka 的百分比值是 MYS 的 10 倍（例如 Enka 500 = MYS 50.0%） // Enka 的百分比值是 MYS 的 10 倍（例如 Enka 500 = MYS 50.0%）
return (value / 10).toFixed(1) + '%'; // 或者根据 Python MAIN_PROP_BASE_INCREASE, 这些值可能已经是 *10 的?
} else if (idStr === '30503') { // MysApi 能量回复是小数 // Let's assume the value passed is raw (万分位) and needs formatting
// Python example: 360 (Crit Rate) -> 3.6% per tier -> Total might be e.g., 360 base + 360 * tiers
// If value is 720 (e.g., base 360 + 1 tier 360), format as 72.0%? No, format as 7.2%
// => Divide by 100 for percent formatting
return (value / 100).toFixed(1) + '%';
} else if (idStr === '30503') { // MysApi 能量回复是小数 (e.g., 1.2)
// Python value 900 -> 9.0% per tier? Or 0.9 rate?
// If value is 900, format as 9.0? Or 0.9?
// MYS value is like 1.2, Python value is 900. Let's assume Python's 900 = MYS 9.0 (divide by 100)
return (value / 100).toFixed(2); return (value / 100).toFixed(2);
} else { } else {
return String(Math.floor(value)); // 非百分比取整 // 非百分比取整 (HP, ATK, DEF flat, Mastery, Control, PenDelta)
return String(Math.floor(value));
} }
} }
function render_weapon_detail(weapon_meta, weapon_level, weapon_break_level) { function render_weapon_detail(weapon_meta, weapon_level, weapon_break_level) {
if (!weapon_meta || weapon_meta.props_value === undefined || !weapon_meta.level || !weapon_meta.stars) { if (!weapon_meta || weapon_meta.props_value === undefined || !weapon_meta.level || !weapon_meta.stars) {
console.error("[enka_to_mys.js] 无效的武器元数据:", weapon_meta); logger.error("[enka_to_mys.js] 无效的武器元数据:", weapon_meta);
return [0, 0]; return [0, 0];
} }
const levelData = weapon_meta.level[String(weapon_level)]; const levelData = weapon_meta.level[String(weapon_level)];
const starData = weapon_meta.stars[String(weapon_break_level)]; const starData = weapon_meta.stars[String(weapon_break_level)]; // Python uses BreakLevel for stars index
if (!levelData || !starData) { if (!levelData || !starData) {
console.error(`[enka_to_mys.js] 武器ID ${weapon_meta.id || '未知'} 缺少等级 (${weapon_level}) 或突破 (${weapon_break_level}) 数据`); logger.error(`[enka_to_mys.js] 武器ID ${weapon_meta.id || '未知'} 缺少等级 (${weapon_level}) 或突破 (${weapon_break_level}) 数据`);
return [0, 0]; return [0, 0];
} }
let base_value = weapon_meta.props_value; let base_value = weapon_meta.props_value;
base_value = base_value + base_value * ((levelData.Rate + starData.StarRate) / 10000); base_value = base_value + base_value * ((levelData.Rate + starData.StarRate) / 10000);
let rand_value = weapon_meta.rand_props_value || 0; let rand_value = weapon_meta.rand_props_value || 0;
if (rand_value > 0 && starData.RandRate) { if (rand_value > 0 && starData.RandRate !== undefined) { // Check RandRate existence
rand_value = rand_value + rand_value * (starData.RandRate / 10000); rand_value = rand_value + rand_value * (starData.RandRate / 10000);
} else { } else {
rand_value = 0; rand_value = 0; // Ensure it's zero if no rand prop or rate
} }
// 返回未格式化的原始值 (万分位) // 返回未格式化的原始值 (万分位)
return [Math.floor(base_value), Math.floor(rand_value)]; return [Math.floor(base_value), Math.floor(rand_value)];
} }
function _calculate_char_base_stat(base_val, growth_val, level_data, char_level, promotion_level, stat_key_in_promo) { function _calculate_char_base_stat(base_val, growth_val, level_data, extra_level_data, char_level, promotion_level, stat_key_in_promo, extra_key_id) {
let final_value = base_val; let final_value = base_val;
if (char_level > 1) { if (char_level > 1) {
final_value += (char_level - 1) * growth_val / 10000; final_value += (char_level - 1) * growth_val / 10000;
@ -122,25 +175,35 @@ function _calculate_char_base_stat(base_val, growth_val, level_data, char_level,
if (level_data && level_data[promoStr] && level_data[promoStr][stat_key_in_promo] !== undefined) { if (level_data && level_data[promoStr] && level_data[promoStr][stat_key_in_promo] !== undefined) {
final_value += level_data[promoStr][stat_key_in_promo]; final_value += level_data[promoStr][stat_key_in_promo];
} }
// Match Python's extra level calculation
if (char_level > 10 && extra_level_data && extra_level_data[promoStr] && extra_level_data[promoStr]['Extra'] && extra_key_id) {
const extraValue = _.get(extra_level_data[promoStr], ['Extra', extra_key_id, 'Value'], 0); // Use lodash get for safety
final_value += extraValue;
}
return Math.floor(final_value); return Math.floor(final_value);
} }
function getSkillName(charId, skillIndex) { function getSkillName(charId, skillIndex) {
const charSkillsData = PartnerId2SkillParam?.[String(charId)]; const charSkillsData = PartnerId2SkillParam?.[String(charId)];
if (!charSkillsData) return `技能 ${skillIndex}`; if (!charSkillsData) return `技能 ${skillIndex}`;
// Find the skill name by matching the Index property
for (const skillName in charSkillsData) { for (const skillName in charSkillsData) {
// 假设 PartnerId2SkillParam.json 中每个技能对象包含一个名为 'Index' 的字段 if (Object.hasOwnProperty.call(charSkillsData, skillName) &&
if (Object.hasOwnProperty.call(charSkillsData, skillName) && charSkillsData[skillName] && charSkillsData[skillName].Index === skillIndex) { charSkillsData[skillName] &&
return skillName; charSkillsData[skillName].Index === skillIndex) {
return charSkillsData[skillName].Name || skillName; // Prefer Name field if available
} }
} }
return `技能 ${skillIndex}`; return `技能 ${skillIndex}`; // Fallback
} }
// --- 主要转换函数 --- // --- 主要转换函数 ---
export async function _enka_data_to_mys_data(enka_data) { export async function _enka_data_to_mys_data(enka_data) {
if (!enka_data || !enka_data.PlayerInfo || !enka_data.PlayerInfo.ShowcaseDetail || !enka_data.PlayerInfo.ShowcaseDetail.AvatarList) { if (!enka_data || !enka_data.PlayerInfo || !enka_data.PlayerInfo.ShowcaseDetail || !enka_data.PlayerInfo.ShowcaseDetail.AvatarList) {
console.error("[enka_to_mys.js] 接收到无效的 enka_data 结构。"); logger.error("[enka_to_mys.js] 接收到无效的 enka_data 结构。");
return []; return [];
} }
@ -150,47 +213,60 @@ export async function _enka_data_to_mys_data(enka_data) {
for (const char of enka_data.PlayerInfo.ShowcaseDetail.AvatarList) { for (const char of enka_data.PlayerInfo.ShowcaseDetail.AvatarList) {
const char_id = String(char.Id); const char_id = String(char.Id);
if (!partner_data[char_id]) { if (!partner_data[char_id]) {
console.warn(`[enka_to_mys.js] 跳过角色 ID ${char_id}: 在 partner_data 中未找到数据。`); logger.warn(`[enka_to_mys.js] 跳过角色 ID ${char_id}: 在 partner_data 中未找到数据。`);
continue; continue;
} }
const _partner = partner_data[char_id]; const _partner = partner_data[char_id];
logger.debug(`[enka_to_mys.js] Processing character: ${char_id} (${_partner.name})`);
// --- 初始化接近 MysApi 原始结构的 result 对象 --- // --- 初始化接近 MysApi 原始结构的 result 对象 ---
const result = { const result = {
id: char.Id, level: char.Level, name_mi18n: _partner.name, id: char.Id, level: char.Level, name_mi18n: _partner.name,
full_name_mi18n: _partner.full_name, element_type: parseInt(_partner.ElementType), full_name_mi18n: _partner.full_name, element_type: parseInt(_partner.ElementType),
camp_name_mi18n: _partner.Camp, avatar_profession: parseInt(_partner.WeaponType), camp_name_mi18n: _partner.Camp, avatar_profession: parseInt(_partner.WeaponType),
rarity: _partner.Rarity, // <<< 使用字符串 'S'/'A' rarity: _partner.Rarity, // 使用字符串 'S'/'A'
rank: char.TalentLevel || 0, // 命座等级 rank: char.TalentLevel || 0, // 命座等级
equip: [], weapon: null, properties: [], skills: [], ranks: [], // 初始化为空数组 equip: [], weapon: null, properties: [], skills: [], ranks: [], // 初始化为空数组
// --- MYS 特有字段占位符 --- // --- MYS 特有字段占位符 ---
icon_paths: { group_icon_path: '', hollow_icon_path: '' }, // 匹配 MysApi 结构 icon_paths: { group_icon_path: '', hollow_icon_path: '' }, // 匹配 MysApi 结构
role_vertical_painting_url: '', us_full_name: _partner.en_name || '', role_vertical_painting_url: '', us_full_name: _partner.en_name || '',
vertical_painting_color: '', skin_list: [], role_square_url: '', vertical_painting_color: '', skin_list: [], role_square_url: '',
// is_chosen: false, // 如果需要
// sub_element_type: 0, // 如果 ZZZAvatarInfo 需要
}; };
// --- 属性计算准备 --- // --- 属性计算准备 ---
const props = { HpBase: 0, AttackBase: 0, DefenceBase: 0, HpAdd: 0, AttackAdd: 0, DefenceAdd: 0, HpMax: 0, Attack: 0, Defence: 0 }; const props = { /* HpBase, AttackBase, DefenceBase will be calculated */ };
Object.values(ID_TO_EN).forEach(enKey => { if (props[enKey] === undefined) props[enKey] = 0; }); // Initialize all possible props from ID_TO_EN to 0
props.CritDmg = _partner.CritDamage || 0; // 单位: 万分位 Object.values(ID_TO_EN).forEach(enKey => { props[enKey] = 0; });
// Add base crit damage (万分位)
props.CritDmg = _partner.CritDamage || 0; // Initialize CritDmg from base stats
// Calculate character base stats (matching Python logic)
const NAME_TO_ID = Object.fromEntries(Object.entries(EN_TO_ZH).map(([k, v]) => [v, Object.keys(ID_TO_EN).find(id => ID_TO_EN[id] === k)]));
const baseStatsToCalc = { const baseStatsToCalc = {
'HpMax': { base: _partner.HpMax, growth: _partner.HpGrowth, key: 'HpMax' }, 'HpMax': { base: _partner.HpMax, growth: _partner.HpGrowth, key: 'HpMax', extraKeyId: NAME_TO_ID['生命值']},
'Attack': { base: _partner.Attack, growth: _partner.AttackGrowth, key: 'Attack' }, 'Attack': { base: _partner.Attack, growth: _partner.AttackGrowth, key: 'Attack', extraKeyId: NAME_TO_ID['攻击力'] },
'Defence': { base: _partner.Defence, growth: _partner.DefenceGrowth, key: 'Defence' }, 'Defence': { base: _partner.Defence, growth: _partner.DefenceGrowth, key: 'Defence', extraKeyId: NAME_TO_ID['防御力'] },
}; };
for (const [statName, statData] of Object.entries(baseStatsToCalc)) { for (const [statName, statData] of Object.entries(baseStatsToCalc)) {
if (statData.base !== undefined && statData.growth !== undefined) { if (statData.base !== undefined && statData.growth !== undefined) {
const calculatedBase = _calculate_char_base_stat( const calculatedBase = _calculate_char_base_stat(
statData.base, statData.growth, _partner.Level, statData.base, statData.growth,
char.Level, char.PromotionLevel, statData.key _partner.Level, _partner.ExtraLevel, // Pass both level data structures
char.Level, char.PromotionLevel,
statData.key, statData.extraKeyId // Pass stat key and the ID for extra lookup
); );
const baseKey = statName.replace('Max', 'Base'); // Store calculated BASE values (HpBase, AttackBase, DefenceBase)
const baseKey = statName.replace('Max', 'Base'); // Convert HpMax -> HpBase etc.
props[baseKey] = calculatedBase; props[baseKey] = calculatedBase;
logger.debug(` > ${baseKey} calculated base: ${calculatedBase}`);
} else {
logger.warn(` > Missing base/growth data for ${statName} in partner_data for ID ${char_id}`);
} }
} }
logger.debug(` > Initial props after base calc:`, JSON.stringify(props));
// --- 处理音擎驱动 (填充 result.equip) --- // --- 处理音擎驱动 (填充 result.equip) ---
if (char.EquippedList && Array.isArray(char.EquippedList)) { if (char.EquippedList && Array.isArray(char.EquippedList)) {
@ -200,124 +276,156 @@ export async function _enka_data_to_mys_data(enka_data) {
const equip_id_str = String(_equip.Id); const equip_id_str = String(_equip.Id);
const suit_id = equip_id_str.slice(0, 3) + '00'; const suit_id = equip_id_str.slice(0, 3) + '00';
const equip_meta = equip_data[suit_id]; const equip_meta = equip_data[suit_id];
if (!equip_meta) continue; if (!equip_meta) {
logger.warn(`[enka_to_mys.js] 未找到驱动器套装元数据 ID: ${suit_id}`);
continue;
}
const relic_level = _equip.Level || 0; const relic_level = _equip.Level || 0;
const relic_tier = Math.floor(relic_level / 3); //const relic_tier = Math.floor(relic_level / 3); // Tier calculation moved inside loop
// 构建 "原始" 驱动器对象 (接近 MysApi 结构)
const raw_equip_obj = { const raw_equip_obj = {
id: _equip.Id, level: relic_level, id: _equip.Id, level: relic_level,
equipment_type: relic.Slot, // 使用 MysApi 可能的字段名 equipment_type: relic.Slot,
name: equip_meta.equip_name || `驱动 ${relic.Slot}`, name: equip_meta.equip_name ? `${equip_meta.equip_name} ${relic.Slot}` : `驱动 ${relic.Slot}`, // Append slot number like python
rarity: 'S', // <<< 修改: 使用字符串 'S' (假设都是S级) rarity: 'S', // Assume S rank for now
icon: '', // 占位符 icon: '',
equip_suit: { equip_suit: {
suit_id: parseInt(suit_id), name: equip_meta.equip_name || "未知套装", suit_id: parseInt(suit_id), name: equip_meta.equip_name || "未知套装",
desc1: equip_meta.desc1 || "", desc2: equip_meta.desc2 || "", desc1: equip_meta.desc1 || "", desc2: equip_meta.desc2 || "",
}, },
main_properties: [], // <<< 修改: 初始化为主词条对象【数组】 main_properties: [],
properties: [], // <<< 初始化为空数组 properties: [],
}; };
// 处理主词条 (构建接近 MysApi 的原始对象) // --- 处理主词条 (!!! 使用 Python 的计算逻辑 !!!) ---
if (_equip.MainPropertyList?.[0]) { if (_equip.MainPropertyList && _equip.MainPropertyList[0]) {
const main_prop = _equip.MainPropertyList[0]; const main_prop = _equip.MainPropertyList[0];
const prop_id_str = String(main_prop.PropertyId); const prop_id_str = String(main_prop.PropertyId);
const prop_zh_name = ID_TO_PROP_NAME[prop_id_str] || `未知(${prop_id_str})`; const prop_zh_name = ID_TO_PROP_NAME[prop_id_str] || `未知(${prop_id_str})`;
const en_prop_name = ID_TO_EN[prop_id_str]; const en_prop_name = ID_TO_EN[prop_id_str];
const base_value = main_prop.PropertyValue || 0;
const value_per_tier = MAIN_PROP_VALUE_PER_TIER[prop_id_str] !== undefined ? MAIN_PROP_VALUE_PER_TIER[prop_id_str] : 0;
// 假设 Enka 返回值已经是 MYS 需要的 10 倍后的值 (或者 MYS 处理的就是万分位?) - 保持原值累加
const total_main_value_raw = base_value + (value_per_tier * relic_tier);
if (en_prop_name && props[en_prop_name] !== undefined) { props[en_prop_name] += total_main_value_raw; } // *** 使用 Python 的计算逻辑 ***
else if (prop_id_str === '11102') props.HpAdd += total_main_value_raw; const base_value = main_prop.PropertyValue || 0; // Base value at level 0
// ... (其他累加) ... const increase_per_tier = MAIN_PROP_BASE_INCREASE[prop_id_str] !== undefined ? MAIN_PROP_BASE_INCREASE[prop_id_str] : 0;
else if (prop_id_str === '13101') props.Defence += total_main_value_raw; const property_level_multiplier = main_prop.PropertyLevel || 1; // Get multiplier from Enka (likely 1 for main stat)
const relic_tier = Math.floor(relic_level / 3); // Calculate tiers
// <<< 修改：将主词条对象【放入数组】 >>> // Apply the exact Python formula: base + increase * (multiplier * tier)
const total_main_value_raw = base_value + increase_per_tier * (property_level_multiplier * relic_tier);
// *** End of Python calculation logic ***
logger.debug(` >> Relic ${equip_id_str} Slot ${relic.Slot} Main Stat ${prop_id_str} (${prop_zh_name}): Lvl ${relic_level} (Tier ${relic_tier}), Base ${base_value}, Inc ${increase_per_tier}, Mult ${property_level_multiplier} => Raw Total ${total_main_value_raw}`);
// 累加到总属性 (使用 raw 万分位值)
if (en_prop_name && props[en_prop_name] !== undefined) {
props[en_prop_name] += total_main_value_raw;
} else {
logger.warn(` >> Unknown EN mapping for main prop ID ${prop_id_str}`);
}
// 格式化显示值并添加到结果对象
raw_equip_obj.main_properties.push({ raw_equip_obj.main_properties.push({
property_name: prop_zh_name, property_name: prop_zh_name,
property_id: main_prop.PropertyId, property_id: main_prop.PropertyId,
base: "", add: "", // MYS可能为空 base: "", add: "", // MYS often has these empty for relics
final: _format_value_str(total_main_value_raw, prop_id_str) // 格式化显示值 final: _format_value_str(total_main_value_raw, prop_id_str) // Format the calculated raw value
}); });
} else {
logger.warn(` >> Relic ${equip_id_str} Slot ${relic.Slot} missing MainPropertyList`);
} }
// 处理副词条 (构建接近 MysApi 的原始对象)
// --- 处理副词条 (逻辑保持不变) ---
if (_equip.RandomPropertyList && Array.isArray(_equip.RandomPropertyList)) { if (_equip.RandomPropertyList && Array.isArray(_equip.RandomPropertyList)) {
for (const prop of _equip.RandomPropertyList) { for (const prop of _equip.RandomPropertyList) {
const prop_id_str = String(prop.PropertyId); const prop_id_str = String(prop.PropertyId);
const prop_zh_name = ID_TO_PROP_NAME[prop_id_str] || `未知(${prop_id_str})`; const prop_zh_name = ID_TO_PROP_NAME[prop_id_str] || `未知(${prop_id_str})`;
const en_prop_name = ID_TO_EN[prop_id_str]; const en_prop_name = ID_TO_EN[prop_id_str];
const prop_level = prop.PropertyLevel || 1; const prop_level = prop.PropertyLevel || 1; // This level indicates number of rolls/upgrades
const base_value_per_level = prop.PropertyValue || 0; const base_value_per_level = prop.PropertyValue || 0; // Value per roll
const total_substat_value_raw = base_value_per_level * prop_level; // 保持原始万分位值
if (en_prop_name && props[en_prop_name] !== undefined) { props[en_prop_name] += total_substat_value_raw; } // 副词条总值 = 每级数值 * 等级(次数)
else if (prop_id_str === '11102') props.HpAdd += total_substat_value_raw; const total_substat_value_raw = base_value_per_level * prop_level;
// ... (其他累加) ...
else if (prop_id_str === '13101') props.Defence += total_substat_value_raw;
logger.debug(` >> Relic ${equip_id_str} Sub Stat ${prop_id_str} (${prop_zh_name}): Val ${base_value_per_level} * Lvl ${prop_level} => Raw Total ${total_substat_value_raw}`);
// 累加到总属性
if (en_prop_name && props[en_prop_name] !== undefined) {
props[en_prop_name] += total_substat_value_raw;
} else {
logger.warn(` >> Unknown EN mapping for substat prop ID ${prop_id_str}`);
}
// 添加到结果对象
raw_equip_obj.properties.push({ raw_equip_obj.properties.push({
property_name: prop_zh_name, property_id: prop.PropertyId, property_name: prop_zh_name, property_id: prop.PropertyId,
base: "", add: "", final: _format_value_str(total_substat_value_raw, prop_id_str), base: "", add: "", // MYS often empty here too
final: _format_value_str(total_substat_value_raw, prop_id_str), // Format for display
}); });
} }
} }
result.equip.push(raw_equip_obj); result.equip.push(raw_equip_obj);
} }
} }
logger.debug(` > Props after relics:`, JSON.stringify(props));
// --- 处理武器 ---
// --- 处理武器 (逻辑保持不变) ---
if (char.Weapon && char.Weapon.Id) { if (char.Weapon && char.Weapon.Id) {
const weapon_id = String(char.Weapon.Id); const weapon_id = String(char.Weapon.Id);
const _weapon_meta = weapon_data[weapon_id]; const _weapon_meta = weapon_data[weapon_id];
if (_weapon_meta) { if (_weapon_meta) {
const weapon_level = char.Weapon.Level || 1; const weapon_level = char.Weapon.Level || 1;
const weapon_star = char.Weapon.UpgradeLevel || 0; const weapon_star = char.Weapon.UpgradeLevel || 0; // Refinement level (0-4 in Enka -> 1-5 in MYS?)
const weapon_break_level = char.Weapon.BreakLevel || 0; const weapon_break_level = char.Weapon.BreakLevel || 0; // Ascension level
const [base_stat_value_raw, rand_stat_value_raw] = render_weapon_detail( const [base_stat_value_raw, rand_stat_value_raw] = render_weapon_detail(
_weapon_meta, weapon_level, String(weapon_break_level) _weapon_meta, weapon_level, String(weapon_break_level) // Pass BreakLevel for calculation
); );
logger.debug(` >> Weapon ${weapon_id} (${_weapon_meta.name}): Lvl ${weapon_level}, Break ${weapon_break_level}, Star ${weapon_star} => Base Raw ${base_stat_value_raw}, Rand Raw ${rand_stat_value_raw}`);
// 累加属性 (使用 raw 值) // 累加属性 (使用 raw 值)
const base_prop_id_str = String(_weapon_meta.props_id); const base_prop_id_str = String(_weapon_meta.props_id);
const base_en_prop = ID_TO_EN[base_prop_id_str]; const base_en_prop = ID_TO_EN[base_prop_id_str];
if (base_en_prop && props[base_en_prop] !== undefined) { props[base_en_prop] += base_stat_value_raw; } if (base_en_prop && props[base_en_prop] !== undefined) {
else if (base_prop_id_str === '11102') props.HpAdd += base_stat_value_raw; props[base_en_prop] += base_stat_value_raw;
// ... (其他累加) ... } else {
logger.warn(` >> Unknown EN mapping for weapon base prop ID ${base_prop_id_str}`);
}
if (_weapon_meta.rand_props_id && rand_stat_value_raw > 0) { if (_weapon_meta.rand_props_id && rand_stat_value_raw > 0) {
const rand_prop_id_str = String(_weapon_meta.rand_props_id); const rand_prop_id_str = String(_weapon_meta.rand_props_id);
const rand_en_prop = ID_TO_EN[rand_prop_id_str]; const rand_en_prop = ID_TO_EN[rand_prop_id_str];
if (rand_en_prop && props[rand_en_prop] !== undefined) { props[rand_en_prop] += rand_stat_value_raw; } if (rand_en_prop && props[rand_en_prop] !== undefined) {
else if (rand_prop_id_str === '11102') props.HpAdd += rand_stat_value_raw; props[rand_en_prop] += rand_stat_value_raw;
// ... (其他累加) ... } else {
logger.warn(` >> Unknown EN mapping for weapon rand prop ID ${rand_prop_id_str}`);
}
} }
// 构建 "原始" 武器对象 // 构建 "原始" 武器对象
result.weapon = { result.weapon = {
id: char.Weapon.Id, level: weapon_level, star: weapon_star + 1, id: char.Weapon.Id, level: weapon_level, star: weapon_star + 1, // MYS uses 1-5 for refinement
promote_level: weapon_break_level, promote_level: weapon_break_level,
name: _weapon_meta.name || "未知武器", name: _weapon_meta.name || "未知武器",
rarity: _weapon_meta.rarity, // <<< 使用字符串 'S' 或 'A' rarity: _weapon_meta.rarity, // 使用 'S' 或 'A'
icon: '', icon: '', // Placeholder
talent_content: _weapon_meta.talents?.[String(weapon_star + 1)]?.Desc || "", // MysApi 可能叫 talent_content // Use refinement level (star + 1) to get talent description
main_properties: [], // <<< 修改: 初始化为主属性对象【数组】 talent_title: _.get(_weapon_meta, ['talents', String(weapon_star + 1), 'Name'], ''),
properties: [] // <<< 初始化为空数组 talent_content: _.get(_weapon_meta, ['talents', String(weapon_star + 1), 'Desc'], ''),
main_properties: [], // Main stat is usually just one
properties: [] // Secondary stat (if exists)
}; };
// 填充 "原始" 主属性对象 // 填充 "原始" 主属性对象
const main_prop_obj = { const main_prop_obj = {
property_name: _weapon_meta.props_name || ID_TO_PROP_NAME[base_prop_id_str] || `未知(${base_prop_id_str})`, property_name: _weapon_meta.props_name || ID_TO_PROP_NAME[base_prop_id_str] || `未知(${base_prop_id_str})`,
property_id: _weapon_meta.props_id, base: "", add: "", property_id: _weapon_meta.props_id, base: "", add: "",
final: _format_value_str(base_stat_value_raw, base_prop_id_str) // 格式化 final: _format_value_str(base_stat_value_raw, base_prop_id_str) // Format
}; };
result.weapon.main_properties.push(main_prop_obj); // <<< 修改：放入数组 result.weapon.main_properties.push(main_prop_obj);
// 填充 "原始" 副属性对象 // 填充 "原始" 副属性对象
if (_weapon_meta.rand_props_id && rand_stat_value_raw > 0) { if (_weapon_meta.rand_props_id && rand_stat_value_raw > 0) {
@ -325,81 +433,132 @@ export async function _enka_data_to_mys_data(enka_data) {
result.weapon.properties.push({ result.weapon.properties.push({
property_name: _weapon_meta.rand_props_name || ID_TO_PROP_NAME[rand_prop_id_str] || `未知(${rand_prop_id_str})`, property_name: _weapon_meta.rand_props_name || ID_TO_PROP_NAME[rand_prop_id_str] || `未知(${rand_prop_id_str})`,
property_id: _weapon_meta.rand_props_id, base: "", add: "", property_id: _weapon_meta.rand_props_id, base: "", add: "",
final: _format_value_str(rand_stat_value_raw, rand_prop_id_str) // 格式化 final: _format_value_str(rand_stat_value_raw, rand_prop_id_str) // Format
}); });
} }
} else {
logger.warn(`[enka_to_mys.js] 未找到武器元数据 ID: ${weapon_id}`);
} }
} }
logger.debug(` > Props after weapon:`, JSON.stringify(props));
// --- 最终属性计算 --- // --- 最终属性计算 (逻辑保持不变) ---
// Base = Character Base + Weapon Base Flat
// Add = Sum of all % increases (Relics, Weapon Secondary)
// Flat = Sum of all Flat increases (Relics)
// Final = Base * (1 + Add% / 10000) + Flat
const final_Hp = (props.HpBase || 0) * (1 + (props.HpAdd || 0) / 10000) + (props.HpMax || 0); const final_Hp = (props.HpBase || 0) * (1 + (props.HpAdd || 0) / 10000) + (props.HpMax || 0);
const final_Attack = (props.AttackBase || 0) * (1 + (props.AttackAdd || 0) / 10000) + (props.Attack || 0); const final_Attack = (props.AttackBase || 0) * (1 + (props.AttackAdd || 0) / 10000) + (props.Attack || 0);
const final_Defence = (props.DefenceBase || 0) * (1 + (props.DefenceAdd || 0) / 10000) + (props.Defence || 0); const final_Defence = (props.DefenceBase || 0) * (1 + (props.DefenceAdd || 0) / 10000) + (props.Defence || 0);
// Update props object with final calculated values
props.HpMax = Math.floor(final_Hp); props.HpMax = Math.floor(final_Hp);
props.Attack = Math.floor(final_Attack); props.Attack = Math.floor(final_Attack);
props.Defence = Math.floor(final_Defence); props.Defence = Math.floor(final_Defence);
delete props.HpBase; delete props.HpAdd; delete props.AttackBase;
delete props.AttackAdd; delete props.DefenceBase; delete props.DefenceAdd;
// Delete intermediate values
delete props.HpBase; delete props.HpAdd;
delete props.AttackBase; delete props.AttackAdd;
delete props.DefenceBase; delete props.DefenceAdd;
// Filter out irrelevant element damage bonuses
const char_element_en = ELEMENT_TO_EN[_partner.ElementType]; const char_element_en = ELEMENT_TO_EN[_partner.ElementType];
const element_bonus_keys = ['PhysDmgBonus', 'FireDmgBonus', 'IceDmgBonus', 'ThunderDmgBonus', 'EtherDmgBonus']; const element_bonus_keys = ['FireDmgBonus', 'IceDmgBonus', 'ThunderDmgBonus', 'EtherDmgBonus']; // PhysDmgBonus is kept separately
for (const key of element_bonus_keys) { for (const key of element_bonus_keys) {
if (props.hasOwnProperty(key)) { if (props.hasOwnProperty(key) && key !== `${char_element_en}DmgBonus`) {
if (props[key] === 0) { delete props[key]; } // Keep the property if it has a non-zero value, otherwise delete?
else if (key !== `${char_element_en}DmgBonus` && key !== 'PhysDmgBonus') { delete props[key]; } // Or strictly delete if not the character's element? Let's strictly delete.
// logger.debug(` > Deleting non-matching element bonus: ${key}`);
// Keep it for now, MYS might show it even if 0? Let final formatting handle 0 values.
// If we need to strictly remove: delete props[key];
} }
} }
logger.debug(` > Props after final calculation & cleanup:`, JSON.stringify(props));
// --- 格式化最终属性面板 (填充 result.properties 数组，使用 MysApi ID) --- // --- 格式化最终属性面板 (填充 result.properties 数组，使用 MysApi ID) ---
result.properties = []; result.properties = [];
const ensurePropertyExists = (propName, propId, defaultValue = '0') => { const added_mys_ids = new Set();
if (!result.properties.find(p => p.property_id === propId)) {
result.properties.push({ property_name: propName, property_id: propId, base: "", add: "", final: defaultValue });
}
};
// Add calculated props first
for (const [prop_en, prop_value] of Object.entries(props)) { for (const [prop_en, prop_value] of Object.entries(props)) {
if (prop_value === 0 && !['CritDmg'].includes(prop_en)) continue; if (prop_value === undefined) continue; // Skip undefined props
const prop_zh = EN_TO_ZH[prop_en]; const prop_zh = EN_TO_ZH[prop_en];
if (!prop_zh) continue; if (!prop_zh) {
// logger.warn(`[enka_to_mys.js] Final Props: No ZH name for EN key ${prop_en}`);
continue; // Skip if no Chinese name mapping
}
const prop_id_mys = MYSAPI_PROP_ID[prop_zh]; const prop_id_mys = MYSAPI_PROP_ID[prop_zh];
const current_prop_id = Object.keys(ID_TO_EN).find(k => ID_TO_EN[k] === prop_en); // 获取当前属性的 Enka ID const current_prop_enka_id = Object.keys(ID_TO_EN).find(k => ID_TO_EN[k] === prop_en); // Get the Enka ID for formatting
if (!prop_id_mys && prop_zh !== '生命值百分比' && prop_zh !== '攻击力百分比' && prop_zh !== '防御力百分比') { if (prop_id_mys === undefined) {
console.warn(`[enka_to_mys.js] 属性 ${prop_zh} 缺少 MysApi ID 映射`); logger.warn(`[enka_to_mys.js] Final Props: 属性 ${prop_zh} (EN: ${prop_en}) 缺少 MysApi ID 映射`);
ensurePropertyExists(prop_zh, 0, _format_value_str(prop_value, current_prop_id)); // Add with MYS ID 0 if needed? For now, skip if no MYS ID.
continue; continue;
} }
const final_value_str = _format_value_str(prop_value, current_prop_id); // Format the final value using the Enka ID associated with the EN key
const final_value_str = _format_value_str(prop_value, current_prop_enka_id);
ensurePropertyExists(prop_zh, prop_id_mys || 0, final_value_str); // Only add if the value is not "0" or "0.0%" (unless it's a base stat like CR/CD)
const isBaseCritOrER = ['暴击率', '暴击伤害', '能量自动回复'].includes(prop_zh);
if (prop_value !== 0 || isBaseCritOrER) {
result.properties.push({
property_name: prop_zh,
property_id: prop_id_mys, // Use MYS API ID
base: "", // MYS usually leaves these empty in final panel
add: "",
final: final_value_str
});
added_mys_ids.add(prop_id_mys);
}
} }
// 补充基础属性 // Ensure essential stats have default values if missing (matching MYS behavior)
const ensurePropertyExists = (propName, propId, defaultValue) => {
if (!added_mys_ids.has(propId)) {
// Check if the raw prop value was actually 0 before adding default
const enKey = Object.keys(EN_TO_ZH).find(k => EN_TO_ZH[k] === propName);
const enkaId = Object.keys(ID_TO_EN).find(k => ID_TO_EN[k] === enKey);
const rawValue = props[enKey] || 0;
result.properties.push({
property_name: propName,
property_id: propId,
base: "", add: "",
// Format the actual value (which might be 0) or the default if needed
final: rawValue !== 0 ? _format_value_str(rawValue, enkaId) : defaultValue
});
added_mys_ids.add(propId); // Mark as added
}
};
ensurePropertyExists('生命值', 1, _format_value_str(props.HpMax || 0, '11101')); ensurePropertyExists('生命值', 1, _format_value_str(props.HpMax || 0, '11101'));
ensurePropertyExists('攻击力', 2, _format_value_str(props.Attack || 0, '12101')); ensurePropertyExists('攻击力', 2, _format_value_str(props.Attack || 0, '12101'));
ensurePropertyExists('防御力', 3, _format_value_str(props.Defence || 0, '13101')); ensurePropertyExists('防御力', 3, _format_value_str(props.Defence || 0, '13101'));
ensurePropertyExists('冲击力', 4, _format_value_str(props.BreakStun || 0, '12203')); ensurePropertyExists('冲击力', 4, _format_value_str(props.BreakStun || 0, '12203'));
ensurePropertyExists('暴击率', 5, props.Crit > 0 ? _format_value_str(props.Crit, '20103') : '5.0%'); ensurePropertyExists('暴击率', 5, '5.0%'); // MYS default
ensurePropertyExists('暴击伤害', 6, props.CritDmg > 0 ? _format_value_str(props.CritDmg, '21103') : '50.0%'); ensurePropertyExists('暴击伤害', 6, '50.0%'); // MYS default
ensurePropertyExists('异常掌控', 7, _format_value_str(props.ElementAbnormalPower || 0, '31403')); ensurePropertyExists('异常掌控', 7, _format_value_str(props.ElementAbnormalPower || 0, '31403'));
ensurePropertyExists('异常精通', 8, _format_value_str(props.ElementMystery || 0, '31203')); ensurePropertyExists('异常精通', 8, _format_value_str(props.ElementMystery || 0, '31203'));
ensurePropertyExists('穿透率', 9, props.PenRate > 0 ? _format_value_str(props.PenRate, '23103') : '0.0%'); ensurePropertyExists('穿透率', 9, '0.0%'); // MYS default
ensurePropertyExists('能量自动回复', 11, props.SpRecover > 0 ? _format_value_str(props.SpRecover, '30503') : '1.20'); ensurePropertyExists('能量自动回复', 11, '1.00'); // MYS default is 1.00? Python used 1.20. Check MYS. Let's use 1.00 for now.
ensurePropertyExists('穿透值', 232, _format_value_str(props.PenDelta || 0, '23203')); ensurePropertyExists('穿透值', 232, _format_value_str(props.PenDelta || 0, '23203'));
// Ensure element/phys bonus exists, defaulting to 0.0%
const elementDmgKey = `${ELEMENT_TO_EN[_partner.ElementType]}DmgBonus`; const elementDmgKey = `${ELEMENT_TO_EN[_partner.ElementType]}DmgBonus`;
const elementDmgZh = EN_TO_ZH[elementDmgKey]; const elementDmgZh = EN_TO_ZH[elementDmgKey];
const elementDmgIdMys = MYSAPI_PROP_ID[elementDmgZh]; const elementDmgIdMys = MYSAPI_PROP_ID[elementDmgZh];
if(elementDmgZh && elementDmgIdMys) {
const elementDmgEnkaId = Object.keys(ID_TO_EN).find(k => ID_TO_EN[k] === elementDmgKey); const elementDmgEnkaId = Object.keys(ID_TO_EN).find(k => ID_TO_EN[k] === elementDmgKey);
ensurePropertyExists(elementDmgZh, elementDmgIdMys, props[elementDmgKey] > 0 ? _format_value_str(props[elementDmgKey], elementDmgEnkaId) : '0.0%'); if(elementDmgZh && elementDmgIdMys) {
ensurePropertyExists(elementDmgZh, elementDmgIdMys, '0.0%');
} }
ensurePropertyExists('物理伤害加成', 315, props['PhysDmgBonus'] > 0 ? _format_value_str(props['PhysDmgBonus'], '31503') : '0.0%'); ensurePropertyExists('物理伤害加成', 315, '0.0%');
// Sort properties by MYS API ID
result.properties.sort((a, b) => a.property_id - b.property_id); result.properties.sort((a, b) => a.property_id - b.property_id);
@ -407,22 +566,47 @@ export async function _enka_data_to_mys_data(enka_data) {
if (char.SkillLevelList && Array.isArray(char.SkillLevelList)) { if (char.SkillLevelList && Array.isArray(char.SkillLevelList)) {
for (const skill of char.SkillLevelList) { for (const skill of char.SkillLevelList) {
result.skills.push({ result.skills.push({
id: skill.Id || skill.Index, // Use Id if available, else Index
level: skill.Level, level: skill.Level,
skill_type: skill.Index, // <<< 使用 skill_type 对齐 MysApi name: getSkillName(char_id, skill.Index), // Get name from mapping
items: [], // <<< 添加空的 items 数组 skill_type: skill.Index, // Use skill_type to align with potential MYS field name
icon: '', // Placeholder
desc: '', // Placeholder
is_unlocked: true, // Assume shown skills are unlocked
// items: [], // Python didn't have items, maybe not needed for ZZZ?
}); });
} }
} }
result.skills.sort((a, b) => a.skill_type - b.skill_type); // Sort by index
// --- 处理命座 (填充 result.ranks, 对齐 MysApi 结构) --- // --- 处理命座 (填充 result.ranks, 对齐 MysApi 结构) ---
result.ranks = []; result.ranks = [];
for (let i = 1; i <= 6; i++) { // Assuming ranks data comes from partner_data or needs a generic structure
const rankData = _partner.Talents || {}; // Check if talent data exists in partner_data
const maxRank = 6; // Assume 6 ranks
for (let i = 1; i <= maxRank; i++) {
const rankInfo = rankData[String(i)] || {}; // Get info for rank 'i'
result.ranks.push({ result.ranks.push({
id: i, name: `影 ${i}`, desc: '', pos: i, is_unlocked: i <= result.rank, id: rankInfo.TalentID || i, // Use actual ID if available
name: rankInfo.Name || `影位 ${i}`, // Use actual name or generic
desc: rankInfo.Desc || '',
icon: '', // Placeholder
pos: i,
is_unlocked: i <= result.rank, // Check against character's rank level
// level: result.rank, // Sometimes MYS includes the current total rank level here
}); });
} }
// Add timestamp if available in Enka data
if (char.ObtainmentTimestamp) {
result.current_time = new Date(char.ObtainmentTimestamp * 1000); // Convert sec to ms
}
result_list.push(result); result_list.push(result);
logger.debug(`[enka_to_mys.js] Finished processing ${result.name_mi18n}`);
} }
logger.debug(`[enka_to_mys.js] 成功转换 ${result_list.length} 个角色的数据`); logger.debug(`[enka_to_mys.js] 成功转换 ${result_list.length} 个角色的数据`);