Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Commit

Permalink
fixup #2
Browse files Browse the repository at this point in the history
  • Loading branch information
xulai1001 committed Nov 2, 2020
1 parent cecbcbd commit 70084ce
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
7 changes: 4 additions & 3 deletions _docs/mastery.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function queryArkPlanner(mats, callback, ...args) {
dataType: "json",
crossDomain: true, // 跨域
success: function (result) {
// console.log("<-", result, args);
// console.log("<-", result, args);
callback(result, ...args);
},
error: alert
Expand Down Expand Up @@ -410,8 +410,9 @@ function calculate(charId) {
var i = {};
if (level) {
level.forEach(x => {
i[itemdb[x.id].name] = x.count;
itemCache[itemdb[x.id].name] = {id: x.id, name: itemdb[x.id].name, rarity: itemdb[x.id].rarity};
var _n = itemdb[x.id].name.replace(" ", "");
i[_n] = x.count;
itemCache[_n] = {id: x.id, name: _n, rarity: itemdb[x.id].rarity};
});
resultView.mats[k].push(i);
}
Expand Down
1 change: 1 addition & 0 deletions _docs/whatsnew.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ icon: info-circle
- [update] 阿米娅(近卫 ver)
- [plot] 增加了坐标轴标题
- [bugfix] 絮雨talent_scale
- [bugfix] 新材料名称修正

## 20.11.01
- [update] 迷迭香等
Expand Down
8 changes: 4 additions & 4 deletions resources/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1716,10 +1716,10 @@ function calculateAttack(charAttr, enemy, raidBlackboard, isSkill, charData, lev
break;
case "tachr_436_whispr_1":
if (options.cond) {
var ts = (blackboard.id == "skchr_whispr_2" ? blackboard.talent_scale : 1;
var hps = bb.atk_to_hp_recovery_ratio * finalFrame.atk * ts;
pool[2] += hps * dur.duration * enemy.count;
log.write(`天赋hps: ${hps.toFixed(1)}`);
var ts = (blackboard.id == "skchr_whispr_2") ? blackboard.talent_scale : 1;
var extra_hps = bb.atk_to_hp_recovery_ratio * finalFrame.atk * ts;
pool[2] += extra_hps * dur.duration * enemy.count;
log.write(`天赋hps: ${extra_hps.toFixed(1)}`);
if (isSkill) log.writeNote("天赋可以治疗召唤物");
}
break;
Expand Down

0 comments on commit 70084ce

Please sign in to comment.