jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #245 from ckcz123/master

Browse Source 
V2.0
This commit is contained in:
Zhang Chen 2018-10-28 20:13:33 +08:00 committed by GitHub
commit e6c4d6a95d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/control.js
View File

@ -1317,6 +1317,12 @@ control.prototype.snipe = function (snipes) {
else color = '#FF0000'; else color = '#FF0000';
damage = core.formatBigNumber(damage); 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; snipe.damage = damage;
@ -1560,6 +1566,8 @@ control.prototype.updateDamage = function (floorId, canvas) {
damage += "+"; damage += "+";
if (core.enemys.hasSpecial(core.material.enemys[id], 21)) if (core.enemys.hasSpecial(core.material.enemys[id], 21))
damage += "-"; damage += "-";
if (core.enemys.hasSpecial(core.material.enemys[id], 11))
damage += "^";
} }
canvas.fillStyle = '#000000'; canvas.fillStyle = '#000000';

20
libs/ui.js
View File

@ -1402,6 +1402,8 @@ ui.prototype.drawBook = function (index) {
damage += "+"; damage += "+";
if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 21)) if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 21))
damage += "-"; damage += "-";
if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 11))
damage += "^";
} }
if (core.material.enemys[enemy.id].notBomb) if (core.material.enemys[enemy.id].notBomb)
damage += "[b]"; damage += "[b]";
@ -1436,16 +1438,16 @@ ui.prototype.drawBookDetail = function (index) {
if (index<0) index=0; if (index<0) index=0;
if (index>=enemys.length) index=enemys.length-1; if (index>=enemys.length) index=enemys.length-1;
var enemy = enemys[index]; var enemyId=enemys[index].id;
var enemyId=enemy.id; var enemy = core.material.enemys[enemyId];
var hints=core.enemys.getSpecialHint(core.material.enemys[enemyId]); var hints=core.enemys.getSpecialHint(enemy);
if (hints.length==0) if (hints.length==0)
hints.push("该怪物无特殊属性。"); hints.push("该怪物无特殊属性。");
// 模仿临界计算器 // 模仿临界计算器
if (core.enemys.hasSpecial(core.material.enemys[enemyId].special, 10)) { if (core.enemys.hasSpecial(enemy.special, 10)) {
var hp = core.material.enemys[enemyId].hp; var hp = enemy.hp;
var delta = core.status.hero.atk - core.status.hero.def; var delta = core.status.hero.atk - core.status.hero.def;
if (delta<hp && hp<=10000 && hp>0) { if (delta<hp && hp<=10000 && hp>0) {
hints.push(""); 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); var damage = core.getDamage(enemyId);
if (damage != null) { if (damage != null) {
// 二分HP // 二分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(""); hints.push("");
var criticals = core.enemys.nextCriticals(enemyId, 10).map(function (v) { var criticals = core.enemys.nextCriticals(enemyId, 10).map(function (v) {
return v[0]+":"+v[1]; return v[0]+":"+v[1];