Aug 07

xulai1001 · Aug 7, 2023 · 2a4ef0f · 2a4ef0f
1 parent 7b2723c
commit 2a4ef0f
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 21 deletions.
diff --git a/_data/config.yml b/_data/config.yml
@@ -36,4 +36,4 @@ css:
 
 modules:
   - /assets/js/common.js
-  - /resources/akdata.js?ver=230802
+  - /resources/akdata.js?ver=230807
diff --git a/_docs/dps.js b/_docs/dps.js
@@ -640,9 +640,12 @@ function updateOptions(charId, index) {
   let scroll_evts = [];
   let html = `    
   <div class="form-check">
-    <label class="form-check-label" data-toggle="tooltip" data-placement="right" title="${opts.tags['buff'].explain}">
+    <label class="form-check-label">
       <input class="form-check-input dps__buff" type="checkbox" value="" data-index="${index}" checked>
         计算团辅
+        <i class="fas fa-question-circle pull-right" data-toggle="tooltip" data-placement="right"
+           title="${opts.tags['buff'].explain}">
+        </i>
     </label> </div>`;   // 默认计算团辅
 
   if (opts.char[charId]) {
@@ -689,9 +692,10 @@ function updateOptions(charId, index) {
         case "bool":
           let html_bool = `
           <div class="form-check">
-            <label class="form-check-label" data-toggle="tooltip" data-placement="right" title="${tooltip}">
+            <label class="form-check-label">
               <input class="form-check-input dps__${t}" type="checkbox" value="" data-index="${index}" ${checked} ${disabled}>
                 ${text}
+                <i class="fas fa-question-circle pull-right" data-toggle="tooltip" data-placement="right" title="${tooltip}"></i>
             </label> </div>`;
           html += html_bool;
           break;

diff --git a/_docs/whatsnew.md b/_docs/whatsnew.md
@@ -7,6 +7,9 @@ icon: cloud-upload
 layout: text-page
 ---
 ## 23.08.03 - 
+- [update] 琳琅诗怀雅，青枳，苍苔
+- [fix] 订正青枳第一天赋精一无潜能时的数值（8%）
+- [fix] 修改了选项文字提示的样式，尝试解决手机不能点击的问题
 - [fix] 订正纯艾3技能元素治疗量
 - [fix] 增加行医职业帧数补正数据，同时修正了连击边缘检测结果
 - [fix] 修正临光模组没有覆盖1天赋的问题

diff --git a/penguin.gif b/penguin.gif
diff --git a/resources/akdata.js b/resources/akdata.js
@@ -8,13 +8,13 @@ const useCache = true;
 const cacheBeginTime = new Date(2019, 12, 10).getTime();
 
 window.AKDATA = {
-  akdata: "230802", // jsdelivr tag version
+  akdata: "230807", // jsdelivr tag version
   useLocal: false,
 
   Data: {},
 
-  new_op: [ "char_1016_agoat2"],
-  todo_list: ["char_1033_swire2", "char_488_buildr", "char_4106_bryota", "char_421_crow",
+  new_op: [ "char_1016_agoat2", "char_1033_swire2", "char_488_buildr", "char_4106_bryota"],
+  todo_list: [ "char_421_crow",
               "char_4066_highmo", "char_491_humus", "char_017_huang", "char_1026_gvial2",
               "char_143_ghost", "char_356_broca", "char_230_savage", "char_127_estell"],
 

diff --git a/resources/attributes.js b/resources/attributes.js
@@ -1693,6 +1693,7 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
       case "tachr_485_pallas_trait":
       case "tachr_308_swire_trait":
       case "tachr_265_sophia_trait":
+      case "tachr_4106_bryota_trait":
         if (!options.noblock) 
           done = true;
         break;
@@ -2386,6 +2387,16 @@ function applyBuff(charAttr, buffFrm, tag, blackbd, isSkill, isCrit, log, enemy)
         break;
       case "tachr_1016_agoat2_1":
         done = true; break;
+      case "tachr_4106_bryota_1":
+        if (options.noblock)
+          blackboard.def = blackboard["bryota_t_self.def"];
+        break;
+      case "skchr_swire2_2":
+        if (options.cond)
+          blackboard.times = 2;
+        break;
+      case "skchr_swire2_3":
+        done = true; break;
     }
   }
   // --- applyBuff switch ends here ---
@@ -3136,6 +3147,7 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
     // 技能类型
     if (levelData.description.includes("持续时间无限") || checkSpecs(skillId, "toggle")) {
       if (skillId == "skchr_thorns_3" && !options.warmup) {}
+      else if (skillId == "skchr_buildr_2" && !options.warmup) {}
       else if (skillId == "skchr_tuye_2") {
         log.writeNote("取技能时间=暖机时间");
         duration = spData.spCost / (1 + buffFrame.spRecoveryPerSec);
@@ -3149,6 +3161,12 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
       } else if (skillId == "skchr_typhon_2" && !options.warmup) {
         duration = blackboard.first_duration;
         attackCount = Math.ceil(duration / attackTime);
+      } else if (skillId == "skchr_swire2_3") {
+        duration = 3 * options.swire2_s3_coin;
+        attackCount = Math.ceil(duration / attackTime);
+        log.writeNote(`以${duration.toFixed(2)}s(${options.swire2_s3_coin}金币)计算技能时间`);
+        log.writeNote(`终结动画40帧`);
+        duration += 1.33;
       } else {
         var d = (options.short_mode ? 180 : 1000);
         attackCount = Math.ceil(d / attackTime);
@@ -3188,7 +3206,7 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
         else if (skillId == "skchr_yato2_3") {
           attackCount = (options.cond ? 18 : 5);
           log.writeNote(`以${attackCount}段伤害计算`);
-        }
+        } 
       }
     } else if (levelData.duration <= 0) { 
       if (checkSpecs(skillId, "instant_buff")) { // 瞬发的有持续时间的buff，例如血浆
@@ -3594,6 +3612,11 @@ function calcDurations(isSkill, attackTime, attackSpeed, levelData, buffList, bu
           tags.push("passive");
           log.write(`[特殊] 被动 - 以10次普攻计算`);
           log.writeNote("以10次普攻计算");
+        } else if (skillId == "skchr_swire2_1" || skillId == "skchr_swire2_2") {
+          attackDuration = 2;
+          attackCount = Math.ceil(attackDuration / attackTime);
+          duration = attackCount * attackTime;
+          tags.push("auto", "instant");
         } else {
           attackDuration = 10;
           attackCount = Math.ceil(attackDuration / attackTime);
@@ -5555,6 +5578,12 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
           log.writeNote("非主目标按1层第一天赋计算");      
         }
         break;
+      case "skchr_swire2_3":
+        let swire2_s3_atk = finalFrame.atk * bb.atk_scale;
+        damage = Math.max(swire2_s3_atk - edef, swire2_s3_atk * 0.05) * buffFrame.damage_scale;
+        pool[0] += damage * options.swire2_s3_coin;
+        log.write(`终结伤害 ${damage.toFixed(1)} x ${options.swire2_s3_coin}`);
+        break;
     }; // extraDamage switch ends here
 
     // 百分比/固定回血
@@ -5742,6 +5771,10 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
             pool[2] += heal * dur.duration * ecount;
           }
           break;
+        case "tachr_1033_swire2_2":
+          heal = finalFrame.maxHp * bb.hp_ratio;
+          log.writeNote(`买活HP ${heal.toFixed(1)}`);
+          break;
         default:
           pool[2] += bb.hp_ratio * finalFrame.maxHp * dur.attackCount;
       };

diff --git a/resources/customdata/dps_options.json b/resources/customdata/dps_options.json
@@ -32,7 +32,8 @@
         "mlyss_count": { "type": "scroll", "displaytext": "流形数量", "min": 1, "max": 5, "value": 1 },
         "extra_magazine": { "type": "scroll", "displaytext": "额外弹药<br>(包括第二天赋)", "min": 0, "max": 15, "value": 1 },
         "typhon_fix": { "type": "bool", "displaytext": "穿防叠层修正", "explain": "考虑第一天赋叠层过程", "off": true },
-        "agoat2_stack": { "type": "scroll", "displaytext": "1天赋层数", "min": 0, "max": 3, "value": 3 }
+        "agoat2_stack": { "type": "scroll", "displaytext": "1天赋层数", "min": 0, "max": 3, "value": 3 },
+        "swire2_s3_coin":   { "type": "scroll", "displaytext": "[s3]金币数", "min": 1, "max": 10, "value": 10 }
     },
     "cond_info": {
         "char_126_shotst": 1,
@@ -138,7 +139,9 @@
         "char_4027_heyak": 1,
         "char_249_mlyss": "trait",
         "char_250_phatom": 1,
-        "char_4102_threye": 1
+        "char_4102_threye": 1,
+        "char_488_buildr":  1,
+        "char_1033_swire2": { "text": "[s2]放置三秒", "tooltip": "2技能-香槟3秒后2连击" }
     },
     "char" : {
         "char_103_angel": [ "equip", "archet", "chen" ],
@@ -347,6 +350,9 @@
         "char_341_sntlla":  [ "freeze" ],
         "char_4102_threye": [ "cond" ],
         "char_1016_agoat2": [ "agoat2_stack" ],
-        "char_148_nearl":   [ "equip" ]
+        "char_148_nearl":   [ "equip" ],
+        "char_488_buildr":  [ "cond", "warmup" ],
+        "char_4106_bryota": [ "noblock" ],
+        "char_1033_swire2": [ "stack", "cond", "swire2_s3_coin" ]
     }
 }
diff --git a/resources/customdata/dps_specialtags.json b/resources/customdata/dps_specialtags.json
@@ -398,6 +398,9 @@
     "skchr_surtr_1":    { "damage_type": 1 },
     "skchr_surtr_3":    { "damage_type": 1, "attack_begin": 10, "frame_corr": 1 },
     "skchr_svrash_2":   { "toggle": true },
+    "skchr_swire2_1":   { "cast_time": 30, "attack_begin": 6, "note": "以2s普攻计算" },
+    "skchr_swire2_2":   { "cast_time": 30, "attack_begin": 10, "note": "以2s普攻计算" },
+    "skchr_swire2_3":   { "times": 2 },
     "skchr_swllow_1":   { "sim": true },
     "skchr_swllow_2":   { "reset_attack": true, "attack_begin": 2 },
     "skchr_tachak_1":   { "times": 2, "note": "未计算无视防御效果" },
@@ -439,6 +442,7 @@
     "tachr_1013_chen2_trait": { "cond": true },
     "tachr_1029_yato2_2":   { "note": "假设2天赋一直生效" },
     "tachr_1030_noirc2_2":  { "cond": true },
+    "tachr_1033_swire2_1":  { "stack": true },
     "tachr_107_liskam_1":   { "cloneable": true },
     "tachr_113_cqbw_2":     { "cond": true },
     "tachr_118_yuki_1":     { "cloneable": true },
@@ -554,6 +558,7 @@
     "tachr_476_blkngt_trait":   { "cond": true },
     "tachr_478_kirara_1":   { "cond": true },
     "tachr_485_pallas_1":   { "cond": true },
+    "tachr_488_buildr_1":   { "cond": true },
     "tachr_503_rang_1":	{ "cond": true },
     "tachr_511_asnipe_1":   { "crit": true },
     "tachr_1012_skadi2_2":  { "cond": true },
@@ -744,5 +749,8 @@
     "uniequip_002_myrtle":   { "override_talent": 1 },
     "uniequip_003_helage":  { "override_talent": 2 },
     "uniequip_003_phatom":  { "override_talent": 1 },
-    "uniequip_002_excu2":   { "override_talent": 1, "override_trait": true }
+    "uniequip_002_excu2":   { "override_talent": 1, "override_trait": true },
+    "uniequip_002_buildr":  { "override_talent": 1 },
+    "uniequip_002_bryota":  { "override_talent": 1, "override_trait": true },
+    "uniequip_002_swire2":  { "override_talent": 1 }
 }
diff --git a/resources/customdata/mastery.json b/resources/customdata/mastery.json
@@ -185,5 +185,8 @@
     "char_479_sleach":  { "mod_update_time": "2023/7/7" },
     "char_151_myrtle":  { "mod_update_time": "2023/7/7" },
     "char_1032_excu2":  { "mod_update_time": "2023/8/1", "edef": 500 },
-    "char_1016_agoat2": { "options": { "agoat2_stack": 3 }  }
+    "char_1016_agoat2": { "options": { "agoat2_stack": 3 }  },
+    "char_488_buildr":  { "mod_update_time": "2023/8/7" },
+    "char_4106_bryota": { "mod_update_time": "2023/8/7" },
+    "char_1033_swire2": { "mod_update_time": "2023/8/7", "options": { "swire2_s3_coin": 10 } }
 }
diff --git a/resources/gamedata/excel/character_table.json b/resources/gamedata/excel/character_table.json
@@ -56695,7 +56695,7 @@
             "blackboard": [
               {
                 "key": "max_hp",
-                "value": 0.8,
+                "value": 0.08,
                 "valueStr": null
               },
               {

diff --git a/resources/gamedata/excel/data_version.txt b/resources/gamedata/excel/data_version.txt
@@ -1,3 +1,3 @@
 Stream://torappu-data/v041/rel41.0
-Change:48629 on 2023/07/26
+Change:48844 on 2023/08/01
 VersionControl:41.0.0
diff --git a/resources/gamedata/excel/uniequip_table.json b/resources/gamedata/excel/uniequip_table.json
@@ -29744,11 +29744,12 @@
       "jumpStageId": "main_07-03"
     },
     "uniequip_002_swire2_1": {
-      "template": "EquipmentDamageTotal",
+      "template": "EquipmentDamageTotalWithToken",
       "desc": "由非助战琳琅诗怀雅累计造成60000点伤害",
       "paramList": [
-        "char_1033_swire2",
-        "60000"
+        "char_1033_swire2;token_10031_swire2_gdtrap",
+        "60000",
+        "char_1033_swire2"
       ],
       "uniEquipMissionId": "uniequip_002_swire2_1",
       "uniEquipMissionSort": 1,
@@ -29761,7 +29762,7 @@
       "paramList": [
         "3",
         "main_05-02",
-        "char_1033_swire2",
+        "char_1033_swire2;token_10031_swire2_gdtrap",
         "15",
         "char_1033_swire2"
       ],

diff --git a/resources/version.json b/resources/version.json
@@ -1,6 +1,6 @@
 { 
-  "akdata": "230802",
+  "akdata": "230807",
   "gamedata": "23-08-02-06-59-13-d7bbcc",
-  "customdata": "230802",
-  "whatsnew": "纯艾"
+  "customdata": "230807",
+  "whatsnew": "诗怀雅"
 }