Fix 266 bug

This commit is contained in:
ckcz123 2019-12-31 20:10:36 +08:00
parent b111d8aa80
commit 202b6c8ca6
2 changed files with 5 additions and 5 deletions

View File

@ -845,10 +845,12 @@ events.prototype.setEvents = function (list, x, y, callback) {
if (list) { if (list) {
data.list = [{todo: core.clone(list), total: core.clone(list), condition: "false"}]; data.list = [{todo: core.clone(list), total: core.clone(list), condition: "false"}];
// 结束所有正在执行的自动事件 // 结束所有正在执行的自动事件
if (list.length == 0) {
core.status.autoEvents.forEach(function (autoEvent) { core.status.autoEvents.forEach(function (autoEvent) {
core.autoEventExecuting(autoEvent.symbol, false); core.autoEventExecuting(autoEvent.symbol, false);
}); });
} }
}
if (x != null) data.x = x; if (x != null) data.x = x;
if (y != null) data.y = y; if (y != null) data.y = y;
if (callback) data.callback = callback; if (callback) data.callback = callback;

View File

@ -1293,8 +1293,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
} }
// 如需强行终止行走可以在这里条件判定: // 如需强行终止行走可以在这里条件判定:
// core.stopAutomaticRoute(); // core.stopAutomaticRoute();
core.updateStatusBar();
}, },
"moveDirectly": function (x, y, ignoreSteps) { "moveDirectly": function (x, y, ignoreSteps) {
// 瞬间移动x,y为要瞬间移动的点ignoreSteps为减少的步数可能之前已经被计算过 // 瞬间移动x,y为要瞬间移动的点ignoreSteps为减少的步数可能之前已经被计算过