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

setGlobal & getGlobal

Browse Source
This commit is contained in:
oc 2019-04-29 19:34:27 +08:00
parent efe51ce363
commit 8769668222
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/control.js
View File

@ -1300,6 +1300,7 @@ control.prototype._replay_save = function () {
} }
control.prototype._replay_error = function (action) { control.prototype._replay_error = function (action) {
core.ui.closePanel();
core.status.replay.replaying = false; core.status.replay.replaying = false;
var len = core.status.replay.toReplay.length; var len = core.status.replay.toReplay.length;
var prevList = core.status.replay.totalList.slice(-len - 11, -len - 1); var prevList = core.status.replay.totalList.slice(-len - 11, -len - 1);
@ -1427,8 +1428,7 @@ control.prototype._replayAction_shop = function (action) {
var shopInterval = setInterval(function () { var shopInterval = setInterval(function () {
if (!core.actions._clickShop(core.__HALF_SIZE__, topIndex+core.status.event.selection)) { if (!core.actions._clickShop(core.__HALF_SIZE__, topIndex+core.status.event.selection)) {
clearInterval(shopInterval); clearInterval(shopInterval);
core.stopReplay(); core.control._replay_error(action);
core.drawTip("录像文件出错");
return; return;
} }
if (selections.length==0) { if (selections.length==0) {

18
libs/events.js
View File

@ -1336,10 +1336,8 @@ events.prototype.__action_getInput = function (hint, isText, callback) {
callback(value); callback(value);
} }
catch (e) { catch (e) {
main.log(e); core.control._replay_error(action);
core.stopReplay(); return;
core.insertAction(["录像文件出错，请在控制台查看报错信息。", {"type": "exit"}]);
core.doAction();
} }
} }
else { else {
@ -1384,10 +1382,7 @@ events.prototype._action_choices = function (data, x, y, prefix) {
}, 750 / Math.max(1, core.status.replay.speed)) }, 750 / Math.max(1, core.status.replay.speed))
} }
else { else {
main.log("录像文件出错！当前需要一个 choices: 项，实际为 " + action); core.control._replay_error(action);
core.stopReplay();
core.insertAction(["录像文件出错，请在控制台查看报错信息。", {"type": "exit"}]);
core.doAction();
return; return;
} }
} }
@ -1410,10 +1405,7 @@ events.prototype._action_confirm = function (data, x, y, prefix) {
}, 750 / Math.max(1, core.status.replay.speed)) }, 750 / Math.max(1, core.status.replay.speed))
} }
else { else {
main.log("录像文件出错！当前需要一个 choices: 项，实际为 " + action); core.control._replay_error(action);
core.stopReplay();
core.insertAction(["录像文件出错，请在控制台查看报错信息。", {"type": "exit"}]);
core.doAction();
return; return;
} }
} }
@ -1827,7 +1819,7 @@ events.prototype._setValue_setSwitch = function (name, value, prefix) {
events.prototype._setValue_setGlobal = function (name, value) { events.prototype._setValue_setGlobal = function (name, value) {
if (name.indexOf("global:") !== 0) return; if (name.indexOf("global:") !== 0) return;
core.setLocalStorage(name.substring(7), value); core.setGlobal(name.substring(7), value);
} }
////// 数值增减 ////// ////// 数值增减 //////

32
libs/utils.js
View File

@ -67,7 +67,7 @@ utils.prototype.calValue = function (value, prefix, need, times) {
value = value.replace(/item:([a-zA-Z0-9_]+)/g, "core.itemCount('$1')"); value = value.replace(/item:([a-zA-Z0-9_]+)/g, "core.itemCount('$1')");
value = value.replace(/flag:([a-zA-Z0-9_\u4E00-\u9FCC]+)/g, "core.getFlag('$1', 0)"); value = value.replace(/flag:([a-zA-Z0-9_\u4E00-\u9FCC]+)/g, "core.getFlag('$1', 0)");
value = value.replace(/switch:([a-zA-Z0-9_]+)/g, "core.getFlag('" + (prefix || ":f@x@y") + "@$1', 0)"); value = value.replace(/switch:([a-zA-Z0-9_]+)/g, "core.getFlag('" + (prefix || ":f@x@y") + "@$1', 0)");
value = value.replace(/global:([a-zA-Z0-9_\u4E00-\u9FCC]+)/g, "core.getLocalStorage('$1', 0)"); value = value.replace(/global:([a-zA-Z0-9_\u4E00-\u9FCC]+)/g, "core.getGlobal('$1', 0)");
return eval(value); return eval(value);
} }
if (value instanceof Function) { if (value instanceof Function) {
@ -247,6 +247,31 @@ utils.prototype.removeLocalForage = function (key, successCallback, errorCallbac
}) })
} }
utils.prototype.setGlobal = function (key, value) {
if (core.status.replay.replaying) return;
core.setLocalStorage(key, value);
}
utils.prototype.getGlobal = function (key, defaultValue) {
var value;
if (core.isReplaying()) {
// 不考虑key不一致的情况
var action = core.status.replay.toReplay.shift();
if (action.indexOf("input2:") == 0) {
value = JSON.parse(core.decodeBase64(action.substring(7)));
}
else {
core.control._replay_error(action);
return defaultValue;
}
}
else {
value = core.getLocalStorage(key, defaultValue);
}
core.status.route.push("input2:" + core.encodeBase64(JSON.stringify(value)));
return value;
}
////// 深拷贝一个对象 ////// ////// 深拷贝一个对象 //////
utils.prototype.clone = function (data, filter, recursion) { utils.prototype.clone = function (data, filter, recursion) {
if (!core.isset(data)) return null; if (!core.isset(data)) return null;
@ -687,9 +712,8 @@ utils.prototype.rand2 = function (num) {
value = parseInt(action.substring(7)); value = parseInt(action.substring(7));
} }
else { else {
core.stopReplay(); core.control._replay_error(action);
core.drawTip("录像文件出错"); return 0;
return;
} }
} }
else { else {