diff --git a/libs/control.js b/libs/control.js index fe2cedae..2924b269 100644 --- a/libs/control.js +++ b/libs/control.js @@ -1429,7 +1429,7 @@ control.prototype._replayAction_shop = function (action) { } control.prototype._replayAction_turn = function (action) { - if (action != 'turn' || action.indexOf('turn:') != 0) return false; + if (action != 'turn' && action.indexOf('turn:') != 0) return false; if (action == 'turn') core.turnHero(); else core.turnHero(action.substring(5)); setTimeout(core.replay); diff --git a/libs/core.js b/libs/core.js index 2d582aa0..12012112 100644 --- a/libs/core.js +++ b/libs/core.js @@ -348,7 +348,13 @@ core.prototype._initPlugins = function () { for (var name in plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1) { if (plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1[name] instanceof Function) { - plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1[name].apply(core.plugin); + try { + plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1[name].apply(core.plugin); + } + catch (e) { + main.log(e); + main.log("无法初始化插件"+name); + } } } diff --git a/main.js b/main.js index ecad21ed..a6c60bba 100644 --- a/main.js +++ b/main.js @@ -222,7 +222,7 @@ main.prototype.init = function (mode, callback) { for (i = 0; i < main.loadList.length; i++) { var name = main.loadList[i]; if (name === 'core') continue; - main.core[name] = new (eval(name))(); + main.core[name] = new window[name](); } main.loadFloors(function() {