From e0c4544b8cf08fb25be9fd3dea0e39721ca69394 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Mon, 6 Jul 2020 16:26:36 +0800 Subject: [PATCH] Fix bool_e --- _server/MotaActionParser.js | 1 + libs/core.js | 5 ++++- libs/loader.js | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/_server/MotaActionParser.js b/_server/MotaActionParser.js index 2117cc9f..8d22c8be 100644 --- a/_server/MotaActionParser.js +++ b/_server/MotaActionParser.js @@ -1083,6 +1083,7 @@ ActionParser.prototype.matchEvalAtom = function(args) { // 勾选框 match = /^(true|false)$/.exec(args[0]) if(match){ + args[0]='true'==args[0]; return rt(MotaActionBlocks['bool_e'].xmlText, args); } // 怪物属性 diff --git a/libs/core.js b/libs/core.js index 77baf55e..49ab324d 100644 --- a/libs/core.js +++ b/libs/core.js @@ -15,10 +15,13 @@ function core() { 'images': {}, 'bgms': {}, 'sounds': {}, - 'ground': null, 'items': {}, 'enemys': {}, 'icons': {}, + 'ground': null, + 'grundCanvas': null, + 'groundPattern': null, + 'autotileEdges': {}, } this.timeout = { 'turnHeroTimeout': null, diff --git a/libs/loader.js b/libs/loader.js index c86b3d42..5e603f2f 100644 --- a/libs/loader.js +++ b/libs/loader.js @@ -176,13 +176,14 @@ loader.prototype._loadAutotiles_async = function (onprogress, onfinished) { loader.prototype._loadAutotiles_afterLoad = function (keys, autotiles) { // autotile需要保证顺序 - keys.forEach(function (v) { - core.material.images.autotile[v] = autotiles[v]; + keys.forEach(function (v) { + core.material.images.autotile[v] = autotiles[v]; }); setTimeout(function () { core.maps._makeAutotileEdges(); }); + } // ------ 加载额外素材 ------ //