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

Merge pull request #373 from ckcz123/v2.x

Browse Source 
V2.x
This commit is contained in:
Zhang Chen 2019-05-21 16:42:57 +08:00 committed by GitHub
commit a9244c1f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_docs/api.md
View File

@ -952,10 +952,11 @@ core.startEvents(list, x, y, callback)
此函数将调用core.setEvents，然后停止勇士，再执行core.doAction()。 此函数将调用core.setEvents，然后停止勇士，再执行core.doAction()。
core.doAction() core.doAction(keepUI)
执行下一个自定义事件。 执行下一个自定义事件。
此函数将检测事件列表是否全部执行完毕，如果是则执行回调函数。 此函数将检测事件列表是否全部执行完毕，如果是则执行回调函数。
否则，将从事件列表中弹出下一个事件，并调用core.doEvent进行执行。 否则，将从事件列表中弹出下一个事件，并调用core.doEvent进行执行。
如果keepUI为true，则不会清掉UI层和selector，适合于自己用脚本的绘制。
core.insertAction(action, x, y, callback, addToLast) core.insertAction(action, x, y, callback, addToLast)

14
libs/events.js
View File

@ -788,11 +788,13 @@ events.prototype.startEvents = function (list, x, y, callback) {
} }
////// 执行当前自定义事件列表中的下一个事件 ////// ////// 执行当前自定义事件列表中的下一个事件 //////
events.prototype.doAction = function () { events.prototype.doAction = function (keepUI) {
// 清空boxAnimate和UI层 if (!keepUI) {
core.clearUI(); // 清空boxAnimate和UI层
clearInterval(core.status.event.interval); core.clearUI();
core.status.event.interval = null; clearInterval(core.status.event.interval);
core.status.event.interval = null;
}
// 判定是否执行完毕 // 判定是否执行完毕
if (this._doAction_finishEvents()) return; if (this._doAction_finishEvents()) return;
// 当前点坐标和前缀 // 当前点坐标和前缀
@ -1874,7 +1876,7 @@ events.prototype.setGlobalFlag = function (name, value) {
events.prototype.closeDoor = function (x, y, id, callback) { events.prototype.closeDoor = function (x, y, id, callback) {
id = id || ""; id = id || "";
if (!(id.endsWith("Door") || id.endsWith("Wall")) if (!(id.endsWith("Door") || id.endsWith("Wall"))
|| !core.material.icons.animates[id] || core.getBlock(x, y) != null) { || core.material.icons.animates[id] == null || core.getBlock(x, y) != null) {
if (callback) callback(); if (callback) callback();
return; return;
} }

30
libs/ui.js
View File

@ -1664,8 +1664,19 @@ ui.prototype.drawFly = function(page) {
core.setTextAlign('ui', 'center'); core.setTextAlign('ui', 'center');
core.fillText('ui', '楼层跳跃', this.HPIXEL, 60, '#FFFFFF', this._buildFont(28, true)); core.fillText('ui', '楼层跳跃', this.HPIXEL, 60, '#FFFFFF', this._buildFont(28, true));
core.fillText('ui', '返回游戏', this.HPIXEL, this.PIXEL - 13, null, this._buildFont(15, true)) core.fillText('ui', '返回游戏', this.HPIXEL, this.PIXEL - 13, null, this._buildFont(15, true))
core.fillText('ui', title, this.PIXEL - 60, this.HPIXEL + 39, null, this._buildFont(19, true));
var middle = this.HPIXEL + 39; var middle = this.HPIXEL + 39;
// 换行
var lines = core.splitLines('ui', title, 120, this._buildFont(19, true));
var start_y = middle - (lines.length - 1) * 11;
for (var i in lines) {
core.fillText('ui', lines[i], this.PIXEL - 60, start_y);
start_y += 22;
}
// core.fillText('ui', title, this.PIXEL - 60, this.HPIXEL + 39, null, this._buildFont(19, true));
if (core.actions._getNextFlyFloor(1) != page) { if (core.actions._getNextFlyFloor(1) != page) {
core.fillText('ui', '▲', this.PIXEL - 60, middle - 64, null, this._buildFont(17, false)); core.fillText('ui', '▲', this.PIXEL - 60, middle - 64, null, this._buildFont(17, false));
core.fillText('ui', '▲', this.PIXEL - 60, middle - 96); core.fillText('ui', '▲', this.PIXEL - 60, middle - 96);
@ -1913,9 +1924,12 @@ ui.prototype._drawToolbox_drawDescription = function (info, max_height) {
// 检查能否eval // 检查能否eval
text = core.replaceText(text); text = core.replaceText(text);
} catch (e) {} } catch (e) {}
var lines = core.splitLines('ui', text, this.PIXEL - 15, this._buildFont(17, false));
// --- 开始逐行绘制 for (var font_size = 17; font_size >= 14; font_size -= 3) {
var curr = 62, line_height = 25; var lines = core.splitLines('ui', text, this.PIXEL - 15, this._buildFont(font_size, false));
var line_height = parseInt(font_size * 1.4), curr = 37 + line_height;
if (curr + lines.length * line_height < max_height) break;
}
core.setFillStyle('ui', '#FFFFFF'); core.setFillStyle('ui', '#FFFFFF');
for (var i=0;i<lines.length;++i) { for (var i=0;i<lines.length;++i) {
core.fillText('ui', lines[i], 10, curr); core.fillText('ui', lines[i], 10, curr);
@ -2019,8 +2033,12 @@ ui.prototype._drawEquipbox_description = function (info, max_height) {
try { try {
text = core.replaceText(text); text = core.replaceText(text);
} catch (e) {} } catch (e) {}
var lines = core.splitLines('ui', text, this.PIXEL - 15, this._buildFont(17, false));
var curr = 62, line_height = 25; for (var font_size = 17; font_size >= 11; font_size -= 3) {
var lines = core.splitLines('ui', text, this.PIXEL - 15, this._buildFont(font_size, false));
var line_height = parseInt(font_size * 1.4), curr = 37 + line_height;
if (curr + lines.length * line_height < max_height) break;
}
core.setFillStyle('ui', '#FFFFFF'); core.setFillStyle('ui', '#FFFFFF');
for (var i = 0; i < lines.length; ++i) { for (var i = 0; i < lines.length; ++i) {
core.fillText('ui', lines[i], 10, curr); core.fillText('ui', lines[i], 10, curr);