diff --git a/libs/control.js b/libs/control.js index f4cff9e7..9054d2dd 100644 --- a/libs/control.js +++ b/libs/control.js @@ -1317,6 +1317,12 @@ control.prototype.snipe = function (snipes) { else color = '#FF0000'; damage = core.formatBigNumber(damage); + if (core.enemys.hasSpecial(core.material.enemys[block.event.id], 19)) + damage += "+"; + if (core.enemys.hasSpecial(core.material.enemys[block.event.id], 21)) + damage += "-"; + if (core.enemys.hasSpecial(core.material.enemys[block.event.id], 11)) + damage += "^"; } snipe.damage = damage; @@ -1560,6 +1566,8 @@ control.prototype.updateDamage = function (floorId, canvas) { damage += "+"; if (core.enemys.hasSpecial(core.material.enemys[id], 21)) damage += "-"; + if (core.enemys.hasSpecial(core.material.enemys[id], 11)) + damage += "^"; } canvas.fillStyle = '#000000'; diff --git a/libs/ui.js b/libs/ui.js index 0acdb8dd..05e16959 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1402,6 +1402,8 @@ ui.prototype.drawBook = function (index) { damage += "+"; if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 21)) damage += "-"; + if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 11)) + damage += "^"; } if (core.material.enemys[enemy.id].notBomb) damage += "[b]"; @@ -1436,16 +1438,16 @@ ui.prototype.drawBookDetail = function (index) { if (index<0) index=0; if (index>=enemys.length) index=enemys.length-1; - var enemy = enemys[index]; - var enemyId=enemy.id; - var hints=core.enemys.getSpecialHint(core.material.enemys[enemyId]); + var enemyId=enemys[index].id; + var enemy = core.material.enemys[enemyId]; + var hints=core.enemys.getSpecialHint(enemy); if (hints.length==0) hints.push("该怪物无特殊属性。"); // 模仿临界计算器 - if (core.enemys.hasSpecial(core.material.enemys[enemyId].special, 10)) { - var hp = core.material.enemys[enemyId].hp; + if (core.enemys.hasSpecial(enemy.special, 10)) { + var hp = enemy.hp; var delta = core.status.hero.atk - core.status.hero.def; if (delta0) { hints.push(""); @@ -1481,7 +1483,7 @@ ui.prototype.drawBookDetail = function (index) { } // 吸血怪的最低生命值 - if (core.enemys.hasSpecial(core.material.enemys[enemyId].special, 11)) { + if (core.enemys.hasSpecial(enemy.special, 11)) { var damage = core.getDamage(enemyId); if (damage != null) { // 二分HP @@ -1502,6 +1504,12 @@ ui.prototype.drawBookDetail = function (index) { } } + // 仇恨伤害 + if (core.enemys.hasSpecial(enemy.special, 17)) { + hints.push(""); + hints.push("当前仇恨伤害值:"+core.getFlag('hatred', 0)); + } + hints.push(""); var criticals = core.enemys.nextCriticals(enemyId, 10).map(function (v) { return v[0]+":"+v[1];