diff --git a/.gitignore b/.gitignore index 61350cf9..24be2b76 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ assets/images/relic/ */build/* resources/gamedata/story npm/node_modules +a.exe +*.zip + diff --git a/_data/config.yml b/_data/config.yml index 0cea2a72..cf68f977 100644 --- a/_data/config.yml +++ b/_data/config.yml @@ -36,4 +36,4 @@ css: modules: - /assets/js/common.js - - /resources/akdata.js?ver=230217 + - /resources/akdata.js?ver=230320 diff --git a/_docs/equip.js b/_docs/equip.js index b393c44f..18d4e541 100644 --- a/_docs/equip.js +++ b/_docs/equip.js @@ -224,13 +224,33 @@ function buildEquipList() { function showSubclassDialog() { edb = AKDATA.Data.uniequip_table; let excludeKeys = ["notchar1", "notchar2", "none1", "none2"]; - let names = {}; - Object.keys(edb["subProfDict"]).filter(x => !excludeKeys.includes(x)) - .forEach(x => { - names[x] = edb["subProfDict"][x].subProfessionName; - }); + let jobRanges = { // index < Key -> job is Value + "先锋": 0, + "近卫": 4, + "重装": 14, + "狙击": 20, + "术师": 27, + "医疗": 34, + "辅助": 38, + "特种": 44, + "其他新职业": 52, + "_": -1 + }; + let nameKeys = {}; + let subProfKeys = Object.keys(edb["subProfDict"]).filter(x => !excludeKeys.includes(x)) + let jobs = Object.keys(jobRanges); + for (let i=0; i `
${names[x]}
`) + // emmmmm... + let href_list = Object.keys(nameKeys).map(x => + `

${jobs[x]}

` + + nameKeys[x].map(y => ` +
+ ${edb["subProfDict"][y].subProfessionName} +
`).join("\n") + ); let html = '
' + href_list.join("\n") + '
'; pmBase.component.create({ diff --git a/_docs/mastery.js b/_docs/mastery.js index e19d69bd..f165e8c3 100644 --- a/_docs/mastery.js +++ b/_docs/mastery.js @@ -572,22 +572,27 @@ function calculate(charId) { let equipId = null, equipName = null; let extraNotes = []; + enemy.count = 1; let masterySpecs = AKDATA.Data.mastery[charId] || {}; - - if ("ecount" in masterySpecs) { - enemy.count = masterySpecs.ecount; - extraNotes.push(`${enemy.count}目标`); - } else enemy.count = 1; - - if ("emr" in masterySpecs) { - enemy.magicResistance = masterySpecs.emr; - extraNotes.push(`${enemy.magicResistance}法抗`); - } - - if ("edef" in masterySpecs) { - enemy.def = masterySpecs.edef; - extraNotes.push(`${enemy.def}防御`); - } + Object.keys(masterySpecs).forEach(key => { + switch (key) { + case "ecount": + enemy.count = masterySpecs.ecount; + extraNotes.push(`${enemy.count}目标`); + break; + case "emr": + enemy.magicResistance = masterySpecs.emr; + extraNotes.push(`${enemy.magicResistance}法抗`); + break; + case "edef": + enemy.def = masterySpecs.edef; + extraNotes.push(`${enemy.def}防御`); + break; + case "note": + extraNotes.push(masterySpecs.note); + break; + } + }); window.vue_app.calculating = true; @@ -598,6 +603,9 @@ function calculate(charId) { for (let st in Stages) { $.extend(recipe, stages[st]); let ch = buildChar(charId, skill.skillId, recipe); + if ("options" in masterySpecs) { + Object.assign(ch.options, masterySpecs.options); + } ch.dps = AKDATA.attributes.calculateDps(ch, enemy, raidBuff); if (ch.options.token && !extraNotes.includes("召唤物")) { extraNotes.push("召唤物"); @@ -699,7 +707,7 @@ function calculate(charId) { // 绿票算法 let greenTable = {}; AKDATA.Data.itemValue.forEach(item => { - if (item.version == "auto0.625") + if (item.expCoefficient == 0.625) greenTable[item.itemName] = item.itemValueGreen; }); //console.log(greenTable); diff --git a/_docs/whatsnew.md b/_docs/whatsnew.md index 08015917..224787a1 100644 --- a/_docs/whatsnew.md +++ b/_docs/whatsnew.md @@ -1,10 +1,21 @@ --- title: 更新日志 withjs: false -order: 4 -category: 其他功能 -icon: info-circle +order: 1 +category: 帮助与支持 +icon: cloud-upload +layout: text-page --- +## 23.03.20 +- [update] 麒麟X夜刀,火龙S黑角,轰击术师/推击手模组,推王、闪灵新模组
+ 增加了暂时关闭某个干员的功能。**目前调整中干员:温蒂,白铁**
+ 更新logo,微调页面布局;预计增加说明和捐助页面
+ 微调了时间轴模拟结果的符号规则 +- [equip] 模组一览页面,改进了子职业选单 +- [mastery] 专精收益图表现在可以在后台设定更多参数了 +- [mastery] 更新绿票价值表 +- [note] 伊芙莉特模组效果,1,3技能以触发1次计算,2技能以平均概率进行模拟(每5/3.33次触发一次),以避免随机模拟导致的结果波动 + ## 23.03.07 - [fix] 菲亚梅塔2技能阻回暂时订正为84帧固定 - [fix] 修复拜松的第一天赋计算顺序错误的问题,补充2技能防御力计算 diff --git a/_includes/header.html b/_includes/header.html index 53866530..2e4d904f 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -13,9 +13,9 @@
diff --git a/_includes/sidebar.html b/_includes/sidebar.html index d1254207..830b6533 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,4 +1,4 @@ -{%- assign categories = '计算器|干员与关卡|游戏数据速查|其他功能' | split: '|' -%} +{%- assign categories = '计算器|干员与关卡|游戏数据速查|帮助与支持' | split: '|' -%}