March 20 v1

.gitignore

@@ -13,3 +13,6 @@ assets/images/relic/
 */build/*
 resources/gamedata/story
 npm/node_modules
+a.exe
+*.zip
+

_data/config.yml

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

_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<jobs.length-1; ++i) {
+    nameKeys[i] = subProfKeys.slice(jobRanges[jobs[i]], jobRanges[jobs[i+1]]);
+  };
 
-  let href_list = Object.keys(names).map(x => `<div class="col-3"><a href="#${x}" onclick="$('#subclass_dialog').modal('hide');">${names[x]}</a></div>`)
+  // emmmmm...
+  let href_list = Object.keys(nameKeys).map(x => 
+    `<div class="col-12"><h2>${jobs[x]}</h2></div>` + 
+    nameKeys[x].map(y => `
+      <div class="col-3">
+        <a href="#${y}" onclick="$('#subclass_dialog').modal('hide');">${edb["subProfDict"][y].subProfessionName}</a>
+      </div>`).join("\n")
+  );
   let html = '<div class="row">' + href_list.join("\n") + '</div>';
 
   pmBase.component.create({

_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);

_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黑角，轰击术师/推击手模组，推王、闪灵新模组 <br>
+  增加了暂时关闭某个干员的功能。**目前调整中干员：温蒂，白铁** <br>
+  更新logo，微调页面布局；预计增加说明和捐助页面 <br>
+  微调了时间轴模拟结果的符号规则
+- [equip] 模组一览页面，改进了子职业选单
+- [mastery] 专精收益图表现在可以在后台设定更多参数了
+- [mastery] 更新绿票价值表
+- [note] 伊芙莉特模组效果，1，3技能以触发1次计算，2技能以平均概率进行模拟（每5/3.33次触发一次），以避免随机模拟导致的结果波动
+
 ## 23.03.07
 - [fix] 菲亚梅塔2技能阻回暂时订正为84帧固定
 - [fix] 修复拜松的第一天赋计算顺序错误的问题，补充2技能防御力计算

_includes/header.html

@@ -13,9 +13,9 @@
   <div class="l-header__body">
     <div class="l-header__logo">
       <a href="{{ gameHome | default: "/" | relative_url }}">
-          <div style="width:30%; float:left"><img src="/akdata/penguin.gif" alt="{{ site.logo }}"></div>
-          <div style="width:70%; float:left;"><img src="/akdata/logo.png" style="width:100%; margin-top: 5px;"></div>
-  		</a>
+          <div style="float:left"><img src="/akdata/penguin.gif" alt="{{ site.logo }}"></div>
+          <div style="float:left;"><img src="/akdata/logo.jpg" style="max-height: 55px; "></div>
+        </a>
     </div>
     <div class="l-header__left">
       <ul class="l-navbar">
@@ -25,6 +25,7 @@
       </ul>
     </div>
     <nav class="l-header__navbar">
+
       <ul class="l-navbar">
       </ul>
     </nav>

_includes/sidebar.html

@@ -1,4 +1,4 @@
-{%- assign categories = '计算器|干员与关卡|游戏数据速查|其他功能' | split: '|' -%}
+{%- assign categories = '计算器|干员与关卡|游戏数据速查|帮助与支持' | split: '|' -%}
 
 <div class="l-layout__sidebar">
   <ul class="l-sidebar">

_layouts/text-page.html

@@ -0,0 +1,25 @@
+---
+layout: default
+---
+
+<div class="l-main__body">
+    <div class="l-page">
+      <div class="l-page__header form-inline">
+        <h1 class="l-page__title">
+          <a href="{{page.url | relative_url }}">{{ page.title}}</a>
+        </h1>
+
+      </div>
+      <hr style="width:100%; color: rgba(0, 0, 0, 0.3)" class="m-0">
+      <div class="l-page__body">
+
+        <div class="l-dynamic">
+          <div class="l-content ml-4" style="margin-top: 16px">
+            {{ content }}
+          </div>
+        </div>
+      </div>
+      <div class="l-page__footer">
+      </div>
+    </div>
+</div>

_sass/layout/_header.scss

@@ -6,14 +6,14 @@
   &__body {
     display: flex;
     flex-direction: row;
-    height: 50px;
+    height: 60px;
     text-align: center;
     margin: auto;
   }
 
   &__logo {
     height: 100%;
-    width: 250px;
+    width: 420px;
     align-items: center;
     display: flex;
     text-align: center;
@@ -25,7 +25,7 @@
     }
 
     img {
-      max-height: 40px;
+      max-height: 60px;
     }
   }
 

_sass/layout/_sidebar.scss

@@ -1,5 +1,5 @@
 .l-layout__sidebar {
-  flex: 0 0 250px;
+  flex: 0 0 220px;
   background: $side-background-color;
   box-shadow: inset -1px 0 0 $layout-border-color;
 

resources/akdata.js

@@ -2,17 +2,19 @@ const stringRegex = /<[@\$](.+?)>(.+?)<\/>/g;
 const variableRegex = /{(\-)*(.+?)(?:\:(.+?))?}/g;
 
 let CacheList = null;
-let _use_local = false;
+let _use_local = true;
+let _use_todo_list = true;
 
 const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "230217", // jsdelivr tag version
+  akdata: "230320", // jsdelivr tag version
 
   Data: {},
 
-  new_op: ["char_4082_qiubai", "char_4083_chimes"],
+  new_op: ["char_1029_yato2", "char_1030_noirc2"],
+  todo_list: ["char_400_weedy", "char_4072_ironmn"],
 
   professionNames: {
     "PIONEER": "先锋",
@@ -176,7 +178,7 @@ window.AKDATA = {
       let data = AKDATA.Data.item_table.items[id];
       text = data.name;
       rarity = data.rarity;
-      if (id == "30145") rarity = "crystal";
+      if (id == "30145" || id == "30155") rarity = "crystal";
     }
     let s = createBadge('item', text, rarity);
     if ( count !== null ) s += createBadge('count', '×' + count);
@@ -281,9 +283,21 @@ window.AKDATA = {
   },
 
   selectChar: function(id) {
-    AKDATA.selChar = id;
     $("#select_char_dialog").modal("hide");
-    if (AKDATA.selectCharCallback) AKDATA.selectCharCallback(id);
+    if (_use_todo_list && AKDATA.todo_list.includes(id)) {
+      let charName = AKDATA.Data.character_table[id].name;
+      pmBase.component.create({
+        type: 'modal',
+        id: "error_dialog",
+        content: "计算结果调整中，敬请期待",
+        width: 600,
+        title: `施工中 - ${charName}`,
+        show: true,
+      });
+    } else {
+      AKDATA.selChar = id;
+      if (AKDATA.selectCharCallback) AKDATA.selectCharCallback(id);
+    }
   },
   selectCharCallback: null,