-
-
+
@@ -432,6 +432,7 @@
+
diff --git a/extensions/localSave.js b/extensions/localSave.js
new file mode 100644
index 00000000..061d5c17
--- /dev/null
+++ b/extensions/localSave.js
@@ -0,0 +1,110 @@
+/**
+ * 离线游戏使用本地存储扩展。
+ * 开启本拓展后，将会把所有存档存至 _saves 目录下。
+ * 需配合样板V2.8.2+使用
+ */
+
+"use strict";
+
+(function () {
+ // 将这一行改成 false 可以禁用本拓展
+ var __enabled = true;
+
+ if (window.jsinterface || !window.fs || !__enabled) return;
+
+ function rewrite() {
+ core.utils._setLocalForage_set = function (name, str, callback) {
+ var data = LZString.compressToBase64(str);
+ core.saves.cache[name] = data;
+ fs.writeFile('_saves/' + name, data, 'utf-8', callback);
+ }
+
+ core.utils._getLocalForage_get = function (name, callback) {
+ fs.readFile('_saves/' + name, 'utf-8', function (err, data) {
+ if (err) return callback(err);
+ callback(null, data);
+ });
+ }
+
+ core.utils.decompress = function (data) {
+ try {
+ return JSON.parse(LZString.decompressFromBase64(data))
+ } catch (e) {
+ return null;
+ }
+ }
+
+ core.utils._removeLocalForage_remove = function (name, callback) {
+ fs.deleteFile('_saves/' + name, callback);
+ }
+
+ core.utils.clearLocalForage = function (callback) {
+ fs.deleteFile('_saves', function () {
+ fs.mkdir('_saves', callback);
+ })
+ }
+
+ core.utils.iterateLocalForage = function (iter, callback) {
+ fs.readdir('_saves', function (err, data) {
+ if (err) callback(err);
+ else {
+ data.forEach(function (one) {
+ iter(null, one, null);
+ });
+ callback();
+ }
+ });
+ }
+
+ core.utils.keysLocalForage = function (callback) {
+ fs.readdir('_saves', callback);
+ }
+
+ core.utils.lengthLocalForage = function (callback) {
+ fs.readdir('_saves', function (err, data) {
+ if (err) callback(err);
+ else callback(null, data.length);
+ });
+ }
+ }
+
+
+ var _export = function () {
+ var toExport = [];
+
+ localforage.iterate(function (value, key, n) {
+ if (value == null || !key.startsWith(core.firstData.name)) return;
+ value = core.decompress(value);
+ if (value == null) return;
+ var str = JSON.stringify(value).replace(/[\u007F-\uFFFF]/g, function (chr) {
+ return "\\u" + ("0000" + chr.charCodeAt(0).toString(16)).substr(-4)
+ });
+ str = LZString.compressToBase64(str);
+ toExport.push(key);
+ core.saves.cache[key] = str;
+ fs.writeFile('_saves/' + key, str, 'utf-8', function () {});
+ }, function () {
+ if (toExport.length > 0) {
+ alert('提示！本塔已开启存档本地化！原始存档已全部导出至 _saves/ 目录下。');
+ }
+ fs.writeFile('_saves/.exported', '1', 'utf-8', function () {});
+ rewrite();
+ core.control.getSaveIndexes(function (indexes) { core.saves.ids = indexes; });
+ });
+ }
+
+ fs.mkdir('_saves', function (err) {
+ if (err) return;
+
+ fs.readFile('_saves/.exported', 'utf-8', function(err, data) {
+ if (!err && data) {
+ rewrite();
+ core.control.getSaveIndexes(function (indexes) { core.saves.ids = indexes; });
+ return;
+ }
+ _export();
+ });
+ });
+})();
+
+
diff --git a/libs/actions.js b/libs/actions.js
index b8762467..4d90883b 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -47,17 +47,13 @@ actions.prototype._init = function () {
// --- onup注册
this.registerAction('onup', '_sys_checkReplay', this._sys_checkReplay, 100);
this.registerAction('onup', '_sys_onup', this._sys_onup, 0);
- // --- onclick注册
- this.registerAction('onclick', '_sys_checkReplay', this._sys_checkReplay, 100);
- this.registerAction('onclick', '_sys_onclick_lockControl', this._sys_onclick_lockControl, 50);
- this.registerAction('onclick', '_sys_onclick', this._sys_onclick, 0);
+ // --- onclick已废弃，将视为ondown
// --- onmousewheel注册
this.registerAction('onmousewheel', '_sys_onmousewheel', this._sys_onmousewheel, 0);
// --- keyDownCtrl注册
this.registerAction('keyDownCtrl', '_sys_keyDownCtrl', this._sys_keyDownCtrl, 0);
// --- longClick注册
this.registerAction('longClick', '_sys_longClick_lockControl', this._sys_longClick_lockControl, 50);
- this.registerAction('longClick', '_sys_longClick', this._sys_longClick, 0);
// --- onStatusBarClick注册
this.registerAction('onStatusBarClick', '_sys_onStatusBarClick', this._sys_onStatusBarClick, 0);
@@ -66,7 +62,7 @@ actions.prototype._init = function () {
////// 注册一个用户交互行为 //////
/*
* 此函数将注册一个用户交互行为。
- * action：要注册的交互类型，如 ondown, onclick, keyDown 等等。
+ * action：要注册的交互类型，如 ondown, onup, keyDown 等等。
* name：你的自定义名称，可被注销使用；同名重复注册将后者覆盖前者。
* func：执行函数。
* priority：优先级；优先级高的将会被执行。此项可不填，默认为0。
@@ -75,6 +71,8 @@ actions.prototype._init = function () {
actions.prototype.registerAction = function (action, name, func, priority) {
if (!name || !func)
return;
+ // 将onclick视为ondown处理
+ if (action == 'onclick') action = 'ondown';
priority = priority || 0;
if (!this.actions[action]) {
this.actions[action] = [];
@@ -90,6 +88,8 @@ actions.prototype.registerAction = function (action, name, func, priority) {
////// 注销一个用户交互行为 //////
actions.prototype.unregisterAction = function (action, name) {
+ // 将onclick视为ondown处理
+ if (action == 'onclick') action = 'ondown';
if (!this.actions[action]) return;
this.actions[action] = this.actions[action].filter(function (x) {
return x.name != name;
@@ -286,6 +286,7 @@ actions.prototype._sys_keyDown_lockControl = function (keyCode) {
case 'load':
case 'replayLoad':
case 'replayRemain':
+ case 'replaySince':
this._keyDownSL(keyCode);
break;
case 'selectShop':
@@ -388,6 +389,7 @@ actions.prototype._sys_keyUp_lockControl = function (keyCode, altKey) {
case 'load':
case 'replayLoad':
case 'replayRemain':
+ case 'replaySince':
this._keyUpSL(keyCode);
break;
case 'keyBoard':
@@ -460,176 +462,6 @@ actions.prototype.ondown = function (loc) {
actions.prototype._sys_ondown_lockControl = function (x, y, px, py) {
if (core.status.played && !core.status.lockControl) return false;
- core.actions.onclick(x, y, px, py, []);
-
- // --- 长按判定
- if (core.timeout.onDownTimeout == null) {
- core.timeout.onDownTimeout = setTimeout(function () {
- if (core.interval.onDownInterval == null) {
- core.interval.onDownInterval = setInterval(function () {
- if (!core.actions.longClick(x, y, px, py)) {
- clearInterval(core.interval.onDownInterval);
- core.interval.onDownInterval = null;
- }
- }, 40)
- }
- }, 500);
- }
- return true;
-}
-
-actions.prototype._sys_ondown = function (x, y, px, py) {
- core.status.downTime = new Date();
- core.deleteCanvas('route');
- var pos = {'x': x, 'y': y}
- core.status.stepPostfix = [];
- core.status.stepPostfix.push(pos);
- core.fillPosWithPoint(pos);
-}
-
-////// 当在触摸屏上滑动时 //////
-actions.prototype.onmove = function (loc) {
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- var px = parseInt(loc.x / core.domStyle.scale), py = parseInt(loc.y / core.domStyle.scale);
- this.doRegisteredAction('onmove', x, y, px, py);
-}
-
-actions.prototype._sys_onmove_choices = function (x, y) {
- if (!core.status.lockControl) return false;
-
- switch (core.status.event.id) {
- case 'action':
- if (core.status.event.data.type == 'choices') {
- this._onMoveChoices(x, y);
- return true;
- }
- if (core.status.event.data.type == 'confirm') {
- this._onMoveConfirmBox(x, y);
- return true;
- }
- break;
- case 'selectShop':
- case 'switchs':
- case 'switchs-sounds':
- case 'switchs-display':
- case 'switchs-action':
- case 'notes':
- case 'settings':
- case 'syncSave':
- case 'syncSelect':
- case 'localSaveSelect':
- case 'storageRemove':
- case 'replay':
- case 'gameInfo':
- this._onMoveChoices(x, y);
- return true;
- case 'confirmBox':
- this._onMoveConfirmBox(x, y);
- return true;
- default:
- break;
- }
- return false;
-}
-
-actions.prototype._sys_onmove = function (x, y) {
- if ((core.status.stepPostfix || []).length > 0) {
- var pos = {'x': x, 'y': y};
- var pos0 = core.status.stepPostfix[core.status.stepPostfix.length - 1];
- var directionDistance = [pos.y - pos0.y, pos0.x - pos.x, pos0.y - pos.y, pos.x - pos0.x];
- var max = 0, index = 4;
- for (var ii = 0; ii < 4; ii++) {
- if (directionDistance[ii] > max) {
- index = ii;
- max = directionDistance[ii];
- }
- }
- pos = [{'x': 0, 'y': 1}, {'x': -1, 'y': 0}, {'x': 0, 'y': -1}, {'x': 1, 'y': 0}, false][index]
- if (pos) {
- pos.x += pos0.x;
- pos.y += pos0.y;
- core.status.stepPostfix.push(pos);
- core.fillPosWithPoint(pos);
- }
- }
- return true;
-}
-
-////// 当点击（触摸）事件放开时 //////
-actions.prototype.onup = function (loc) {
- var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
- var px = parseInt(loc.x / core.domStyle.scale), py = parseInt(loc.y / core.domStyle.scale);
- this.doRegisteredAction('onup', x, y, px, py);
-}
-
-actions.prototype._sys_onup = function () {
- clearTimeout(core.timeout.onDownTimeout);
- core.timeout.onDownTimeout = null;
- clearInterval(core.interval.onDownInterval);
- core.interval.onDownInterval = null;
-
- if ((core.status.stepPostfix || []).length == 0) return false;
-
- var stepPostfix = [];
- var direction = {'0': {'1': 'down', '-1': 'up'}, '-1': {'0': 'left'}, '1': {'0': 'right'}};
- for (var ii = 1; ii < core.status.stepPostfix.length; ii++) {
- var pos0 = core.status.stepPostfix[ii - 1];
- var pos = core.status.stepPostfix[ii];
- stepPostfix.push({
- 'direction': direction[pos.x - pos0.x][pos.y - pos0.y],
- 'x': pos.x + parseInt(core.bigmap.offsetX / 32),
- 'y': pos.y + parseInt(core.bigmap.offsetY / 32)
- });
- }
- var posx = core.status.stepPostfix[0].x;
- var posy = core.status.stepPostfix[0].y;
- core.status.stepPostfix = [];
- if (!core.status.lockControl) {
- core.clearMap('ui');
- }
-
- // 长按
- if (!core.status.lockControl && stepPostfix.length == 0 && core.status.downTime != null && new Date() - core.status.downTime >= 1000) {
- core.actions.longClick(posx, posy, 32 * posx + 16, 32 * posy + 16);
- }
- else {
- //posx,posy是寻路的目标点,stepPostfix是后续的移动
- core.actions.onclick(posx, posy, 32 * posx + 16, 32 * posy + 16, stepPostfix);
- }
- core.status.downTime = null;
- return true;
-}
-
-////// 获得点击事件相对左上角的坐标 //////
-actions.prototype._getClickLoc = function (x, y) {
-
- var statusBar = {'x': 0, 'y': 0};
- var size = 32;
- size = size * core.domStyle.scale;
-
- if (core.domStyle.isVertical) {
- statusBar.x = 3;
- statusBar.y = core.dom.statusBar.offsetHeight + 3;
- }
- else {
- statusBar.x = core.dom.statusBar.offsetWidth + 3;
- statusBar.y = 3;
- }
-
- var left = core.dom.gameGroup.offsetLeft + statusBar.x;
- var top = core.dom.gameGroup.offsetTop + statusBar.y;
- var loc = {'x': Math.max(x - left), 'y': Math.max(y - top, 0), 'size': size};
- return loc;
-}
-
-////// 具体点击屏幕上(x,y)点时，执行的操作 //////
-actions.prototype.onclick = function (x, y, px, py, stepPostfix) {
- // console.log("Click: (" + x + "," + y + ")");
- return this.doRegisteredAction('onclick', x, y, px, py, stepPostfix || []);
-}
-
-actions.prototype._sys_onclick_lockControl = function (x, y, px, py) {
- if (!core.status.lockControl) return false;
switch (core.status.event.id) {
case 'centerFly':
this._clickCenterFly(x, y, px, py);
@@ -674,6 +506,7 @@ actions.prototype._sys_onclick_lockControl = function (x, y, px, py) {
case 'load':
case 'replayLoad':
case 'replayRemain':
+ case 'replaySince':
this._clickSL(x, y, px, py);
break;
case 'confirmBox':
@@ -717,15 +550,211 @@ actions.prototype._sys_onclick_lockControl = function (x, y, px, py) {
core.ui.closePanel();
break;
}
+
+ // --- 长按判定
+ if (core.timeout.onDownTimeout == null) {
+ core.timeout.onDownTimeout = setTimeout(function () {
+ if (core.interval.onDownInterval == null) {
+ core.interval.onDownInterval = setInterval(function () {
+ if (!core.actions.longClick(x, y, px, py)) {
+ clearInterval(core.interval.onDownInterval);
+ core.interval.onDownInterval = null;
+ }
+ }, 40)
+ }
+ }, 500);
+ }
return true;
}
-actions.prototype._sys_onclick = function (x, y, px, py, stepPostfix) {
- // 寻路
- core.setAutomaticRoute(x + parseInt(core.bigmap.offsetX / 32), y + parseInt(core.bigmap.offsetY / 32), stepPostfix);
+actions.prototype._sys_ondown = function (x, y, px, py) {
+ if (core.status.lockControl) return false;
+ core.status.downTime = new Date();
+ core.deleteCanvas('route');
+ var pos = {'x': parseInt((px + core.bigmap.offsetX) / 32), 'y': parseInt((py + core.bigmap.offsetY) / 32)};
+ core.status.stepPostfix = [];
+ core.status.stepPostfix.push(pos);
+ core.fillRect('ui', pos.x*32+12-core.bigmap.offsetX,pos.y*32+12-core.bigmap.offsetY,8,8, '#bfbfbf');
+
+ clearTimeout(core.timeout.onDownTimeout);
+ core.timeout.onDownTimeout = null;
+ core.status.preview.prepareDragging = false;
+ if (!core.hasFlag('__lockViewport__') && (core.status.thisMap.width > core.__SIZE__ || core.status.thisMap.height > core.__SIZE__)) {
+ core.status.preview.prepareDragging = true;
+ core.status.preview.px = px;
+ core.status.preview.py = py;
+ core.timeout.onDownTimeout = setTimeout(function () {
+ core.clearMap('ui');
+ core.status.preview.prepareDragging = false;
+ core.status.preview.enabled = true;
+ core.status.preview.dragging = true;
+ core.drawTip('已进入预览模式，可直接拖动大地图');
+ core.status.stepPostfix = [];
+ }, 500);
+ }
+}
+
+////// 当在触摸屏上滑动时 //////
+actions.prototype.onmove = function (loc) {
+ var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
+ var px = parseInt(loc.x / core.domStyle.scale), py = parseInt(loc.y / core.domStyle.scale);
+ this.doRegisteredAction('onmove', x, y, px, py);
+}
+
+actions.prototype._sys_onmove_choices = function (x, y, px, py) {
+ if (!core.status.lockControl) return false;
+
+ switch (core.status.event.id) {
+ case 'action':
+ if (core.status.event.data.type == 'choices') {
+ this._onMoveChoices(x, y);
+ return true;
+ }
+ if (core.status.event.data.type == 'confirm') {
+ this._onMoveConfirmBox(x, y, px, py);
+ return true;
+ }
+ break;
+ case 'selectShop':
+ case 'switchs':
+ case 'switchs-sounds':
+ case 'switchs-display':
+ case 'switchs-action':
+ case 'notes':
+ case 'settings':
+ case 'syncSave':
+ case 'syncSelect':
+ case 'localSaveSelect':
+ case 'storageRemove':
+ case 'replay':
+ case 'gameInfo':
+ this._onMoveChoices(x, y);
+ return true;
+ case 'confirmBox':
+ this._onMoveConfirmBox(x, y, px, py);
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+
+actions.prototype._sys_onmove = function (x, y, px, py) {
+ if (core.status.lockControl) return false;
+
+ if (core.status.preview.dragging) {
+ core.setViewport(core.bigmap.offsetX - px + core.status.preview.px, core.bigmap.offsetY - py + core.status.preview.py);
+ core.status.preview.px = px;
+ core.status.preview.py = py;
+ return true;
+ }
+ if (core.status.preview.prepareDragging) {
+ if (Math.abs(px - core.status.preview.px) <= 20 && Math.abs(py - core.status.preview.py) <= 20)
+ return true;
+ else core.status.preview.prepareDragging = false;
+ }
+
+ clearTimeout(core.timeout.onDownTimeout);
+ core.timeout.onDownTimeout = null;
+
+ if ((core.status.stepPostfix || []).length > 0) {
+ var pos = {'x': parseInt((px + core.bigmap.offsetX) / 32), 'y': parseInt((py + core.bigmap.offsetY) / 32)};
+ var pos0 = core.status.stepPostfix[core.status.stepPostfix.length - 1];
+ var directionDistance = [pos.y - pos0.y, pos0.x - pos.x, pos0.y - pos.y, pos.x - pos0.x];
+ var max = 0, index = 4;
+ for (var ii = 0; ii < 4; ii++) {
+ if (directionDistance[ii] > max) {
+ index = ii;
+ max = directionDistance[ii];
+ }
+ }
+ pos = [{'x': 0, 'y': 1}, {'x': -1, 'y': 0}, {'x': 0, 'y': -1}, {'x': 1, 'y': 0}, false][index]
+ if (pos) {
+ pos.x += pos0.x;
+ pos.y += pos0.y;
+ core.status.stepPostfix.push(pos);
+ core.fillRect('ui', pos.x*32+12-core.bigmap.offsetX,pos.y*32+12-core.bigmap.offsetY,8,8, '#bfbfbf');
+ }
+ }
return true;
}
+////// 当点击（触摸）事件放开时 //////
+actions.prototype.onup = function (loc) {
+ var x = parseInt(loc.x / loc.size), y = parseInt(loc.y / loc.size);
+ var px = parseInt(loc.x / core.domStyle.scale), py = parseInt(loc.y / core.domStyle.scale);
+ this.doRegisteredAction('onup', x, y, px, py);
+}
+
+actions.prototype._sys_onup = function (x, y, px, py) {
+ clearTimeout(core.timeout.onDownTimeout);
+ core.timeout.onDownTimeout = null;
+ clearInterval(core.interval.onDownInterval);
+ core.interval.onDownInterval = null;
+
+ if (core.isPlaying()) {
+ core.status.preview.prepareDragging = false;
+ if (core.status.preview.dragging) {
+ core.status.preview.dragging = false;
+ return true;
+ }
+ }
+
+ if ((core.status.stepPostfix || []).length == 0) return false;
+
+ var stepPostfix = [];
+ var direction = {'0': {'1': 'down', '-1': 'up'}, '-1': {'0': 'left'}, '1': {'0': 'right'}};
+ for (var ii = 1; ii < core.status.stepPostfix.length; ii++) {
+ var pos0 = core.status.stepPostfix[ii - 1];
+ var pos = core.status.stepPostfix[ii];
+ stepPostfix.push({
+ 'direction': direction[pos.x - pos0.x][pos.y - pos0.y],
+ 'x': pos.x,
+ 'y': pos.y
+ });
+ }
+ var posx = core.status.stepPostfix[0].x;
+ var posy = core.status.stepPostfix[0].y;
+ core.status.stepPostfix = [];
+ if (!core.status.lockControl) {
+ core.clearMap('ui');
+ }
+
+ // 长按
+ if (!core.status.lockControl && stepPostfix.length == 0 && core.status.downTime != null && new Date() - core.status.downTime >= 1000) {
+ core.actions.longClick(x, y, px, py);
+ }
+ else {
+ //posx,posy是寻路的目标点,stepPostfix是后续的移动
+ core.setAutomaticRoute(posx, posy, stepPostfix);
+ }
+ core.status.downTime = null;
+ return true;
+}
+
+////// 获得点击事件相对左上角的坐标 //////
+actions.prototype._getClickLoc = function (x, y) {
+
+ var statusBar = {'x': 0, 'y': 0};
+ var size = 32;
+ size = size * core.domStyle.scale;
+
+ if (core.domStyle.isVertical) {
+ statusBar.x = 3;
+ statusBar.y = core.dom.statusBar.offsetHeight + 3;
+ }
+ else {
+ statusBar.x = core.dom.statusBar.offsetWidth + 3;
+ statusBar.y = 3;
+ }
+
+ var left = core.dom.gameGroup.offsetLeft + statusBar.x;
+ var top = core.dom.gameGroup.offsetTop + statusBar.y;
+ var loc = {'x': Math.max(x - left), 'y': Math.max(y - top, 0), 'size': size};
+ return loc;
+}
+
+
////// 滑动鼠标滚轮时的操作 //////
actions.prototype.onmousewheel = function (direct) {
this.doRegisteredAction('onmousewheel', direct);
@@ -766,8 +795,8 @@ actions.prototype._sys_onmousewheel = function (direct) {
// 浏览地图
if (core.status.lockControl && core.status.event.id == 'viewMaps') {
- if (direct == 1) this._clickViewMaps(this.HSIZE, this.HSIZE - 3);
- if (direct == -1) this._clickViewMaps(this.HSIZE, this.HSIZE + 3);
+ if (direct == 1) this._clickViewMaps(this.HSIZE, this.HSIZE - 3, core.__PIXELS__ / 2, core.__PIXELS__ / 5 * 1.5);
+ if (direct == -1) this._clickViewMaps(this.HSIZE, this.HSIZE + 3, core.__PIXELS__ / 2, core.__PIXELS__ / 5 * 3.5);
return;
}
@@ -816,9 +845,9 @@ actions.prototype._sys_keyDownCtrl = function () {
}
////// 长按 //////
-actions.prototype.longClick = function (x, y, px, py, fromEvent) {
+actions.prototype.longClick = function (x, y, px, py) {
if (!core.isPlaying()) return false;
- return this.doRegisteredAction('longClick', x, y, px, py, fromEvent);
+ return this.doRegisteredAction('longClick', x, y, px, py);
}
actions.prototype._sys_longClick_lockControl = function (x, y, px, py) {
@@ -839,7 +868,7 @@ actions.prototype._sys_longClick_lockControl = function (x, y, px, py) {
}
}
// 长按SL上下页快速翻页
- if (["save","load","replayLoad","replayRemain"].indexOf(core.status.event.id) >= 0) {
+ if (["save","load","replayLoad","replayRemain","replaySince"].indexOf(core.status.event.id) >= 0) {
if ([this.HSIZE-2, this.HSIZE-3, this.HSIZE+2, this.HSIZE+3].indexOf(x) >= 0 && y == this.LAST) {
this._clickSL(x, y);
return true;
@@ -858,15 +887,6 @@ actions.prototype._sys_longClick_lockControl = function (x, y, px, py) {
return false;
}
-actions.prototype._sys_longClick = function (x, y, px, py, fromEvent) {
- if (core.status.lockControl) return false;
- // 虚拟键盘
- core.waitHeroToStop(function () {
- core.ui._drawKeyBoard();
- });
- return true;
-}
-
actions.prototype.onStatusBarClick = function (e) {
if (!core.isPlaying()) return false;
var left = core.dom.gameGroup.offsetLeft + 3;
@@ -958,10 +978,12 @@ actions.prototype._keyUpCenterFly = function (keycode) {
}
////// 点击确认框时 //////
-actions.prototype._clickConfirmBox = function (x, y) {
- if ((x == this.HSIZE-2 || x == this.HSIZE-1) && y == this.HSIZE+1 && core.status.event.data.yes)
+actions.prototype._clickConfirmBox = function (x, y, px, py) {
+ if (px >= core.__PIXELS__ / 2 - 70 && px <= core.__PIXELS__ / 2 - 10
+ && py >= core.__PIXELS__ / 2 && py <= core.__PIXELS__ / 2 + 64 && core.status.event.data.yes)
core.status.event.data.yes();
- if ((x == this.HSIZE+2 || x == this.HSIZE+1) && y == this.HSIZE+1 && core.status.event.data.no)
+ if (px >= core.__PIXELS__ / 2 + 10 && px <= core.__PIXELS__ / 2 + 70
+ && py >= core.__PIXELS__ / 2 && py <= core.__PIXELS__ / 2 + 64 && core.status.event.data.no)
core.status.event.data.no();
}
@@ -990,9 +1012,9 @@ actions.prototype._keyUpConfirmBox = function (keycode) {
}
////// 鼠标在确认框上移动时 //////
-actions.prototype._onMoveConfirmBox = function (x, y) {
- if (y == this.HSIZE + 1) {
- if (x == this.HSIZE - 2 || x == this.HSIZE - 1) {
+actions.prototype._onMoveConfirmBox = function (x, y, px, py) {
+ if (py >= core.__PIXELS__ / 2 && py <= core.__PIXELS__ / 2 + 64) {
+ if (px >= core.__PIXELS__ / 2 - 70 && px <= core.__PIXELS__ / 2 - 10) {
if (core.status.event.selection != 0) {
core.status.event.selection = 0;
core.playSound('光标移动');
@@ -1004,7 +1026,7 @@ actions.prototype._onMoveConfirmBox = function (x, y) {
}
return;
}
- if (x == this.HSIZE + 2 || x == this.HSIZE + 1) {
+ if (px >= core.__PIXELS__ / 2 + 10 && px <= core.__PIXELS__ / 2 + 70) {
if (core.status.event.selection != 1) {
core.status.event.selection = 1;
core.playSound('光标移动');
@@ -1084,7 +1106,12 @@ actions.prototype._clickAction = function (x, y, px, py) {
var timeout = Math.max(0, core.status.event.timeout - new Date().getTime()) || 0;
delete core.status.event.timeout;
core.setFlag('timeout', timeout);
- core.status.route.push("choices:" + (100 * timeout + y - topIndex));
+ // 对全局商店特殊处理
+ var index = y - topIndex;
+ if (index == choices.length - 1 && core.hasFlag('@temp@shop')) {
+ index = -1;
+ }
+ core.status.route.push("choices:" + (100 * timeout + index));
core.insertAction(choice.action);
core.doAction();
}
@@ -1309,7 +1336,7 @@ actions.prototype._keyUpFly = function (keycode) {
}
////// 查看地图界面时的点击操作 //////
-actions.prototype._clickViewMaps = function (x, y) {
+actions.prototype._clickViewMaps = function (x, y, px, py) {
if (core.status.event.data == null) {
core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId));
return;
@@ -1318,50 +1345,50 @@ actions.prototype._clickViewMaps = function (x, y) {
var index = core.status.event.data.index;
var cx = core.status.event.data.x, cy = core.status.event.data.y;
var floorId = core.floorIds[index], mw = core.floors[floorId].width, mh = core.floors[floorId].height;
- var per = this.HSIZE - 4;
+ var perpx = core.__PIXELS__ / 5, cornerpx = perpx * 3 / 4;
- if (x <= per - 2 && y <= per - 2) {
+ if (px <= cornerpx && py <= cornerpx) {
core.status.event.data.damage = !core.status.event.data.damage;
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx, cy);
return;
}
- if (x <= per - 2 && y >= this.SIZE + 1 - per) {
+ if (px <= cornerpx && py >= core.__PIXELS__ - cornerpx) {
if (core.markedFloorIds[floorId]) delete core.markedFloorIds[floorId];
else core.markedFloorIds[floorId] = true;
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx, cy);
return;
}
- if (x >= this.SIZE + 1 - per && y <= per - 2) {
+ if (px >= core.__PIXELS__ - cornerpx && py <= cornerpx) {
core.status.event.data.all = !core.status.event.data.all;
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx, cy);
return;
}
- if (x >= per && x <= this.LAST - per && y <= per - 1 && (!core.status.event.data.all && mh > this.SIZE)) {
+ if (px >= perpx && px <= core.__PIXELS__ - perpx && py <= perpx && (!core.status.event.data.all && mh > this.SIZE)) {
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx, cy - 1);
return;
}
- if (x >= per && x <= this.LAST - per && y >= this.SIZE - per && (!core.status.event.data.all && mh > this.SIZE)) {
+ if (px >= perpx && px <= core.__PIXELS__ - perpx && py >= core.__PIXELS__ - perpx && (!core.status.event.data.all && mh > this.SIZE)) {
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx, cy + 1);
return;
}
- if (x <= per - 1 && y >= per && y <= this.LAST - per) {
+ if (px <= perpx && py >= perpx && py <= core.__PIXELS__ - perpx) {
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx - 1, cy);
return;
}
- if (x >= this.SIZE - per && y >= per && y <= this.LAST - per) {
+ if (px >= core.__PIXELS__ - perpx && py >= perpx && py <= core.__PIXELS__ - perpx) {
core.playSound('光标移动');
core.ui._drawViewMaps(index, cx + 1, cy);
return;
}
- if (y <= this.HSIZE - 2 && (mh == this.SIZE || (x >= per && x <= this.LAST - per))) {
+ if (py <= 2 * perpx && (mh == this.SIZE || (px >= perpx && px <= core.__PIXELS__ - perpx))) {
core.playSound('光标移动');
index++;
while (index < core.floorIds.length && index != now && core.status.maps[core.floorIds[index]].cannotViewMap)
@@ -1370,7 +1397,7 @@ actions.prototype._clickViewMaps = function (x, y) {
core.ui._drawViewMaps(index);
return;
}
- if (y >= this.HSIZE + 2 && (mh == this.SIZE || (x >= per && x <= this.LAST - per))) {
+ if (py >= 3 * perpx && (mh == this.SIZE || (px >= perpx && px <= core.__PIXELS__ - perpx))) {
core.playSound('光标移动');
index--;
while (index >= 0 && index != now && core.status.maps[core.floorIds[index]].cannotViewMap)
@@ -1379,7 +1406,7 @@ actions.prototype._clickViewMaps = function (x, y) {
core.ui._drawViewMaps(index);
return;
}
- if (x >= per && x <= this.LAST - per && y >= this.HSIZE - 1 && y <= this.HSIZE + 1) {
+ if (px >= perpx && px <= core.__PIXELS__ - perpx && py >= perpx * 2 && py <= perpx * 3) {
core.clearMap('data');
core.playSound('取消');
core.ui.closePanel();
@@ -1393,12 +1420,12 @@ actions.prototype._keyDownViewMaps = function (keycode) {
var floorId = core.floorIds[core.status.event.data.index], mh = core.floors[floorId].height;
- if (keycode == 38 || keycode == 33) this._clickViewMaps(this.HSIZE, this.HSIZE - 3);
- if (keycode == 40 || keycode == 34) this._clickViewMaps(this.HSIZE, this.HSIZE + 3);
- if (keycode == 87 && mh > this.SIZE) this._clickViewMaps(this.HSIZE, 0);
- if (keycode == 65) this._clickViewMaps(0, this.HSIZE);
- if (keycode == 83 && mh > this.SIZE) this._clickViewMaps(this.HSIZE, this.LAST);
- if (keycode == 68) this._clickViewMaps(this.LAST, this.HSIZE);
+ if (keycode == 38 || keycode == 33) this._clickViewMaps(this.HSIZE, this.HSIZE - 3, core.__PIXELS__ / 2, core.__PIXELS__ / 5 * 1.5);
+ if (keycode == 40 || keycode == 34) this._clickViewMaps(this.HSIZE, this.HSIZE + 3, core.__PIXELS__ / 2, core.__PIXELS__ / 5 * 3.5);
+ if (keycode == 87 && mh > this.SIZE) this._clickViewMaps(this.HSIZE, 0, core.__PIXELS__ / 2, 1);
+ if (keycode == 65) this._clickViewMaps(0, this.HSIZE, 1, core.__PIXELS__ / 2);
+ if (keycode == 83 && mh > this.SIZE) this._clickViewMaps(this.HSIZE, this.LAST, core.__PIXELS__ / 2, core.__PIXELS__ - 1);
+ if (keycode == 68) this._clickViewMaps(this.LAST, this.HSIZE, core.__PIXELS__, core.__PIXELS__ / 2 - 1);
return;
}
@@ -2754,7 +2781,8 @@ actions.prototype._clickLocalSaveSelect = function (x, y) {
"version": core.firstData.version,
"data": saves
}
- core.download(core.firstData.name + "_" + core.formatDate2(new Date()) + ".h5save", JSON.stringify(content));
+ core.download(core.firstData.name + "_" + core.formatDate2(new Date()) + ".h5save",
+ LZString.compressToBase64(JSON.stringify(content)));
}
};
if (selection == 0) core.getAllSaves(callback);
@@ -2804,11 +2832,13 @@ actions.prototype._clickStorageRemove = function (x, y) {
actions.prototype._clickStorageRemove_all = function () {
core.myconfirm("你确定要清除【全部游戏】的所有本地存档？\n此行为不可逆！！！", function () {
- var done = function () {
+ core.ui.drawWaiting("正在清空，请稍候...");
+ core.clearLocalForage(function () {
core.saves.ids = {};
core.saves.autosave.data = null;
core.saves.autosave.updated = false;
core.saves.autosave.now = 0;
+ core.saves.cache = {};
core.ui.closePanel();
core.saves.saveIndex = 1;
core.saves.favorite = [];
@@ -2816,15 +2846,7 @@ actions.prototype._clickStorageRemove_all = function () {
core.control._updateFavoriteSaves();
core.removeLocalStorage('saveIndex');
core.drawText("\t[操作成功]你的所有存档已被清空。");
- };
- if (core.platform.useLocalForage) {
- core.ui.drawWaiting("正在清空，请稍候...");
- localforage.clear(done);
- }
- else {
- localStorage.clear();
- done();
- }
+ });
});
}
@@ -2843,20 +2865,11 @@ actions.prototype._clickStorageRemove_current = function () {
core.removeLocalStorage('saveIndex');
core.drawText("\t[操作成功]当前塔的存档已被清空。");
}
- if (core.platform.useLocalForage) {
- core.ui.drawWaiting("正在清空，请稍候...");
- Object.keys(core.saves.ids).forEach(function (v) {
- core.removeLocalForage("save" + v);
- });
- core.removeLocalForage("autoSave", done);
- }
- else {
- Object.keys(core.saves.ids).forEach(function (v) {
- core.removeLocalStorage("save" + v);
- });
- core.removeLocalStorage("autoSave");
- done();
- }
+ core.ui.drawWaiting("正在清空，请稍候...");
+ Object.keys(core.saves.ids).forEach(function (v) {
+ core.removeLocalForage("save" + v);
+ });
+ core.removeLocalForage("autoSave", done);
});
}
@@ -2885,9 +2898,10 @@ actions.prototype._clickReplay = function (x, y) {
case 0: core.playSound('确定'); return this._clickReplay_fromBeginning();
case 1: core.playSound('确定'); return this._clickReplay_fromLoad();
case 2: core.playSound('确定'); return this._clickReplay_replayRemain();
- case 3: core.playSound('确定'); return core.chooseReplayFile();
- case 4: core.playSound('确定'); return this._clickReplay_download();
- case 5: core.playSound('取消'); return core.ui.closePanel();
+ case 3: core.playSound('确定'); return this._clickReplay_replaySince();
+ case 4: core.playSound('确定'); return core.chooseReplayFile();
+ case 5: core.playSound('确定'); return this._clickReplay_download();
+ case 6: core.playSound('取消'); return core.ui.closePanel();
}
}
}
@@ -2922,14 +2936,32 @@ actions.prototype._clickReplay_replayRemain = function () {
});
}
+actions.prototype._clickReplay_replaySince = function () {
+ core.closePanel();
+ core.drawText([
+ "\t[播放存档剩余录像]该功能为【接续播放录像】的简化版本，允许你播放\r[yellow]一个存档中剩余的录像\r，常常用于\r[yellow]录像局部优化\r。\n" +
+ "在录像正常播放中，你随时可以暂停并按S键进行存档；此时\r[yellow]剩余录像\r也会被记在存档中（在读档界面用\r[yellow][R]\r标识。）\n" +
+ "之后，你可以选择在路线优化后直接播放该存档的\r[yellow]剩余录像\r，而无需再像接续播放一样选择录像起点和终点。\n\n" +
+ "详细使用方法参见露珠录制的视频教程：\n\r[yellow]https://bilibili.com/video/BV1az4y1C78x",
+ "请选择一个存档。\n\n\r[yellow]该存档需为录像播放中存的，且坐标必须和当前勇士坐标完全相同。\r\n将尝试播放此存档的剩余录像。",
+ ], function () {
+ core.status.event.id = 'replaySince';
+ core.lockControl();
+ var saveIndex = core.saves.saveIndex;
+ var page = parseInt((saveIndex - 1) / 5), offset = saveIndex - 5 * page;
+ core.ui._drawSLPanel(10 * page + offset);
+ });
+}
+
actions.prototype._clickReplay_download = function () {
// if (core.hasFlag('debug')) return core.drawText("\t[系统提示]调试模式下无法下载录像");
- core.download(core.firstData.name + "_" + core.formatDate2() + ".h5route", JSON.stringify({
- 'name': core.firstData.name,
- 'hard': core.status.hard,
- 'seed': core.getFlag('__seed__'),
- 'route': core.encodeRoute(core.status.route)
- }));
+ core.download(core.firstData.name + "_" + core.formatDate2() + ".h5route",
+ LZString.compressToBase64(JSON.stringify({
+ 'name': core.firstData.name,
+ 'hard': core.status.hard,
+ 'seed': core.getFlag('__seed__'),
+ 'route': core.encodeRoute(core.status.route)
+ })));
}
@@ -3085,7 +3117,9 @@ actions.prototype._clickKeyBoard = function (x, y) {
actions.prototype._clickCursor = function (x, y, px, py) {
if (x == core.status.automaticRoute.cursorX && y == core.status.automaticRoute.cursorY) {
core.ui.closePanel();
- core.onclick(x, y, px, py, []);
+ // 视为按下再放起
+ this.doRegisteredAction('ondown', x, y, px, py);
+ this.doRegisteredAction('onup', x, y, px, py);
return;
}
core.status.automaticRoute.cursorX = x;
@@ -3133,7 +3167,9 @@ actions.prototype._keyUpCursor = function (keycode) {
core.ui.closePanel();
var x = core.status.automaticRoute.cursorX;
var y = core.status.automaticRoute.cursorY;
- core.onclick(x, y, 32 * x + 16, 32 * y + 16, []);
+ // 视为按下再放起
+ this.doRegisteredAction('ondown', x, y, 32 * x + 16, 32 * y + 16);
+ this.doRegisteredAction('onup', x, y, 32 * x + 16, 32 * y + 16);
return;
}
}
diff --git a/libs/control.js b/libs/control.js
index 45588528..94c668d7 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -159,7 +159,7 @@ control.prototype._animationFrame_globalAnimate = function (timestamp) {
});
// Global hero animate
- if ((core.status.hero || {}).animate && core.status.heroMoving == 0 && main.mode == 'play') {
+ if ((core.status.hero || {}).animate && core.status.heroMoving == 0 && main.mode == 'play' && !core.status.preview.enabled) {
core.drawHero('stop', null, core.status.globalAnimateStatus);
}
}
@@ -498,11 +498,6 @@ control.prototype.clearContinueAutomaticRoute = function (callback) {
if (callback) callback();
}
-////// 显示离散的寻路点 //////
-control.prototype.fillPosWithPoint = function (pos) {
- core.fillRect('ui', pos.x*32+12,pos.y*32+12,8,8, '#bfbfbf');
-}
-
////// 设置自动寻路路线 //////
control.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) {
if (!core.status.played || core.status.lockControl) return;
@@ -831,20 +826,15 @@ control.prototype.drawHero = function (status, offset, frame) {
core.status.heroCenter.py = 32 * y + offsetY + 32 - core.material.icons.hero.height / 2;
// 重置hero层画布
- var px = parseFloat(core.canvas.hero.canvas.getAttribute('_px')) || 0;
- var py = parseFloat(core.canvas.hero.canvas.getAttribute('_py')) || 0;
core.setGameCanvasTranslate('hero', 0, 0);
- core.canvas.hero.canvas.removeAttribute('_px');
- core.canvas.hero.canvas.removeAttribute('_py');
- offset.px = px;
- offset.py = py;
+ delete core.canvas.hero._px;
+ delete core.canvas.hero._py;
+ core.status.preview.enabled = false;
if (!core.hasFlag('__lockViewport__')) {
this._drawHero_updateViewport(x, y, offset);
}
- if (!core.hasFlag('hideHero')) {
- this._drawHero_draw(direction, x, y, status, offset, frame);
- }
+ this._drawHero_draw(direction, x, y, status, offset, frame);
}
control.prototype._drawHero_updateViewport = function (x, y, offset) {
@@ -855,11 +845,13 @@ control.prototype._drawHero_updateViewport = function (x, y, offset) {
control.prototype._drawHero_draw = function (direction, x, y, status, offset, frame) {
offset = offset || {x: 0, y: 0, offset: 0, px: 0, py: 0};
+ var opacity = core.setAlpha('hero', core.getFlag('__heroOpacity__', 1))
this._drawHero_getDrawObjs(direction, x, y, status, offset).forEach(function (block) {
core.drawImage('hero', block.img, (block.heroIcon[block.status] + (frame || 0))%4*block.width,
block.heroIcon.loc * block.height, block.width, block.height,
- offset.px+block.posx+(32-block.width)/2, offset.py+block.posy+32-block.height, block.width, block.height);
+ block.posx+(32-block.width)/2, block.posy+32-block.height, block.width, block.height);
});
+ core.setAlpha('hero', opacity);
}
control.prototype._drawHero_getDrawObjs = function (direction, x, y, status, offset) {
@@ -893,45 +885,34 @@ control.prototype._drawHero_getDrawObjs = function (direction, x, y, status, off
});
}
-control.prototype.triggerHero = function (type, time, callback) {
- if (type == null) {
- type = core.hasFlag('hideHero') ? 'show' : 'hide';
- }
- if ((core.hasFlag('hideHero') && type != 'show') || (!core.hasFlag('hideHero') && type != 'hide')) {
- if (callback) callback();
- return;
- }
- core.removeFlag('hideHero');
-
- var cb = function () {
- if (type == 'hide') core.setFlag('hideHero', true);
- core.drawHero();
- if (callback) callback();
- return;
- }
-
+control.prototype.setHeroOpacity = function (opacity, moveMode, time, callback) {
time = time || 0;
- if (time == 0) return cb();
- time /= Math.max(core.status.replay.speed, 1)
- this._triggerHero_animate(type, 10 / time, cb);
-}
-
-control.prototype._triggerHero_animate = function (type, delta, callback) {
- var opacity = type != 'show' ? 1 : 0;
- var animate = setInterval(function () {
- opacity += type != 'show' ? -delta : delta;
- core.setAlpha('hero', opacity);
+ if (time == 0) {
+ core.setFlag('__heroOpacity__', opacity);
core.drawHero();
- core.setAlpha('hero', 1);
- if (opacity >= 1 || opacity <= 0) {
+ if (callback) callback();
+ return;
+ }
+ time /= Math.max(core.status.replay.speed, 1)
+
+ var fromOpacity = core.getFlag('__heroOpacity__', 1);
+ var step = 0, steps = parseInt(time / 10);
+ if (steps <= 0) steps = 1;
+ var moveFunc = core.applyEasing(moveMode);
+
+ var animate = setInterval(function () {
+ step++;
+ core.setFlag('__heroOpacity__', fromOpacity + (opacity - fromOpacity) * moveFunc(step / steps));
+ core.drawHero();
+ if (step == steps) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- core.drawHero();
if (callback) callback();
}
}, 10);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
// ------ 画布、位置、阻激夹域，显伤 ------ //
@@ -1015,14 +996,13 @@ control.prototype.setViewport = function (px, py) {
core.bigmap.offsetY = core.clamp(py, 0, 32 * core.bigmap.height - core.__PIXELS__);
this.updateViewport();
// ------ hero层也需要！
- var canvas = core.canvas.hero.canvas;
- var px = parseFloat(canvas.getAttribute('_px')) || 0;
- var py = parseFloat(canvas.getAttribute('_py')) || 0;
+ var px = parseFloat(core.canvas.hero._px) || 0;
+ var py = parseFloat(core.canvas.hero._py) || 0;
px += originOffsetX - core.bigmap.offsetX;
py += originOffsetY - core.bigmap.offsetY;
core.control.setGameCanvasTranslate('hero', px, py);
- core.canvas.hero.canvas.setAttribute('_px', px);
- core.canvas.hero.canvas.setAttribute('_py', py);
+ core.canvas.hero._px = px;
+ core.canvas.hero._py = py;
}
////// 移动视野范围 //////
@@ -1052,7 +1032,8 @@ control.prototype.moveViewport = function (x, y, moveMode, time, callback) {
}
}, per_time);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 获得勇士面对位置的x坐标 //////
@@ -1303,15 +1284,9 @@ control.prototype.drawDamage = function (ctx) {
control.prototype._drawDamage_draw = function (ctx, onMap) {
if (!core.hasItem('book')) return;
- // 双缓冲
- var cacheCtx = core.bigmap.cacheCanvas;
- cacheCtx.canvas.width = ctx.canvas.width;
- cacheCtx.canvas.height = ctx.canvas.height;
- cacheCtx.clearRect(0, 0, cacheCtx.canvas.width, cacheCtx.canvas.height);
- if (onMap && core.bigmap.v2) cacheCtx.translate(32, 32);
- core.setFont(cacheCtx, "bold 11px Arial");
- core.setTextAlign(cacheCtx, 'left');
+ core.setFont(ctx, "bold 11px Arial");
+ core.setTextAlign(ctx, 'left');
core.status.damage.data.forEach(function (one) {
var px = one.px, py = one.py;
if (onMap && core.bigmap.v2) {
@@ -1320,10 +1295,10 @@ control.prototype._drawDamage_draw = function (ctx, onMap) {
if (px < -32 * 2 || px > core.__PIXELS__ + 32 || py < -32 || py > core.__PIXELS__ + 32)
return;
}
- core.fillBoldText(cacheCtx, one.text, px, py, one.color);
+ core.fillBoldText(ctx, one.text, px, py, one.color);
});
- core.setTextAlign(cacheCtx, 'center');
+ core.setTextAlign(ctx, 'center');
core.status.damage.extraData.forEach(function (one) {
var px = one.px, py = one.py;
if (onMap && core.bigmap.v2) {
@@ -1332,13 +1307,10 @@ control.prototype._drawDamage_draw = function (ctx, onMap) {
if (px < -32 || px > core.__PIXELS__ + 32 || py < -32 || py > core.__PIXELS__ + 32)
return;
}
- var alpha = core.setAlpha(cacheCtx, one.alpha);
- core.fillBoldText(cacheCtx, one.text, px, py, one.color);
- core.setAlpha(cacheCtx, alpha);
+ var alpha = core.setAlpha(ctx, one.alpha);
+ core.fillBoldText(ctx, one.text, px, py, one.color);
+ core.setAlpha(ctx, alpha);
});
- cacheCtx.translate(0, 0);
-
- core.drawImage(ctx, cacheCtx.canvas, onMap && core.bigmap.v2 ? -32 : 0, onMap && core.bigmap.v2 ? -32 : 0);
}
// ------ 录像相关 ------ //
@@ -1364,6 +1336,7 @@ control.prototype.startReplay = function (list) {
if (!core.isPlaying()) return;
core.status.replay.replaying=true;
core.status.replay.pausing=true;
+ core.status.replay.failed = false;
core.status.replay.speed=1.0;
core.status.replay.toReplay = core.cloneArray(list);
core.status.replay.totalList = core.status.route.concat(list);
@@ -1459,6 +1432,7 @@ control.prototype.stopReplay = function (force) {
core.status.replay.totalList = [];
core.status.replay.replaying=false;
core.status.replay.pausing=false;
+ core.status.replay.failed = false;
core.status.replay.speed=1.0;
core.status.replay.steps = 0;
core.status.replay.save = [];
@@ -1614,7 +1588,7 @@ control.prototype.isReplaying = function () {
////// 回放 //////
control.prototype.replay = function (force) {
if (!core.isPlaying() || !core.isReplaying()
- || core.status.replay.animate || core.status.event.id) return;
+ || core.status.replay.animate || core.status.event.id || core.status.replay.failed) return;
if (core.status.replay.pausing && !force) return;
this._replay_drawProgress();
if (core.status.replay.toReplay.length==0)
@@ -1656,6 +1630,7 @@ control.prototype._doReplayAction = function (action) {
control.prototype._replay_finished = function () {
core.status.replay.replaying = false;
+ core.status.replay.failed = false;
core.status.event.selection = 0;
var str = "录像播放完毕，你想退出播放吗？";
if (core.status.route.length != core.status.replay.totalList.length
@@ -1688,6 +1663,7 @@ control.prototype._replay_save = function () {
control.prototype._replay_error = function (action, callback) {
core.ui.closePanel();
core.status.replay.replaying = false;
+ core.status.replay.failed = true;
var len = core.status.replay.toReplay.length;
var prevList = core.status.replay.totalList.slice(-len - 11, -len - 1);
var nextList = core.status.replay.toReplay.slice(0, 10);
@@ -1695,6 +1671,7 @@ control.prototype._replay_error = function (action, callback) {
main.log("之前的10个操作是：\n" + prevList.toString());
main.log("接下来10个操作是：\n" + nextList.toString());
core.ui.drawConfirmBox("录像文件出错，你想回到上个节点吗？", function () {
+ core.status.replay.failed = false;
core.ui.closePanel();
if (core.status.replay.save.length > 0) {
core.status.replay.replaying = true;
@@ -1708,6 +1685,7 @@ control.prototype._replay_error = function (action, callback) {
if (callback) callback();
}
}, function () {
+ core.status.replay.failed = false;
core.ui.closePanel();
core.stopReplay(true);
if (callback) callback();
@@ -1977,6 +1955,7 @@ control.prototype.doSL = function (id, type) {
case 'reload': this._doSL_reload(id, this._doSL_load_afterGet); break;
case 'replayLoad': this._doSL_load(id, this._doSL_replayLoad_afterGet); break;
case 'replayRemain': this._doSL_load(id, this._doSL_replayRemain_afterGet); break;
+ case 'replaySince': this._doSL_load(id, this._doSL_replaySince_afterGet); break;
}
}
@@ -1988,7 +1967,11 @@ control.prototype._doSL_save = function (id) {
// 在事件中的存档
if (core.status.event.interval != null)
core.setFlag("__events__", core.status.event.interval);
- core.setLocalForage("save"+id, core.saveData(), function() {
+ var data = core.saveData();
+ if (core.isReplaying() && core.status.replay.toReplay.length > 0) {
+ data.__toReplay__ = core.encodeRoute(core.status.replay.toReplay);
+ }
+ core.setLocalForage("save"+id, data, function() {
core.saves.saveIndex = id;
core.setLocalStorage('saveIndex', core.saves.saveIndex);
// 恢复事件
@@ -1998,12 +1981,7 @@ control.prototype._doSL_save = function (id) {
core.drawTip('存档成功！');
}, function(err) {
main.log(err);
- if (core.platform.useLocalForage) {
- alert("存档失败，错误信息：\n"+err);
- }
- else {
- alert("存档失败，错误信息：\n"+err+"\n建议使用垃圾存档清理工具进行清理！");
- }
+ alert("存档失败，错误信息：\n"+err);
});
core.removeFlag("__events__");
return;
@@ -2079,30 +2057,25 @@ control.prototype._doSL_replayLoad_afterGet = function (id, data) {
if (!data) {
core.playSound('操作失败');
return core.drawTip("无效的存档");
- }
+ }
if (data.version != core.firstData.version) {
core.playSound('操作失败');
return core.drawTip("存档版本不匹配");
}
- if (data.hard != core.status.hard) {
- core.playSound('操作失败');
- return core.drawTip("游戏难度不匹配！");
- }
if (data.hero.flags.__events__ && data.guid != core.getGuid()) {
core.playSound('操作失败');
return core.drawTip("此存档可能存在风险，无法读档");
}
var route = core.subarray(core.status.route, core.decodeRoute(data.route));
- if (route == null || data.hero.flags.__seed__ != core.getFlag('__seed__')) {
+ if (route == null) {
core.playSound('操作失败');
- return core.drawTip("种子不一致，无法从此存档回放录像");
+ return core.drawTip("无法从此存档回放录像");
}
core.loadData(data, function () {
core.removeFlag('__fromLoad__');
core.startReplay(route);
core.drawTip("回退到存档节点");
});
-
}
control.prototype._doSL_replayRemain_afterGet = function (id, data) {
@@ -2135,6 +2108,16 @@ control.prototype._doSL_replayRemain_afterGet = function (id, data) {
});
}
+control.prototype._doSL_replaySince_afterGet = function (id, data) {
+ if (data.floorId != core.status.floorId || data.hero.loc.x != core.getHeroLoc('x') || data.hero.loc.y != core.getHeroLoc('y'))
+ return alert("楼层或坐标不一致！");
+ if (!data.__toReplay__) return alert('该存档没有剩余录像！');
+ core.ui.closePanel();
+ core.startReplay(core.decodeRoute(data.__toReplay__));
+ core.drawTip("播放存档剩余录像");
+ return;
+}
+
////// 同步存档到服务器 //////
control.prototype.syncSave = function (type) {
core.ui.drawWaiting("正在同步，请稍候...");
@@ -2150,7 +2133,7 @@ control.prototype._syncSave_http = function (type, saves) {
var formData = new FormData();
formData.append('type', 'save');
formData.append('name', core.firstData.name);
- formData.append('data', JSON.stringify(saves));
+ formData.append('data', LZString.compressToBase64(JSON.stringify(saves)));
formData.append('shorten', '1');
core.http("POST", "/games/sync.php", formData, function (data) {
@@ -2195,7 +2178,20 @@ control.prototype._syncLoad_http = function (id, password) {
core.http("POST", "/games/sync.php", formData, function (data) {
var response = JSON.parse(data);
if (response.code == 0) {
- core.control._syncLoad_write(JSON.parse(response.msg));
+ var msg = null;
+ try {
+ msg = JSON.parse(LZString.decompressFromBase64(response.msg));
+ } catch (e) {}
+ if (!msg) {
+ try {
+ msg = JSON.parse(response.msg);
+ } catch (e) {}
+ }
+ if (msg) {
+ core.control._syncLoad_write(msg);
+ } else {
+ core.drawText("出错啦！\n存档解析失败！");
+ }
}
else {
core.drawText("出错啦！\n无法从服务器同步存档。\n错误原因："+response.msg);
@@ -2299,19 +2295,16 @@ control.prototype.getAllSaves = function (callback) {
////// 获得所有存在存档的存档位 //////
control.prototype.getSaveIndexes = function (callback) {
var indexes = {};
- if (core.platform.useLocalForage) {
- localforage.iterate(function (value, key, n) {
+ core.keysLocalForage(function (err, keys) {
+ if (err) {
+ main.log(err);
+ return callback(indexes);
+ }
+ keys.forEach(function (key) {
core.control._getSaveIndexes_getIndex(indexes, key);
- }, function () {
- callback(indexes);
- });
- }
- else {
- Object.keys(localStorage).forEach(function (key) {
- core.control._getSaveIndexes_getIndex(indexes, key);
- });
- callback(indexes);
- }
+ });
+ callback(indexes);
+ });
}
control.prototype._getSaveIndexes_getIndex = function (indexes, name) {
@@ -2384,7 +2377,7 @@ control.prototype.getStatus = function (name) {
if (!core.status.hero) return null;
if (name == 'x' || name == 'y' || name == 'direction')
return this.getHeroLoc(name);
- if (main.mode == 'editor') {
+ if (main.mode == 'editor' && !core.hasFlag('__statistics__')) {
return data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.firstData.hero[name];
}
return core.status.hero[name];
@@ -2691,10 +2684,9 @@ control.prototype._weather_snow = function (level) {
control.prototype._weather_fog = function (level) {
if (!core.animateFrame.weather.fog) return;
- var number = level * parseInt(20*core.bigmap.width*core.bigmap.height/(core.__SIZE__*core.__SIZE__));
core.animateFrame.weather.nodes = [{
'image': core.animateFrame.weather.fog,
- 'level': number,
+ 'level': 40 * level,
'x': 0,
'y': -core.__PIXELS__ / 2,
'dx': -Math.random() * 1.5,
@@ -2705,10 +2697,9 @@ control.prototype._weather_fog = function (level) {
control.prototype._weather_cloud = function (level) {
if (!core.animateFrame.weather.cloud) return;
- var number = level * parseInt(20*core.bigmap.width*core.bigmap.height/(core.__SIZE__*core.__SIZE__));
core.animateFrame.weather.nodes = [{
'image': core.animateFrame.weather.cloud,
- 'level': number,
+ 'level': 40 * level,
'x': 0,
'y': -core.__PIXELS__ / 2,
'dx': -Math.random() * 1.5,
@@ -2752,10 +2743,16 @@ control.prototype._setCurtain_animate = function (nowColor, color, time, moveMod
time /= Math.max(core.status.replay.speed, 1)
var per_time = 10, step = 0, steps = parseInt(time / per_time);
if (steps <= 0) steps = 1;
+ var curr = nowColor;
var moveFunc = core.applyEasing(moveMode);
+
+ var cb = function () {
+ core.status.curtainColor = curr;
+ if (callback) callback();
+ }
var animate = setInterval(function() {
step++;
- var curr = [
+ curr = [
nowColor[0] + (color[0] - nowColor[0]) * moveFunc(step / steps),
nowColor[1] + (color[1] - nowColor[1]) * moveFunc(step / steps),
nowColor[2] + (color[2] - nowColor[2]) * moveFunc(step / steps),
@@ -2766,12 +2763,12 @@ control.prototype._setCurtain_animate = function (nowColor, color, time, moveMod
if (step == steps) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- core.status.curtainColor = color;
- if (core.isset(callback)) callback();
+ cb();
}
}, per_time);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
////// 画面闪烁 //////
@@ -3246,9 +3243,9 @@ control.prototype.resize = function() {
var statusDisplayArr = this._shouldDisplayStatus(), count = statusDisplayArr.length;
var statusCanvas = core.flags.statusCanvas, statusCanvasRows = core.values.statusCanvasRowsOnMobile || 3;
var col = statusCanvas ? statusCanvasRows : Math.ceil(count / 3);
- if (col > 4) {
- if (statusCanvas) alert("自绘状态栏的在竖屏下的行数应不超过4！");
- else alert("当前状态栏数目("+count+")大于12，请调整到不超过12以避免手机端出现显示问题。");
+ if (col > 5) {
+ if (statusCanvas) alert("自绘状态栏的在竖屏下的行数应不超过5！");
+ else alert("当前状态栏数目("+count+")大于15，请调整到不超过15以避免手机端出现显示问题。");
}
var globalAttribute = core.status.globalAttribute || core.initStatus.globalAttribute;
@@ -3258,7 +3255,7 @@ control.prototype.resize = function() {
CANVAS_WIDTH: CANVAS_WIDTH,
BORDER: BORDER,
BAR_WIDTH: BAR_WIDTH,
- TOOLBAR_HEIGHT: extendToolbar ? 38 : 44,
+ TOOLBAR_HEIGHT: 38,
outerSize: CANVAS_WIDTH * core.domStyle.scale + 2 * BORDER,
globalAttribute: globalAttribute,
border: '3px ' + core.arrayToRGBA(globalAttribute.borderColor) + ' solid',
@@ -3266,7 +3263,7 @@ control.prototype.resize = function() {
count: count,
col: col,
statusBarHeightInVertical: core.domStyle.isVertical ? (32 * col + 6) * core.domStyle.scale + 2 * BORDER : 0,
- toolbarHeightInVertical: core.domStyle.isVertical ? 44 * core.domStyle.scale + 2 * BORDER : 0,
+ toolbarHeightInVertical: core.domStyle.isVertical ? 38 * core.domStyle.scale + 2 * BORDER : 0,
extendToolbar: extendToolbar,
is15x15: core.__SIZE__ == 15
};
@@ -3473,7 +3470,7 @@ control.prototype._resize_tools = function (obj) {
var style = core.dom.tools[i].style;
style.height = toolsHeight + "px";
style.marginLeft = toolsMarginLeft + "px";
- style.marginTop = (obj.extendToolbar ? 3 : 6) * core.domStyle.scale + "px"
+ style.marginTop = 3 * core.domStyle.scale + "px"
}
core.dom.hard.style.lineHeight = toolsHeight + "px";
if (core.domStyle.isVertical || obj.extendToolbar) {
diff --git a/libs/core.js b/libs/core.js
index abe42f11..804cbacf 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -54,7 +54,8 @@ function core() {
'sun': null
},
"tip": null,
- "asyncId": {}
+ "asyncId": {},
+ "lastAsyncId": null
}
this.musicStatus = {
'audioContext': null, // WebAudioContext
@@ -82,7 +83,6 @@ function core() {
'isQQ': false, // 是否是QQ
'isChrome': false, // 是否是Chrome
'supportCopy': false, // 是否支持复制到剪切板
- 'useLocalForage': true,
'fileInput': null, // FileInput
'fileReader': null, // 是否支持FileReader
@@ -126,7 +126,8 @@ function core() {
"now": 0,
},
"favorite": [],
- "favoriteName": {}
+ "favoriteName": {},
+ "cache": {}
}
this.initStatus = {
'played': false,
@@ -178,6 +179,13 @@ function core() {
// 按下键的时间：为了判定双击
'downTime': null,
'ctrlDown': false,
+ 'preview': {
+ 'enabled': false,
+ 'prepareDragging': false,
+ 'dragging': false,
+ 'px': 0,
+ 'py': 0,
+ },
// 路线&回放
'route': [],
@@ -185,6 +193,7 @@ function core() {
'replaying': false,
'pausing': false,
'animate': false, // 正在某段动画中
+ 'failed': false,
'toReplay': [],
'totalList': [],
'speed': 1.0,
@@ -242,6 +251,11 @@ function core() {
this.markedFloorIds = {};
this.status = {};
this.dymCanvas = {};
+
+ if (main.mode == 'editor') {
+ document.documentElement.style.setProperty('--size', this.__SIZE__);
+ document.documentElement.style.setProperty('--pixel', this.__PIXELS__ + 'px');
+ }
}
/////////// 系统事件相关 ///////////
@@ -402,7 +416,6 @@ core.prototype._init_platform = function () {
core.platform.isSafari = /Safari/i.test(navigator.userAgent) && !/Chrome/i.test(navigator.userAgent);
core.platform.isQQ = /QQ/i.test(navigator.userAgent);
core.platform.isWeChat = /MicroMessenger/i.test(navigator.userAgent);
- this._init_checkLocalForage();
if (window.FileReader) {
core.platform.fileReader = new FileReader();
core.platform.fileReader.onload = function () {
@@ -421,37 +434,6 @@ core.prototype._init_platform = function () {
}
}
-core.prototype._init_checkLocalForage = function () {
- core.platform.useLocalForage = core.getLocalStorage('useLocalForage', true);
- var _error = function (e) {
- main.log(e);
- core.platform.useLocalForage = false;
- };
- if (core.platform.useLocalForage) {
- try {
- core.setLocalForage("__test__", lzw_encode("__test__"), function () {
- try {
- core.getLocalForage("__test__", null, function (data) {
- try {
- if (lzw_decode(data) != "__test__") {
- console.log("localForage unsupported!");
- core.platform.useLocalForage = false;
- }
- else {
- console.log("localForage supported!");
- core.removeLocalForage("__test__");
- }
- }
- catch (e) {_error(e);}
- }, _error)
- }
- catch (e) {_error(e);}
- }, _error)
- }
- catch (e) {_error(e);}
- }
-}
-
core.prototype._init_others = function () {
// 一些额外的东西
core.material.groundCanvas = document.createElement('canvas').getContext('2d');
diff --git a/libs/enemys.js b/libs/enemys.js
index 0fb5e49d..5ab31a09 100644
--- a/libs/enemys.js
+++ b/libs/enemys.js
@@ -228,13 +228,12 @@ enemys.prototype.nextCriticals = function (enemy, number, x, y, floorId) {
if (specialCriticals != null) return specialCriticals;
var info = this.getDamageInfo(enemy, null, x, y, floorId);
if (info == null) { // 如果未破防...
- var enemyInfo = this.getEnemyInfo(enemy, null, x, y, floorId);
- if (enemyInfo.def == null || enemyInfo.def < core.status.hero.atk) return [];
- // 再次尝试获得破防后伤害
- info = this.getDamageInfo(enemy, {atk: enemyInfo.def + 1}, x, y, floorId);
- if (info == null || info.mon_def != enemyInfo.def) return [];
+ var overAtk = this._nextCriticals_overAtk(enemy, x, y, floorId);
+ if (overAtk == null) return [];
+ if (typeof overAtk[1] == 'number') return [[overAtk[0], -overAtk[1]]];
+ info = overAtk[1];
info.__over__ = true;
- info.__overAtk__ = info.mon_def + 1 - core.status.hero.atk;
+ info.__overAtk__ = overAtk[0];
}
if (typeof info == 'number') return [[0,0]];
@@ -255,6 +254,26 @@ enemys.prototype.nextCriticals = function (enemy, number, x, y, floorId) {
}
}
+/// 未破防临界采用二分计算
+enemys.prototype._nextCriticals_overAtk = function (enemy, x, y, floorId) {
+ var calNext = function (currAtk, maxAtk) {
+ var start = currAtk, end = maxAtk;
+ if (start > end) return null;
+
+ while (start < end) {
+ var mid = Math.floor((start + end) / 2);
+ if (mid - start > end - mid) mid--;
+ var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": mid}, x, y, floorId);
+ if (nextInfo != null) end = mid;
+ else start = mid + 1;
+ }
+ var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": start}, x, y, floorId);
+ return nextInfo == null ? null : [start - core.status.hero.atk, nextInfo];
+ }
+ return calNext(core.status.hero.atk + 1,
+ core.getEnemyValue(enemy, 'hp', x, y, floorId) + core.getEnemyValue(enemy, 'def', x, y, floorId));
+}
+
enemys.prototype._nextCriticals_special = function (enemy, number, x, y, floorId) {
if (this.hasSpecial(enemy.special, 10) || this.hasSpecial(enemy.special, 3))
return []; // 模仿or坚固临界
@@ -266,15 +285,15 @@ enemys.prototype._nextCriticals_useLoop = function (enemy, info, number, x, y, f
var list = [];
var start_atk = hero_atk;
if (info.__over__) {
- start_atk = mon_def + 1;
+ start_atk += info.__overAtk__;
list.push([info.__overAtk__, -info.damage]);
}
for (var atk = start_atk + 1; atk <= mon_hp + mon_def; atk++) {
- var nextInfo = this.getDamageInfo(enemy, {"atk": Math.ceil(atk / core.getBuff('atk'))}, x, y, floorId);
+ var nextInfo = this.getDamageInfo(enemy, {"atk": atk}, x, y, floorId);
if (nextInfo == null || (typeof nextInfo == 'number')) break;
if (pre > nextInfo.damage) {
pre = nextInfo.damage;
- list.push([Math.ceil(atk / core.getBuff('atk')) - hero_atk, info.damage - nextInfo.damage]);
+ list.push([atk - hero_atk, info.damage - nextInfo.damage]);
if (nextInfo.damage <= 0 && !core.flags.enableNegativeDamage) break;
if (list.length >= number) break;
}
@@ -288,7 +307,7 @@ enemys.prototype._nextCriticals_useBinarySearch = function (enemy, info, number,
var list = [];
var start_atk = hero_atk;
if (info.__over__) {
- start_atk = mon_def + 1;
+ start_atk += info.__overAtk__;
list.push([info.__overAtk__, -info.damage]);
}
var calNext = function (currAtk, maxAtk) {
@@ -298,12 +317,12 @@ enemys.prototype._nextCriticals_useBinarySearch = function (enemy, info, number,
while (start < end) {
var mid = Math.floor((start + end) / 2);
if (mid - start > end - mid) mid--;
- var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": Math.ceil(mid / core.getBuff('atk'))}, x, y, floorId);
+ var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": mid}, x, y, floorId);
if (nextInfo == null || (typeof nextInfo == 'number')) return null;
if (pre > nextInfo.damage) end = mid;
else start = mid + 1;
}
- var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": Math.ceil(start / core.getBuff('atk'))}, x, y, floorId);
+ var nextInfo = core.enemys.getDamageInfo(enemy, {"atk": start}, x, y, floorId);
return nextInfo == null || (typeof nextInfo == 'number') || nextInfo.damage >= pre ? null : [start, nextInfo.damage];
}
var currAtk = start_atk;
@@ -312,7 +331,7 @@ enemys.prototype._nextCriticals_useBinarySearch = function (enemy, info, number,
if (next == null) break;
currAtk = next[0];
pre = next[1];
- list.push([Math.ceil(currAtk / core.getBuff('atk')) - hero_atk, info.damage - pre]);
+ list.push([currAtk - hero_atk, info.damage - pre]);
if (pre <= 0 && !core.flags.enableNegativeDamage) break;
if (list.length >= number) break;
}
@@ -330,7 +349,7 @@ enemys.prototype._nextCriticals_useTurn = function (enemy, info, number, x, y, f
var list = [], pre = null;
var start_atk = hero_atk;
if (info.__over__) {
- start_atk = mon_def + 1;
+ start_atk += info.__overAtk__;
list.push([info.__overAtk__, -info.damage]);
}
for (var t = turn - 1; t >= 1; t--) {
@@ -460,11 +479,15 @@ enemys.prototype._getCurrentEnemys_addEnemy = function (enemyId, enemys, used, x
e.damage = this.getDamage(enemy, x, y, floorId);
e.critical = critical[0];
e.criticalDamage = critical[1];
- var ratio = core.status.maps[floorId || core.status.floorId].ratio || 1;
- e.defDamage = this.getDefDamage(enemy, ratio, x, y, floorId);
+ e.defDamage = this._getCurrentEnemys_addEnemy_defDamage(enemy, x, y, floorId);
enemys.push(e);
}
+enemys.prototype._getCurrentEnemys_addEnemy_defDamage = function (enemy, x, y, floorId) {
+ var ratio = core.status.maps[floorId || core.status.floorId].ratio || 1;
+ return this.getDefDamage(enemy, ratio, x, y, floorId);
+}
+
enemys.prototype._getCurrentEnemys_sort = function (enemys) {
return enemys.sort(function (a, b) {
if (a.damage == b.damage) {
diff --git a/libs/events.js b/libs/events.js
index c4e9f7b2..6adca43f 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -217,7 +217,8 @@ events.prototype._gameOver_confirmDownload = function (ending) {
'seed': core.getFlag('__seed__'),
'route': core.encodeRoute(core.status.route)
}
- core.download(core.firstData.name + "_" + core.formatDate2(new Date()) + ".h5route", JSON.stringify(obj));
+ core.download(core.firstData.name + "_" + core.formatDate2(new Date()) + ".h5route",
+ LZString.compressToBase64(JSON.stringify(obj)));
core.events._gameOver_askRate(ending);
}, function () {
core.events._gameOver_askRate(ending);
@@ -422,7 +423,7 @@ events.prototype._trigger_ignoreChangeFloor = function (block) {
events.prototype._sys_battle = function (data, callback) {
// 检查是否需要改变朝向
- if (data.x == core.nextX() && data.y == core.nextY()) {
+ /* if (data.x == core.nextX() && data.y == core.nextY()) {
var dir = core.turnDirection(":back");
var id = data.event.id, toId = (data.event.faceIds || {})[dir];
if (toId && id != toId) {
@@ -430,7 +431,7 @@ events.prototype._sys_battle = function (data, callback) {
if (number > 0)
core.setBlock(number, data.x, data.y);
}
- }
+ } */
// 检查战前事件
var beforeBattle = [];
@@ -580,21 +581,28 @@ events.prototype._openDoor_animate = function (block, x, y, callback) {
blockInfo.posX = 0;
core.maps._drawBlockInfo(blockInfo, x, y);
+
+ var cb = function () {
+ core.maps._removeBlockFromMap(core.status.floorId, block);
+ if (!locked) core.unlockControl();
+ core.status.replay.animate = false;
+ core.events.afterOpenDoor(block.event.id, x, y);
+ if (callback) callback();
+ }
+
var animate = window.setInterval(function() {
blockInfo.posX++;
if (blockInfo.posX == 4) {
- core.maps._removeBlockFromMap(core.status.floorId, block);
clearInterval(animate);
delete core.animateFrame.asyncId[animate];
- if (!locked) core.unlockControl();
- core.status.replay.animate = false;
- core.events.afterOpenDoor(block.event.id, x, y);
- if (callback) callback();
+ cb();
return;
}
core.maps._drawBlockInfo(blockInfo, x, y);
}, core.status.replay.speed == 24 ? 1 : speed / Math.max(core.status.replay.speed, 1));
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
////// 开一个门后触发的事件 //////
@@ -775,6 +783,7 @@ events.prototype._changeFloor_getHeroLoc = function (floorId, stair, heroLoc) {
}
events.prototype._changeFloor_beforeChange = function (info, callback) {
+ this._changeFloor_playSound();
// 需要 setTimeout 执行，不然会出错
window.setTimeout(function () {
if (info.time == 0)
@@ -786,6 +795,16 @@ events.prototype._changeFloor_beforeChange = function (info, callback) {
}, 25)
}
+events.prototype._changeFloor_playSound = function () {
+ // 播放换层音效
+ if (core.hasFlag('__fromLoad__')) // 是否是读档造成的切换
+ core.playSound('读档');
+ else if (core.hasFlag('__isFlying__')) // 是否是楼传造成的切换
+ core.playSound('飞行器');
+ else
+ core.playSound('上下楼');
+}
+
events.prototype._changeFloor_changing = function (info, callback) {
this.changingFloor(info.floorId, info.heroLoc);
// 回归视角
@@ -984,9 +1003,10 @@ events.prototype.doAction = function () {
clearInterval(core.status.event.animateUI);
core.status.event.interval = null;
delete core.status.event.aniamteUI;
- core.clearUI();
+ if (core.status.gameOver || core.status.replay.failed) return;
// 判定是否执行完毕
if (this._doAction_finishEvents()) return;
+ core.clearUI();
var floorId = core.status.event.data.floorId || core.status.floorId;
// 当前点坐标和前缀
var x = core.status.event.data.x, y = core.status.event.data.y;
@@ -1007,8 +1027,7 @@ events.prototype.doAction = function () {
}
events.prototype._doAction_finishEvents = function () {
- if (core.status.gameOver) return true;
-
+ if (core.status.event.id != 'action') return true;
// 事件处理完毕
if (core.status.event.data.list.length == 0) {
// 检测并执行延迟自动事件
@@ -1358,12 +1377,18 @@ events.prototype._action_text = function (data, x, y, prefix) {
if (core.getContextByName(ctx) && !data.showAll) {
core.ui._animateUI('hide', ctx, function () {
core.ui.drawTextBox(data.text, data);
- core.ui._animateUI('show', ctx);
+ core.ui._animateUI('show', ctx, function () {
+ if (data.async) core.doAction();
+ });
});
return;
}
core.ui.drawTextBox(data.text, data);
- if (!data.showAll) core.ui._animateUI('show', ctx);
+ if (!data.showAll) {
+ core.ui._animateUI('show', ctx, function () {
+ if (data.async) core.doAction();
+ });
+ }
}
events.prototype._action_moveTextBox = function (data, x, y, prefix) {
@@ -1521,6 +1546,11 @@ events.prototype._action_animate = function (data, x, y, prefix) {
}
}
+events.prototype._action_stopAnimate = function (data, x, y, prefix) {
+ core.stopAnimate(null, data.doCallback);
+ core.doAction();
+}
+
events.prototype._action_setViewport = function (data, x, y, prefix) {
if (data.dxy != null) {
data.loc = [core.bigmap.offsetX / 32 + (core.calValue(data.dxy[0], prefix) || 0), core.bigmap.offsetY / 32 + (core.calValue(data.dxy[1], prefix) || 0)];
@@ -1682,12 +1712,12 @@ events.prototype._precompile_scaleImage = function (data) {
events.prototype._action_setCurtain = function (data, x, y, prefix) {
if (data.async) {
- core.setCurtain(data.color, data.time, data.moveMode);
+ core.setCurtain(data.color || core.status.thisMap.color, data.time, data.moveMode);
if (data.color == null || data.keep) core.setFlag('__color__', data.color || null);
core.doAction();
}
else {
- core.setCurtain(data.color, data.time, data.moveMode, function () {
+ core.setCurtain(data.color || core.status.thisMap.color, data.time, data.moveMode, function () {
if (data.color == null || data.keep) core.setFlag('__color__', data.color || null);
core.doAction();
});
@@ -1871,14 +1901,14 @@ events.prototype._action_addValue = function (data, x, y, prefix) {
}
events.prototype._action_setEnemy = function (data, x, y, prefix) {
- this.setEnemy(data.id, data.name, data.value, data.operator, prefix);
+ this.setEnemy(data.id, data.name, data.value, data.operator, prefix, data.norefresh);
core.doAction();
}
events.prototype._action_setEnemyOnPoint = function (data, x, y, prefix) {
var loc = this.__action_getLoc2D(data.loc, x, y, prefix);
loc.forEach(function (one) {
- core.setEnemyOnPoint(one[0], one[1], data.floorId, data.name, data.value, data.operator, prefix);
+ core.setEnemyOnPoint(one[0], one[1], data.floorId, data.name, data.value, data.operator, prefix, data.norefresh);
});
core.doAction();
}
@@ -1886,7 +1916,7 @@ events.prototype._action_setEnemyOnPoint = function (data, x, y, prefix) {
events.prototype._action_resetEnemyOnPoint = function (data, x, y, prefix) {
var loc = this.__action_getLoc2D(data.loc, x, y, prefix);
loc.forEach(function (one) {
- core.resetEnemyOnPoint(one[0], one[1], data.floorId);
+ core.resetEnemyOnPoint(one[0], one[1], data.floorId, data.norefresh);
});
core.doAction();
}
@@ -1905,7 +1935,7 @@ events.prototype._action_moveEnemyOnPoint = function (data, x, y, prefix) {
} else {
to = this.__action_getLoc(data.to, x, y, prefix);
}
- this.moveEnemyOnPoint(from[0], from[1], to[0], to[1], data.floorId);
+ this.moveEnemyOnPoint(from[0], from[1], to[0], to[1], data.floorId, data.norefresh);
core.doAction();
}
@@ -2037,9 +2067,7 @@ events.prototype._action_choices = function (data, x, y, prefix) {
var action = core.status.replay.toReplay.shift();
if (action.indexOf('choices:') == 0 && !(action == 'choices:none' && !data.timeout)) {
var index = action.substring(8);
- if (index == 'none' || ((index = parseInt(index)) >= 0) && index % 100 < data.choices.length) {
- this.__action_choices_replaying(data, index);
- } else {
+ if (!this.__action_choices_replaying(data, index)) {
core.control._replay_error(action);
return;
}
@@ -2057,7 +2085,7 @@ events.prototype._action_choices = function (data, x, y, prefix) {
return;
}
if (action != 'choices:none') core.status.replay.toReplay.unshift(action); // 首先归还刚才读出的下一步操作
- core.events.__action_choices_replaying(data, core.clamp(parseInt(value), 0, data.choices.length - 1))
+ core.events.__action_choices_replaying(data, ((parseInt(value) || 0) + data.choices.length) % data.choices.length);
});
}
}
@@ -2080,17 +2108,24 @@ events.prototype._action_choices = function (data, x, y, prefix) {
}
events.prototype.__action_choices_replaying = function (data, index) {
+ var selection = index;
if (index != 'none') {
- var timeout = Math.floor(index / 100) || 0;
+ selection = parseInt(index);
+ if (isNaN(selection)) return false;
+ if (selection < 0) selection += data.choices.length;
+ if (selection < 0) return false;
+ if (selection % 100 > 50) selection += data.choices.length;
+ if (selection % 100 > data.choices.length) return false;
+ var timeout = Math.floor(selection / 100) || 0;
core.setFlag('timeout', timeout);
- index %= 100;
+ selection %= 100;
} else core.setFlag('timeout', 0);
- core.status.event.selection = index;
+ core.status.event.selection = selection;
setTimeout(function () {
core.status.route.push("choices:"+index);
- if (index != 'none') {
+ if (selection != 'none') {
// 检查
- var choice = data.choices[index];
+ var choice = data.choices[selection];
if (choice.need != null && choice.need != '' && !core.calValue(choice.need)) {
// 无法选择此项
core.control._replay_error("无法选择项："+index);
@@ -2101,6 +2136,7 @@ events.prototype.__action_choices_replaying = function (data, index) {
}
core.doAction();
}, core.status.replay.speed == 24 ? 1 : 750 / Math.max(1, core.status.replay.speed));
+ return true;
}
events.prototype._precompile_choices = function (data) {
@@ -2339,22 +2375,22 @@ events.prototype._action_hideStatusBar = function (data, x, y, prefix) {
}
events.prototype._action_showHero = function (data, x, y, prefix) {
- data.time = data.time || 0;
- if (data.time > 0) {
- this.__action_doAsyncFunc(data.async, core.triggerHero, 'show', data.time);
- } else {
- core.removeFlag('hideHero');
- core.drawHero();
- core.doAction();
- }
+ data.opacity = 1;
+ return this._action_setHeroOpacity(data, x, y, prefix);
}
events.prototype._action_hideHero = function (data, x, y, prefix) {
+ data.opacity = 0;
+ return this._action_setHeroOpacity(data, x, y, prefix);
+}
+
+events.prototype._action_setHeroOpacity = function (data, x, y, prefix) {
data.time = data.time || 0;
+ if (data.opacity == null) data.opacity = 1;
if (data.time > 0) {
- this.__action_doAsyncFunc(data.async, core.triggerHero, 'hide', data.time);
+ this.__action_doAsyncFunc(data.async, core.setHeroOpacity, data.opacity, data.moveMode, data.time);
} else {
- core.setFlag('hideHero', true);
+ core.setFlag('__heroOpacity__', data.opacity);
core.drawHero();
core.doAction();
}
@@ -2501,6 +2537,11 @@ events.prototype._action_waitAsync = function (data, x, y, prefix) {
}, 50 / core.status.replay.speed);
}
+events.prototype._action_stopAsync = function (data, x, y, prefix) {
+ core.stopAsync();
+ core.doAction();
+}
+
events.prototype._action_callBook = function (data, x, y, prefix) {
if (core.isReplaying() || !core.hasItem('book')) {
core.doAction();
@@ -2878,6 +2919,19 @@ events.prototype.hasAsync = function () {
return Object.keys(core.animateFrame.asyncId).length > 0;
}
+////// 立刻停止所有异步事件 //////
+events.prototype.stopAsync = function () {
+ var callbacks = [];
+ for (var id in core.animateFrame.asyncId) {
+ clearInterval(id);
+ callbacks.push(core.animateFrame.asyncId[id]);
+ }
+ core.animateFrame.asyncId = {};
+ callbacks.forEach(function (cb) {
+ if (cb && cb instanceof Function) cb();
+ });
+}
+
events.prototype.hasAsyncAnimate = function () {
return (core.status.animateObjs || []).length > 0;
}
@@ -2980,7 +3034,7 @@ events.prototype._setValue_setGlobal = function (name, value) {
}
////// 设置一个怪物属性 //////
-events.prototype.setEnemy = function (id, name, value, operator, prefix) {
+events.prototype.setEnemy = function (id, name, value, operator, prefix, norefresh) {
if (!core.hasFlag('enemyInfo')) {
core.setFlag('enemyInfo', {});
}
@@ -2990,11 +3044,11 @@ events.prototype.setEnemy = function (id, name, value, operator, prefix) {
value = this._updateValueByOperator(core.calValue(value, prefix), (core.material.enemys[id]||{})[name], operator);
enemyInfo[id][name] = value;
(core.material.enemys[id]||{})[name] = core.clone(value);
- core.updateStatusBar();
+ if (!norefresh) core.updateStatusBar();
}
////// 设置某个点上的怪物属性 //////
-events.prototype.setEnemyOnPoint = function (x, y, floorId, name, value, operator, prefix) {
+events.prototype.setEnemyOnPoint = function (x, y, floorId, name, value, operator, prefix, norefresh) {
floorId = floorId || core.status.floorId;
var block = core.getBlock(x, y, floorId);
if (block == null) return;
@@ -3007,22 +3061,22 @@ events.prototype.setEnemyOnPoint = function (x, y, floorId, name, value, operato
flags.enemyOnPoint[floorId] = flags.enemyOnPoint[floorId] || {};
flags.enemyOnPoint[floorId][x+","+y] = flags.enemyOnPoint[floorId][x+","+y] || {};
flags.enemyOnPoint[floorId][x+","+y][name] = value;
- core.updateStatusBar();
+ if (!norefresh) core.updateStatusBar();
}
////// 重置某个点上的怪物属性 //////
-events.prototype.resetEnemyOnPoint = function (x, y, floorId) {
+events.prototype.resetEnemyOnPoint = function (x, y, floorId, norefresh) {
delete ((flags.enemyOnPoint||{})[floorId||core.status.floorId]||{})[x+","+y];
- core.updateStatusBar();
+ if (!norefresh) core.updateStatusBar();
}
////// 将某个点上已经设置的怪物属性移动到其他点 //////
-events.prototype.moveEnemyOnPoint = function (fromX, fromY, toX, toY, floorId) {
+events.prototype.moveEnemyOnPoint = function (fromX, fromY, toX, toY, floorId, norefresh) {
floorId = floorId || core.status.floorId;
if (((flags.enemyOnPoint||{})[floorId]||{})[fromX+","+fromY]) {
flags.enemyOnPoint[floorId][toX+","+toY] = flags.enemyOnPoint[floorId][fromX+","+fromY];
delete flags.enemyOnPoint[floorId][fromX+","+fromY];
- core.updateStatusBar();
+ if (!norefresh) core.updateStatusBar();
}
}
@@ -3067,7 +3121,7 @@ events.prototype.setGlobalFlag = function (name, value) {
core.setFlag("globalFlags", flags);
core.resize();
if (name == 'blurFg')
- core.drawMap();
+ core.redrawMap();
}
////// 设置文件别名 //////
@@ -3143,7 +3197,9 @@ events.prototype._moveTextBox_moving = function (ctx, moveInfo, callback) {
if (callback) callback();
}
}, 10);
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 清除对话框 //////
@@ -3191,19 +3247,25 @@ events.prototype.closeDoor = function (x, y, id, callback) {
blockInfo.posX = 3;
core.maps._drawBlockInfo(blockInfo, x, y);
+ var cb = function () {
+ core.setBlock(id, x, y);
+ core.showBlock(x, y);
+ if (callback) callback();
+ }
+
var animate = window.setInterval(function () {
blockInfo.posX--;
if (blockInfo.posX < 0) {
clearInterval(animate);
delete core.animateFrame.asyncId[animate];
- core.setBlock(id, x, y);
- core.showBlock(x, y);
- if (callback) callback();
+ cb();
return;
}
core.maps._drawBlockInfo(blockInfo, x, y);
}, core.status.replay.speed == 24 ? 1 : speed / Math.max(core.status.replay.speed, 1));
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
////// 显示图片 //////
@@ -3307,13 +3369,14 @@ events.prototype._moveImage_moving = function (name, moveInfo, callback) {
core.setOpacity(name, currOpacity);
core.relocateCanvas(name, currX, currY);
if (step == steps) {
- core.setOpacity(name, toOpacity);
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
if (callback) callback();
}
}, per_time);
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 旋转图片 //////
@@ -3356,8 +3419,9 @@ events.prototype._rotateImage_rotating = function (name, rotateInfo, callback) {
if (callback) callback();
}
}, per_time);
- core.animateFrame.asyncId[animate] = true;
-
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 放缩一张图片 //////
@@ -3416,7 +3480,9 @@ events.prototype._scaleImage_scale = function (ctx, scaleInfo, callback) {
if (callback) callback();
}
}, per_time);
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 绘制或取消一张gif图片 //////
@@ -3454,16 +3520,18 @@ events.prototype.setVolume = function (value, time, callback) {
time /= Math.max(core.status.replay.speed, 1);
var per_time = 10, step = 0, steps = parseInt(time / per_time);
if (steps <= 0) steps = 1;
- var fade = setInterval(function () {
+ var animate = setInterval(function () {
step++;
set(currVolume + (value - currVolume) * step / steps);
if (step >= steps) {
- delete core.animateFrame.asyncId[fade];
- clearInterval(fade);
+ delete core.animateFrame.asyncId[animate];
+ clearInterval(animate);
if (callback) callback();
}
}, per_time);
- core.animateFrame.asyncId[fade] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 画面震动 //////
@@ -3476,6 +3544,13 @@ events.prototype.vibrate = function (direction, time, speed, power, callback) {
speed = speed || 10;
power = power || 10;
var shakeInfo = {duration: parseInt(time / 10), speed: speed, power: power, direction: 1, shake: 0};
+ if (direction == 'random') {
+ direction = ['horizontal', 'vertical', 'diagonal1', 'diagonal2'][Math.floor(Math.random() * 4)];
+ }
+ var cb = function () {
+ core.addGameCanvasTranslate(0, 0);
+ if (callback) callback();
+ }
var animate = setInterval(function () {
core.events._vibrate_update(shakeInfo);
switch (direction) {
@@ -3487,11 +3562,12 @@ events.prototype.vibrate = function (direction, time, speed, power, callback) {
if (shakeInfo.duration === 0 && shakeInfo.shake == 0) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- if (callback) callback();
+ cb();
}
}, 10);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
events.prototype._vibrate_update = function (shakeInfo) {
@@ -3525,13 +3601,17 @@ events.prototype.eventMoveHero = function(steps, time, callback) {
});
core.status.heroMoving = -1;
var _run = function () {
+ var cb = function () {
+ core.status.heroMoving = 0;
+ core.drawHero();
+ if (callback) callback();
+ }
+
var animate=window.setInterval(function() {
if (moveSteps.length==0) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- core.status.heroMoving = 0;
- core.drawHero();
- if (callback) callback();
+ cb();
}
else {
if (step == 0 && moveSteps[0][0] == 'speed' && moveSteps[0][1] >= 16) {
@@ -3546,7 +3626,8 @@ events.prototype.eventMoveHero = function(steps, time, callback) {
}
}, core.status.replay.speed == 24 ? 1 : time / 8 / core.status.replay.speed);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
_run();
}
@@ -3601,15 +3682,27 @@ events.prototype.jumpHero = function (ex, ey, time, callback) {
}
events.prototype._jumpHero_doJump = function (jumpInfo, callback) {
+ var cb = function () {
+ core.setHeroLoc('x', jumpInfo.ex);
+ core.setHeroLoc('y', jumpInfo.ey);
+ core.status.heroMoving = 0;
+ core.drawHero();
+ if (callback) callback();
+ }
+
core.status.heroMoving = -1;
var animate = window.setInterval(function () {
if (jumpInfo.jump_count > 0)
core.events._jumpHero_jumping(jumpInfo)
- else
- core.events._jumpHero_finished(animate, jumpInfo.ex, jumpInfo.ey, callback);
+ else {
+ delete core.animateFrame.asyncId[animate];
+ clearInterval(animate);
+ cb();
+ }
}, jumpInfo.per_time);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
events.prototype._jumpHero_jumping = function (jumpInfo) {
@@ -3621,16 +3714,6 @@ events.prototype._jumpHero_jumping = function (jumpInfo) {
core.drawHero('stop', { x: nowx - 32 * x, y: nowy - 32 * y });
}
-events.prototype._jumpHero_finished = function (animate, ex, ey, callback) {
- delete core.animateFrame.asyncId[animate];
- clearInterval(animate);
- core.setHeroLoc('x', ex);
- core.setHeroLoc('y', ey);
- core.status.heroMoving = 0;
- core.drawHero();
- if (callback) callback();
-}
-
////// 设置角色行走图 //////
events.prototype.setHeroIcon = function (name, noDraw) {
name = core.getMappedName(name);
diff --git a/libs/loader.js b/libs/loader.js
index 1395d34f..8ca0868f 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -305,6 +305,22 @@ loader.prototype.loadImagesFromZip = function (url, names, toSave, onprogress, o
loader.prototype._loadAnimates_sync = function () {
this._setStartLoadTipText("正在加载动画文件...");
+ if (main.supportBunch) {
+ if (core.animates.length > 0) {
+ core.http('GET', '__all_animates__?v=' + main.version + '&id=' + core.animates.join(','), null, function (content) {
+ var u = content.split('@@@~~~###~~~@@@');
+ for (var i = 0; i < core.animates.length; ++i) {
+ if (u[i] != '') {
+ core.material.animates[core.animates[i]] = core.loader._loadAnimate(u[i]);
+ } else {
+ console.error('无法找到动画文件' + core.animates[i] + '！');
+ }
+ }
+ }, "text/plain; charset=x-user-defined");
+ }
+ return;
+ }
+
core.animates.forEach(function (t) {
core.http('GET', 'project/animates/' + t + ".animate?v=" + main.version, null, function (content) {
core.material.animates[t] = core.loader._loadAnimate(content);
diff --git a/libs/maps.js b/libs/maps.js
index 3ec3c198..091c562a 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -385,7 +385,7 @@ maps.prototype.setBlockOpacity = function (opacity, x, y, floorId) {
block.opacity = opacity;
if (floorId == core.status.floorId && !block.disable) {
if (block.event.cls == 'autotile') {
- core.drawMap();
+ core.redrawMap();
} else {
core.drawBlock(block);
core.addGlobalAnimate(block);
@@ -416,7 +416,7 @@ maps.prototype.setBlockFilter = function (filter, x, y, floorId) {
block.filter = core.clone(filter);
if (floorId == core.status.floorId && !block.disable) {
if (block.event.cls == 'autotile') {
- core.drawMap();
+ core.redrawMap();
} else {
core.drawBlock(block);
core.addGlobalAnimate(block);
@@ -968,10 +968,9 @@ maps.prototype._getBigImageInfo = function (bigImage, face, animate) {
}
var dx, dy;
switch (face) {
- case "down": dx = 16 - per_width / 2; dy = 32 - per_height; break;
- case "left": dx = 0; dy = 16 - per_height / 2; break;
- case "right": dx = 32 - per_width; dy = 16 - per_height / 2; break;
- case "up": dx = 16 - per_width / 2; dy = 0; break;
+ case "down": case "up": case "left": case "right": dx = 16 - per_width / 2; dy = 32 - per_height; break;
+ // case "left": dx = 0; dy = 32 - per_height; break;
+ // case "right": dx = 32 - per_width; dy = 32 - per_height; break;
}
return {sx: sx, sy: sy, per_width: per_width, per_height: per_height, face: face, dx: dx, dy: dy};
@@ -1034,43 +1033,36 @@ maps.prototype._drawBlockInfo_bigImage = function (blockInfo, x, y, ctx) {
var dx = bigImageInfo.dx, dy = bigImageInfo.dy;
switch (bigImageInfo.face) {
- case "down":
- core.createCanvas(header, px + dx, py + dy, per_width, per_height - 32, 51);
+ case "down": case "up": case "left": case "right":
+ core.createCanvas(header, px + dx, py + dy, per_width, -dy, 51);
this._drawBlockInfo_drawWithFilter(blockInfo, header, function () {
- core.drawImage(header, bigImage, sx, sy, per_width, per_height - 32, 0, 0, per_width, per_height - 32);
+ core.drawImage(header, bigImage, sx, sy, per_width, -dy, 0, 0, per_width, -dy);
});
core.createCanvas(body, px + dx, py, per_width, 32, 31);
this._drawBlockInfo_drawWithFilter(blockInfo, body, function () {
- core.drawImage(body, bigImage, sx, sy + per_height - 32, per_width, 32, 0, 0, per_width, 32);
+ core.drawImage(body, bigImage, sx, sy - dy, per_width, 32, 0, 0, per_width, 32);
})
break;
- case "left":
- core.createCanvas(header, px + dx, py + dy, per_width, per_height / 2 - 16, 51);
+ /*case "left":
+ core.createCanvas(header, px + dx, py + dy, per_width, -dy, 51);
this._drawBlockInfo_drawWithFilter(blockInfo, header, function () {
- core.drawImage(header, bigImage, sx, sy, per_width, per_height / 2 - 16, 0, 0, per_width, per_height / 2 - 16);
+ core.drawImage(header, bigImage, sx, sy, per_width, -dy, 0, 0, per_width, -dy);
});
- core.createCanvas(body, px + dx, py, per_width, per_height / 2 + 16, 31);
+ core.createCanvas(body, px + dx, py, per_width, 32, 31);
this._drawBlockInfo_drawWithFilter(blockInfo, body, function () {
- core.drawImage(body, bigImage, sx, sy + per_height / 2 - 16, per_width, per_height / 2 + 16, 0, 0, per_width, per_height / 2 + 16);
+ core.drawImage(body, bigImage, sx, sy - dy, per_width, 32, 0, 0, per_width, 32);
});
break;
case "right":
- core.createCanvas(header, px + dx, py + dy, per_width, per_height / 2 - 16, 51);
+ core.createCanvas(header, px + dx, py + dy, per_width, -dy, 51);
this._drawBlockInfo_drawWithFilter(blockInfo, header, function () {
- core.drawImage(header, bigImage, sx, sy, per_width, per_height / 2 - 16, 0, 0, per_width, per_height / 2 - 16);
+ core.drawImage(header, bigImage, sx, sy, per_width, -dy, 0, 0, per_width, -dy);
});
core.createCanvas(body, px + dx, py, per_width, per_height / 2 + 16, 31);
this._drawBlockInfo_drawWithFilter(blockInfo, body, function () {
- core.drawImage(body, bigImage, sx, sy + per_height / 2 - 16, per_width, per_height / 2 + 16, 0, 0, per_width, per_height / 2 + 16);
+ core.drawImage(body, bigImage, sx, sy - dy, per_width, 32, 0, 0, per_width, 32);
});
- break;
- case "up":
- core.deleteCanvas(header);
- core.createCanvas(body, px + dx, py, per_width, per_height, 31);
- this._drawBlockInfo_drawWithFilter(blockInfo, body, function () {
- core.drawImage(body, bigImage, sx, sy, per_width, per_height, 0, 0, per_width, per_height);
- });
- break;
+ break;*/
}
if (core.dymCanvas[header]) {
core.dymCanvas[header].canvas.setAttribute('_ox', 32 * x + dx);
@@ -1684,25 +1676,28 @@ maps.prototype._makeAutotileEdges = function () {
ctx.msImageSmoothingEnabled = false;
ctx.imageSmoothingEnabled = false;
+ var first = {}, second = {};
autotileIds.forEach(function (t) {
var n = core.maps.getNumberById(t);
- core.material.autotileEdges[n] = [n];
-
core.clearMap(ctx, 0, 0, 32, 32);
core.drawImage(ctx, core.material.images.autotile[t], 0, 0, 32, 32, 0, 0, 32, 32);
- var data = canvas.toDataURL("image/png");
+ first[n] = canvas.toDataURL("image/png");
+ core.clearMap(ctx, 0, 0, 32, 32);
+ core.drawImage(ctx, core.material.images.autotile[t], 32, 0, 32, 32, 0, 0, 32, 32);
+ second[n] = canvas.toDataURL("image/png");
+ });
- autotileIds.forEach(function (t2) {
- if (t == t2) return;
- var n2 = core.maps.getNumberById(t2);
-
- core.clearMap(ctx, 0, 0, 32, 32);
- core.drawImage(ctx, core.material.images.autotile[t2], 32, 0, 32, 32, 0, 0, 32, 32);
- if (data == canvas.toDataURL("image/png")) {
+ for (var n in first) {
+ n = parseInt(n);
+ core.material.autotileEdges[n] = [n];
+ for (var n2 in second) {
+ n2 = parseInt(n2);
+ if (n == n2) continue;
+ if (first[n] == second[n2]) {
core.material.autotileEdges[n].push(n2);
}
- });
- });
+ }
+ }
}
////// 绘制缩略图 //////
@@ -1785,8 +1780,9 @@ maps.prototype._drawThumbnail_realDrawTempCanvas = function (floorId, blocks, op
options.heroIcon = core.getMappedName(options.heroIcon);
var icon = core.material.icons.hero[options.heroLoc.direction];
var height = core.material.images.images[options.heroIcon].height / 4;
- core.drawImage(options.ctx, core.material.images.images[options.heroIcon], icon.stop * 32, icon.loc * height, 32, height,
- 32 * options.heroLoc.x, 32 * options.heroLoc.y + 32 - height, 32, height);
+ var width = core.material.images.images[options.heroIcon].width || 32;
+ core.drawImage(options.ctx, core.material.images.images[options.heroIcon], icon.stop * width, icon.loc * height, width, height,
+ 32 * options.heroLoc.x + 32 - width, 32 * options.heroLoc.y + 32 - height, width, height);
}
// 缩略图：前景
this.drawFg(floorId, options);
@@ -2054,7 +2050,7 @@ maps.prototype.showBlock = function (x, y, floorId) {
// 在本层，添加动画
if (floorId == core.status.floorId) {
if (block.event.cls == 'autotile') {
- core.drawMap();
+ core.redrawMap();
} else {
core.drawBlock(block);
core.addGlobalAnimate(block);
@@ -2104,7 +2100,7 @@ maps.prototype._removeBlockFromMap = function (floorId, block) {
if (floorId != core.status.floorId) return;
var filter = block.filter || {};
if (block.event.cls == 'autotile' || filter.blur > 0 || filter.shadow > 0) {
- core.drawMap();
+ core.redrawMap();
} else {
var x = block.x, y = block.y;
var px = 32 * x - core.bigmap.posX * 32;
@@ -2193,7 +2189,7 @@ maps.prototype._triggerBgFgMap = function (type, name, loc, floorId, callback) {
core.status[name + "maps"][floorId] = null;
if (floorId == core.status.floorId) {
- core.drawMap(floorId);
+ core.redrawMap();
}
if (callback) callback();
}
@@ -2225,7 +2221,7 @@ maps.prototype._triggerFloorImage = function (type, loc, floorId, callback) {
})
if (floorId == core.status.floorId) {
- core.drawMap(floorId);
+ core.redrawMap();
}
if (callback) callback();
}
@@ -2264,7 +2260,7 @@ maps.prototype.setBlock = function (number, x, y, floorId) {
if (floorId == core.status.floorId) {
// 有任何一个是autotile直接重绘地图
if ((originEvent != null && originEvent.cls == 'autotile') || block.event.cls == 'autotile') {
- core.drawMap();
+ core.redrawMap();
} else {
if (originEvent != null) {
this._removeBlockFromMap(floorId, {x: x, y: y, event: originEvent});
@@ -2415,7 +2411,7 @@ maps.prototype.replaceBlock = function (fromNumber, toNumber, floorId) {
this._updateMapArray(floorId, block.x, block.y);
}
}, this);
- if (floorId == core.status.floorId) core.drawMap();
+ if (floorId == core.status.floorId) core.redrawMap();
}
////// 改变前景背景的图块 //////
@@ -2461,7 +2457,7 @@ maps.prototype.resetMap = function (floorId) {
delete (core.status.mapBlockObjs || {})[t];
if (t == core.status.floorId) needRefresh = true;
});
- if (needRefresh) this.drawMap();
+ if (needRefresh) this.redrawMap();
core.drawTip("地图重置成功");
}
@@ -2522,7 +2518,18 @@ maps.prototype._moveDetachedBlock = function (blockInfo, nowX, nowY, opacity, ca
}
if (bodyCanvas) {
if (blockInfo.bigImage) {
- var bigImageInfo = this._getBigImageInfo(blockInfo.bigImage, blockInfo.face, blockInfo.posX);
+ var face = blockInfo.face;
+ if (!blockInfo.faceIds) face = 'down';
+ else if (!blockInfo.faceIds[face]) {
+ // 维持此时朝向
+ face = 'down';
+ for (var f in blockInfo.faceIds) {
+ if (blockInfo.faceIds[f] == blockInfo.id) {
+ face = f;
+ }
+ }
+ }
+ var bigImageInfo = this._getBigImageInfo(blockInfo.bigImage, face, blockInfo.posX);
var per_width = bigImageInfo.per_width, per_height = bigImageInfo.per_height;
core.dymCanvas[bodyCanvas].clearRect(0, 0, bigImageInfo.per_width, bigImageInfo.per_height);
core.dymCanvas[bodyCanvas].drawImage(blockInfo.bigImage, bigImageInfo.sx, bigImageInfo.sy, per_width, per_height, 0, 0, per_width, per_height);
@@ -2586,6 +2593,17 @@ maps.prototype.moveBlock = function (x, y, steps, time, keep, callback) {
maps.prototype._moveBlock_doMove = function (blockInfo, canvases, moveInfo, callback) {
var animateTotal = blockInfo.animate, animateTime = 0;
var _run = function () {
+ var cb = function () {
+ core.maps._deleteDetachedBlock(canvases);
+ // 不消失
+ if (moveInfo.keep) {
+ core.setBlock(blockInfo.number, moveInfo.x, moveInfo.y);
+ core.showBlock(moveInfo.x, moveInfo.y);
+ core.moveEnemyOnPoint(moveInfo.sx, moveInfo.sy, moveInfo.x, moveInfo.y);
+ }
+ if (callback) callback();
+ }
+
var animate = window.setInterval(function () {
if (blockInfo.cls != 'tileset') {
animateTime += moveInfo.per_time;
@@ -2603,9 +2621,11 @@ maps.prototype._moveBlock_doMove = function (blockInfo, canvases, moveInfo, call
else core.maps._moveBlock_moving(blockInfo, canvases, moveInfo);
}
else
- core.maps._moveJumpBlock_finished(blockInfo, canvases, moveInfo, animate, callback);
+ core.maps._moveJumpBlock_finished(blockInfo, canvases, moveInfo, animate, cb);
}, moveInfo.per_time);
- core.animateFrame.asyncId[animate] = true;
+
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
_run();
}
@@ -2719,14 +2739,26 @@ maps.prototype.__generateJumpInfo = function (sx, sy, ex, ey, time) {
}
maps.prototype._jumpBlock_doJump = function (blockInfo, canvases, jumpInfo, callback) {
+ var cb = function () {
+ core.maps._deleteDetachedBlock(canvases);
+ // 不消失
+ if (jumpInfo.keep) {
+ core.setBlock(blockInfo.number, jumpInfo.ex, jumpInfo.ey);
+ core.showBlock(jumpInfo.ex, jumpInfo.ey);
+ core.moveEnemyOnPoint(jumpInfo.sx, jumpInfo.sy, jumpInfo.ex, jumpInfo.ey);
+ }
+ if (callback) callback();
+ }
+
var animate = window.setInterval(function () {
if (jumpInfo.jump_count > 0)
core.maps._jumpBlock_jumping(blockInfo, canvases, jumpInfo)
else
- core.maps._moveJumpBlock_finished(blockInfo, canvases, jumpInfo, animate, callback);
+ core.maps._moveJumpBlock_finished(blockInfo, canvases, jumpInfo, animate, cb);
}, jumpInfo.per_time);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
maps.prototype.__updateJumpInfo = function (jumpInfo) {
@@ -2743,20 +2775,13 @@ maps.prototype._jumpBlock_jumping = function (blockInfo, canvases, jumpInfo) {
core.maps._moveDetachedBlock(blockInfo, jumpInfo.px, jumpInfo.py, jumpInfo.opacity, canvases);
}
-maps.prototype._moveJumpBlock_finished = function (blockInfo, canvases, info, animate, callback) {
+maps.prototype._moveJumpBlock_finished = function (blockInfo, canvases, info, animate, cb) {
if (info.keep) info.opacity = 0;
else info.opacity -= 0.06;
if (info.opacity <= 0) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- this._deleteDetachedBlock(canvases);
- // 不消失
- if (info.keep) {
- core.setBlock(blockInfo.number, info.x, info.y);
- core.showBlock(info.x, info.y);
- core.moveEnemyOnPoint(info.sx, info.sy, info.x, info.y);
- }
- if (callback) callback();
+ cb();
}
else {
this._moveDetachedBlock(blockInfo, info.px, info.py, info.opacity, canvases);
@@ -2784,30 +2809,35 @@ maps.prototype.animateBlock = function (loc, type, time, callback) {
maps.prototype._animateBlock_doAnimate = function (loc, list, type, time, callback) {
var step = 0, steps = Math.max(parseInt(time / 10), 1);
+ var cb = function () {
+ list.forEach(function (t) {
+ if (t.blockInfo)
+ core.maps._deleteDetachedBlock(t.canvases);
+ });
+ loc.forEach(function (t) {
+ if (type == 'show') core.showBlock(t[0], t[1]);
+ else if (type == 'hide') core.hideBlock(t[0], t[1]);
+ else if (type == 'remove') core.removeBlock(t[0], t[1]);
+ else {
+ core.setBlockOpacity(type, t[0], t[1]);
+ core.showBlock(t[0], t[1]);
+ }
+ });
+ if (callback) callback();
+ }
+
var animate = setInterval(function () {
step++;
core.maps._animateBlock_drawList(list, step / steps);
if (step == steps) {
delete core.animateFrame.asyncId[animate];
clearInterval(animate);
- list.forEach(function (t) {
- if (t.blockInfo)
- core.maps._deleteDetachedBlock(t.canvases);
- });
- loc.forEach(function (t) {
- if (type == 'show') core.showBlock(t[0], t[1]);
- else if (type == 'hide') core.hideBlock(t[0], t[1]);
- else if (type == 'remove') core.removeBlock(t[0], t[1]);
- else {
- core.setBlockOpacity(type, t[0], t[1]);
- core.showBlock(t[0], t[1]);
- }
- });
- if (callback) callback();
+ cb();
}
}, 10);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = cb;
}
maps.prototype._animateBlock_getList = function (loc, type) {
@@ -3028,7 +3058,7 @@ maps.prototype._drawAnimateFrame = function (name, animate, centerX, centerY, in
maps.prototype.stopAnimate = function (id, doCallback) {
for (var i = 0; i < core.status.animateObjs.length; i++) {
var obj = core.status.animateObjs[i];
- if (obj.id == id) {
+ if (id == null || obj.id == id) {
if (doCallback) {
(function (callback) {
setTimeout(function () {
@@ -3038,7 +3068,7 @@ maps.prototype.stopAnimate = function (id, doCallback) {
}
}
}
- core.status.animateObjs = core.status.animateObjs.filter(function (x) { return x.id != id });
+ core.status.animateObjs = core.status.animateObjs.filter(function (x) { return id != null && x.id != id });
if (core.status.animateObjs.length == 0)
core.clearMap('animate');
}
diff --git a/libs/ui.js b/libs/ui.js
index a359e5a4..4f552203 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -1463,7 +1463,7 @@ ui.prototype.drawTextBox = function(content, config) {
// Step 5: 绘制正文
var config = this.drawTextContent(config.ctx || 'ui', content, {
left: hPos.content_left, top: content_top, maxWidth: hPos.validWidth,
- lineHeight: vPos.lineHeight, time: (config.showAll || textAttribute.time<=0 || core.status.event.id!='action')?0:textAttribute.time
+ lineHeight: vPos.lineHeight, time: (config.showAll || config.async || textAttribute.time<=0 || core.status.event.id!='action')?0:textAttribute.time
});
// Step 6: 绘制光标
@@ -1683,7 +1683,8 @@ ui.prototype._drawScrollText_animate = function (ctx, time, callback) {
core.drawImage('ui', ctx.canvas, 0, currH);
}, per_time);
- core.animateFrame.asyncId[animate] = true;
+ core.animateFrame.lastAsyncId = animate;
+ core.animateFrame.asyncId[animate] = callback;
}
////// 文本图片化 //////
@@ -2031,7 +2032,7 @@ ui.prototype._drawReplay = function () {
core.status.event.id = 'replay';
core.playSound('打开界面');
this.drawChoices(null, [
- "从头回放录像", "从存档开始回放", "接续播放剩余录像", "选择录像文件", "下载当前录像", "返回游戏"
+ "从头回放录像", "从存档开始回放", "接续播放剩余录像", "播放存档剩余录像", "选择录像文件", "下载当前录像", "返回游戏"
]);
}
@@ -2069,6 +2070,7 @@ ui.prototype._drawCursor = function () {
if (automaticRoute.cursorY == null)
automaticRoute.cursorY = core.getHeroLoc('y');
automaticRoute.cursorX = core.clamp(automaticRoute.cursorX, 0, this.LAST);
+ automaticRoute.cursorY = core.clamp(automaticRoute.cursorY, 0, this.LAST);
core.status.event.id = 'cursor';
core.lockControl();
core.clearUI();
@@ -2481,14 +2483,6 @@ ui.prototype._drawBookDetail_turnAndCriticals = function (enemy, floorId, texts)
});
while (criticals[0]=='0:0') criticals.shift();
texts.push("\r[#FF6A6A]\\d临界表：\\d\r[]"+JSON.stringify(criticals));
- var prevInfo = core.getDamageInfo(enemy.id, {atk: core.status.hero.atk-1}, null, null, floorId);
- if (prevInfo != null && damageInfo != null) {
- if (damageInfo.damage != null) damageInfo = damageInfo.damage;
- if (prevInfo.damage != null) prevInfo = prevInfo.damage;
- if (prevInfo > damageInfo) {
- texts.push("（当前攻击力正位于临界点上）")
- }
- }
}
ui.prototype._drawBookDetail_drawContent = function (enemy, content, pos) {
@@ -2524,7 +2518,7 @@ ui.prototype.drawFly = function(page) {
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);
+ core.fillText('ui', lines[i], this.PIXEL - 60, start_y, '#FFFFFF');
start_y += 22;
}
@@ -2593,34 +2587,35 @@ ui.prototype._drawViewMaps_drawHint = function () {
core.fillRect('ui', 0, 0, this.PIXEL, this.PIXEL, 'rgba(0,0,0,0.7)');
core.setTextAlign('ui', 'center');
var stroke = function (left, top, width, height, fillStyle, lineWidth) {
- core.strokeRect('ui', left*32+2, top*32+2, width*32-4, height*32-4, fillStyle, lineWidth);
+ core.strokeRect('ui', left+2, top+2, width-4, height-4, fillStyle, lineWidth);
}
- var per = this.HSIZE - 4;
- stroke(per, 0, 9, per, core.status.globalAttribute.selectColor, 4); // up
- stroke(0, per, per, 9); // left
- stroke(per, this.SIZE - per, 9, per); // down
- stroke(this.SIZE - per, per, per, 9); // right
- stroke(per, per, 9, 3); // prev
- stroke(per, this.SIZE - per - 3, 9, 3); // next
- stroke(0, 0, per-1, per-1); // left top
- stroke(this.SIZE-(per - 1), 0, per-1, per-1); // right top
- stroke(0, this.SIZE-(per-1), per-1, per-1); // left bottom
+
+ var perpx = this.PIXEL / 5, cornerpx = perpx * 3 / 4;
+ stroke(perpx, 0, 3 * perpx, perpx, core.status.globalAttribute.selectColor, 4); // up
+ stroke(0, perpx, perpx, 3 * perpx); // left
+ stroke(perpx, 4 * perpx, 3 * perpx, perpx); // down
+ stroke(4 * perpx, perpx, perpx, 3 * perpx); // right
+ stroke(perpx, perpx, 3 * perpx, perpx); // prev
+ stroke(perpx, 3 * perpx, 3 * perpx, perpx); // next
+ stroke(0, 0, cornerpx, cornerpx); // left top
+ stroke(this.PIXEL - cornerpx, 0, cornerpx, cornerpx); // right top
+ stroke(0, this.PIXEL - cornerpx, cornerpx, cornerpx); // left bottom;
core.setTextBaseline('ui', 'middle');
- core.fillText('ui', "上移地图 [W]", this.HPIXEL, per * 16, core.status.globalAttribute.selectColor, '20px Arial');
- core.fillText('ui', "下移地图 [S]", this.HPIXEL, this.PIXEL - per * 16);
- core.fillText('ui', 'V', (per-1)*16, (per-1)*16);
- core.fillText('ui', 'Z', this.PIXEL - (per-1)*16, (per-1)*16);
- core.fillText('ui', 'B', (per-1)*16, this.PIXEL - (per-1)*16);
+ core.fillText('ui', "上移地图 [W]", this.HPIXEL, perpx / 2, core.status.globalAttribute.selectColor, '20px Arial');
+ core.fillText('ui', "下移地图 [S]", this.HPIXEL, this.PIXEL - perpx / 2);
+ core.fillText('ui', 'V', cornerpx / 2, cornerpx / 2);
+ core.fillText('ui', 'Z', this.PIXEL - cornerpx / 2, cornerpx / 2);
+ core.fillText('ui', 'B', cornerpx / 2, this.PIXEL - cornerpx / 2);
- var top = this.HPIXEL - 66, left = per * 16, right = this.PIXEL - left;
+ var top = this.HPIXEL - 66, left = perpx / 2, right = this.PIXEL - left;
var lt = ["左", "移", "地", "图", "[A]"], rt = ["右", "移", "地", "图", "[D]"];
for (var i = 0; i < 5; ++i) {
core.fillText("ui", lt[i], left, top + 32 * i);
core.fillText("ui", rt[i], right, top + 32 * i);
}
- core.fillText('ui', "前张地图 [▲ / PGUP]", this.HPIXEL, 32 * per + 48);
- core.fillText('ui', "后张地图 [▼ / PGDN]", this.HPIXEL, this.PIXEL - (32 * per + 48));
+ core.fillText('ui', "前张地图 [▲ / PGUP]", this.HPIXEL, perpx * 1.5);
+ core.fillText('ui', "后张地图 [▼ / PGDN]", this.HPIXEL, this.PIXEL - perpx * 1.5);
core.fillText('ui', "退出 [ESC / ENTER]", this.HPIXEL, this.HPIXEL);
core.fillText('ui', "[X] 可查看" + core.material.items['book'].name + " [G] 可使用" + core.material.items.fly.name, this.HPIXEL, this.HPIXEL + 32, null, '12px Arial');
@@ -3026,6 +3021,7 @@ ui.prototype._drawSLPanel_drawRecord = function(title, data, x, y, size, cho, hi
var strokeColor = globalAttribute.selectColor;
if (core.status.event.selection) strokeColor = '#FF6A6A';
if (!data || !data.floorId) highLight = false;
+ if (data && data.__toReplay__) title = '[R]' + title;
core.fillText('ui', title, x, y, highLight?globalAttribute.selectColor:'#FFFFFF', this._buildFont(17, true));
core.strokeRect('ui', x-size/2, y+15, size, size, cho?strokeColor:'#FFFFFF', cho?6:2);
@@ -3105,17 +3101,20 @@ ui.prototype._drawKeyBoard = function () {
core.clearUI();
core.playSound('打开界面');
+ var offset = this.SIZE % 2 == 0 ? 16 : 0;
+
var width = 384, height = 320;
- var left = (this.PIXEL - width) / 2, right = left + width;
- var top = (this.PIXEL - height) / 2, bottom = top + height;
+ var left = (this.PIXEL - width) / 2 + offset, right = left + width;
+ var top = (this.PIXEL - height) / 2 + offset, bottom = top + height;
+
var isWindowSkin = this.drawBackground(left, top, right, bottom);
core.setTextAlign('ui', 'center');
core.setFillStyle('ui', core.arrayToRGBA(core.status.textAttribute.title));
- core.fillText('ui', '虚拟键盘', this.HPIXEL, top + 35, null, this._buildFont(22, true));
+ core.fillText('ui', '虚拟键盘', this.HPIXEL + offset, top + 35, null, this._buildFont(22, true));
core.setFont('ui', this._buildFont(17, false));
core.setFillStyle('ui', core.arrayToRGBA(core.status.textAttribute.text));
- var offset = this.HPIXEL - 89;
+ var now = this.HPIXEL - 89 + offset;
var lines = [
["F1","F2","F3","F4","F5","F6","F7","F8","F9","10","11"],
@@ -3129,17 +3128,17 @@ ui.prototype._drawKeyBoard = function () {
lines.forEach(function (line) {
for (var i=0;i
100000 ? LZString.compress(str) : lzw_encode(str);
- localforage.setItem(core.firstData.name + "_" + key, compressed, function (err) {
+ var callback = function (err) {
if (err) {
if (errorCallback) errorCallback(err);
}
@@ -282,22 +264,31 @@ utils.prototype.setLocalForage = function (key, value, successCallback, errorCal
else if (/^save\d+$/.test(key)) core.saves.ids[parseInt(key.substring(4))] = true;
if (successCallback) successCallback();
}
- });
+ }
+ this._setLocalForage_set(name, str, callback);
+}
+
+utils.prototype._setLocalForage_set = function (name, str, callback) {
+ if (window.jsinterface && window.jsinterface.setLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ core.saves.cache[name] = str;
+ window.jsinterface.setLocalForage(id, name, str);
+ } else {
+ var compressed = str.length > 100000 ? LZString.compress(str) : lzw_encode(str);
+ core.saves.cache[name] = compressed;
+ localforage.setItem(name, compressed, callback);
+ }
}
utils.prototype.getLocalForage = function (key, defaultValue, successCallback, errorCallback) {
-
- if (!core.platform.useLocalForage) {
- var value = this.getLocalStorage(key, defaultValue);
- if (successCallback) successCallback(value);
- return;
- }
-
- localforage.getItem(core.firstData.name + "_" + key, function (err, value) {
+ var name = core.firstData.name + "_" + key;
+ var callback = function (err, value) {
if (err) {
if (errorCallback) errorCallback(err);
}
else {
+ core.saves.cache[name] = value;
if (!successCallback) return;
if (value != null) {
var res = core.utils.decompress(value);
@@ -306,18 +297,26 @@ utils.prototype.getLocalForage = function (key, defaultValue, successCallback, e
}
successCallback(defaultValue);
}
- })
+ };
+ if (core.saves.cache[name] != null) {
+ return callback(null, core.saves.cache[name]);
+ }
+ this._getLocalForage_get(name, callback);
+}
+
+utils.prototype._getLocalForage_get = function (name, callback) {
+ if (window.jsinterface && window.jsinterface.getLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ window.jsinterface.getLocalForage(id, name);
+ } else {
+ localforage.getItem(name, callback);
+ }
}
utils.prototype.removeLocalForage = function (key, successCallback, errorCallback) {
-
- if (!core.platform.useLocalForage) {
- this.removeLocalStorage(key);
- if (successCallback) successCallback();
- return;
- }
-
- localforage.removeItem(core.firstData.name + "_" + key, function (err) {
+ var name = core.firstData.name + "_" + key;
+ var callback = function (err) {
if (err) {
if (errorCallback) errorCallback(err);
}
@@ -326,7 +325,61 @@ utils.prototype.removeLocalForage = function (key, successCallback, errorCallbac
else if (/^save\d+$/.test(key)) delete core.saves.ids[parseInt(key.substring(4))];
if (successCallback) successCallback();
}
- })
+ }
+ delete core.saves.cache[name];
+ this._removeLocalForage_remove(name, callback);
+}
+
+utils.prototype._removeLocalForage_remove = function (name, callback) {
+ if (window.jsinterface && window.jsinterface.removeLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ window.jsinterface.removeLocalForage(id, name);
+ } else {
+ localforage.removeItem(name, callback);
+ }
+}
+
+utils.prototype.clearLocalForage = function (callback) {
+ core.saves.cache = {};
+ if (window.jsinterface && window.jsinterface.clearLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ window.jsinterface.clearLocalForage(id);
+ } else {
+ localforage.clear(callback);
+ }
+}
+
+utils.prototype.iterateLocalForage = function (iter, callback) {
+ if (window.jsinterface && window.jsinterface.iterateLocalForage) {
+ var id = setTimeout(null);
+ core['__iter' + id] = iter;
+ core['__callback' + id] = callback;
+ window.jsinterface.iterateLocalForage(id);
+ } else {
+ localforage.iterate(iter, callback);
+ }
+}
+
+utils.prototype.keysLocalForage = function (callback) {
+ if (window.jsinterface && window.jsinterface.keysLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ window.jsinterface.keysLocalForage(id);
+ } else {
+ localforage.keys(callback);
+ }
+}
+
+utils.prototype.lengthLocalForage = function (callback) {
+ if (window.jsinterface && window.jsinterface.lengthLocalForage) {
+ var id = setTimeout(null);
+ core['__callback' + id] = callback;
+ window.jsinterface.lengthLocalForage(id);
+ } else {
+ localforage.length(callback);
+ }
}
utils.prototype.setGlobal = function (key, value) {
@@ -450,7 +503,7 @@ utils.prototype.formatTime = function (time) {
////// 两位数显示 //////
utils.prototype.setTwoDigits = function (x) {
- return parseInt(x) < 10 ? "0" + x : x;
+ return (parseInt(x) < 10 && parseInt(x) >= 0) ? "0" + x : x;
}
utils.prototype.formatSize = function (size) {
@@ -459,41 +512,34 @@ utils.prototype.formatSize = function (size) {
else return (size/1024/1024).toFixed(2) + "MB";
}
-utils.prototype.formatBigNumber = function (x, onMap) {
- x = Math.floor(parseFloat(x));
- if (!core.isset(x) || !Number.isFinite(x)) return '???';
- if (x > 1e24 || x < -1e24) return x.toExponential(2);
+utils.prototype.formatBigNumber = function (x, digits) {
+ if (digits === true) digits = 5; // 兼容旧版onMap参数
+ if (!digits || digits < 5) digits = 6; // 连同负号、小数点和后缀字母在内的总位数，至少需为5，默认为6
+ x = Math.trunc(parseFloat(x)); // 尝试识别为小数，然后向0取整
+ if (x == null || !Number.isFinite(x)) return '???'; // 无法识别的数或正负无穷大，显示'???'
+ var units = [ // 单位及其后缀字母，可自定义，如改成千进制下的K、M、G、T、P
+ { "val": 1e4, "suffix": "w" },
+ { "val": 1e8, "suffix": "e" },
+ { "val": 1e12, "suffix": "z" },
+ { "val": 1e16, "suffix": "j" },
+ { "val": 1e20, "suffix": "g" },
+ ];
+ if (Math.abs(x) > 1e20 * Math.pow(10, digits - 2))
+ return x.toExponential(0); // 绝对值过大以致于失去精度的数，直接使用科学记数法，系数只保留整数
+ var sign = x < 0 ? '-' : '';
+ if (sign) --digits; // 符号位单独处理，负号要占一位
+ x = Math.abs(x);
- var c = x < 0 ? "-" : "";
- x = Math.abs(x);
+ if (x < Math.pow(10, digits)) return sign + x;
- if (x <= 99999 || (!onMap && x <= 999999)) return c + x;
-
- var all = [
- {"val": 1e20, "c": "g"},
- {"val": 1e16, "c": "j"},
- {"val": 1e12, "c": "z"},
- {"val": 1e8, "c": "e"},
- {"val": 1e4, "c": "w"},
- ]
-
- for (var i = 0; i < all.length; i++) {
- var one = all[i];
- if (onMap) {
- if (x >= one.val) {
- var v = x / one.val;
- return c + v.toFixed(Math.max(0, Math.floor(3 - Math.log10(v + 1)))) + one.c;
- }
- }
- else {
- if (x >= 10 * one.val) {
- var v = x / one.val;
- return c + v.toFixed(Math.max(0, Math.floor(4 - Math.log10(v + 1)))) + one.c;
- }
- }
+ for (var i = 0; i < units.length; ++i) {
+ var each = units[i];
+ var u = (x / each.val).toFixed(digits).substring(0, digits);
+ if (u.indexOf('.') < 0) continue;
+ u = u.substring(0, u[u.length - 2] == '.' ? u.length - 2 : u.length - 1);
+ return sign + u + each.suffix;
}
-
- return c + x;
+ return sign + x.toExponential(0);
}
////// 变速移动 //////
@@ -514,6 +560,10 @@ utils.prototype.applyEasing = function(name) {
return t
}
}
+ if (name == 'random') {
+ var keys = Object.keys(list);
+ name = keys[Math.floor(Math.random() * keys.length)];
+ }
return list[name] || list.linear;
}
@@ -635,8 +685,14 @@ utils.prototype.decodeRoute = function (route) {
utils.prototype._decodeRoute_getNumber = function (decodeObj, noparse) {
var num = "";
- while (decodeObj.index < decodeObj.route.length && !isNaN(decodeObj.route.charAt(decodeObj.index))) {
- num += decodeObj.route.charAt(decodeObj.index++);
+ var first = true;
+ while (true) {
+ var ch = decodeObj.route.charAt(decodeObj.index);
+ if (ch >= '0' && ch <= '9') num += ch;
+ else if (ch == '-' && first) num += ch;
+ else break;
+ first = false;
+ decodeObj.index++;
}
if (num.length == 0) num = "1";
return noparse ? num : parseInt(num);
@@ -814,6 +870,8 @@ utils.prototype.turnDirection = function (turn, direction) {
direction = direction || core.getHeroLoc('direction');
var directionList = ["left", "leftup", "up", "rightup", "right", "rightdown", "down", "leftdown"];
if (directionList.indexOf(turn) >= 0) return turn;
+ if (turn == ':hero') return core.getHeroLoc('direction');
+ if (turn == ':backhero') return this.turnDirection(':back', core.getHeroLoc('direction'));
if (typeof turn === 'number' && turn % 45 == 0) turn /= 45;
else {
switch (turn) {
@@ -969,19 +1027,23 @@ utils.prototype.readFileContent = function (content) {
core.platform.successCallback(content);
return;
}
+ // 检查base64
try {
- obj = JSON.parse(content);
- if (obj) {
- if (core.platform.successCallback)
- core.platform.successCallback(obj);
- return;
+ obj = JSON.parse(LZString.decompressFromBase64(content));
+ } catch (e) {}
+ if (!obj) {
+ try {
+ obj = JSON.parse(content);
+ } catch (e) {
+ main.log(e)
}
}
- catch (e) {
- main.log(e);
- alert(e);
+
+ if (obj) {
+ if (core.platform.successCallback)
+ core.platform.successCallback(obj);
+ return;
}
- // alert("不是有效的JSON文件！");
if (core.platform.errorCallback)
core.platform.errorCallback();
@@ -1195,10 +1257,10 @@ utils.prototype.same = function (a, b) {
return true;
}
if (a instanceof Object && b instanceof Object) {
- for (var i in a) {
- if (!this.same(a[i], b[i])) return false;
- }
- for (var i in b) {
+ var obj = {};
+ for (var i in a) obj[i] = true;
+ for (var i in b) obj[i] = true;
+ for (var i in obj) {
if (!this.same(a[i], b[i])) return false;
}
return true;
diff --git a/main.js b/main.js
index 88379e9d..addc8163 100644
--- a/main.js
+++ b/main.js
@@ -2,7 +2,7 @@ function main() {
//------------------------ 用户修改内容 ------------------------//
- this.version = "2.8.1"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
+ this.version = "2.8.2"; // 游戏版本号；如果更改了游戏内容建议修改此version以免造成缓存问题。
this.useCompress = false; // 是否使用压缩文件
// 当你即将发布你的塔时，请使用“JS代码压缩工具”将所有js代码进行压缩，然后将这里的useCompress改为true。
@@ -188,8 +188,8 @@ function main() {
this.floors = {}
this.canvas = {};
- this.__VERSION__ = "2.8.1";
- this.__VERSION_CODE__ = 443;
+ this.__VERSION__ = "2.8.2";
+ this.__VERSION_CODE__ = 507;
}
main.prototype.init = function (mode, callback) {
@@ -290,8 +290,19 @@ main.prototype.loadFloors = function (callback) {
main.dom.mainTips.style.display = 'none';
callback();
}
+ return;
}
- else {
+
+ // 高层塔优化
+ var script = document.createElement('script');
+ script.src = '__all_floors__.js?v=' + this.version + '&id=' + main.floorIds.join(',');
+ script.onload = function () {
+ main.dom.mainTips.style.display = 'none';
+ main.supportBunch = true;
+ callback();
+ }
+ script.onerror = script.onabort = script.ontimeout = function (e) {
+ console.clear();
for (var i = 0; i < main.floorIds.length; i++) {
main.loadFloor(main.floorIds[i], function (modName) {
main.setMainTipsText("楼层 " + modName + '.js 加载完毕');
@@ -300,8 +311,9 @@ main.prototype.loadFloors = function (callback) {
callback();
}
});
- }
+ }
}
+ main.dom.body.appendChild(script);
}
////// 加载某一个楼层 //////
diff --git a/project/data.js b/project/data.js
index d99ae5d6..ac3bbcbf 100644
--- a/project/data.js
+++ b/project/data.js
@@ -9,7 +9,9 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
],
"floorPartitions": [],
"images": [
+ "bear.png",
"bg.jpg",
+ "dragon.png",
"hero.png",
"winskin.png"
],
@@ -150,12 +152,20 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
],
"floorChangingStyle": "background-color: black; color: white",
"font": "Verdana"
- }
+ },
+ "splitImages": [
+ {
+ "name": "dragon.png",
+ "width": 384,
+ "height": 96,
+ "prefix": "dragon_"
+ }
+ ]
},
"firstData": {
"title": "魔塔样板",
"name": "template",
- "version": "Ver 2.8.1",
+ "version": "Ver 2.8.2",
"floorId": "sample0",
"hero": {
"image": "hero.png",
diff --git a/project/enemys.js b/project/enemys.js
index bac13fde..17cde5ac 100644
--- a/project/enemys.js
+++ b/project/enemys.js
@@ -35,7 +35,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
"whiteHornSlime": {"name":"尖角怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"redSwordsman": {"name":"剑王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
"poisonZombie": {"name":"绿兽人","hp":100,"atk":120,"def":0,"money":13,"exp":0,"point":0,"special":[12]},
- "octopus": {"name":"血影","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+ "octopus": {"name":"血影","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":"dragon_1.png"},
"princessEnemy": {"name":"假公主","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"angel": {"name":"天使","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"elemental": {"name":"元素生物","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
@@ -52,7 +52,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
"magicMaster": {"name":"黑暗大法师","hp":100,"atk":120,"def":0,"money":12,"exp":0,"point":0,"special":11,"value":0.3333333333333333,"add":true,"notBomb":true},
"devilWarrior": {"name":"魔神武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"fairyEnemy": {"name":"仙子","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
- "dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+ "dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":"dragon_0.png"},
"skeletonKnight": {"name":"骷髅武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"skeletonPresbyter": {"name":"骷髅巫师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"ironRock": {"name":"铁面人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
@@ -76,5 +76,9 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
"blueKing": {"name":"白衣武士","hp":100,"atk":120,"def":0,"money":17,"exp":0,"point":0,"special":16},
"keiskeiFairy": {"name":"铃兰花妖","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
"tulipFairy": {"name":"郁金香花妖","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
- "purpleBowman": {"name":"高级弓兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0}
+ "purpleBowman": {"name":"高级弓兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+ "bearDown": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"bigImage":"bear.png"},
+ "bearLeft": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}},
+ "bearRight": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}},
+ "bearUp": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"}}
}
\ No newline at end of file
diff --git a/project/floors/sample0.js b/project/floors/sample0.js
index ec642e75..7ffc7566 100644
--- a/project/floors/sample0.js
+++ b/project/floors/sample0.js
@@ -12,7 +12,7 @@ main.floors.sample0=
"ratio": 1,
"map": [
[ 0, 0,220, 0, 0, 20, 87, 3, 58, 59, 60, 61, 64],
- [ 0,246, 0,246, 0, 20, 0, 3, 57, 62, 63, 43, 44],
+ [ 0,246, 0,246, 0, 20, 0, 3, 57, 72, 63, 43, 44],
[219, 0, 0, 0,219, 20, 0, 3, 53, 54, 55, 56, 69],
[ 20, 20,125, 20, 20, 20, 0, 3, 49, 50, 51, 52, 68],
[251,247,256,234,248, 6, 0, 3, 35, 36, 46, 47, 48],
@@ -177,13 +177,13 @@ main.floors.sample0=
},
"afterGetItem": {
"9,1": [
- "样板给出的道具素材中有很多道具都是未定义甚至未注册的，需要自行实现功能。\n（比如屠龙匕首就是一个没有功能的道具）\n如果你想为未定的道具添加自定义功能，请参照样板中其他道具的写法；如果有更多疑问，请查阅帮助文档。"
+ "技能的支持需要依赖状态栏的“魔力”以及脚本编辑的“按键处理”，详见帮助文档“个性化”一节。"
],
"12,2": [
- "跳跃本身没有音效，使用跳跃鞋时播放的音效是通过跳跃鞋的道具效果实现的。\n如果想为跳跃设置音效，请在 events.js 的 jumpHero 函数执行前插入一行代码，用 core.playSound 的方式来播放音效即可。\n如果想了解更多关于这方面的内容，请参与帮助文档中的“脚本——复写函数”章节。\n\n类似的是，敌人的“支援”技能也是通过在支援技能中播放音效实现的。"
+ "跳跃靴和支援怪的跳跃音效是用脚本额外添加的，\n如果想为任意跳跃指令添加音效，请查阅帮助文档中的“脚本——复写函数”章节。"
],
"8,3": [
- "炸弹是只能炸面前的怪物还是四个方向的怪物，由其图块属性（快捷键C）中的“使用效果”决定。\n不能被炸的怪物请直接在该怪物的图块属性中勾选“不可炸”，可参见样板里黑衣魔王和黑暗大法师的写法。"
+ "炸弹是只能炸面前的怪物还是四个甚至八个方向的怪物，\n由其图块属性（快捷键C）中的“使用效果”决定。\n不能被炸的怪物请直接在该怪物的图块属性中勾选“不可炸”，\n可参见样板里黑衣魔王和黑暗大法师的写法。\nV2.8.1起，炸弹炸怪可以添加获得金经/触发战后事件，详见其使用效果中的注释。"
],
"10,3": [
"“上楼”和“下楼”的目标层由全塔属性（快捷键B）的“楼层列表”顺序所决定。"
@@ -209,11 +209,7 @@ main.floors.sample0=
"在 2.8.1 版更新后，能够被破冰镐摧毁的冰块被移动到了 animates 下。\n如果想制作一个可以以特定触发器的方式移除特定图块的道具，可以参照破冰镐物品图块属性中\n useItemEffect 和 canUseItemEffect 的写法。"
],
"11,8": [
- "由于状态栏放不下，铁门钥匙（根据全塔属性的系统开关勾选与否，可能还有绿钥匙）会被放入道具栏中。\n碰到绿门和铁门时仍然会自动使用钥匙开门。",
- {
- "type": "comment",
- "text": "由于状态栏放不下，铁门钥匙（根据全塔属性的系统开关勾选与否，可能还有绿钥匙）会被放入道具栏中。\n碰到绿门和铁门仍然会自动使用钥匙（根据全塔属性的系统开关勾选与否，铁门可能不需要钥匙）开门。"
- }
+ "由于状态栏放不下，铁门钥匙（根据全塔属性的系统开关勾选与否，可能还有绿钥匙）会被放入道具栏中。\n碰到绿门和铁门时仍然会自动使用钥匙开门。"
],
"12,8": [
"该道具默认是大黄门钥匙，如需改为钥匙盒直接修改其图块属性（快捷键C）的“道具类别”为items即可。"
diff --git a/project/floors/sample1.js b/project/floors/sample1.js
index be0af792..2d3f74a0 100644
--- a/project/floors/sample1.js
+++ b/project/floors/sample1.js
@@ -7,7 +7,14 @@ main.floors.sample1=
"canFlyFrom": true,
"canUseQuickShop": true,
"defaultGround": "grass",
- "images": null,
+ "images": [
+ {
+ "name": "bg.jpg",
+ "canvas": "bg",
+ "x": 0,
+ "y": 0
+ }
+ ],
"weather": [
"snow",
6
@@ -441,7 +448,10 @@ main.floors.sample1=
}
],
"false": [
- "\t[老人,trader]你的金钱不足！"
+ "\t[老人,trader]你的金钱不足！",
+ {
+ "type": "continue"
+ }
]
}
]
@@ -464,13 +474,13 @@ main.floors.sample1=
"name": "item:blueKey",
"operator": "+=",
"value": "1"
- },
- {
- "type": "continue"
}
],
"false": [
- "\t[老人,trader]你的金钱不足！"
+ "\t[老人,trader]你的金钱不足！",
+ {
+ "type": "continue"
+ }
]
}
]
diff --git a/project/floors/sample2.js b/project/floors/sample2.js
index 821f594a..7e370e35 100644
--- a/project/floors/sample2.js
+++ b/project/floors/sample2.js
@@ -13,22 +13,22 @@ main.floors.sample2=
"map": [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1,121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 1, 1, 45, 0, 1, 0,202,202, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0,202,202, 0],
- [ 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 0, 0, 88, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 0,202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,202, 0, 0, 0, 0, 0, 0, 0],
+ [ 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [ 1, 27, 28, 29, 1, 0,202, 1, 27, 28, 29, 1, 0, 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0],
+ [ 1, 31, 32, 33, 1, 0, 0, 1, 31, 32, 33, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [ 1, 21,258, 22, 1, 0, 0, 1, 21,257, 22, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [ 1, 1, 82, 1, 1, 0, 0, 1, 1, 81, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 22, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0, 45, 0, 1, 0,202,202, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0,202,202, 0],
+ [ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0],
+ [ 0,327, 0, 0, 0, 0, 88, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0,202, 0, 0, 0, 0,328, 0, 0, 0, 0, 0, 0, 0,202, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0,122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- [ 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0,329, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 0, 0, 0, 0, 0,330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,202, 0, 0, 0, 0, 0, 0],
+ [ 0, 0, 1, 0, 0,202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0],
@@ -42,9 +42,6 @@ main.floors.sample2=
"height": 26,
"firstArrive": [],
"events": {
- "3,2": [
- "123"
- ],
"12,12": [
"234"
]
@@ -71,5 +68,6 @@ main.floors.sample2=
],
"autoEvent": {},
- "beforeBattle": {}
+ "beforeBattle": {},
+ "cannotMoveIn": {}
}
\ No newline at end of file
diff --git a/project/functions.js b/project/functions.js
index 020ae2ce..796c6327 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -112,14 +112,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
// core.deleteAllCanvas();
// }
- // 播放换层音效
- if (fromLoad)
- core.playSound('读档');
- else if (isFlying)
- core.playSound('飞行器');
- else if (currentId)
- core.playSound('上下楼');
-
// 根据分区信息自动砍层与恢复
if (core.autoRemoveMaps) core.autoRemoveMaps(floorId);
@@ -149,6 +141,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
var bgm = core.status.maps[floorId].bgm;
if (bgm instanceof Array) bgm = bgm[Math.floor(Math.random() * bgm.length)]; // 多个bgm则随机播放一个
if (!core.hasFlag("__bgm__")) core.playBgm(bgm);
+ } else if (fromLoad && !core.hasFlag("__bgm__")) {
+ core.pauseBgm();
}
// 更改画面色调
var color = core.getFlag('__color__', null);
@@ -1141,11 +1135,14 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.setFlag('curse', true);
}
} else if (action == 'remove') {
+ var success = false;
if (core.inArray(type, "poison") && core.hasFlag("poison")) {
+ success = true;
// 移除毒效果
core.setFlag("poison", false);
}
if (core.inArray(type, "weak") && core.hasFlag("weak")) {
+ success = true;
// 移除衰效果
core.setFlag("weak", false);
if (core.values.weakValue >= 1) {
@@ -1159,9 +1156,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
}
}
if (core.inArray(type, "curse") && core.hasFlag("curse")) {
+ success = true;
// 移除咒效果
core.setFlag("curse", false);
}
+ if (success) core.playSound('回血');
}
},
"updateStatusBar": function () {
diff --git a/project/icons.js b/project/icons.js
index fbff0263..c0d6eae8 100644
--- a/project/icons.js
+++ b/project/icons.js
@@ -109,24 +109,8 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
"expShop": 9,
"moneyShop": 10,
"princess": 11,
- "greenMan": 28,
- "blueTrader": 29,
- "octopusLeftTop": 12,
- "octopusTop": 13,
- "octopusRightTop": 14,
- "octopusLeft": 15,
- "octopusCenter": 16,
- "octopusRight": 17,
- "octopusLeftBottom": 18,
- "octopusRightBottom": 19,
- "dragonLeftTop": 20,
- "dragonTop": 21,
- "dragonRightTop": 22,
- "dragonLeft": 23,
- "dragonCenter": 24,
- "dragonRight": 25,
- "dragonLeftBottom": 26,
- "dragonRightBottom": 27
+ "greenMan": 12,
+ "blueTrader": 13
},
"npc48": {
"npc0": 0,
@@ -219,7 +203,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
"angel": 0,
"elemental": 1,
"steelGuard": 2,
- "evilBat": 3
+ "evilBat": 3,
+ "bearDown": 4,
+ "bearLeft": 5,
+ "bearRight": 6,
+ "bearUp": 7
},
"items": {
"yellowKey": 0,
diff --git a/project/images/bear.png b/project/images/bear.png
new file mode 100644
index 00000000..3a0ea543
Binary files /dev/null and b/project/images/bear.png differ
diff --git a/project/images/dragon.png b/project/images/dragon.png
new file mode 100644
index 00000000..ad20aaae
Binary files /dev/null and b/project/images/dragon.png differ
diff --git a/project/items.js b/project/items.js
index 289c494a..d7ba487a 100644
--- a/project/items.js
+++ b/project/items.js
@@ -297,7 +297,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"name": "圣水",
"itemEffect": "core.status.hero.hp *= 2",
"itemEffectTip": "，生命值翻倍",
- "useItemEffect": "core.status.hero.hp *= 2;\ncore.playSound('回血');",
+ "useItemEffect": "core.status.hero.hp *= 2;core.playSound('回血');",
"canUseItemEffect": "true",
"text": "生命值翻倍"
},
@@ -327,7 +327,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"cls": "constants",
"name": "冰冻徽章",
"text": "可以将面前的熔岩变成平地",
- "useItemEffect": "(function () {\n\tvar success = false;\n\n\tvar snowFourDirections = false; // 是否四方向雪花；如果是将其改成true\n\tif (snowFourDirections) {\n\t\t// 四方向雪花\n\t\tfor (var direction in core.utils.scan) {\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (core.getBlockId(nx, ny) == 'lava') {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\tif (core.getBlockId(core.nextX(), core.nextY()) == 'lava') {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t}\n\t}\n\n\tif (success) {\n\t\tcore.playSound('打开界面');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\t} else {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
+ "useItemEffect": "(function () {\n\tvar success = false;\n\n\tvar snowFourDirections = false; // 是否多方向雪花；如果是将其改成true\n\tif (snowFourDirections) {\n\t\t// 多方向雪花\n\t\tfor (var direction in core.utils.scan) { // 多方向雪花默认四方向，如需改为八方向请将这两个scan改为scan2\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (core.getBlockId(nx, ny) == 'lava') {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\tif (core.getBlockId(core.nextX(), core.nextY()) == 'lava') {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t}\n\t}\n\n\tif (success) {\n\t\tcore.playSound('打开界面');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\t} else {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
"canUseItemEffect": "true"
},
"cross": {
@@ -368,21 +368,21 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"cls": "tools",
"name": "破墙镐",
"text": "可以破坏勇士面前的墙",
- "useItemEffect": "(function () {\n\tvar canBreak = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable) return false;\n\t\treturn block.event.canBreak;\n\t};\n\n\tvar success = false;\n\tvar pickaxeFourDirections = false; // 是否四方向破；如果是将其改成true\n\tif (pickaxeFourDirections) {\n\t\t// 四方向破\n\t\tfor (var direction in core.utils.scan) {\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (canBreak(nx, ny)) {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\t// 仅破当前\n\t\tif (canBreak(core.nextX(), core.nextY())) {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t}\n\t}\n\n\tif (success) {\n\t\tcore.playSound('破墙镐');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\t} else {\n\t\t// 无法使用\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
+ "useItemEffect": "(function () {\n\tvar canBreak = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable) return false;\n\t\treturn block.event.canBreak;\n\t};\n\n\tvar success = false;\n\tvar pickaxeFourDirections = false; // 是否多方向破；如果是将其改成true\n\tif (pickaxeFourDirections) {\n\t\t// 多方向破\n\t\tfor (var direction in core.utils.scan) { // 多方向破默认四方向，如需改成八方向请将这两个scan改为scan2\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (canBreak(nx, ny)) {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\t// 仅破当前\n\t\tif (canBreak(core.nextX(), core.nextY())) {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t}\n\t}\n\n\tif (success) {\n\t\tcore.playSound('破墙镐');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\t} else {\n\t\t// 无法使用\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
"canUseItemEffect": "true"
},
"icePickaxe": {
"cls": "tools",
"name": "破冰镐",
"text": "可以破坏勇士面前的一堵冰墙",
- "useItemEffect": "(function () {\n\tcore.openDoor(core.nextX(), core.nextY(), false);\n\tcore.playSound('破冰镐');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n})();",
+ "useItemEffect": "(function () {\n\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\tcore.insertAction({ \"type\": \"openDoor\", \"loc\": [\"core.nextX()\", \"core.nextY()\"] });\n})();",
"canUseItemEffect": "(function () {\n\treturn core.getBlockId(core.nextX(), core.nextY()) == 'ice';\n})();"
},
"bomb": {
"cls": "tools",
"name": "炸弹",
"text": "可以炸掉勇士面前的怪物",
- "useItemEffect": "(function () {\n\tvar bombList = []; // 炸掉的怪物坐标列表\n\tvar todo = []; // 炸弹后事件\n\tvar money = 0,\n\t\texp = 0; // 炸弹获得的金币和经验\n\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar bomb = function (x, y) {\n\t\tif (!canBomb(x, y)) return;\n\t\tbombList.push([x, y]);\n\t\tvar id = core.getBlockId(x, y),\n\t\t\tenemy = core.material.enemys[id];\n\t\tmoney += core.getEnemyValue(enemy, 'money', x, y) || 0;\n\t\texp += core.getEnemyValue(enemy, 'exp', x, y) || 0;\n\t\tcore.push(todo, core.floors[core.status.floorId].afterBattle[x + \",\" + y]);\n\t\tcore.push(todo, enemy.afterBattle);\n\t\tcore.removeBlock(x, y);\n\t}\n\n\t// 如果要四方形可炸，把这里的false改成true\n\tif (false) {\n\t\tvar scan = core.utils.scan; // 如果要改成八方向炸可以改成 core.utils.scan2\n\t\tfor (var direction in scan) {\n\t\t\tvar delta = scan[direction];\n\t\t\tbomb(core.getHeroLoc('x') + delta.x, core.getHeroLoc('y') + delta.y);\n\t\t}\n\t} else {\n\t\t// 仅炸当前\n\t\tbomb(core.nextX(), core.nextY());\n\t}\n\n\tif (bombList.length > 0) {\n\t\tcore.playSound('炸弹');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n\t\t// 取消这里的注释可以炸弹后获得金币和经验\n\t\t// core.status.hero.money += money;\n\t\t// core.status.hero.exp += exp;\n\n\t\t// 取消这里的注释可以炸弹引发战后事件\n\t\t// if (todo.length > 0) core.insertAction(todo);\n\t} else {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip('当前无法使用' + core.material.items[itemId].name);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n\n\t// 炸弹后事件\n\t// 这是一个使用炸弹也能开门的例子\n\t/*\n\tif (core.status.floorId=='xxx' && core.terrainExists(x0,y0,'specialDoor') // 某个楼层，该机关门存在\n\t\t&& !core.enemyExists(x1,y1) && !core.enemyExists(x2,y2)) // 且守门的怪物都不存在\n\t{\n\t\tcore.insertAction([ // 插入事件\n\t\t\t{\"type\": \"openDoor\", \"loc\": [x0,y0]} // 开门\n\t\t])\n\t}\n\t*/\n})();",
+ "useItemEffect": "(function () {\n\tvar bombList = []; // 炸掉的怪物坐标列表\n\tvar todo = []; // 炸弹后事件\n\tvar money = 0,\n\t\texp = 0; // 炸弹获得的金币和经验\n\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar bomb = function (x, y) {\n\t\tif (!canBomb(x, y)) return;\n\t\tbombList.push([x, y]);\n\t\tvar id = core.getBlockId(x, y),\n\t\t\tenemy = core.material.enemys[id];\n\t\tmoney += core.getEnemyValue(enemy, 'money', x, y) || 0;\n\t\texp += core.getEnemyValue(enemy, 'exp', x, y) || 0;\n\t\tcore.push(todo, core.floors[core.status.floorId].afterBattle[x + \",\" + y]);\n\t\tcore.push(todo, enemy.afterBattle);\n\t\tcore.removeBlock(x, y);\n\t}\n\n\t// 如果要多方向可炸，把这里的false改成true\n\tif (false) {\n\t\tvar scan = core.utils.scan; // 多方向炸时默认四方向，如果要改成八方向炸可以改成 core.utils.scan2\n\t\tfor (var direction in scan) {\n\t\t\tvar delta = scan[direction];\n\t\t\tbomb(core.getHeroLoc('x') + delta.x, core.getHeroLoc('y') + delta.y);\n\t\t}\n\t} else {\n\t\t// 仅炸当前\n\t\tbomb(core.nextX(), core.nextY());\n\t}\n\n\tif (bombList.length == 0) {\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip('当前无法使用' + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n\n\tcore.playSound('炸弹');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\n\t// 取消这里的注释可以炸弹后获得金币和经验\n\t// core.status.hero.money += money;\n\t// core.status.hero.exp += exp;\n\n\t// 取消这里的注释可以炸弹引发战后事件\n\t// if (todo.length > 0) core.insertAction(todo);\n\n})();",
"canUseItemEffect": "true"
},
"centerFly": {
@@ -410,35 +410,35 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"cls": "tools",
"name": "地震卷轴",
"text": "可以破坏当前层的所有墙",
- "useItemEffect": "(function () {\n\tvar indexes = [];\n\tfor (var index in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[index];\n\t\tif (!block.disable && block.event.canBreak) {\n\t\t\tindexes.push(index);\n\t\t}\n\t}\n\tcore.removeBlockByIndexes(indexes);\n\tcore.drawMap();\n\tcore.playSound('炸弹');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n})();",
+ "useItemEffect": "(function () {\n\tvar indexes = [];\n\tfor (var index in core.status.thisMap.blocks) {\n\t\tvar block = core.status.thisMap.blocks[index];\n\t\tif (!block.disable && block.event.canBreak) {\n\t\t\tindexes.push(index);\n\t\t}\n\t}\n\tcore.removeBlockByIndexes(indexes);\n\tcore.redrawMap();\n\tcore.playSound('炸弹');\n\tcore.drawTip(core.material.items[itemId].name + '使用成功');\n})();",
"canUseItemEffect": "(function () {\n\treturn core.status.thisMap.blocks.filter(function (block) {\n\t\treturn !block.disable && block.event.canBreak;\n\t}).length > 0;\n})();"
},
"poisonWine": {
"cls": "tools",
"name": "解毒药水",
"text": "可以解除中毒状态",
- "useItemEffect": "core.triggerDebuff('remove', 'poison');\ncore.playSound('回血');",
+ "useItemEffect": "core.triggerDebuff('remove', 'poison');",
"canUseItemEffect": "core.hasFlag('poison');"
},
"weakWine": {
"cls": "tools",
"name": "解衰药水",
"text": "可以解除衰弱状态",
- "useItemEffect": "core.triggerDebuff('remove', 'weak');\ncore.playSound('回血');",
+ "useItemEffect": "core.triggerDebuff('remove', 'weak');",
"canUseItemEffect": "core.hasFlag('weak');"
},
"curseWine": {
"cls": "tools",
"name": "解咒药水",
"text": "可以解除诅咒状态",
- "useItemEffect": "core.triggerDebuff('remove', 'curse');\ncore.playSound('回血');",
+ "useItemEffect": "core.triggerDebuff('remove', 'curse');",
"canUseItemEffect": "core.hasFlag('curse');"
},
"superWine": {
"cls": "tools",
"name": "万能药水",
"text": "可以解除所有不良状态",
- "useItemEffect": "core.triggerDebuff('remove', ['poison', 'weak', 'curse']);\ncore.playSound('回血');",
+ "useItemEffect": "core.triggerDebuff('remove', ['poison', 'weak', 'curse']);",
"canUseItemEffect": "(function() {\n\treturn core.hasFlag('poison') || core.hasFlag('weak') || core.hasFlag('curse');\n})();"
},
"hammer": {
diff --git a/project/maps.js b/project/maps.js
index c8211a5e..fbf881ca 100644
--- a/project/maps.js
+++ b/project/maps.js
@@ -5,7 +5,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{}}},
"4": {"cls":"animates","id":"star","name":"星空"},
"5": {"cls":"animates","id":"lava","name":"岩浆"},
- "6": {"cls":"animates","id":"ice","doorInfo":{"time":160,"openSound":"icepickaxe.mp3","closeSound":"door.mp3","keys":{"specialKey":1}},"animate":1},
+ "6": {"cls":"animates","id":"ice","doorInfo":{"time":160,"openSound":"破冰镐","closeSound":"door.mp3","keys":{"icePickaxe":1}},"animate":1},
"7": {"cls":"terrains","id":"blueShopLeft"},
"8": {"cls":"terrains","id":"blueShopRight"},
"9": {"cls":"terrains","id":"pinkShopLeft"},
@@ -118,22 +118,6 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"168": {"cls":"terrains","id":"flower","canPass":true},
"169": {"cls":"terrains","id":"box","trigger":"pushBox"},
"170": {"cls":"terrains","id":"boxed","trigger":"pushBox"},
- "181": {"cls":"npcs","id":"octopusLeftTop"},
- "182": {"cls":"npcs","id":"octopusTop"},
- "183": {"cls":"npcs","id":"octopusRightTop"},
- "184": {"cls":"npcs","id":"octopusLeft"},
- "185": {"cls":"npcs","id":"octopusCenter"},
- "186": {"cls":"npcs","id":"octopusRight"},
- "187": {"cls":"npcs","id":"octopusLeftBottom"},
- "188": {"cls":"npcs","id":"octopusRightBottom"},
- "189": {"cls":"npcs","id":"dragonLeftTop"},
- "190": {"cls":"npcs","id":"dragonTop"},
- "191": {"cls":"npcs","id":"dragonRightTop"},
- "192": {"cls":"npcs","id":"dragonLeft"},
- "193": {"cls":"npcs","id":"dragonCenter"},
- "194": {"cls":"npcs","id":"dragonRight"},
- "195": {"cls":"npcs","id":"dragonLeftBottom"},
- "196": {"cls":"npcs","id":"dragonRightBottom"},
"201": {"cls":"enemys","id":"greenSlime"},
"202": {"cls":"enemys","id":"redSlime"},
"203": {"cls":"enemys","id":"blackSlime"},
@@ -235,5 +219,9 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"323": {"cls":"npc48","id":"tallSpecialDoor","trigger":"openDoor","name":"高机关门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"specialKey":1}}},
"324": {"cls":"npc48","id":"tallSteelDoor","trigger":"openDoor","name":"高铁门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.mp3","keys":{"steelKey":1}}},
"325": {"cls":"enemys","id":"keiskeiFairy"},
- "326": {"cls":"enemys","id":"tulipFairy"}
+ "326": {"cls":"enemys","id":"tulipFairy"},
+ "327": {"cls":"enemy48","id":"bearDown"},
+ "328": {"cls":"enemy48","id":"bearLeft"},
+ "329": {"cls":"enemy48","id":"bearRight"},
+ "330": {"cls":"enemy48","id":"bearUp"}
}
\ No newline at end of file
diff --git a/project/materials/enemy48.png b/project/materials/enemy48.png
index a7f7d0cd..d18a129a 100644
Binary files a/project/materials/enemy48.png and b/project/materials/enemy48.png differ
diff --git a/project/materials/keyboard.png b/project/materials/keyboard.png
index 5928c832..161adfb8 100644
Binary files a/project/materials/keyboard.png and b/project/materials/keyboard.png differ
diff --git a/project/materials/npcs.png b/project/materials/npcs.png
index e37d3498..2bff0872 100644
Binary files a/project/materials/npcs.png and b/project/materials/npcs.png differ
diff --git a/project/plugins.js b/project/plugins.js
index 254d451d..730b7eed 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -112,6 +112,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
return;
}
+ _shouldProcessKeyUp = true;
+
// Step 4: 执行标准公共商店
core.insertAction(this._convertShop(shop));
return true;
@@ -120,7 +122,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
////// 将一个全局商店转变成可预览的公共事件 //////
this._convertShop = function (shop) {
return [
- { "type": "function", "function": "function() {core.setFlag('@temp@shop', true);}" },
+ { "type": "function", "function": "function() {core.addFlag('@temp@shop', 1);}" },
{
"type": "while",
"condition": "true",
@@ -154,7 +156,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
}
]
},
- { "type": "function", "function": "function() {core.removeFlag('@temp@shop');}" }
+ { "type": "function", "function": "function() {core.addFlag('@temp@shop', -1);}" }
];
}
@@ -221,10 +223,17 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
return null;
}
+ var _shouldProcessKeyUp = true;
+
/// 允许商店X键退出
core.registerAction('keyUp', 'shops', function (keycode) {
- if (!core.status.lockControl || !core.hasFlag("@temp@shop") || core.status.event.id != 'action') return false;
- if (core.status.event.data.type != 'choices') return false;
+ if (!core.status.lockControl || core.status.event.id != 'action') return false;
+ if ((keycode == 13 || keycode == 32) && !_shouldProcessKeyUp) {
+ _shouldProcessKeyUp = true;
+ return true;
+ }
+
+ if (!core.hasFlag("@temp@shop") || core.status.event.data.type != 'choices') return false;
var data = core.status.event.data.current;
var choices = data.choices;
var topIndex = core.actions._getChoicesTopIndex(choices.length);
@@ -232,7 +241,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
core.actions._clickAction(core.actions.HSIZE, topIndex + choices.length - 1);
return true;
}
- if (keycode == 13 || keycode == 32) return true;
return false;
}, 60);
@@ -245,6 +253,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
var topIndex = core.actions._getChoicesTopIndex(choices.length);
if (keycode == 13 || keycode == 32) { // Space, Enter
core.actions._clickAction(core.actions.HSIZE, topIndex + core.status.event.selection);
+ _shouldProcessKeyUp = false;
return true;
}
return false;
@@ -438,13 +447,16 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
// 背景层2插入事件层前
parent.insertBefore(input, child);
// 不能直接更改背景层2的innerText 所以创建文本节点
- var txt = document.createTextNode('背景层2');
+ var txt = document.createTextNode('bg2');
// 插入事件层前(即新插入的背景层2前)
parent.insertBefore(txt, child);
// 向最后插入前景层2(即插入前景层后)
parent.appendChild(input2);
- var txt2 = document.createTextNode('前景层2');
+ var txt2 = document.createTextNode('fg2');
parent.appendChild(txt2);
+ parent.childNodes[2].replaceWith("bg");
+ parent.childNodes[6].replaceWith("事件");
+ parent.childNodes[8].replaceWith("fg");
} else {
var input = createCanvasBtn_mobile('bg2');
var input2 = createCanvasBtn_mobile('fg2');
@@ -1054,6 +1066,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
core.ui.drawTip = _drawTip;
core.control.playSound = _playSound;
core.status.route = core.status.route.slice(0, routeLength);
+ core.control._bindRoutePush();
// 插入事件：改变角色行走图并进行楼层切换
var toFloorId = data.floorId || core.status.floorId;
diff --git a/project/sounds/error.mp3 b/project/sounds/error.mp3
index 7d572668..329cca45 100644
Binary files a/project/sounds/error.mp3 and b/project/sounds/error.mp3 differ
diff --git a/project/sounds/open_ui.mp3 b/project/sounds/open_ui.mp3
index 31da851d..0282a089 100644
Binary files a/project/sounds/open_ui.mp3 and b/project/sounds/open_ui.mp3 differ
diff --git a/runtime.d.ts b/runtime.d.ts
index 9b411e29..f1703043 100644
--- a/runtime.d.ts
+++ b/runtime.d.ts
@@ -623,9 +623,6 @@ declare class control {
/** 清空剩下的自动寻路列表 */
clearContinueAutomaticRoute(callback?: () => any): void
- /** 显示离散的寻路点 */
- fillPosWithPoint(pos?: any): void
-
/** 设置行走的效果动画 */
setHeroMoveInterval(callback?: () => any): void
@@ -638,8 +635,8 @@ declare class control {
/** 瞬间移动 */
moveDirectly(destX?: any, destY?: any, ignoreSteps?: any): void
- /** 改变勇士的显隐状态 */
- triggerHero(type?: 'show' | 'hide', time?: any, callback?: () => any): void
+ /** 改变勇士的不透明度 */
+ setHeroOpacity(opacity?: number, moveMode?: string, time?: any, callback?: () => any): void
/** 加减画布偏移 */
addGameCanvasTranslate(x?: number, y?: number): void
@@ -1235,6 +1232,9 @@ declare class events {
/** 当前是否有未处理完毕的异步事件（不包含动画和音效） */
hasAsync(): boolean
+ /** 立刻停止所有异步事件 */
+ stopAsync(): void
+
/**
* 跟随
* @param name 要跟随的一个合法的4x4的行走图名称，需要在全塔属性注册
@@ -1781,7 +1781,7 @@ declare class maps {
* @param id 播放动画的编号，即drawAnimate或drawHeroAnimate返回值
* @param doCallback 是否执行该动画的回调函数
*/
- stopAnimate(id: number, doCallback?: boolean): void
+ stopAnimate(id?: number, doCallback?: boolean): void
/** 获得当前正在播放的所有（指定）动画的id列表 */
getPlayingAnimates(name?: string) : Array
@@ -2148,7 +2148,7 @@ declare class ui {
createCanvas(name: string, x: number, y: number, width: number, height: number, zIndex: number): CanvasRenderingContext2D
/** 重新定位一个自定义画布 */
- relocateCanvas(name: string, x: number, y: number): void
+ relocateCanvas(name: string, x: number, y: number, useDelta: boolean): void
/** 重新设置一个自定义画布的大小 */
resizeCanvas(name: string, x: number, y: number): void
@@ -2774,7 +2774,6 @@ type core = {
/** 是否是QQ */isQQ: boolean
/** 是否是Chrome */isChrome: boolean
/** 是否支持复制到剪切板 */supportCopy: boolean
- useLocalForage: boolean,
fileInput: null
/** 是否支持FileReader */fileReader: null
diff --git a/server.py b/server.py
index 04533e94..0e7d5900 100644
--- a/server.py
+++ b/server.py
@@ -47,11 +47,12 @@ def get_mimetype(path):
def get_file(path):
if not os.path.isfile(path):
+ if path.startswith('_saves/'):
+ return ''
abort(404)
return None
if not is_sub(path):
abort(403)
- return None
with open(path, 'rb') as f:
content = f.read() # str in py2 and bytes in py3
return content
@@ -60,6 +61,32 @@ def get_file(path):
def root():
return static_file('index.html')
+@app.route('/__all_floors__.js', methods=['GET'])
+def all_floors():
+ ids = request.args.get('id', '').split(',')
+ if len(ids) == 0:
+ abort(404)
+ return None
+ return Response('\n'.join([get_file('project/floors/%s.js' % id) for id in ids]), mimetype = 'text/javascript')
+
+@app.route('/__all_animates__', methods=['GET'])
+def all_animates():
+ ids = request.args.get('id', '').split(',')
+ if len(ids) == 0:
+ abort(404)
+ return None
+ content = []
+ for id in ids:
+ animate = 'project/animates/%s.animate' % id
+ if os.path.exists(animate):
+ content.append(get_file(animate))
+ else: content.append('')
+ return '@@@~~~###~~~@@@'.join(content)
+
+@app.route('/favicon.ico', methods=['GET'])
+def favicon():
+ return ''
+
@app.route('/', methods=['GET'])
def static_file(path):
if os.path.isdir(path):
@@ -184,6 +211,10 @@ def deleteFile():
shutil.rmtree(name)
return 'Success'
+@app.route('/games/upload.php', methods=['POST'])
+def upload():
+ return ''
+
def port_used(port):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = True
diff --git a/启动服务.exe b/启动服务.exe
index 7c532394..95cfac40 100644
Binary files a/启动服务.exe and b/启动服务.exe differ