From 202b6c8ca650692bdf9eeb7effa93a407e32f5e2 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Tue, 31 Dec 2019 20:10:36 +0800 Subject: [PATCH] Fix 266 bug --- libs/events.js | 8 +++++--- project/functions.js | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/events.js b/libs/events.js index 26d786fb..80c92ccf 100644 --- a/libs/events.js +++ b/libs/events.js @@ -845,9 +845,11 @@ events.prototype.setEvents = function (list, x, y, callback) { if (list) { data.list = [{todo: core.clone(list), total: core.clone(list), condition: "false"}]; // 结束所有正在执行的自动事件 - core.status.autoEvents.forEach(function (autoEvent) { - core.autoEventExecuting(autoEvent.symbol, false); - }); + if (list.length == 0) { + core.status.autoEvents.forEach(function (autoEvent) { + core.autoEventExecuting(autoEvent.symbol, false); + }); + } } if (x != null) data.x = x; if (y != null) data.y = y; diff --git a/project/functions.js b/project/functions.js index dbab9534..e094e708 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1293,8 +1293,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = } // 如需强行终止行走可以在这里条件判定: // core.stopAutomaticRoute(); - - core.updateStatusBar(); }, "moveDirectly": function (x, y, ignoreSteps) { // 瞬间移动;x,y为要瞬间移动的点;ignoreSteps为减少的步数,可能之前已经被计算过