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

type:insert set args

Browse Source
This commit is contained in:
oc 2019-03-28 00:24:13 +08:00
parent b84912c189
commit 13b09ff911
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/events.js
View File

@ -1163,7 +1163,8 @@ events.prototype._action_insert = function (data, x, y, prefix) {
if (data.args instanceof Array) { if (data.args instanceof Array) {
for (var i = 0; i < data.args.length; ++i) { for (var i = 0; i < data.args.length; ++i) {
try { try {
core.setFlag('arg'+(i+1), core.calValue(data.args[i], prefix)); if (data.args[i] != null)
core.setFlag('arg'+(i+1), data.args[i]);
} catch (e) { main.log(e); } } catch (e) { main.log(e); }
} }
} }

5
libs/ui.js
View File

@ -1332,7 +1332,7 @@ ui.prototype._drawBook_drawRow1 = function (index, enemy, top, left, width, posi
} }
ui.prototype._drawBook_drawRow2 = function (index, enemy, top, left, width, position) { ui.prototype._drawBook_drawRow2 = function (index, enemy, top, left, width, position) {
// 绘制第三行 // 绘制第二行
core.setTextAlign('ui', 'left'); core.setTextAlign('ui', 'left');
var b13 = this._buildFont(13, true), f13 = this._buildFont(13, false); var b13 = this._buildFont(13, true), f13 = this._buildFont(13, false);
var col1 = left, col2 = left + width * 9 / 25, col3 = left + width * 17 / 25; var col1 = left, col2 = left + width * 9 / 25, col3 = left + width * 17 / 25;
@ -1396,6 +1396,7 @@ ui.prototype._drawBook_drawDamage = function (index, enemy, offset, position) {
////// 绘制怪物属性的详细信息 ////// ////// 绘制怪物属性的详细信息 //////
ui.prototype.drawBookDetail = function (index) { ui.prototype.drawBookDetail = function (index) {
var info = this._drawBookDetail_getInfo(index), enemy = info[0]; var info = this._drawBookDetail_getInfo(index), enemy = info[0];
if (!enemy) return;
var content = info[1].join("\n"); var content = info[1].join("\n");
core.status.event.id = 'book-detail'; core.status.event.id = 'book-detail';
clearInterval(core.interval.tipAnimate); clearInterval(core.interval.tipAnimate);
@ -1418,7 +1419,7 @@ ui.prototype.drawBookDetail = function (index) {
ui.prototype._drawBookDetail_getInfo = function (index) { ui.prototype._drawBookDetail_getInfo = function (index) {
var floorId = core.floorIds[(core.status.event.ui||{}).index] || core.status.floorId; var floorId = core.floorIds[(core.status.event.ui||{}).index] || core.status.floorId;
var enemys = core.enemys.getCurrentEnemys(floorId); var enemys = core.enemys.getCurrentEnemys(floorId);
if (enemys.length==0) return; if (enemys.length==0) return [];
index = core.clamp(index, 0, enemys.length - 1); index = core.clamp(index, 0, enemys.length - 1);
var enemy = enemys[index], enemyId = enemy.id; var enemy = enemys[index], enemyId = enemy.id;
var texts=core.enemys.getSpecialHint(enemyId); var texts=core.enemys.getSpecialHint(enemyId);