June 10

_data/config.yml

@@ -36,4 +36,4 @@ css:
 
 modules:
   - /assets/js/common.js
-  - /resources/akdata.js?ver=230609
+  - /resources/akdata.js?ver=230610

_docs/character.js

@@ -160,12 +160,12 @@ function show(hash) {
       '<span class="o-badge" style="font-size:xx-small;width:60px;color:white;background-color:#FFB400;">受击回复</span>',
       '', '', '',
       '<span class="o-badge" style="font-size:xx-small;width:60px;color:white;background-color:#6F6F6F;">被动</span>',
-    ][skillData.levels[0].spData.spType];
+    ][AKDATA.checkEnum('spType', skillData.levels[0].spData.spType)];
     let skillType = [
       '',
       '<span class="o-badge" style="font-size:xx-small;width:60px;color:white;background-color:#6F6F6F;">手动触发</span>',
       '<span class="o-badge" style="font-size:xx-small;width:60px;color:white;background-color:#6F6F6F;">自动触发</span>',
-    ][skillData.levels[0].skillType];
+    ][AKDATA.checkEnum('skillType', skillData.levels[0].skillType)];
     skillHtml += pmBase.component.create({
       type: 'list',
       card: true,
@@ -200,16 +200,7 @@ function show(hash) {
         let spData = levelData.spData;
         let blackboard = Object.fromEntries(levelData.blackboard.map(x => [x.key.toLowerCase(), x.value]));
         let desc = AKDATA.formatString(levelData.description, true, blackboard, true);
-        /*
-        desc = desc.replace(variableRegex, (match, minus, key, format) => {
-          key = key.toLowerCase();
-          let value = blackboard[key];
-          delete blackboard[key];
-          if (minus) value = value * -1;
-          if (format === '0%') value = Math.round(value * 100) + '%';
-          else if (format === '0.0%') value = Math.round(value * 1000) / 10 + '%';
-          return value;
-        });*/
+
         if ( levelData.rangeId && (l == 0 || levelData.rangeId != skillData.levels[l-1].rangeId ) ) desc += '<hr>' + createRangeTable(levelData.rangeId);
         let bbtext = `<ul class="small text-left mb-0 muted">${Object.entries(blackboard).map(k=>`<li>${k[0]}: ${k[1]}</li>`).join('')}</ul>`;
 

_docs/plot.js

@@ -221,6 +221,7 @@ function init() {
     'excel/skill_table.json',
     'excel/uniequip_table.json',
     'excel/battle_equip_table.json',
+    '../customdata/enums.json',
     '../version.json',
     '../customdata/dps_specialtags.json',
     '../customdata/dps_options.json',
@@ -430,7 +431,7 @@ function load() {
       setSkill: function() {
         let skills=[], slv = 0;
         charDB[this.charId].skills.forEach((skill, sid) => {
-          if (this.details.phase >= skill.unlockCond.phase) {
+          if (this.details.phase >= AKDATA.checkEnum('phase', skill.unlockCond.phase)) {
             let name = skillDB[skill.skillId].levels[0].name;
             skills.push({id: skill.skillId, name: name});
             slv = skillDB[skill.skillId].levels.length;

_docs/whatsnew.md

@@ -6,10 +6,11 @@ category: 帮助与支持
 icon: cloud-upload
 layout: text-page
 ---
-## 23.06.09
-- [update] 圣约送葬人
-- [todo] 其余干员和模组有待更新。同时需要优化Log伤害表显示
-- [note] 补充了部分页面对新数据格式的枚举值的适配。可能还有一些页面的（稀有度和精英化等级）显示问题需要排查
+## 23.06.09-10
+- [update] 圣约送葬人，空构，隐现；怪杰、工匠、瑕光、焰尾模组
+- [dps] 优化了可变伤害类技能的计算过程中，伤害表格的显示
+- [fix] 普攻现在按照普攻前摇数据计算，而非技能。具体对结果的影响还在观察
+- [fix] 补充了部分页面（角色、图表）对新数据格式的枚举值的适配。可能还有一些页面的（稀有度和精英化等级）显示问题需要排查
 
 ## 23.06.05
 - [fix] Issue #22 优化了伤害颜色表示。现在可以按照DPS和HPS单独显示不同的伤害类型颜色了

resources/akdata.js

@@ -9,12 +9,12 @@ const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "230609-v1", // jsdelivr tag version
+  akdata: "230610", // jsdelivr tag version
 
   Data: {},
 
-  new_op: [ "char_1032_excu2" /*, "char_498_inside", "char_4015_spuria"*/],
-  todo_list: ["char_498_inside", "char_4015_spuria"],
+  new_op: [ "char_1032_excu2", "char_498_inside", "char_4015_spuria"],
+  todo_list: [],
 
   professionNames: {
     "PIONEER": "先锋",