From a778dda4de1ce5bd960b1cd2f1284c2742c81d4a Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Thu, 23 May 2019 17:08:06 +0800
Subject: [PATCH 01/23] quickLoadEquip

---
 libs/items.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/libs/items.js b/libs/items.js
index a68aa04c..d55066c5 100644
--- a/libs/items.js
+++ b/libs/items.js
@@ -372,7 +372,8 @@ items.prototype._realLoadEquip = function (type, loadId, unloadId, callback) {
 }
 
 items.prototype._realLoadEquip_playSound = function () {
-    core.stopSound(); // 先停止所有音效（为了避免快捷换装很乱）
+    if (core.hasFlag("__quickLoadEquip__")) return;
+    core.stopSound();
     core.playSound('equip.mp3');
 }
 
@@ -398,20 +399,30 @@ items.prototype.quickLoadEquip = function (index) {
         if (v && !this.canEquip(v, true))
             return;
     }
+    core.setFlag("__quickLoadEquip__", true);
     // 快速换装
+    var toEquip = [];
     for (var i = 0; i < equipSize; i++) {
         var now = core.status.hero.equipment[i];
-        if (now) {
-            this.unloadEquip(i);
-            core.status.route.push("unEquip:" + i);
+        // --- 只考虑diff的装备
+        var to = current[i];
+        if (now != to) {
+            toEquip.push(to || null);
+            if (now) {
+                this.unloadEquip(i);
+                core.status.route.push("unEquip:" + i);
+            }
         }
     }
-    for (var i = 0; i < equipSize; i++) {
-        var to = current[i];
+    for (var i in toEquip) {
+        var to = toEquip[i];
         if (to) {
             this.loadEquip(to);
             core.status.route.push("equip:" + to);
         }
     }
+    core.removeFlag("__quickLoadEquip__");
+    this._realLoadEquip_playSound();
+
     core.drawTip("成功换上" + index + "号套装");
 }

From 22f89277086bab52268b636739d312ef28ffb944 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 24 May 2019 11:34:55 +0800
Subject: [PATCH 02/23] getEnemyInfo query cache

---
 project/functions.js | 112 +++++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 52 deletions(-)

diff --git a/project/functions.js b/project/functions.js
index 9ff2e15b..8e84d5e4 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -513,64 +513,72 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		mon_def = hero_atk - 1;
 	}
 
-	// 光环检查
-	// 从V2.5.4开始，对光环效果增加缓存，以解决多次重复计算的问题，从而大幅提升运行效率。
-	// 检查当前楼层所有光环怪物（数字25）
-	var hp_buff = 0,
-		atk_buff = 0,
-		def_buff = 0,
-		cnt = 0;
 	// ------ 支援 ------
 	var guards = [];
-	// 检查光环缓存
-	var index = x != null && y != null ? (x + "," + y) : "floor";
-	if (!core.status.checkBlock) core.status.checkBlock = {};
-	if (!core.status.checkBlock.cache) core.status.checkBlock.cache = {};
-	var cache = core.status.checkBlock.cache[index];
-	if (!cache) {
-		// 没有该点的缓存，则遍历每个图块
-		core.status.maps[floorId].blocks.forEach(function (block) {
-			if (!block.disable) {
-				// 获得该图块的ID
-				var id = block.event.id,
-					enemy = core.material.enemys[id];
-				// 检查是不是怪物，且是否拥有该特殊属性
-				if (enemy && core.hasSpecial(enemy.special, 25)) {
-					// 检查是否可叠加
-					if (enemy.add || cnt == 0) {
-						hp_buff += enemy.value || 0;
-						atk_buff += enemy.atkValue || 0;
-						def_buff += enemy.defValue || 0;
-						cnt++;
-					}
-				}
-				// 检查【支援】技能
-				if (enemy && core.hasSpecial(enemy.special, 26) &&
-					// 检查支援条件，坐标存在，距离为1，且不能是自己
-					// 其他类型的支援怪，比如十字之类的话.... 看着做是一样的
-					x != null && y != null && Math.abs(block.x - x) <= 1 && Math.abs(block.y - y) <= 1 && !(x == block.x && y == block.y)) {
-					// 记录怪物的x,y，ID
-					guards.push([block.x, block.y, id]);
-				}
 
-				// TODO：如果有其他类型光环怪物在这里仿照添加检查
-			}
-		});
-
-		core.status.checkBlock.cache[index] = { "hp_buff": hp_buff, "atk_buff": atk_buff, "def_buff": def_buff, "guards": guards };
-	} else {
-		// 直接使用缓存数据
-		hp_buff = cache.hp_buff;
-		atk_buff = cache.atk_buff;
-		def_buff = cache.def_buff;
-		guards = cache.guards;
+	// 光环检查
+	// 在这里判定是否需要遍历全图（由于光环需要遍历全图，应尽可能不需要以减少计算量，尤其是大地图）
+	var query = function () {
+		var floorIds = ["MTx"]; // 在这里给出所有需要遍历的楼层（即有光环或支援等）
+		return core.inArray(floorIds, floorId); // 也可以写其他的判定条件
 	}
 
-	// 增加比例；如果要增加数值可以直接在这里修改
-	mon_hp *= (1 + hp_buff / 100);
-	mon_atk *= (1 + atk_buff / 100);
-	mon_def *= (1 + def_buff / 100);
+	if (query()) {
+		// 从V2.5.4开始，对光环效果增加缓存，以解决多次重复计算的问题，从而大幅提升运行效率。
+		// 检查当前楼层所有光环怪物（数字25）
+		var hp_buff = 0,
+			atk_buff = 0,
+			def_buff = 0,
+			cnt = 0;
+		// 检查光环缓存
+		var index = x != null && y != null ? (x + "," + y) : "floor";
+		if (!core.status.checkBlock) core.status.checkBlock = {};
+		if (!core.status.checkBlock.cache) core.status.checkBlock.cache = {};
+		var cache = core.status.checkBlock.cache[index];
+		if (!cache) {
+			// 没有该点的缓存，则遍历每个图块
+			core.status.maps[floorId].blocks.forEach(function (block) {
+				if (!block.disable) {
+					// 获得该图块的ID
+					var id = block.event.id,
+						enemy = core.material.enemys[id];
+					// 检查是不是怪物，且是否拥有该特殊属性
+					if (enemy && core.hasSpecial(enemy.special, 25)) {
+						// 检查是否可叠加
+						if (enemy.add || cnt == 0) {
+							hp_buff += enemy.value || 0;
+							atk_buff += enemy.atkValue || 0;
+							def_buff += enemy.defValue || 0;
+							cnt++;
+						}
+					}
+					// 检查【支援】技能
+					if (enemy && core.hasSpecial(enemy.special, 26) &&
+						// 检查支援条件，坐标存在，距离为1，且不能是自己
+						// 其他类型的支援怪，比如十字之类的话.... 看着做是一样的
+						x != null && y != null && Math.abs(block.x - x) <= 1 && Math.abs(block.y - y) <= 1 && !(x == block.x && y == block.y)) {
+						// 记录怪物的x,y，ID
+						guards.push([block.x, block.y, id]);
+					}
 
+					// TODO：如果有其他类型光环怪物在这里仿照添加检查
+				}
+			});
+
+			core.status.checkBlock.cache[index] = { "hp_buff": hp_buff, "atk_buff": atk_buff, "def_buff": def_buff, "guards": guards };
+		} else {
+			// 直接使用缓存数据
+			hp_buff = cache.hp_buff;
+			atk_buff = cache.atk_buff;
+			def_buff = cache.def_buff;
+			guards = cache.guards;
+		}
+
+		// 增加比例；如果要增加数值可以直接在这里修改
+		mon_hp *= (1 + hp_buff / 100);
+		mon_atk *= (1 + atk_buff / 100);
+		mon_def *= (1 + def_buff / 100);
+	}
 
 	// TODO：可以在这里新增其他的怪物数据变化
 	// 比如仿攻（怪物攻击不低于勇士攻击）：

From a57771d1bfbc1940780c5e2cd4fcd0352bf4acf6 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 12:01:39 +0800
Subject: [PATCH 03/23] changeFloor symmetry point

---
 _server/MotaAction.g4        |  8 ++++----
 _server/editor_mode.js       |  2 +-
 _server/editor_unsorted_1.js | 17 ++++++++++++++---
 libs/events.js               | 13 ++++++++++++-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index d8593e39..82deb5dc 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -228,7 +228,7 @@ default : [null,"MT1",null,0,0,null,500,null]
 var toFloorId = IdString_0;
 if (Floor_List_0!='floorId') toFloorId = Floor_List_0;
 var loc = ', "loc": ['+Number_0+', '+Number_1+']';
-if (Stair_List_0==='now')loc = '';
+if (Stair_List_0===':now') loc = '';
 else if (Stair_List_0!=='loc')loc = ', "stair": "'+Stair_List_0+'"';
 DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"');
 Int_0 = (Int_0!=='')  ?(', "time": '+Int_0):'';
@@ -2032,8 +2032,8 @@ Floor_List
     /*Floor_List ['floorId',':before',':next']*/;
 
 Stair_List
-    :   '坐标'|'上楼梯'|'下楼梯'|'保持不变'
-    /*Stair_List ['loc','upFloor','downFloor','now']*/;
+    :   '坐标'|'上楼梯'|'下楼梯'|'保持不变'|'中心对称点'|'x对称点'|'y对称点'
+    /*Stair_List ['loc','upFloor','downFloor',':now',':symmetry',':symmetry_x',':symmetry_y']*/;
 
 SetTextPosition_List
     :   '不改变'|'距离顶部'|'居中'|'距离底部'
@@ -2220,7 +2220,7 @@ ActionParser.prototype.parse = function (obj,type) {
       if(!obj)obj={};
       if(!this.isset(obj.loc)) {
         obj.loc=[0,0];
-        if (!this.isset(obj.stair)) obj.stair='now';
+        if (!this.isset(obj.stair)) obj.stair=':now';
       }
       if (obj.floorId==':before'||obj.floorId==':next') {
         obj.floorType=obj.floorId;
diff --git a/_server/editor_mode.js b/_server/editor_mode.js
index 8bf22dc9..f0215cf0 100644
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@@ -57,7 +57,7 @@ editor_mode = function (editor) {
                 printe(objs_.slice(-1)[0]);
                 throw(objs_.slice(-1)[0])
             }
-            ;printf('修改成功');
+            ;printf('修改成功' + (data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.firstData.name == 'template' ? '\n\n请注意：全塔属性的name尚未修改，请及时予以设置' : ''));
         }
         switch (mode) {
             case 'loc':
diff --git a/_server/editor_unsorted_1.js b/_server/editor_unsorted_1.js
index 0d3861d8..c37078e1 100644
--- a/_server/editor_unsorted_1.js
+++ b/_server/editor_unsorted_1.js
@@ -502,6 +502,10 @@ editor.constructor.prototype.listen=function () {
             addFloorEvent.style.display='block';
             addFloorEvent.children[0].innerHTML='绑定下楼事件';
         }
+        else if (['leftPortal','rightPortal','downPortal','upPortal'].indexOf(thisevent.id)>=0) {
+            addFloorEvent.style.display='block';
+            addFloorEvent.children[0].innerHTML='绑定楼传事件';
+        }
         else addFloorEvent.style.display='none';
 
         chooseThis.children[0].innerHTML='选中此点'+'('+editor.pos.x+','+editor.pos.y+')'
@@ -524,20 +528,27 @@ editor.constructor.prototype.listen=function () {
         editor.hideMidMenu();
         e.stopPropagation();
         var thisevent = editor.map[editor.pos.y][editor.pos.x];
+        var loc = editor.pos.x+","+editor.pos.y;
         if (thisevent.id=='upFloor') {
-            editor.currentFloorData.changeFloor[editor.pos.x+","+editor.pos.y] = {"floorId": ":next", "stair": "downFloor"};
+            editor.currentFloorData.changeFloor[loc] = {"floorId": ":next", "stair": "downFloor"};
         }
         else if (thisevent.id=='downFloor') {
-            editor.currentFloorData.changeFloor[editor.pos.x+","+editor.pos.y] = {"floorId": ":before", "stair": "upFloor"};
+            editor.currentFloorData.changeFloor[loc] = {"floorId": ":before", "stair": "upFloor"};
+        }
+        else if (thisevent.id=='leftPortal' || thisevent.id=='rightPortal') {
+            editor.currentFloorData.changeFloor[loc] = {"floorId": ":next", "stair": ":symmetry_x"}
+        }
+        else if (thisevent.id=='upPortal' || thisevent.id=='downPortal') {
+            editor.currentFloorData.changeFloor[loc] = {"floorId": ":next", "stair": ":symmetry_y"}
         }
         editor.file.saveFloorFile(function (err) {
             if (err) {
                 printe(err);
                 throw(err)
             }
-            ;printf('添加楼梯事件成功');
             editor.drawPosSelection();
             editor_mode.showMode('loc');
+            printf('添加楼梯事件成功');
         });
     }
 
diff --git a/libs/events.js b/libs/events.js
index f0807d4c..41a3b1c7 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -548,8 +548,19 @@ events.prototype._changeFloor_getHeroLoc = function (floorId, stair, heroLoc) {
     if (!heroLoc)
         heroLoc = core.clone(core.status.hero.loc);
     if (stair) {
+        // --- 对称
+        if (stair == ':now')
+            heroLoc = core.clone(core.status.hero.loc);
+        else if (stair == ':symmetry') {
+            heroLoc.x = core.bigmap.width - 1 - core.getHeroLoc('x');
+            heroLoc.y = core.bigmap.height - 1 - core.getHeroLoc('y');
+        }
+        else if (stair == ':symmetry_x')
+            heroLoc.x = core.bigmap.width - 1 - core.getHeroLoc('x');
+        else if (stair == ':symmetry_y')
+            heroLoc.y = core.bigmap.height - 1 - core.getHeroLoc('y');
         // 检查该层地图的 upFloor & downFloor
-        if (core.status.maps[floorId][stair]) {
+        else if (core.status.maps[floorId][stair]) {
             heroLoc.x = core.status.maps[floorId][stair][0];
             heroLoc.y = core.status.maps[floorId][stair][1];
         }

From 304bd80bbcd2936c864c28789bcca2d2a28beff6 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 13:58:08 +0800
Subject: [PATCH 04/23] uievent runtime

---
 libs/control.js |   7 ++-
 libs/events.js  |  70 ++++++++++++++++++++++
 libs/ui.js      | 156 +++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 216 insertions(+), 17 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index d3289e37..905be87f 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -152,8 +152,11 @@ control.prototype._animationFrame_globalAnimate = function (timestamp) {
 }
 
 control.prototype._animationFrame_selector = function (timestamp) {
-    if (timestamp - core.animateFrame.selectorTime <= 20 || !core.dymCanvas._selector) return;
-    var opacity = parseFloat(core.dymCanvas._selector.canvas.style.opacity);
+    if (timestamp - core.animateFrame.selectorTime <= 20) return;
+    var opacity = null;
+    if (core.dymCanvas._selector) opacity = parseFloat(core.dymCanvas._selector.canvas.style.opacity);
+    else if (core.dymCanvas._uievent_selector) opacity = parseFloat(core.dymCanvas._uievent_selector.canvas.style.opacity);
+    if (!core.isset(opacity)) return;
     if (core.animateFrame.selectorUp)
         opacity += 0.02;
     else
diff --git a/libs/events.js b/libs/events.js
index 41a3b1c7..67d409e8 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1620,6 +1620,76 @@ events.prototype._action_exit = function (data, x, y, prefix) {
     core.doAction();
 }
 
+events.prototype._action_previewUIEvent = function (data, x, y, prefix) {
+    this.insert(data.action);
+    core.doAction();
+}
+
+events.prototype._action_clearMap = function (data, x, y, prefix) {
+    core.ui._uievent_clearMap(data);
+    core.doAction();
+}
+
+events.prototype._action_fillText = function (data, x, y, prefix) {
+    core.ui._uievent_fillText(data);
+    core.doAction();
+}
+
+events.prototype._action_fillBoldText = function (data, x, y, prefix) {
+    core.ui._uievent_fillBoldText(data);
+    core.doAction();
+}
+
+events.prototype._action_fillRect = function (data, x, y, prefix) {
+    core.ui._uievent_fillRect(data);
+    core.doAction();
+}
+
+events.prototype._action_strokeRect = function (data, x, y, prefix) {
+    core.ui._uievent_strokeRect(data);
+    core.doAction();
+}
+
+events.prototype._action_drawLine = function (data, x, y, prefix) {
+    core.ui._uievent_drawLine(data);
+    core.doAction();
+}
+
+events.prototype._action_drawArrow = function (data, x, y, prefix) {
+    core.ui._uievent_drawArrow(data);
+    core.doAction();
+}
+
+events.prototype._action_setAttribute = function (data, x, y, prefix) {
+    core.ui._uievent_setAttribute(data);
+    core.doAction();
+}
+
+events.prototype._action_drawImage = function (data, x, y, prefix) {
+    core.ui._uievent_drawImage(data);
+    core.doAction();
+}
+
+events.prototype._action_drawIcon = function (data, x, y, prefix) {
+    core.ui._uievent_drawIcon(data);
+    core.doAction();
+}
+
+events.prototype._action_drawSelector = function (data, x, y, prefix) {
+    core.ui._uievent_drawSelector(data);
+    core.doAction();
+}
+
+events.prototype._action_drawBackground = function (data, x, y, prefix) {
+    core.ui._uievent_drawBackground(data);
+    core.doAction();
+}
+
+events.prototype._action_drawTextContent = function (data, x, y, prefix) {
+    core.ui._uievent_drawTextContent(data);
+    core.doAction();
+}
+
 // ------ 点击状态栏图标所进行的一些操作 ------ //
 
 ////// 判断当前能否进入某个事件 //////
diff --git a/libs/ui.js b/libs/ui.js
index 21ce736e..f06a9a87 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -37,6 +37,13 @@ ui.prototype.getContextByName = function (name) {
     return null;
 }
 
+ui.prototype._createUIEvent = function () {
+    if (main.mode == 'editor') return;
+    if (!core.dymCanvas['uievent']) {
+        core.createCanvas('uievent', 0, 0, this.PIXEL, this.PIXEL, 135);
+    }
+}
+
 ////// 清除地图 //////
 ui.prototype.clearMap = function (name, x, y, width, height) {
     if (name == 'all') {
@@ -52,6 +59,15 @@ ui.prototype.clearMap = function (name, x, y, width, height) {
     }
 }
 
+ui.prototype._uievent_clearMap = function (data) {
+    if (main.mode != 'editor' && (data.x == null || data.y == null || data.width == null || data.height == null)) {
+        this.deleteCanvas('uievent');
+        return;
+    }
+    this._createUIEvent();
+    this.clearMap('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height));
+}
+
 ////// 在某个canvas上绘制一段文字 //////
 ui.prototype.fillText = function (name, text, x, y, style, font, maxWidth) {
     if (style) core.setFillStyle(name, style);
@@ -66,6 +82,11 @@ ui.prototype.fillText = function (name, text, x, y, style, font, maxWidth) {
     }
 }
 
+ui.prototype._uievent_fillText = function (data) {
+    this._createUIEvent();
+    this.fillText('uievent', core.replaceText(data.text), core.calValue(data.x), core.calValue(data.y), data.style, data.font, data.maxWidth);
+}
+
 ////// 自适配字体大小
 ui.prototype._fillTextWithMaxWidth = function (ctx, text, x, y, maxWidth) {
     // 获得当前字体
@@ -94,6 +115,11 @@ ui.prototype.fillBoldText = function (name, text, x, y, style, font) {
     ctx.fillText(text, x, y);
 }
 
+ui.prototype._uievent_fillBoldText = function (data) {
+    this._createUIEvent();
+    this.fillBoldText('uievent', core.replaceText(data.text), core.calValue(data.x), core.calValue(data.y), data.style, data.font);
+}
+
 ////// 在某个canvas上绘制一个矩形 //////
 ui.prototype.fillRect = function (name, x, y, width, height, style) {
     if (style) core.setFillStyle(name, style);
@@ -101,6 +127,11 @@ ui.prototype.fillRect = function (name, x, y, width, height, style) {
     if (ctx) ctx.fillRect(x, y, width, height);
 }
 
+ui.prototype._uievent_fillRect = function (data) {
+    this._createUIEvent();
+    this.fillRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style);
+}
+
 ////// 在某个canvas上绘制一个矩形的边框 //////
 ui.prototype.strokeRect = function (name, x, y, width, height, style, lineWidth) {
     if (style) core.setStrokeStyle(name, style);
@@ -109,6 +140,11 @@ ui.prototype.strokeRect = function (name, x, y, width, height, style, lineWidth)
     if (ctx) ctx.strokeRect(x, y, width, height);
 }
 
+ui.prototype._uievent_strokeRect = function (data) {
+    this._createUIEvent();
+    this.strokeRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style, data.lineWidth);
+}
+
 ////// 在某个canvas上绘制一条线 //////
 ui.prototype.drawLine = function (name, x1, y1, x2, y2, style, lineWidth) {
     if (style) core.setStrokeStyle(name, style);
@@ -121,6 +157,11 @@ ui.prototype.drawLine = function (name, x1, y1, x2, y2, style, lineWidth) {
     ctx.stroke();
 }
 
+ui.prototype._uievent_drawLine = function (data) {
+    this._createUIEvent();
+    this.drawLine('uievent', core.calValue(data.x1), core.calValue(data.y1), core.calValue(data.x2), core.calValue(data.y2), data.style, data.lineWidth);
+}
+
 ////// 在某个canvas上绘制一个箭头 //////
 ui.prototype.drawArrow = function (name, x1, y1, x2, y2, style, lineWidth) {
     if (x1==x2 && y1==y2) return;
@@ -140,6 +181,11 @@ ui.prototype.drawArrow = function (name, x1, y1, x2, y2, style, lineWidth) {
     ctx.stroke();
 }
 
+ui.prototype._uievent_drawArrow = function (data) {
+    this._createUIEvent();
+    this.drawArrow('uievent', core.calValue(data.x1), core.calValue(data.y1), core.calValue(data.x2), core.calValue(data.y2), data.style, data.lineWidth);
+}
+
 ////// 设置某个canvas的文字字体 //////
 ui.prototype.setFont = function (name, font) {
     var ctx = this.getContextByName(name);
@@ -200,6 +246,17 @@ ui.prototype.setTextBaseline = function (name, baseline) {
     if (ctx) ctx.textBaseline = baseline;
 }
 
+ui.prototype._uievent_setAttribute = function (data) {
+    this._createUIEvent();
+    if (data.font) this.setFont('uievent', data.font);
+    if (data.lineWidth) this.setLineWidth('uievent', data.lineWidth);
+    if (data.alpha != null) this.setAlpha('uievent', data.alpha);
+    if (data.fillStyle) this.setFillStyle('uievent', data.fillStyle);
+    if (data.strokeStyle) this.setStrokeStyle('uievent', data.strokeStyle);
+    if (data.align) this.setTextAlign('uievent', data.align);
+    if (data.baseline) this.setTextBaseline('uievent', data.baseline);
+}
+
 ////// 计算某段文字的宽度 //////
 ui.prototype.calWidth = function (name, text, font) {
     var ctx = this.getContextByName(name);
@@ -251,9 +308,9 @@ ui.prototype.drawImage = function (name, image, x, y, w, h, x1, y1, w1, h1) {
     }
 
     // 只能接受2, 4, 8个参数
-    if (core.isset(x) && core.isset(y)) {
-        if (core.isset(w) && core.isset(h)) {
-            if (core.isset(x1) && core.isset(y1) && core.isset(w1) && core.isset(h1)) {
+    if (x != null && y != null) {
+        if (w != null && h != null) {
+            if (x1 != null && y1 != null && w1 != null && h1 != null) {
                 ctx.drawImage(image, x, y, w, h, x1, y1, w1, h1);
                 return;
             }
@@ -265,6 +322,30 @@ ui.prototype.drawImage = function (name, image, x, y, w, h, x1, y1, w1, h1) {
     }
 }
 
+ui.prototype._uievent_drawImage = function (data) {
+    this._createUIEvent();
+    this.drawImage(data.name, core.calValue(data.x), core.calValue(data.y), core.calValue(data.w), core.calValue(data.h),
+        core.calValue(data.x1), core.calValue(data.y1), core.calValue(data.w1), core.calValue(data.h1));
+}
+
+ui.prototype.drawIcon = function (name, id, x, y, w, h) {
+    var ctx = this.getContextByName(name);
+    if (!ctx) return;
+    var info = core.getBlockInfo(id);
+    if (!info) {
+        // 检查状态栏图标
+        if (core.statusBar.icons[id] instanceof Image)
+            info = {image: core.statusBar.icons[id], posX: 0, posY: 0, height: 32};
+        else return;
+    }
+    ctx.drawImage(info.image, 32 * info.posX, info.height * info.posY, 32, info.height, x, y, w || 32, h || info.height);
+}
+
+ui.prototype._uievent_drawIcon = function (data) {
+    this._createUIEvent();
+    this.drawIcon('uievent', data.id, core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height));
+}
+
 ///////////////// UI绘制
 
 ////// 结束一切事件和绘制，关闭UI窗口，返回游戏进程 //////
@@ -465,23 +546,44 @@ ui.prototype._getPosition = function (content) {
 
 ////// 绘制选择光标
 ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
+    w = Math.round(w), h = Math.round(h);
+    var ctx = core.ui.createCanvas("_selector", x, y, w, h, 165);
+    ctx.canvas.style.opacity = 0.8;
+    this._drawSelector(ctx, background, x, y, w, h);
+}
+
+ui.prototype._uievent_drawSelector = function (data) {
+    var background = data.background || core.status.textAttribute.background;
+    if (typeof background != 'string') return;
+    var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);
+    w = Math.round(w); h = Math.round(h);
+    if (main.mode == 'editor') {
+        this._drawSelector('uievent', background, x, y, w, h);
+        return;
+    }
+    var ctx = core.createCanvas('_uievent_selector', x, y, w, h, 136);
+    ctx.canvas.style.opacity = 0.8;
+    this._drawSelector(ctx, background, x, y, w, h);
+}
+
+ui.prototype._drawSelector = function (ctx, background, x, y, w, h) {
+    ctx = this.getContextByName(ctx);
+    if (!ctx) return;
     if (typeof background == 'string')
         background = core.material.images.images[background];
-    w = Math.round(w), h = Math.round(h);
-    var dstImage = core.ui.createCanvas("_selector", x, y, w, h, 165);
-    core.setOpacity("_selector", 0.8);
+    if (!(background instanceof Image)) return;
     // back
-    dstImage.drawImage(background, 130, 66, 28, 28,  2,  2,w-4,h-4);
+    ctx.drawImage(background, 130, 66, 28, 28,  2,  2,w-4,h-4);
     // corner
-    dstImage.drawImage(background, 128, 64,  2,  2,  0,  0,  2,  2);
-    dstImage.drawImage(background, 158, 64,  2,  2,w-2,  0,  2,  2);
-    dstImage.drawImage(background, 128, 94,  2,  2,  0,h-2,  2,  2);
-    dstImage.drawImage(background, 158, 94,  2,  2,w-2,h-2,  2,  2);
+    ctx.drawImage(background, 128, 64,  2,  2,  0,  0,  2,  2);
+    ctx.drawImage(background, 158, 64,  2,  2,w-2,  0,  2,  2);
+    ctx.drawImage(background, 128, 94,  2,  2,  0,h-2,  2,  2);
+    ctx.drawImage(background, 158, 94,  2,  2,w-2,h-2,  2,  2);
     // border
-    dstImage.drawImage(background, 130, 64, 28,  2,  2,  0,w-4,  2);
-    dstImage.drawImage(background, 130, 94, 28,  2,  2,h-2,w-4,  2);
-    dstImage.drawImage(background, 128, 66,  2, 28,  0,  2,  2,h-4);
-    dstImage.drawImage(background, 158, 66,  2, 28,w-2,  2,  2,h-4);
+    ctx.drawImage(background, 130, 64, 28,  2,  2,  0,w-4,  2);
+    ctx.drawImage(background, 130, 94, 28,  2,  2,h-2,w-4,  2);
+    ctx.drawImage(background, 128, 66,  2, 28,  0,  2,  2,h-4);
+    ctx.drawImage(background, 158, 66,  2, 28,w-2,  2,  2,h-4);
 }
 
 ////// 绘制 WindowSkin
@@ -543,6 +645,25 @@ ui.prototype.drawBackground = function (left, top, right, bottom, posInfo) {
     return false;
 }
 
+ui.prototype._uievent_drawBackground = function (data) {
+    this._createUIEvent();
+    var background = data.background || core.status.textAttribute.background;
+    var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);
+    if (typeof background == 'string') {
+        if (data.alpha != null) this.setAlpha('uievent', data.alpha);
+        this.drawWindowSkin(background, 'uievent', x, y, w, h);
+    }
+    else if (background instanceof Array) {
+        var alpha = background[3];
+        if (alpha == null) alpha = 1;
+        if (data.alpha != null) alpha = data.alpha;
+        this.setAlpha('uievent', alpha);
+        this.setLineWidth('uievent', 2);
+        this.fillRect('uievent', x, y, w, h, core.arrayToRGB(background));
+        this.strokeRect('uievent', x, y, w, h, core.status.globalAttribute.borderColor);
+    }
+}
+
 ui.prototype._drawWindowSkin_getOpacity = function () {
     return core.getFlag("__winskin_opacity__", 0.85);
 }
@@ -678,6 +799,11 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
     tempCtx.textBaseline = _textBaseLine;
 }
 
+ui.prototype._uievent_drawTextContent = function (data) {
+    this._createUIEvent();
+    this.drawTextContent('uievent', core.replaceText(data.content), data);
+}
+
 // 绘制的基本逻辑：
 // 1. 一个个字符绘制到对应画布上（靠左对齐）；这个过程中，记下来每个字对应的方块 [x, y, w, h]
 // 2. 每次换行时，计算当前行的宽度，然后如果是居中或者靠右对齐，则对当前行的每个小方块增加偏移量

From a6f3e18efc46bf985c7fdc8cd9f5ace437b329e3 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 14:10:17 +0800
Subject: [PATCH 05/23] uievent runtime

---
 _docs/api.md    | 7 +++++++
 libs/control.js | 1 +
 libs/events.js  | 2 +-
 libs/ui.js      | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/_docs/api.md b/_docs/api.md
index 3943d347..0aa05bfe 100644
--- a/_docs/api.md
+++ b/_docs/api.md
@@ -1695,6 +1695,13 @@ core.drawImage(name, image, x, y, w, h, x1, y1, w1, h1)
 http://www.w3school.com.cn/html5/canvas_drawimage.asp
 这里的image允许传一个图片，画布。也允许传递图片名，将从你导入的图片中获取图片内容。
 
+
+core.drawIcon(name, id, x, y, w, h)
+在一张画布上绘制一个图标。
+id为注册过的图标ID，也可以使用状态栏的图标ID，例如lv, hp, up, save, settings等。
+x和y为绘制的左上角坐标；w和h可选为绘制的宽高，如果不填或null则使用该图标的默认宽高。
+
+
 // ------ 具体的某个UI界面的绘制 ------ //
 core.closePanel()
 结束一切事件和UI绘制，关闭UI窗口，返回游戏。
diff --git a/libs/control.js b/libs/control.js
index 905be87f..4a9c8b84 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -164,6 +164,7 @@ control.prototype._animationFrame_selector = function (timestamp) {
     if (opacity > 0.95 || opacity < 0.55)
         core.animateFrame.selectorUp = !core.animateFrame.selectorUp;
     core.setOpacity("_selector", opacity);
+    core.setOpacity("_uievent_selector", opacity);
     core.animateFrame.selectorTime = timestamp;
 }
 
diff --git a/libs/events.js b/libs/events.js
index 67d409e8..a3481278 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1621,7 +1621,7 @@ events.prototype._action_exit = function (data, x, y, prefix) {
 }
 
 events.prototype._action_previewUIEvent = function (data, x, y, prefix) {
-    this.insert(data.action);
+    this.insertAction(data.action);
     core.doAction();
 }
 
diff --git a/libs/ui.js b/libs/ui.js
index f06a9a87..0ce671c4 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -553,6 +553,12 @@ ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
 }
 
 ui.prototype._uievent_drawSelector = function (data) {
+    if (data.x == null || data.y == null || data.width == null || data.height == null) {
+        if (main.mode != 'editor')
+            core.deleteCanvas('_uievent_selector');
+        return;
+    }
+
     var background = data.background || core.status.textAttribute.background;
     if (typeof background != 'string') return;
     var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);

From 01edcfbc986233210def70b1ea57e5f431dff247 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 16:33:42 +0800
Subject: [PATCH 06/23] uievents part 1

---
 _docs/event.md            |  68 +++++++
 _server/MotaAction.g4     | 381 ++++++++++++++++++++++++++------------
 _server/editor_blockly.js |  35 ++--
 libs/events.js            |   2 +-
 libs/ui.js                |  16 +-
 5 files changed, 354 insertions(+), 148 deletions(-)

diff --git a/_docs/event.md b/_docs/event.md
index 34fff45b..dfd2245c 100644
--- a/_docs/event.md
+++ b/_docs/event.md
@@ -1795,6 +1795,74 @@ yes和no均为必填项，即用户点击确认或取消后执行的事件。
 
 该事件会进行等待，直到所有可能的异步事件（异步动画除外）执行完毕。
 
+### previewUI：UI绘制预览
+
+此项可在地图编辑器中预览UI界面的绘制效果。
+
+在编辑器中将会把此项包含的所有UI绘制事件进行绘制从而可以进行预览。
+
+值得注意的是，在游戏中，UI绘制事件都是绘制在uievent层上的。
+
+### clearMap：清除画布
+
+UI绘制事件。
+
+`{"type": "clearMap"}`可以清除`uievent`画布的内容。
+
+```js
+[
+    {"type": "clearMap", "x": 0, "y": 0, "width": "flag:width", "height": 416}, // 清除画布的一部分
+    {"type": "clearMap"}, // 清空并删除画布
+]
+```
+
+x, y, width, height均可选，表示要清除的坐标和长宽。也可以使用`flag:xxx`。
+
+如果存在某一项不填则会清空全部画布并删除。
+
+### setAttribute：设置画布属性
+
+UI绘制事件。
+
+此项可以设置`uievent`画布的各项属性。
+
+```js
+[
+    {"type": "setAttribute", "font": "17px Verdana", "fillStyle": [255,0,0,1]},
+]
+```
+
+可以选择性的设置如下几项内容：
+- `font`：字体，必须是`[italic] [bold] 14px Verdana`这种形式
+- `fillStyle`：填充样式，必须是三元组RGB或四元组RGBA
+- `strokeStyle`：边框样式，必须是三元组RGB或者四元组RGBA
+- `lineWidth`：线宽度，必须是正整数
+- `alpha`：不透明度，必须是0到1之间的浮点数
+- `align`：对齐方式，只能是`left`, `center`, `right`，分别代表左对齐，居中和右对齐
+- `baseline`：基准线，只能是`top`, `middle`, `alphabetic`, `bottom`，分别代表顶部，居中，标准值和底部。
+
+### fillText：绘制文本
+
+UI绘制事件。
+
+此项可以绘制一行文本。
+
+```js
+[
+    {"type": "fillText", "text"："要绘制的文本", "x": 10, "y": 20, "maxWidth": 50}
+]
+```
+
+text必填，为要绘制的文本，支持`${}`的写法，不支持一切转义字符或换行符。
+
+x和y必填，为要绘制的左上角坐标。请使用`setAttribute`来设置绘制的对齐方式和基准线。
+
+style可选，如果设置需要是三元组RGB或四元组RBGA，代表绘制样式。
+
+font可选，如果设置则是要绘制的字体。
+
+maxWidth可选，如果设置且不为0，则代表要绘制的最大宽度；超过此宽度会自动放缩。
+
 ### function: 自定义JS脚本
 
 上述给出了这么多事件，但有时候往往不能满足需求，这时候就需要执行自定义脚本了。
diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 82deb5dc..a2adf880 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -10,7 +10,7 @@ event_m
 
 /* event_m
 tooltip : 编辑魔塔的事件
-helpUrl : https://h5mota.com/games/template/docs/#/event
+helpUrl : https://h5mota.com/games/template/_docs/#/event
 default : [false,null,null,null,null]
 B_0_List_0=eval(B_0_List_0);
 var code = {
@@ -33,7 +33,7 @@ level_m
 
 /* level_m
 tooltip : 升级事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%bb%8f%e9%aa%8c%e5%8d%87%e7%ba%a7%ef%bc%88%e8%bf%9b%e9%98%b6%2f%e5%a2%83%e7%95%8c%e5%a1%94%ef%bc%89
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%bb%8f%e9%aa%8c%e5%8d%87%e7%ba%a7%ef%bc%88%e8%bf%9b%e9%98%b6%2f%e5%a2%83%e7%95%8c%e5%a1%94%ef%bc%89
 var code = '[\n'+levelCase_0+']\n';
 return code;
 */;
@@ -44,7 +44,7 @@ levelCase
 
 /* levelCase
 tooltip : 升级设定
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%bb%8f%e9%aa%8c%e5%8d%87%e7%ba%a7%ef%bc%88%e8%bf%9b%e9%98%b6%2f%e5%a2%83%e7%95%8c%e5%a1%94%ef%bc%89
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%bb%8f%e9%aa%8c%e5%8d%87%e7%ba%a7%ef%bc%88%e8%bf%9b%e9%98%b6%2f%e5%a2%83%e7%95%8c%e5%a1%94%ef%bc%89
 default : [0,"",false,null]
 colour : this.subColor
 Bool_0 = Bool_0?', "clear": true':'';
@@ -58,7 +58,7 @@ shop_m
     
 /* shop_m
 tooltip : 全局商店列表
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
 var code = '['+shoplist_0+']\n';
 return code;
 */;
@@ -83,7 +83,7 @@ shopcommonevent
     
 /* shopcommonevent
 tooltip : 全局商店, 执行一个公共事件
-helpUrl : https://h5mota.com/games/template/docs/#/
+helpUrl : https://h5mota.com/games/template/_docs/#/
 default : ["shop1","回收钥匙商店",false,"回收钥匙商店",""]
 if (EvalString_2) {
     if (EvalString_2.indexOf('"')>=0)
@@ -114,7 +114,7 @@ shopsub
 
 /* shopsub
 tooltip : 全局商店,消耗填-1表示每个选项的消耗不同,正数表示消耗数值
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
 default : ["shop1","贪婪之神","blueShop","1F金币商店",false,false,null,"20+10*times*(times+1)","勇敢的武士啊, 给我${need}金币就可以："]
 var code = {
     'id': IdString_0,
@@ -138,7 +138,7 @@ shopChoices
 
 /* shopChoices
 tooltip : 商店选项,商店消耗是-1时,这里的消耗对应各自选项的消耗,商店消耗不是-1时这里的消耗不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e5%85%a8%e5%b1%80%e5%95%86%e5%ba%97
 default : ["攻击+1",""]
 colour : this.subColor
 EvalString_1 = EvalString_1 && (', "need": "'+EvalString_1+'"');
@@ -163,7 +163,7 @@ afterBattle_m
 
 /* afterBattle_m
 tooltip : 系统引发的自定义事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -175,7 +175,7 @@ afterGetItem_m
 
 /* afterGetItem_m
 tooltip : 系统引发的自定义事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -187,7 +187,7 @@ afterOpenDoor_m
 
 /* afterOpenDoor_m
 tooltip : 系统引发的自定义事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -199,7 +199,7 @@ firstArrive_m
 
 /* firstArrive_m
 tooltip : 首次到达楼层
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -211,7 +211,7 @@ eachArrive_m
 
 /* eachArrive_m
 tooltip : 每次到达楼层
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=%e7%b3%bb%e7%bb%9f%e5%bc%95%e5%8f%91%e7%9a%84%e8%87%aa%e5%ae%9a%e4%b9%89%e4%ba%8b%e4%bb%b6
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -223,7 +223,7 @@ changeFloor_m
 
 /* changeFloor_m
 tooltip : 楼梯, 传送门, 如果目标楼层有多个楼梯, 写upFloor或downFloor可能会导致到达的楼梯不确定, 这时候请使用loc方式来指定具体的点位置
-helpUrl : https://h5mota.com/games/template/docs/#/element?id=%e8%b7%af%e9%9a%9c%ef%bc%8c%e6%a5%bc%e6%a2%af%ef%bc%8c%e4%bc%a0%e9%80%81%e9%97%a8
+helpUrl : https://h5mota.com/games/template/_docs/#/element?id=%e8%b7%af%e9%9a%9c%ef%bc%8c%e6%a5%bc%e6%a2%af%ef%bc%8c%e4%bc%a0%e9%80%81%e9%97%a8
 default : [null,"MT1",null,0,0,null,500,null]
 var toFloorId = IdString_0;
 if (Floor_List_0!='floorId') toFloorId = Floor_List_0;
@@ -244,7 +244,7 @@ commonEvent_m
 
 /* commonEvent_m
 tooltip : 公共事件
-helpUrl : https://h5mota.com/games/template/docs/#/event
+helpUrl : https://h5mota.com/games/template/_docs/#/event
 var code = '[\n'+action_0+']\n';
 return code;
 */;
@@ -341,6 +341,11 @@ action
     |   callSave_s
     |   autoSave_s
     |   callLoad_s
+    |   previewUI_s
+    |   clearMap_s
+    |   clearMap_1_s
+    |   setAttribute_s
+    |   fillText_s
     |   unknown_s
     |   function_s
     |   pass_s
@@ -352,7 +357,7 @@ text_0_s
 
 /* text_0_s
 tooltip : text：显示一段文字（剧情）
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=text%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%96%87%E5%AD%97%EF%BC%88%E5%89%A7%E6%83%85%EF%BC%89
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=text%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%96%87%E5%AD%97%EF%BC%88%E5%89%A7%E6%83%85%EF%BC%89
 default : ["欢迎使用事件编辑器(双击方块进入多行编辑)"]
 var code = '"'+EvalString_0+'",\n';
 return code;
@@ -364,7 +369,7 @@ text_1_s
 
 /* text_1_s
 tooltip : text：显示一段文字（剧情）,选项较多请右键点击帮助
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=text%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%96%87%E5%AD%97%EF%BC%88%E5%89%A7%E6%83%85%EF%BC%89
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=text%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%96%87%E5%AD%97%EF%BC%88%E5%89%A7%E6%83%85%EF%BC%89
 default : ["小妖精","fairy","","欢迎使用事件编辑器(双击方块进入多行编辑)"]
 var title='';
 if (EvalString_0==''){
@@ -388,7 +393,7 @@ comment_s
 
 /* comment_s
 tooltip : comment：添加一段会被游戏跳过的注释内容
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=comment%ef%bc%9a%e6%b7%bb%e5%8a%a0%e6%b3%a8%e9%87%8a
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=comment%ef%bc%9a%e6%b7%bb%e5%8a%a0%e6%b3%a8%e9%87%8a
 default : ["可以在这里写添加任何注释内容"]
 colour : this.commentColor
 var code = '{"type": "comment", "text": "'+EvalString_0+'"},\n';
@@ -401,7 +406,7 @@ autoText_s
 
 /* autoText_s
 tooltip : autoText：自动剧情文本,用户无法跳过自动剧情文本,大段剧情文本请添加“是否跳过剧情”的提示
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=autotext%EF%BC%9A%E8%87%AA%E5%8A%A8%E5%89%A7%E6%83%85%E6%96%87%E6%9C%AC
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=autotext%EF%BC%9A%E8%87%AA%E5%8A%A8%E5%89%A7%E6%83%85%E6%96%87%E6%9C%AC
 default : ["小妖精","fairy","",3000,"用户无法跳过自动剧情文本，大段剧情文本请添加“是否跳过剧情”的提示"]
 var title='';
 if (EvalString_0==''){
@@ -425,7 +430,7 @@ scrollText_s
 
 /* scrollText_s
 tooltip : scrollText：滚动剧情文本，将从下到上进行滚动显示。
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=scrollText%ef%bc%9a%e6%bb%9a%e5%8a%a8%e5%89%a7%e6%83%85%e6%96%87%e6%9c%ac
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=scrollText%ef%bc%9a%e6%bb%9a%e5%8a%a8%e5%89%a7%e6%83%85%e6%96%87%e6%9c%ac
 default : [5000,1.4,false,"时间是总时间，可以使用setText事件来控制字体、颜色、大小、偏移量等"]
 Bool_0 = Bool_0?', "async": true':'';
 var code =  '{"type": "scrollText", "text": "'+EvalString_0+'"'+Bool_0+', "time" :'+Int_0+', "lineHeight": '+Number_0+'},\n';
@@ -433,15 +438,15 @@ return code;
 */;
 
 setText_s
-    :   '设置剧情文本的属性' '位置' SetTextPosition_List '偏移像素' EvalString? '对齐' SetTextAlign_List? BGNL? '标题颜色' EvalString? Colour '正文颜色' EvalString? Colour '背景色' EvalString? Colour BGNL? '粗体' B_1_List '标题字体大小' EvalString? '正文字体大小' EvalString? '打字间隔' EvalString? Newline
+    :   '设置剧情文本的属性' '位置' SetTextPosition_List '偏移像素' EvalString? '对齐' TextAlign_List? BGNL? '标题颜色' EvalString? Colour '正文颜色' EvalString? Colour '背景色' EvalString? Colour BGNL? '粗体' B_1_List '标题字体大小' EvalString? '正文字体大小' EvalString? '打字间隔' EvalString? Newline
     
 
 /* setText_s
 tooltip : setText：设置剧情文本的属性,颜色为RGB三元组或RGBA四元组,打字间隔为剧情文字添加的时间间隔,为整数或不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=settext%EF%BC%9A%E8%AE%BE%E7%BD%AE%E5%89%A7%E6%83%85%E6%96%87%E6%9C%AC%E7%9A%84%E5%B1%9E%E6%80%A7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=settext%EF%BC%9A%E8%AE%BE%E7%BD%AE%E5%89%A7%E6%83%85%E6%96%87%E6%9C%AC%E7%9A%84%E5%B1%9E%E6%80%A7
 default : [null,"",null,"",'rgba(255,255,255,1)',"",'rgba(255,255,255,1)',"",'rgba(255,255,255,1)',null,"","",""]
 SetTextPosition_List_0 =SetTextPosition_List_0==='null'?'': ', "position": "'+SetTextPosition_List_0+'"';
-SetTextAlign_List_0 =SetTextAlign_List_0==='null'?'': ', "align": "'+SetTextAlign_List_0+'"';
+TextAlign_List_0 = TextAlign_List_0==='null'?'': ', "align": "'+TextAlign_List_0+'"';
 var colorRe = MotaActionFunctions.pattern.colorRe;
 if (EvalString_0) {
   if (!/^\d+$/.test(EvalString_0))throw new Error('像素偏移量必须是整数或不填');
@@ -479,7 +484,7 @@ if (EvalString_6) {
   EvalString_6 = ', "time": '+EvalString_6;
 }
 B_1_List_0 = B_1_List_0==='null'?'':', "bold": '+B_1_List_0;
-var code = '{"type": "setText"'+SetTextPosition_List_0+EvalString_0+SetTextAlign_List_0+EvalString_1+EvalString_2+B_1_List_0+EvalString_3+EvalString_4+EvalString_5+EvalString_6+'},\n';
+var code = '{"type": "setText"'+SetTextPosition_List_0+EvalString_0+TextAlign_List_0+EvalString_1+EvalString_2+B_1_List_0+EvalString_3+EvalString_4+EvalString_5+EvalString_6+'},\n';
 return code;
 */;
 
@@ -489,7 +494,7 @@ tip_s
 
 /* tip_s
 tooltip : tip：显示一段提示文字
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=tip%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%8F%90%E7%A4%BA%E6%96%87%E5%AD%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=tip%EF%BC%9A%E6%98%BE%E7%A4%BA%E4%B8%80%E6%AE%B5%E6%8F%90%E7%A4%BA%E6%96%87%E5%AD%97
 default : ["这段话将在左上角以气泡形式显示",""]
 IdString_0 = IdString_0 && (', "icon": "' + IdString_0 + '"');
 var code = '{"type": "tip", "text": "'+EvalString_0+'"'+IdString_0+'},\n';
@@ -502,7 +507,7 @@ setValue_s
 
 /* setValue_s
 tooltip : setValue：设置勇士的某个属性、道具个数, 或某个变量/Flag的值
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setvalue%EF%BC%9A%E8%AE%BE%E7%BD%AE%E5%8B%87%E5%A3%AB%E7%9A%84%E6%9F%90%E4%B8%AA%E5%B1%9E%E6%80%A7%E3%80%81%E9%81%93%E5%85%B7%E4%B8%AA%E6%95%B0%EF%BC%8C%E6%88%96%E6%9F%90%E4%B8%AA%E5%8F%98%E9%87%8Fflag%E7%9A%84%E5%80%BC
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setvalue%EF%BC%9A%E8%AE%BE%E7%BD%AE%E5%8B%87%E5%A3%AB%E7%9A%84%E6%9F%90%E4%B8%AA%E5%B1%9E%E6%80%A7%E3%80%81%E9%81%93%E5%85%B7%E4%B8%AA%E6%95%B0%EF%BC%8C%E6%88%96%E6%9F%90%E4%B8%AA%E5%8F%98%E9%87%8Fflag%E7%9A%84%E5%80%BC
 colour : this.dataColor
 var code = '{"type": "setValue", "name": "'+idString_e_0+'", "value": "'+expression_0+'"},\n';
 return code;
@@ -514,7 +519,7 @@ addValue_s
 
 /* addValue_s
 tooltip : addValue：增减勇士的某个属性、道具个数, 或某个变量/Flag的值
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=addValue%ef%bc%9a%e5%a2%9e%e5%87%8f%e5%8b%87%e5%a3%ab%e7%9a%84%e6%9f%90%e4%b8%aa%e5%b1%9e%e6%80%a7%e3%80%81%e9%81%93%e5%85%b7%e4%b8%aa%e6%95%b0%ef%bc%8c%e6%88%96%e6%9f%90%e4%b8%aa%e5%8f%98%e9%87%8f%2fFlag%e7%9a%84%e5%80%bc
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=addValue%ef%bc%9a%e5%a2%9e%e5%87%8f%e5%8b%87%e5%a3%ab%e7%9a%84%e6%9f%90%e4%b8%aa%e5%b1%9e%e6%80%a7%e3%80%81%e9%81%93%e5%85%b7%e4%b8%aa%e6%95%b0%ef%bc%8c%e6%88%96%e6%9f%90%e4%b8%aa%e5%8f%98%e9%87%8f%2fFlag%e7%9a%84%e5%80%bc
 colour : this.dataColor
 var code = '{"type": "addValue", "name": "'+idString_e_0+'", "value": "'+expression_0+'"},\n';
 return code;
@@ -526,7 +531,7 @@ setFloor_s
 
 /* setFloor_s
 tooltip : setFloor：设置楼层属性；该楼层属性和编辑器中的楼层属性一一对应
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setFloor%ef%bc%9a%e8%ae%be%e7%bd%ae%e6%a5%bc%e5%b1%82%e5%b1%9e%e6%80%a7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setFloor%ef%bc%9a%e8%ae%be%e7%bd%ae%e6%a5%bc%e5%b1%82%e5%b1%9e%e6%80%a7
 default : ["title","","'字符串类型的值要加引号，其他类型则不用'"]
 colour : this.dataColor
 IdString_0 = IdString_0 && (', "floorId": "'+IdString_0+'"');
@@ -541,7 +546,7 @@ setGlobalAttribute_s
 
 /* setGlobalAttribute_s
 tooltip : setGlobalAttribute：设置全局属性
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setGlobalAttribute%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e5%85%a8%e5%b1%80%e5%b1%9e%e6%80%a7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setGlobalAttribute%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e5%85%a8%e5%b1%80%e5%b1%9e%e6%80%a7
 default : ["font","Verdana"]
 colour : this.dataColor
 var code = '{"type": "setGlobalAttribute", "name": "'+Global_Attribute_List_0+'", "value": "'+EvalString_0+'"},\n';
@@ -555,7 +560,7 @@ setGlobalValue_s
 
 /* setGlobalValue_s
 tooltip : setGlobalValue：设置全局属性
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setGlobalValue%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e5%85%a8%e5%b1%80%e6%95%b0%e5%80%bc
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setGlobalValue%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e5%85%a8%e5%b1%80%e6%95%b0%e5%80%bc
 default : ["lavaDamage","100"]
 colour : this.dataColor
 var code = '{"type": "setGlobalValue", "name": "'+Global_Value_List_0+'", "value": '+EvalString_0+'},\n';
@@ -569,7 +574,7 @@ setGlobalFlag_s
 
 /* setGlobalFlag_s
 tooltip : setGlobalFlag：设置系统开关
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setGlobalFlag%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e7%b3%bb%e7%bb%9f%e5%bc%80%e5%85%b3
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setGlobalFlag%ef%bc%9a%e8%ae%be%e7%bd%ae%e4%b8%80%e4%b8%aa%e7%b3%bb%e7%bb%9f%e5%bc%80%e5%85%b3
 default : ["enableFloor","true"]
 colour : this.dataColor
 var code = '{"type": "setGlobalFlag", "name": "'+Global_Flag_List_0+'", "value": '+Bool_0+'},\n';
@@ -583,7 +588,7 @@ show_s
 
 /* show_s
 tooltip : show: 将禁用事件启用,楼层和动画时间可不填,xy可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=show%EF%BC%9A%E5%B0%86%E4%B8%80%E4%B8%AA%E7%A6%81%E7%94%A8%E4%BA%8B%E4%BB%B6%E5%90%AF%E7%94%A8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=show%EF%BC%9A%E5%B0%86%E4%B8%80%E4%B8%AA%E7%A6%81%E7%94%A8%E4%BA%8B%E4%BB%B6%E5%90%AF%E7%94%A8
 default : ["","","",500,false]
 colour : this.mapColor
 var floorstr = '';
@@ -616,7 +621,7 @@ hide_s
 
 /* hide_s
 tooltip : hide: 将一个启用事件禁用,所有参数均可不填,代表禁用事件自身,xy可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=hide%EF%BC%9A%E5%B0%86%E4%B8%80%E4%B8%AA%E5%90%AF%E7%94%A8%E4%BA%8B%E4%BB%B6%E7%A6%81%E7%94%A8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=hide%EF%BC%9A%E5%B0%86%E4%B8%80%E4%B8%AA%E5%90%AF%E7%94%A8%E4%BA%8B%E4%BB%B6%E7%A6%81%E7%94%A8
 default : ["","","",500,false]
 colour : this.mapColor
 var floorstr = '';
@@ -649,7 +654,7 @@ trigger_s
 
 /* trigger_s
 tooltip : trigger: 立即触发另一个地点的事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=trigger%EF%BC%9A%E7%AB%8B%E5%8D%B3%E8%A7%A6%E5%8F%91%E5%8F%A6%E4%B8%80%E4%B8%AA%E5%9C%B0%E7%82%B9%E7%9A%84%E4%BA%8B%E4%BB%B6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=trigger%EF%BC%9A%E7%AB%8B%E5%8D%B3%E8%A7%A6%E5%8F%91%E5%8F%A6%E4%B8%80%E4%B8%AA%E5%9C%B0%E7%82%B9%E7%9A%84%E4%BA%8B%E4%BB%B6
 default : ["0","0",false]
 colour : this.eventColor
 Bool_0 = Bool_0 ?', "keep": true':'';
@@ -663,7 +668,7 @@ insert_1_s
 
 /* insert_1_s
 tooltip : insert: 插入公共事件并执行
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=insert%ef%bc%9a%e6%8f%92%e5%85%a5%e5%85%ac%e5%85%b1%e4%ba%8b%e4%bb%b6%e6%88%96%e5%8f%a6%e4%b8%80%e4%b8%aa%e5%9c%b0%e7%82%b9%e7%9a%84%e4%ba%8b%e4%bb%b6%e5%b9%b6%e6%89%a7%e8%a1%8c
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=insert%ef%bc%9a%e6%8f%92%e5%85%a5%e5%85%ac%e5%85%b1%e4%ba%8b%e4%bb%b6%e6%88%96%e5%8f%a6%e4%b8%80%e4%b8%aa%e5%9c%b0%e7%82%b9%e7%9a%84%e4%ba%8b%e4%bb%b6%e5%b9%b6%e6%89%a7%e8%a1%8c
 default : ["加点事件", ""]
 colour : this.eventColor
 if (EvalString_1) {
@@ -688,7 +693,7 @@ insert_2_s
 
 /* insert_2_s
 tooltip : insert: 立即插入另一个地点的事件执行，当前事件不会中断，事件坐标不会改变
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=insert%ef%bc%9a%e6%8f%92%e5%85%a5%e5%85%ac%e5%85%b1%e4%ba%8b%e4%bb%b6%e6%88%96%e5%8f%a6%e4%b8%80%e4%b8%aa%e5%9c%b0%e7%82%b9%e7%9a%84%e4%ba%8b%e4%bb%b6%e5%b9%b6%e6%89%a7%e8%a1%8c
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=insert%ef%bc%9a%e6%8f%92%e5%85%a5%e5%85%ac%e5%85%b1%e4%ba%8b%e4%bb%b6%e6%88%96%e5%8f%a6%e4%b8%80%e4%b8%aa%e5%9c%b0%e7%82%b9%e7%9a%84%e4%ba%8b%e4%bb%b6%e5%b9%b6%e6%89%a7%e8%a1%8c
 default : ["0","0",null,"",""]
 colour : this.eventColor
 IdString_0 = IdString_0 && (', "floorId": "'+IdString_0+'"');
@@ -716,7 +721,7 @@ revisit_s
 
 /* revisit_s
 tooltip : revisit: 立即重启当前事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=revisit%EF%BC%9A%E7%AB%8B%E5%8D%B3%E9%87%8D%E5%90%AF%E5%BD%93%E5%89%8D%E4%BA%8B%E4%BB%B6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=revisit%EF%BC%9A%E7%AB%8B%E5%8D%B3%E9%87%8D%E5%90%AF%E5%BD%93%E5%89%8D%E4%BA%8B%E4%BB%B6
 colour : this.eventColor
 var code = '{"type": "revisit"},\n';
 return code;
@@ -728,7 +733,7 @@ exit_s
 
 /* exit_s
 tooltip : exit: 立刻结束当前事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=exit%EF%BC%9A%E7%AB%8B%E5%88%BB%E7%BB%93%E6%9D%9F%E5%BD%93%E5%89%8D%E4%BA%8B%E4%BB%B6
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=exit%EF%BC%9A%E7%AB%8B%E5%88%BB%E7%BB%93%E6%9D%9F%E5%BD%93%E5%89%8D%E4%BA%8B%E4%BB%B6
 colour : this.eventColor
 var code = '{"type": "exit"},\n';
 return code;
@@ -740,7 +745,7 @@ setBlock_s
 
 /* setBlock_s
 tooltip : setBlock：设置某个图块,忽略坐标楼层则为当前事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setblock%EF%BC%9A%E8%AE%BE%E7%BD%AE%E6%9F%90%E4%B8%AA%E5%9B%BE%E5%9D%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setblock%EF%BC%9A%E8%AE%BE%E7%BD%AE%E6%9F%90%E4%B8%AA%E5%9B%BE%E5%9D%97
 colour : this.mapColor
 default : ["yellowDoor","","",""]
 var floorstr = '';
@@ -758,7 +763,7 @@ showFloorImg_s
 
 /* showFloorImg_s
 tooltip : showFloorImg: 显示一个贴图，xy为左上角坐标，可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showFloorImg%ef%bc%9a%e6%98%be%e7%a4%ba%e8%b4%b4%e5%9b%be
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showFloorImg%ef%bc%9a%e6%98%be%e7%a4%ba%e8%b4%b4%e5%9b%be
 default : ["","",""]
 colour : this.mapColor
 var floorstr = '';
@@ -789,7 +794,7 @@ hideFloorImg_s
 
 /* hideFloorImg_s
 tooltip : hideFloorImg: 隐藏一个贴图，xy为左上角坐标，可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=hideFloorImg%ef%bc%9a%e9%9a%90%e8%97%8f%e8%b4%b4%e5%9b%be
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=hideFloorImg%ef%bc%9a%e9%9a%90%e8%97%8f%e8%b4%b4%e5%9b%be
 default : ["","",""]
 colour : this.mapColor
 var floorstr = '';
@@ -820,7 +825,7 @@ showBgFgMap_s
 
 /* showBgFgMap_s
 tooltip : showBgFgMap: 显示图层块，即背景图层/前景图层的某些图块，xy为左上角坐标，可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showFloorImg%ef%bc%9a%e6%98%be%e7%a4%ba%e8%b4%b4%e5%9b%be
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showFloorImg%ef%bc%9a%e6%98%be%e7%a4%ba%e8%b4%b4%e5%9b%be
 default : ["bg","","",""]
 colour : this.mapColor
 var floorstr = '';
@@ -851,7 +856,7 @@ hideBgFgMap_s
 
 /* hideBgFgMap_s
 tooltip : hideBgFgMap: 隐藏图层块，即背景图层/前景图层的某些图块，xy为左上角坐标，可用逗号分隔表示多个点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=hideFloorImg%ef%bc%9a%e9%9a%90%e8%97%8f%e8%b4%b4%e5%9b%be
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=hideFloorImg%ef%bc%9a%e9%9a%90%e8%97%8f%e8%b4%b4%e5%9b%be
 default : ["bg","","",""]
 colour : this.mapColor
 var floorstr = '';
@@ -882,7 +887,7 @@ setBgFgBlock_s
 
 /* setBgFgBlock_s
 tooltip : setBgFgBlock：设置某个图层块,忽略坐标楼层则为当前点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setblock%EF%BC%9A%E8%AE%BE%E7%BD%AE%E6%9F%90%E4%B8%AA%E5%9B%BE%E5%9D%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setblock%EF%BC%9A%E8%AE%BE%E7%BD%AE%E6%9F%90%E4%B8%AA%E5%9B%BE%E5%9D%97
 colour : this.mapColor
 default : ["bg","yellowDoor","","",""]
 var floorstr = '';
@@ -900,7 +905,7 @@ setHeroIcon_s
 
 /* setHeroIcon_s
 tooltip : setHeroIcon：更改角色行走图
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setheroicon%EF%BC%9A%E6%9B%B4%E6%94%B9%E8%A7%92%E8%89%B2%E8%A1%8C%E8%B5%B0%E5%9B%BE
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setheroicon%EF%BC%9A%E6%9B%B4%E6%94%B9%E8%A7%92%E8%89%B2%E8%A1%8C%E8%B5%B0%E5%9B%BE
 colour : this.dataColor
 default : ["hero.png"]
 EvalString_0 = EvalString_0 && (', "name": "'+EvalString_0+'"');
@@ -914,7 +919,7 @@ update_s
 
 /* update_s
 tooltip : update: 立刻更新状态栏和地图显伤
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=update%EF%BC%9A%E7%AB%8B%E5%88%BB%E6%9B%B4%E6%96%B0%E7%8A%B6%E6%80%81%E6%A0%8F%E5%92%8C%E5%9C%B0%E5%9B%BE%E6%98%BE%E4%BC%A4
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=update%EF%BC%9A%E7%AB%8B%E5%88%BB%E6%9B%B4%E6%96%B0%E7%8A%B6%E6%80%81%E6%A0%8F%E5%92%8C%E5%9C%B0%E5%9B%BE%E6%98%BE%E4%BC%A4
 colour : this.dataColor
 var code = '{"type": "update"},\n';
 return code;
@@ -926,7 +931,7 @@ showStatusBar_s
 
 /* showStatusBar_s
 tooltip : showStatusBar: 显示状态栏
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showStatusBar%ef%bc%9a%e6%98%be%e7%a4%ba%e7%8a%b6%e6%80%81%e6%a0%8f
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showStatusBar%ef%bc%9a%e6%98%be%e7%a4%ba%e7%8a%b6%e6%80%81%e6%a0%8f
 colour : this.soundColor
 var code = '{"type": "showStatusBar"},\n';
 return code;
@@ -938,7 +943,7 @@ hideStatusBar_s
 
 /* hideStatusBar_s
 tooltip : hideStatusBar: 隐藏状态栏
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=hideStatusBar%ef%bc%9a%e9%9a%90%e8%97%8f%e7%8a%b6%e6%80%81%e6%a0%8f
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=hideStatusBar%ef%bc%9a%e9%9a%90%e8%97%8f%e7%8a%b6%e6%80%81%e6%a0%8f
 colour : this.soundColor
 default : [false]
 Bool_0 = Bool_0?', "toolbox": true':'';
@@ -952,7 +957,7 @@ updateEnemys_s
 
 /* updateEnemys_s
 tooltip : updateEnemys: 立刻更新怪物数据
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=updateEnemys%ef%bc%9a%e6%9b%b4%e6%96%b0%e6%80%aa%e7%89%a9%e6%95%b0%e6%8d%ae
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=updateEnemys%ef%bc%9a%e6%9b%b4%e6%96%b0%e6%80%aa%e7%89%a9%e6%95%b0%e6%8d%ae
 colour : this.dataColor
 var code = '{"type": "updateEnemys"},\n';
 return code;
@@ -964,7 +969,7 @@ sleep_s
 
 /* sleep_s
 tooltip : sleep: 等待多少毫秒
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=sleep%EF%BC%9A%E7%AD%89%E5%BE%85%E5%A4%9A%E5%B0%91%E6%AF%AB%E7%A7%92
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=sleep%EF%BC%9A%E7%AD%89%E5%BE%85%E5%A4%9A%E5%B0%91%E6%AF%AB%E7%A7%92
 default : [500, false]
 colour : this.soundColor
 Bool_0 = Bool_0?', "noSkip": true':'';
@@ -979,7 +984,7 @@ battle_s
 
 /* battle_s
 tooltip : battle: 强制战斗
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=battle%EF%BC%9A%E5%BC%BA%E5%88%B6%E6%88%98%E6%96%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=battle%EF%BC%9A%E5%BC%BA%E5%88%B6%E6%88%98%E6%96%97
 default : ["greenSlime"]
 colour : this.dataColor
 var code = '{"type": "battle", "id": "'+IdString_0+'"},\n';
@@ -993,7 +998,7 @@ battle_1_s
 
 /* battle_1_s
 tooltip : battle: 强制战斗
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=battle%EF%BC%9A%E5%BC%BA%E5%88%B6%E6%88%98%E6%96%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=battle%EF%BC%9A%E5%BC%BA%E5%88%B6%E6%88%98%E6%96%97
 default : ["","",""]
 colour : this.mapColor
 var floorstr = '';
@@ -1010,7 +1015,7 @@ openDoor_s
 
 /* openDoor_s
 tooltip : openDoor: 开门,楼层可不填表示当前层
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=opendoor%EF%BC%9A%E5%BC%80%E9%97%A8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=opendoor%EF%BC%9A%E5%BC%80%E9%97%A8
 default : ["","","",false,false]
 colour : this.mapColor
 IdString_0 = IdString_0 && (', "floorId": "'+IdString_0+'"');
@@ -1030,7 +1035,7 @@ closeDoor_s
 
 /* closeDoor_s
 tooltip : closeDoor: 关门事件，需要该点本身无事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=opendoor%EF%BC%9A%E5%BC%80%E9%97%A8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=opendoor%EF%BC%9A%E5%BC%80%E9%97%A8
 default : ["","","yellowDoor",false]
 colour : this.mapColor
 var floorstr = '';
@@ -1048,7 +1053,7 @@ changeFloor_s
 
 /* changeFloor_s
 tooltip : changeFloor: 楼层切换,动画时间可不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=changefloor%EF%BC%9A%E6%A5%BC%E5%B1%82%E5%88%87%E6%8D%A2
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=changefloor%EF%BC%9A%E6%A5%BC%E5%B1%82%E5%88%87%E6%8D%A2
 default : ["MT1","0","0",null,500]
 colour : this.dataColor
 DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"');
@@ -1067,7 +1072,7 @@ changePos_0_s
 
 /* changePos_0_s
 tooltip : changePos: 当前位置切换
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=changepos%EF%BC%9A%E5%BD%93%E5%89%8D%E4%BD%8D%E7%BD%AE%E5%88%87%E6%8D%A2%E5%8B%87%E5%A3%AB%E8%BD%AC%E5%90%91
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=changepos%EF%BC%9A%E5%BD%93%E5%89%8D%E4%BD%8D%E7%BD%AE%E5%88%87%E6%8D%A2%E5%8B%87%E5%A3%AB%E8%BD%AC%E5%90%91
 default : ["","",null]
 colour : this.dataColor
 DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"');
@@ -1081,7 +1086,7 @@ changePos_1_s
 
 /* changePos_1_s
 tooltip : changePos: 勇士转向
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=changepos%EF%BC%9A%E5%BD%93%E5%89%8D%E4%BD%8D%E7%BD%AE%E5%88%87%E6%8D%A2%E5%8B%87%E5%A3%AB%E8%BD%AC%E5%90%91
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=changepos%EF%BC%9A%E5%BD%93%E5%89%8D%E4%BD%8D%E7%BD%AE%E5%88%87%E6%8D%A2%E5%8B%87%E5%A3%AB%E8%BD%AC%E5%90%91
 colour : this.dataColor
 default : [null]
 var code = '{"type": "changePos", "direction": "'+Direction_List_0+'"},\n';
@@ -1094,7 +1099,7 @@ useItem_s
 
 /* useItem_s
 tooltip : useItem: 使用道具
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=useItem%ef%bc%9a%e4%bd%bf%e7%94%a8%e9%81%93%e5%85%b7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=useItem%ef%bc%9a%e4%bd%bf%e7%94%a8%e9%81%93%e5%85%b7
 colour : this.dataColor
 default : ["pickaxe"]
 var code = '{"type": "useItem", "id": "'+IdString_0+'"},\n';
@@ -1107,7 +1112,7 @@ openShop_s
 
 /* openShop_s
 tooltip : 全局商店
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=openshop%EF%BC%9A%E6%89%93%E5%BC%80%E4%B8%80%E4%B8%AA%E5%85%A8%E5%B1%80%E5%95%86%E5%BA%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=openshop%EF%BC%9A%E6%89%93%E5%BC%80%E4%B8%80%E4%B8%AA%E5%85%A8%E5%B1%80%E5%95%86%E5%BA%97
 colour : this.dataColor
 default : ["shop1"]
 var code = '{"type": "openShop", "id": "'+IdString_0+'"},\n';
@@ -1120,7 +1125,7 @@ disableShop_s
 
 /* disableShop_s
 tooltip : 全局商店
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=disableshop%EF%BC%9A%E7%A6%81%E7%94%A8%E4%B8%80%E4%B8%AA%E5%85%A8%E5%B1%80%E5%95%86%E5%BA%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=disableshop%EF%BC%9A%E7%A6%81%E7%94%A8%E4%B8%80%E4%B8%AA%E5%85%A8%E5%B1%80%E5%95%86%E5%BA%97
 default : ["shop1"]
 colour : this.dataColor
 var code = '{"type": "disableShop", "id": "'+IdString_0+'"},\n';
@@ -1133,7 +1138,7 @@ follow_s
 
 /* follow_s
 tooltip : follow: 跟随勇士
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=follow%ef%bc%9a%e8%b7%9f%e9%9a%8f%e5%8b%87%e5%a3%ab
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=follow%ef%bc%9a%e8%b7%9f%e9%9a%8f%e5%8b%87%e5%a3%ab
 default : ["npc.png"]
 colour : this.dataColor
 var code = '{"type": "follow", "name": "'+EvalString_0+'"},\n';
@@ -1146,7 +1151,7 @@ unfollow_s
 
 /* unfollow_s
 tooltip : unfollow: 取消跟随
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=unfollow%ef%bc%9a%e5%8f%96%e6%b6%88%e8%b7%9f%e9%9a%8f
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=unfollow%ef%bc%9a%e5%8f%96%e6%b6%88%e8%b7%9f%e9%9a%8f
 default : [""]
 colour : this.dataColor
 EvalString_0 = EvalString_0 ? (', "name": "' + EvalString_0 + '"') : "";
@@ -1160,7 +1165,7 @@ vibrate_s
 
 /* vibrate_s
 tooltip : vibrate: 画面震动
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=vibrate%ef%bc%9a%e7%94%bb%e9%9d%a2%e9%9c%87%e5%8a%a8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=vibrate%ef%bc%9a%e7%94%bb%e9%9d%a2%e9%9c%87%e5%8a%a8
 default : [2000,false]
 colour : this.soundColor
 Int_0 = Int_0 ?(', "time": '+Int_0):'';
@@ -1175,7 +1180,7 @@ animate_s
 
 /* animate_s
 tooltip : animate：显示动画,位置填hero或者1,2形式的位置,或者不填代表当前事件点
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=animate%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E7%94%BB
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=animate%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E7%94%BB
 default : ["zone","hero",false]
 colour : this.soundColor
 if (EvalString_0) {
@@ -1201,7 +1206,7 @@ showImage_s
 
 /* showImage_s
 tooltip : showImage：显示图片
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showImage%ef%bc%9a%e6%98%be%e7%a4%ba%e5%9b%be%e7%89%87
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showImage%ef%bc%9a%e6%98%be%e7%a4%ba%e5%9b%be%e7%89%87
 default : [1,"bg.jpg","0","0",1,0,false]
 colour : this.printColor
 if(Int_0<=0 || Int_0>50) throw new Error('图片编号在1~50之间');
@@ -1218,7 +1223,7 @@ showImage_1_s
 
 /* showImage_1_s
 tooltip : showImage_1：显示图片
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showImage%ef%bc%9a%e6%98%be%e7%a4%ba%e5%9b%be%e7%89%87
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showImage%ef%bc%9a%e6%98%be%e7%a4%ba%e5%9b%be%e7%89%87
 default : [1,"bg.jpg","0","0","","",1,"0","0","","",0,false]
 colour : this.printColor
 if(Int_0<=0 || Int_0>50) throw new Error('图片编号在1~50之间');
@@ -1237,7 +1242,7 @@ showTextImage_s
 
 /* showTextImage_s
 tooltip : showTextImage：显示图片化文本
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showTextImage%ef%bc%9a%e6%98%be%e7%a4%ba%e6%96%87%e6%9c%ac%e5%8c%96%e5%9b%be%e7%89%87
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showTextImage%ef%bc%9a%e6%98%be%e7%a4%ba%e6%96%87%e6%9c%ac%e5%8c%96%e5%9b%be%e7%89%87
 colour : this.printColor
 default : ["可以使用setText事件来控制字体、颜色、大小、偏移量等",1,"0","0",1.4,1,0,false]
 if(Int_0<=0 || Int_0>50) throw new Error('图片编号在1~50之间');
@@ -1252,7 +1257,7 @@ hideImage_s
 
 /* hideImage_s
 tooltip : hideImage：清除图片
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=hideImage%ef%bc%9a%e6%b8%85%e9%99%a4%e5%9b%be%e7%89%87
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=hideImage%ef%bc%9a%e6%b8%85%e9%99%a4%e5%9b%be%e7%89%87
 colour : this.printColor
 default : [1,0,false]
 if(Int_0<=0 || Int_0>50) throw new Error('图片编号在1~50之间');
@@ -1267,7 +1272,7 @@ showGif_0_s
 
 /* showGif_0_s
 tooltip : showGif：显示动图
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showgif%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E5%9B%BE
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showgif%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E5%9B%BE
 default : ["bg.gif","0","0"]
 colour : this.printColor
 var code = '{"type": "showGif", "name": "'+EvalString_0+'", "loc": ['+PosString_0+','+PosString_1+']},\n';
@@ -1280,7 +1285,7 @@ showGif_1_s
 
 /* showGif_1_s
 tooltip : showGif：清除所有显示的动图
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=showgif%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E5%9B%BE
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showgif%EF%BC%9A%E6%98%BE%E7%A4%BA%E5%8A%A8%E5%9B%BE
 colour : this.printColor
 var code = '{"type": "showGif"},\n';
 return code;
@@ -1293,7 +1298,7 @@ moveImage_s
 
 /* moveImage_s
 tooltip : moveImage：图片移动
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=moveImage%ef%bc%9a%e5%9b%be%e7%89%87%e7%a7%bb%e5%8a%a8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=moveImage%ef%bc%9a%e5%9b%be%e7%89%87%e7%a7%bb%e5%8a%a8
 default : [1,'','','',500,false]
 colour : this.printColor
 if(Int_0<=0 || Int_0>50) throw new Error('图片编号在1~50之间');
@@ -1312,7 +1317,7 @@ setCurtain_0_s
 
 /* setCurtain_0_s
 tooltip : setCurtain: 更改画面色调,动画时间可不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setcurtain%EF%BC%9A%E6%9B%B4%E6%94%B9%E7%94%BB%E9%9D%A2%E8%89%B2%E8%B0%83
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setcurtain%EF%BC%9A%E6%9B%B4%E6%94%B9%E7%94%BB%E9%9D%A2%E8%89%B2%E8%B0%83
 default : ["255,255,255,1",'rgba(255,255,255,1)',500,false]
 colour : this.soundColor
 var colorRe = MotaActionFunctions.pattern.colorRe;
@@ -1329,7 +1334,7 @@ setCurtain_1_s
 
 /* setCurtain_1_s
 tooltip : setCurtain: 恢复画面色调,动画时间可不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setcurtain%EF%BC%9A%E6%9B%B4%E6%94%B9%E7%94%BB%E9%9D%A2%E8%89%B2%E8%B0%83
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setcurtain%EF%BC%9A%E6%9B%B4%E6%94%B9%E7%94%BB%E9%9D%A2%E8%89%B2%E8%B0%83
 default : [500,false]
 colour : this.soundColor
 Int_0 = Int_0!=='' ?(', "time": '+Int_0):'';
@@ -1343,7 +1348,7 @@ screenFlash_s
 
 /* screenFlash_s
 tooltip : screenFlash: 画面闪烁,动画时间可不填
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=screenFlash%EF%BC%9A%E7%94%BB%E9%9D%A2%E9%97%AA%E7%83%81
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=screenFlash%EF%BC%9A%E7%94%BB%E9%9D%A2%E9%97%AA%E7%83%81
 default : ["255,255,255,1",'rgba(255,255,255,1)',500,1,false]
 colour : this.soundColor
 var colorRe = MotaActionFunctions.pattern.colorRe;
@@ -1360,7 +1365,7 @@ setWeather_s
 
 /* setWeather_s
 tooltip : setWeather：更改天气
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setweather%EF%BC%9A%E6%9B%B4%E6%94%B9%E5%A4%A9%E6%B0%94
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setweather%EF%BC%9A%E6%9B%B4%E6%94%B9%E5%A4%A9%E6%B0%94
 default : [null,1]
 colour : this.soundColor
 if(Int_0<1 || Int_0>10) throw new Error('天气的强度等级, 在1-10之间');
@@ -1375,7 +1380,7 @@ move_s
 
 /* move_s
 tooltip : move: 让某个NPC/怪物移动,位置可不填代表当前事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=move%EF%BC%9A%E8%AE%A9%E6%9F%90%E4%B8%AAnpc%E6%80%AA%E7%89%A9%E7%A7%BB%E5%8A%A8
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=move%EF%BC%9A%E8%AE%A9%E6%9F%90%E4%B8%AAnpc%E6%80%AA%E7%89%A9%E7%A7%BB%E5%8A%A8
 default : ["","",500,false,false,"上右3下2后4左前2"]
 colour : this.mapColor
 var floorstr = '';
@@ -1395,7 +1400,7 @@ moveHero_s
 
 /* moveHero_s
 tooltip : moveHero：移动勇士,用这种方式移动勇士的过程中将无视一切地形, 无视一切事件, 中毒状态也不会扣血
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=movehero%EF%BC%9A%E7%A7%BB%E5%8A%A8%E5%8B%87%E5%A3%AB
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=movehero%EF%BC%9A%E7%A7%BB%E5%8A%A8%E5%8B%87%E5%A3%AB
 default : [500,false,"上右3下2后4左前2"]
 colour : this.dataColor
 Int_0 = Int_0!=='' ?(', "time": '+Int_0):'';
@@ -1410,7 +1415,7 @@ jump_s
 
 /* jump_s
 tooltip : jump: 让某个NPC/怪物跳跃
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=jump%EF%BC%9A%E8%AE%A9%E6%9F%90%E4%B8%AANPC%2F%E6%80%AA%E7%89%A9%E8%B7%B3%E8%B7%83
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=jump%EF%BC%9A%E8%AE%A9%E6%9F%90%E4%B8%AANPC%2F%E6%80%AA%E7%89%A9%E8%B7%B3%E8%B7%83
 default : ["","","","",500,true,false]
 colour : this.mapColor
 var floorstr = '';
@@ -1433,7 +1438,7 @@ jumpHero_s
 
 /* jumpHero_s
 tooltip : jumpHero: 跳跃勇士
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=jumpHero%EF%BC%9A%E8%B7%B3%E8%B7%83%E5%8B%87%E5%A3%AB
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=jumpHero%EF%BC%9A%E8%B7%B3%E8%B7%83%E5%8B%87%E5%A3%AB
 default : ["","",500,false]
 colour : this.dataColor
 var floorstr = '';
@@ -1452,7 +1457,7 @@ playBgm_s
 
 /* playBgm_s
 tooltip : playBgm: 播放背景音乐
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=playbgm%EF%BC%9A%E6%92%AD%E6%94%BE%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=playbgm%EF%BC%9A%E6%92%AD%E6%94%BE%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
 default : ["bgm.mp3"]
 colour : this.soundColor
 var code = '{"type": "playBgm", "name": "'+EvalString_0+'"},\n';
@@ -1465,7 +1470,7 @@ pauseBgm_s
 
 /* pauseBgm_s
 tooltip : pauseBgm: 暂停背景音乐
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=pausebgm%EF%BC%9A%E6%9A%82%E5%81%9C%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=pausebgm%EF%BC%9A%E6%9A%82%E5%81%9C%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
 colour : this.soundColor
 var code = '{"type": "pauseBgm"},\n';
 return code;
@@ -1477,7 +1482,7 @@ resumeBgm_s
 
 /* resumeBgm_s
 tooltip : resumeBgm: 恢复背景音乐
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=resumebgm%EF%BC%9A%E6%81%A2%E5%A4%8D%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=resumebgm%EF%BC%9A%E6%81%A2%E5%A4%8D%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
 colour : this.soundColor
 var code = '{"type": "resumeBgm"},\n';
 return code;
@@ -1489,7 +1494,7 @@ loadBgm_s
 
 /* loadBgm_s
 tooltip : loadBgm: 预加载某个背景音乐，之后可以直接播放
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=loadBgm%ef%bc%9a%e9%a2%84%e5%8a%a0%e8%bd%bd%e4%b8%80%e4%b8%aa%e8%83%8c%e6%99%af%e9%9f%b3%e4%b9%90
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=loadBgm%ef%bc%9a%e9%a2%84%e5%8a%a0%e8%bd%bd%e4%b8%80%e4%b8%aa%e8%83%8c%e6%99%af%e9%9f%b3%e4%b9%90
 default : ["bgm.mp3"]
 colour : this.soundColor
 var code = '{"type": "loadBgm", "name": "'+EvalString_0+'"},\n';
@@ -1502,7 +1507,7 @@ freeBgm_s
 
 /* freeBgm_s
 tooltip : freeBgm: 释放背景音乐的缓存
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=freeBgm%ef%bc%9a%e9%87%8a%e6%94%be%e4%b8%80%e4%b8%aa%e8%83%8c%e6%99%af%e9%9f%b3%e4%b9%90%e7%9a%84%e7%bc%93%e5%ad%98
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=freeBgm%ef%bc%9a%e9%87%8a%e6%94%be%e4%b8%80%e4%b8%aa%e8%83%8c%e6%99%af%e9%9f%b3%e4%b9%90%e7%9a%84%e7%bc%93%e5%ad%98
 default : ["bgm.mp3"]
 colour : this.soundColor
 var code = '{"type": "freeBgm", "name": "'+EvalString_0+'"},\n';
@@ -1515,7 +1520,7 @@ playSound_s
 
 /* playSound_s
 tooltip : playSound: 播放音效
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=playsound%EF%BC%9A%E6%92%AD%E6%94%BE%E9%9F%B3%E6%95%88
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=playsound%EF%BC%9A%E6%92%AD%E6%94%BE%E9%9F%B3%E6%95%88
 default : ["item.mp3",false]
 colour : this.soundColor
 Bool_0 = Bool_0 ? ', "stop": true' : '';
@@ -1529,7 +1534,7 @@ stopSound_s
 
 /* stopSound_s
 tooltip : stopSound: 停止所有音效
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=stopSound%ef%bc%9a%e5%81%9c%e6%ad%a2%e6%89%80%e6%9c%89%e9%9f%b3%e6%95%88
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=stopSound%ef%bc%9a%e5%81%9c%e6%ad%a2%e6%89%80%e6%9c%89%e9%9f%b3%e6%95%88
 colour : this.soundColor
 var code = '{"type": "stopSound"},\n';
 return code;
@@ -1541,7 +1546,7 @@ setVolume_s
 
 /* setVolume_s
 tooltip : setVolume: 设置音量
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=setvolume%EF%BC%9A%E8%AE%BE%E7%BD%AE%E9%9F%B3%E9%87%8F
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setvolume%EF%BC%9A%E8%AE%BE%E7%BD%AE%E9%9F%B3%E9%87%8F
 default : [90, 500, false]
 colour : this.soundColor
 Int_1 = Int_1!==''?(', "time": '+Int_1):""
@@ -1556,7 +1561,7 @@ win_s
 
 /* win_s
 tooltip : win: 获得胜利, 该事件会显示获胜页面, 并重新游戏
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=win%EF%BC%9A%E8%8E%B7%E5%BE%97%E8%83%9C%E5%88%A9
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=win%EF%BC%9A%E8%8E%B7%E5%BE%97%E8%83%9C%E5%88%A9
 default : ["",false]
 Bool_0 = Bool_0?', "norank": 1':'';
 var code = '{"type": "win", "reason": "'+EvalString_0+'"'+Bool_0+'},\n';
@@ -1569,7 +1574,7 @@ lose_s
 
 /* lose_s
 tooltip : lose: 游戏失败, 该事件会显示失败页面, 并重新开始游戏
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=lose%EF%BC%9A%E6%B8%B8%E6%88%8F%E5%A4%B1%E8%B4%A5
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=lose%EF%BC%9A%E6%B8%B8%E6%88%8F%E5%A4%B1%E8%B4%A5
 default : [""]
 var code = '{"type": "lose", "reason": "'+EvalString_0+'"},\n';
 return code;
@@ -1581,7 +1586,7 @@ restart_s
 
 /* restart_s
 tooltip : restart: 直接回到标题界面
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=restart%ef%bc%9a%e7%9b%b4%e6%8e%a5%e5%9b%9e%e5%88%b0%e6%a0%87%e9%a2%98%e7%95%8c%e9%9d%a2
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=restart%ef%bc%9a%e7%9b%b4%e6%8e%a5%e5%9b%9e%e5%88%b0%e6%a0%87%e9%a2%98%e7%95%8c%e9%9d%a2
 var code = '{"type": "restart"},\n';
 return code;
 */;
@@ -1592,7 +1597,7 @@ input_s
 
 /* input_s
 tooltip : input：接受用户输入数字, 事件只能接受非负整数输入, 所有非法的输入将全部变成0
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=input%ef%bc%9a%e6%8e%a5%e5%8f%97%e7%94%a8%e6%88%b7%e8%be%93%e5%85%a5%e6%95%b0%e5%ad%97
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=input%ef%bc%9a%e6%8e%a5%e5%8f%97%e7%94%a8%e6%88%b7%e8%be%93%e5%85%a5%e6%95%b0%e5%ad%97
 default : ["请输入一个数"]
 colour : this.dataColor
 var code = '{"type": "input", "text": "'+EvalString_0+'"},\n';
@@ -1605,7 +1610,7 @@ input2_s
 
 /* input2_s
 tooltip : input2：接受用户输入文本, 允许用户输入任何形式的文本
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=input2%ef%bc%9a%e6%8e%a5%e5%8f%97%e7%94%a8%e6%88%b7%e8%be%93%e5%85%a5%e6%96%87%e6%9c%ac
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=input2%ef%bc%9a%e6%8e%a5%e5%8f%97%e7%94%a8%e6%88%b7%e8%be%93%e5%85%a5%e6%96%87%e6%9c%ac
 default : ["请输入文本"]
 colour : this.dataColor
 var code = '{"type": "input2", "text": "'+EvalString_0+'"},\n';
@@ -1618,7 +1623,7 @@ if_s
 
 /* if_s
 tooltip : if: 条件判断
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=if%EF%BC%9A%E6%9D%A1%E4%BB%B6%E5%88%A4%E6%96%AD
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=if%EF%BC%9A%E6%9D%A1%E4%BB%B6%E5%88%A4%E6%96%AD
 colour : this.eventColor
 var code = ['{"type": "if", "condition": "',expression_0,'",\n',
     '"true": [\n',action_0,'],\n',
@@ -1633,7 +1638,7 @@ if_1_s
 
 /* if_1_s
 tooltip : if: 条件判断
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=if%EF%BC%9A%E6%9D%A1%E4%BB%B6%E5%88%A4%E6%96%AD
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=if%EF%BC%9A%E6%9D%A1%E4%BB%B6%E5%88%A4%E6%96%AD
 colour : this.eventColor
 var code = ['{"type": "if", "condition": "',expression_0,'",\n',
     '"true": [\n',action_0,'],\n',
@@ -1647,7 +1652,7 @@ switch_s
 
 /* switch_s
 tooltip : switch: 多重条件分歧
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7
 default : ["判别值"]
 colour : this.eventColor
 var code = ['{"type": "switch", "condition": "',expression_0,'", "caseList": [\n',
@@ -1662,7 +1667,7 @@ switchCase
 
 /* switchCase
 tooltip : 选项的选择
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7
 default : ["", false]
 colour : this.subColor
 Bool_0 = Bool_0?', "nobreak": true':'';
@@ -1676,7 +1681,7 @@ choices_s
 
 /* choices_s
 tooltip : choices: 给用户提供选项
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=choices%EF%BC%9A%E7%BB%99%E7%94%A8%E6%88%B7%E6%8F%90%E4%BE%9B%E9%80%89%E9%A1%B9
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=choices%EF%BC%9A%E7%BB%99%E7%94%A8%E6%88%B7%E6%8F%90%E4%BE%9B%E9%80%89%E9%A1%B9
 default : ["","流浪者","woman"]
 var title='';
 if (EvalString_1==''){
@@ -1700,7 +1705,7 @@ choicesContext
 
 /* choicesContext
 tooltip : 选项的选择
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=choices%EF%BC%9A%E7%BB%99%E7%94%A8%E6%88%B7%E6%8F%90%E4%BE%9B%E9%80%89%E9%A1%B9
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=choices%EF%BC%9A%E7%BB%99%E7%94%A8%E6%88%B7%E6%8F%90%E4%BE%9B%E9%80%89%E9%A1%B9
 default : ["提示文字:红钥匙","",""]
 colour : this.subColor
 if (EvalString_1) {
@@ -1720,7 +1725,7 @@ confirm_s
 
 /* confirm_s
 tooltip : 弹出确认框
-helpUrl : https://h5mota.com/games/template/docs/#/
+helpUrl : https://h5mota.com/games/template/_docs/#/
 default : ["确认要xxx吗?",false]
 Bool_0 = Bool_0?', "default": true':''
 var code = ['{"type": "confirm"'+Bool_0+', "text": "',EvalString_0,'",\n',
@@ -1735,7 +1740,7 @@ while_s
 
 /* while_s
 tooltip : while：前置条件循环
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=while%ef%bc%9a%e5%89%8d%e7%bd%ae%e6%9d%a1%e4%bb%b6%e5%be%aa%e7%8e%af
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=while%ef%bc%9a%e5%89%8d%e7%bd%ae%e6%9d%a1%e4%bb%b6%e5%be%aa%e7%8e%af
 colour : this.eventColor
 var code = ['{"type": "while", "condition": "',expression_0,'",\n',
     '"data": [\n',action_0,'],\n',
@@ -1748,7 +1753,7 @@ dowhile_s
 
 /* dowhile_s
 tooltip : dowhile：后置条件循环
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=dowhile%ef%bc%9a%e5%90%8e%e7%bd%ae%e6%9d%a1%e4%bb%b6%e5%be%aa%e7%8e%af
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=dowhile%ef%bc%9a%e5%90%8e%e7%bd%ae%e6%9d%a1%e4%bb%b6%e5%be%aa%e7%8e%af
 colour : this.eventColor
 var code = ['{"type": "dowhile", "condition": "',expression_0,'",\n',
     '"data": [\n',action_0,'],\n',
@@ -1761,7 +1766,7 @@ break_s
 
 /* break_s
 tooltip : break：跳出循环, 如果break事件不在任何循环中被执行，则和exit等价，即会立刻结束当前事件！
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=break%EF%BC%9A%E8%B7%B3%E5%87%BA%E5%BE%AA%E7%8E%AF
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=break%EF%BC%9A%E8%B7%B3%E5%87%BA%E5%BE%AA%E7%8E%AF
 colour : this.eventColor
 var code = '{"type": "break"},\n';
 return code;
@@ -1772,7 +1777,7 @@ continue_s
 
 /* continue_s
 tooltip : continue：继续执行当前循环的下一轮, 如果continue事件不在任何循环中被执行，则和exit等价，即会立刻结束当前事件！
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=continue%EF%BC%9A%E7%BB%A7%E7%BB%AD%E6%89%A7%E8%A1%8C%E5%BD%93%E5%89%8D%E5%BE%AA%E7%8E%AF
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=continue%EF%BC%9A%E7%BB%A7%E7%BB%AD%E6%89%A7%E8%A1%8C%E5%BD%93%E5%89%8D%E5%BE%AA%E7%8E%AF
 colour : this.eventColor
 var code = '{"type": "continue"},\n';
 return code;
@@ -1785,7 +1790,7 @@ wait_s
 
 /* wait_s
 tooltip : wait: 等待用户操作并获得按键或点击信息（具体用法看文档）
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=wait%EF%BC%9A%E7%AD%89%E5%BE%85%E7%94%A8%E6%88%B7%E6%93%8D%E4%BD%9C
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=wait%EF%BC%9A%E7%AD%89%E5%BE%85%E7%94%A8%E6%88%B7%E6%93%8D%E4%BD%9C
 colour : this.soundColor
 var code = '{"type": "wait"},\n';
 return code;
@@ -1798,7 +1803,7 @@ waitAsync_s
 
 /* waitAsync_s
 tooltip : waitAsync: 等待所有异步事件执行完毕
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=waitAsync%ef%bc%9a%e7%ad%89%e5%be%85%e6%89%80%e6%9c%89%e5%bc%82%e6%ad%a5%e4%ba%8b%e4%bb%b6%e6%89%a7%e8%a1%8c%e5%ae%8c%e6%af%95
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=waitAsync%ef%bc%9a%e7%ad%89%e5%be%85%e6%89%80%e6%9c%89%e5%bc%82%e6%ad%a5%e4%ba%8b%e4%bb%b6%e6%89%a7%e8%a1%8c%e5%ae%8c%e6%af%95
 colour : this.soundColor
 var code = '{"type": "waitAsync"},\n';
 return code;
@@ -1811,7 +1816,7 @@ callBook_s
 
 /* callBook_s
 tooltip : callBook: 呼出怪物手册；返回游戏后将继续执行后面的事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=callBook%ef%bc%9a%e5%91%bc%e5%87%ba%e6%80%aa%e7%89%a9%e6%89%8b%e5%86%8c
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=callBook%ef%bc%9a%e5%91%bc%e5%87%ba%e6%80%aa%e7%89%a9%e6%89%8b%e5%86%8c
 colour : this.soundColor
 var code = '{"type": "callBook"},\n';
 return code;
@@ -1824,7 +1829,7 @@ callSave_s
 
 /* callSave_s
 tooltip : callSave: 呼出存档页面
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=callSave%ef%bc%9a%e5%91%bc%e5%87%ba%e5%ad%98%e6%a1%a3%e7%95%8c%e9%9d%a2
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=callSave%ef%bc%9a%e5%91%bc%e5%87%ba%e5%ad%98%e6%a1%a3%e7%95%8c%e9%9d%a2
 colour : this.soundColor
 var code = '{"type": "callSave"},\n';
 return code;
@@ -1837,7 +1842,7 @@ autoSave_s
 
 /* autoSave_s
 tooltip : autoSave: 自动存档
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=autoSave%ef%bc%9a%e8%87%aa%e5%8a%a8%e5%ad%98%e6%a1%a3
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=autoSave%ef%bc%9a%e8%87%aa%e5%8a%a8%e5%ad%98%e6%a1%a3
 colour : this.soundColor
 var code = '{"type": "autoSave"},\n';
 return code;
@@ -1850,18 +1855,121 @@ callLoad_s
 
 /* callLoad_s
 tooltip : callLoad: 呼出存档页面；返回游戏后将继续执行后面的事件
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=callLoad%ef%bc%9a%e5%91%bc%e5%87%ba%e8%af%bb%e6%a1%a3%e7%95%8c%e9%9d%a2
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=callLoad%ef%bc%9a%e5%91%bc%e5%87%ba%e8%af%bb%e6%a1%a3%e7%95%8c%e9%9d%a2
 colour : this.soundColor
 var code = '{"type": "callLoad"},\n';
 return code;
 */;
 
+
+previewUI_s
+    :   'UI绘制预览' '（双击此项可进行预览）' BGNL? Newline action+  BEND Newline
+
+
+/* previewUI_s
+tooltip : previewUI: UI绘制预览
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=previewUI%ef%bc%9aUI%e7%bb%98%e5%88%b6%e9%a2%84%e8%a7%88
+colour : this.commentColor
+var code = ['{"type": "previewUI", "action": [\n', action_0,']},\n'].join('');
+return code;
+*/;
+
+
+clearMap_s
+    :   '清除画布' '起点像素' 'x' PosString 'y' PosString  '宽' PosString '高' PosString Newline
+
+/* clearMap_s
+tooltip : clearMap: 清除画布
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=clearMap%ef%bc%9a%e6%b8%85%e9%99%a4%e7%94%bb%e5%b8%83
+colour : this.subColor
+default : ["0", "0", "416", "480"]
+var code = '{"type": "clearMap", "x": ' + PosString_0 + ', "y": ' + PosString_1 +
+    ', "width": ' + PosString_2 + ', "height": ' + PosString_3 + '},\n';
+return code;
+*/;
+
+
+clearMap_1_s
+    : '清空画布'
+
+/* clearMap_1_s
+tooltip : clearMap: 清除画布
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=clearMap%ef%bc%9a%e6%b8%85%e9%99%a4%e7%94%bb%e5%b8%83
+colour : this.subColor
+var code = '{"type": "clearMap"},\n';
+return code;
+*/;
+
+
+setAttribute_s
+    : '设置画布属性' '字体' EvalString? '填充样式' EvalString? Colour '边框样式' EvalString? Colour BGNL? '线宽度' EvalString? '不透明度' EvalString? '对齐' TextAlign_List '基准线' TextBaseline_List Newline
+
+/* setAttribute_s
+tooltip : setAttribute：设置画布属性
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=setAttribute%ef%bc%9a%e8%ae%be%e7%bd%ae%e7%94%bb%e5%b8%83%e5%b1%9e%e6%80%a7
+colour : this.subColor
+default : ["","",'rgba(255,255,255,1)',"",'rgba(255,255,255,1)',"","",null,null]
+TextAlign_List_0 = TextAlign_List_0==='null'?'': ', "align": "'+TextAlign_List_0+'"';
+TextBaseline_List_0 = TextBaseline_List_0==='null'?'': ', "baseline": "'+TextBaseline_List_0+'"';
+var colorRe = MotaActionFunctions.pattern.colorRe;
+var fontRe = MotaActionFunctions.pattern.fontRe;
+if (EvalString_0) {
+  if (!fontRe.test(EvalString_0)) throw new Error('字体必须是 [italic] [bold] 14px Verdana 这种形式或不填');
+  EvalString_0 = ', "font": "' + EvalString_0 + '"';
+}
+if (EvalString_1) {
+  if (!colorRe.test(EvalString_1))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_1 = ', "fillStyle": ['+EvalString_1+']';
+}
+if (EvalString_2) {
+  if (!colorRe.test(EvalString_2))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_2 = ', "strokeStyle": ['+EvalString_2+']';
+}
+if (EvalString_3) {
+  if (!/^\d+$/.test(EvalString_3))throw new Error('线宽必须是整数或不填');
+  EvalString_3 = ', "lineWidth": '+EvalString_3;
+}
+if (EvalString_4) {
+  var f = parseFloat(EvalString_4);
+  if (isNaN(f) || f<0 || f>1) throw new Error('不透明度必须是0到1的浮点数或不填');
+  EvalString_4 = ', "alpha": '+EvalString_4;
+}
+var code = '{"type": "setAttribute"'+EvalString_0+EvalString_1+EvalString_2+EvalString_3+EvalString_4+TextAlign_List_0+TextBaseline_List_0+'},\n';
+return code;
+*/;
+
+fillText_s
+    :   '绘制文本' 'x' PosString 'y' PosString '样式' EvalString? Colour '字体' EvalString? '最大宽度' EvalString? BGNL? EvalString Newline
+
+/* fillText_s
+tooltip : fillText：绘制一行文本；可以设置最大宽度进行放缩
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=fillText%ef%bc%9a%e7%bb%98%e5%88%b6%e6%96%87%e6%9c%ac
+colour : this.subColor
+default : ["0","0","",'rgba(255,255,255,1)',"","","绘制一行文本"]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+var fontRe = MotaActionFunctions.pattern.fontRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+if (EvalString_1) {
+  if (!fontRe.test(EvalString_1)) throw new Error('字体必须是 [italic] [bold] 14px Verdana 这种形式或不填');
+  EvalString_1 = ', "font": "' + EvalString_1 + '"';
+}
+if (EvalString_2) {
+  if (!/^\d+$/.test(EvalString_2)) throw new Error('最大宽度必须是整数或不填');
+  EvalString_2 = ', "maxWidth": ' + EvalString_2;
+}
+var code = '{"type": "fillText", "x": '+PosString_0+', "y": '+PosString_1+EvalString_0+EvalString_1+EvalString_2+', "text": "'+EvalString_3+'"},\n';
+return code;
+*/;
+
 unknown_s
     :   '自定义事件' BGNL? RawEvalString
 
 /* unknown_s
 tooltip : 通过脚本自定义的事件类型, 以及编辑器不识别的事件类型
-helpUrl : https://h5mota.com/games/template/docs/#/
+helpUrl : https://h5mota.com/games/template/_docs/#/
 default : ['{"type":"test", "data": "这是自定义的参数"}']
 colour : this.dataColor
 try {
@@ -1878,7 +1986,7 @@ function_s
 
 /* function_s
 tooltip : 可双击多行编辑，请勿使用异步代码。常见API参见文档附录。
-helpUrl : https://h5mota.com/games/template/docs/#/event?id=function%EF%BC%9A%E8%87%AA%E5%AE%9A%E4%B9%89js%E8%84%9A%E6%9C%AC
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=function%EF%BC%9A%E8%87%AA%E5%AE%9A%E4%B9%89js%E8%84%9A%E6%9C%AC
 default : [false,"alert(core.getStatus(\"atk\"));"]
 colour : this.dataColor
 Bool_0 = Bool_0?', "async": true':'';
@@ -2039,9 +2147,13 @@ SetTextPosition_List
     :   '不改变'|'距离顶部'|'居中'|'距离底部'
     /*SetTextPosition_List ['null','up','center','down']*/;
 
-SetTextAlign_List
+TextAlign_List
     :   '不改变'|'左对齐'|'左右居中'|'右对齐'
-    /*SetTextAlign_List ['null','left','center','right']*/;
+    /*TextAlign_List ['null','left','center','right']*/;
+
+TextBaseline_List
+    :   '不改变'|'顶部'|'居中'|'标准值'|'底部'
+    /*TextBaseline_List ['null','top','middle','alphabetic','bottom']*/;
 
 ShopUse_List
     :   '金币' | '经验'
@@ -2348,11 +2460,10 @@ ActionParser.prototype.parseAction = function() {
       this.next = MotaActionBlocks['comment_s'].xmlText([this.EvalString(data.text),this.next],null,data.text);
       break;
     case "setText": // 设置剧情文本的属性
-      var setTextfunc = function(a){return a?JSON.stringify(a).slice(1,-1):null;}
-      data.title=setTextfunc(data.title);
-      data.text=setTextfunc(data.text);
+      data.title=this.Colour(data.title);
+      data.text=this.Colour(data.text);
       if (!/^\w+\.png$/.test(data.background))
-        data.background=setTextfunc(data.background);
+        data.background=this.Colour(data.background);
       this.next = MotaActionBlocks['setText_s'].xmlText([
         data.position,data.offset,data.align,data.title,'rgba('+data.title+')',
         data.text,'rgba('+data.text+')',data.background,'rgba('+data.background+')',
@@ -2453,7 +2564,7 @@ ActionParser.prototype.parseAction = function() {
       this.next = MotaActionBlocks['move_s'].xmlText([
         data.loc[0],data.loc[1],data.time||0,data.keep||false,data.async||false,this.StepString(data.steps),this.next]);
       break;
-    case "moveHero":
+    case "moveHero": // 移动勇士
       this.next = MotaActionBlocks['moveHero_s'].xmlText([
         data.time||0,data.async||false,this.StepString(data.steps),this.next]);
       break;
@@ -2536,6 +2647,7 @@ ActionParser.prototype.parseAction = function() {
     case "setFg": // 颜色渐变
     case "setCurtain":
       if(this.isset(data.color)){
+        data.color = this.Colour(data.color);
         this.next = MotaActionBlocks['setCurtain_0_s'].xmlText([
           data.color,'rgba('+data.color+')',data.time||0,data.async||false,this.next]);
       } else {
@@ -2544,6 +2656,7 @@ ActionParser.prototype.parseAction = function() {
       }
       break;
     case "screenFlash": // 画面闪烁
+        data.color = this.Colour(data.color);
         this.next = MotaActionBlocks['screenFlash_s'].xmlText([
           data.color,'rgba('+data.color+')',data.time||500,data.times||1,data.async||false,this.next]);
       break;
@@ -2708,6 +2821,7 @@ ActionParser.prototype.parseAction = function() {
     case "choices": // 提供选项
       var text_choices = null;
       for(var ii=data.choices.length-1,choice;choice=data.choices[ii];ii--) {
+        choice.color = this.Colour(choice.color);
         text_choices=MotaActionBlocks['choicesContext'].xmlText([
           choice.text,choice.icon,choice.color,'rgba('+choice.color+')',this.insertActionList(choice.action),text_choices]);
       }
@@ -2806,6 +2920,34 @@ ActionParser.prototype.parseAction = function() {
       this.next = MotaActionBlocks['exit_s'].xmlText([
         this.next]);
       break;
+    case "previewUI": // UI绘制预览
+      this.next = MotaActionBlocks['previewUI_s'].xmlText([
+        this.insertActionList(data.action), this.next
+      ]);
+      break;
+    case "clearMap": // 清除画布
+      if (data.x != null && data.y != null && data.width != null && data.height != null) {
+        this.next = MotaActionBlocks['clearMap_s'].xmlText([
+          data.x, data.y, data.width, data.height, this.next
+        ]);
+      }
+      else {
+        this.next = MotaActionBlocks['clearMap_1_s'].xmlText([this.next]);
+      }
+      break;
+    case "setAttribute": // 设置画布属性
+      data.fillStyle=this.Colour(data.fillStyle);
+      data.strokeStyle=this.Colour(data.strokeStyle);
+      this.next = MotaActionBlocks['setAttribute_s'].xmlText([
+        data.font,data.fillStyle,'rgba('+data.fillStyle+')',data.strokeStyle,'rgba('+data.strokeStyle+')',
+        data.lineWidth,data.alpha,data.align,data.baseline,this.next]);
+      break;
+    case "fillText": // 绘制一行文本
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['fillText_s'].xmlText([
+        data.x, data.y, data.style, 'rgba('+data.style+')', data.font, data.maxWidth, this.EvalString(data.text), this.next
+      ]);
+      break;
     case "animateImage":  // 兼容 animateImage
       break;
     default:
@@ -2859,6 +3001,10 @@ ActionParser.prototype.EvalString = function(EvalString) {
   return EvalString.split('\b').join('\\b').split('\t').join('\\t').split('\n').join('\\n');
 }
 
+ActionParser.prototype.Colour = function(color) {
+  return color?JSON.stringify(color).slice(1,-1):null;
+}
+
 ActionParser.prototype.tryToUseEvFlag_e = function(defaultType, args, isShadow, comment) {
   var match=/^switch:([A-F])$/.exec(args[0])
   if(match){
@@ -2940,5 +3086,6 @@ MotaActionFunctions.pattern.id=/^flag:([a-zA-Z0-9_\u4E00-\u9FCC]+)$/;
 MotaActionFunctions.pattern.id2=/^flag:([a-zA-Z0-9_\u4E00-\u9FCC]+),flag:([a-zA-Z0-9_\u4E00-\u9FCC]+)$/;
 MotaActionFunctions.pattern.idWithoutFlag=/^[0-9a-zA-Z_][0-9a-zA-Z_\-:]*$/;
 MotaActionFunctions.pattern.colorRe=/^(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(,0(\.\d+)?|,1)?$/;
+MotaActionFunctions.pattern.fontRe=/^(italic )?(bold )?(\d+)px ([a-zA-Z0-9_\u4E00-\u9FCC]+)$/;
 
 */
\ No newline at end of file
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index b81d675a..02964fc0 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -169,6 +169,13 @@ editor_blockly = function () {
       MotaActionBlocks['autoSave_s'].xmlText(),
       MotaActionBlocks['callLoad_s'].xmlText(),
     ],
+    'UI绘制':[
+      MotaActionBlocks['previewUI_s'].xmlText(),
+      MotaActionBlocks['clearMap_s'].xmlText(),
+      MotaActionBlocks['clearMap_1_s'].xmlText(),
+      MotaActionBlocks['setAttribute_s'].xmlText(),
+      MotaActionBlocks['fillText_s'].xmlText(),
+    ],
     '原生脚本':[
       MotaActionBlocks['function_s'].xmlText(),
       MotaActionBlocks['unknown_s'].xmlText(),
@@ -650,40 +657,26 @@ function omitedcheckUpdateFunction(event) {
 
     // Index from 1 - 9
     editor_blockly.openToolbox = function(index) {
-        // var element = document.getElementById(':'+index);
-        // if (element == null || element.getAttribute("aria-selected")=="true") return;
-        // element.click();
-        editor_blockly.workspace.toolbox_.tree_.setSelectedItem(editor_blockly.workspace.toolbox_.tree_.children_[index-1]);
+        if (index < 0) index += editor_blockly.workspace.toolbox_.tree_.children_.length;
+        editor_blockly.workspace.toolbox_.tree_.setSelectedItem(editor_blockly.workspace.toolbox_.tree_.children_[index]);
     }
     editor_blockly.reopenToolbox = function(index) {
-        // var element = document.getElementById(':'+index);
-        // if (element == null) return;
-        // if (element.getAttribute("aria-selected")=="true") element.click();
-        // element.click();
-        editor_blockly.workspace.toolbox_.tree_.setSelectedItem(editor_blockly.workspace.toolbox_.tree_.children_[index-1]);
-        editor_blockly.workspace.getFlyout_().show(editor_blockly.workspace.toolbox_.tree_.children_[index-1].blocks);
+        if (index < 0) index += editor_blockly.workspace.toolbox_.tree_.children_.length;
+        editor_blockly.workspace.toolbox_.tree_.setSelectedItem(editor_blockly.workspace.toolbox_.tree_.children_[index]);
+        editor_blockly.workspace.getFlyout_().show(editor_blockly.workspace.toolbox_.tree_.children_[index].blocks);
     }
 
     editor_blockly.closeToolbox = function() {
-        /*
-        for (var i=1; i<=10; i++) {
-            var element = document.getElementById(':'+i);
-            if (element && element.getAttribute("aria-selected")=="true") {
-                element.click();
-                return;
-            }
-        }
-        */
         editor_blockly.workspace.toolbox_.clearSelection();
     }
 
     var searchInput = document.getElementById("searchBlock");
     searchInput.onfocus = function () {
-        editor_blockly.reopenToolbox(10);
+        editor_blockly.reopenToolbox(-1);
     }
 
     searchInput.oninput = function () {
-        editor_blockly.reopenToolbox(10);
+        editor_blockly.reopenToolbox(-1);
     }
 
     editor_blockly.searchBlock = function (value) {
diff --git a/libs/events.js b/libs/events.js
index a3481278..49844643 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1620,7 +1620,7 @@ events.prototype._action_exit = function (data, x, y, prefix) {
     core.doAction();
 }
 
-events.prototype._action_previewUIEvent = function (data, x, y, prefix) {
+events.prototype._action_previewUI = function (data, x, y, prefix) {
     this.insertAction(data.action);
     core.doAction();
 }
diff --git a/libs/ui.js b/libs/ui.js
index 0ce671c4..6557a452 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -225,12 +225,14 @@ ui.prototype.setOpacity = function (name, opacity) {
 ////// 设置某个canvas的绘制属性（如颜色等） //////
 ui.prototype.setFillStyle = function (name, style) {
     var ctx = this.getContextByName(name);
+    if (style instanceof Array) style = core.arrayToRGBA(style);
     if (ctx) ctx.fillStyle = style;
 }
 
 ////// 设置某个canvas边框属性 //////
 ui.prototype.setStrokeStyle = function (name, style) {
     var ctx = this.getContextByName(name);
+    if (style instanceof Array) style = core.arrayToRGBA(style);
     if (ctx) ctx.strokeStyle = style;
 }
 
@@ -656,17 +658,11 @@ ui.prototype._uievent_drawBackground = function (data) {
     var background = data.background || core.status.textAttribute.background;
     var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);
     if (typeof background == 'string') {
-        if (data.alpha != null) this.setAlpha('uievent', data.alpha);
         this.drawWindowSkin(background, 'uievent', x, y, w, h);
     }
     else if (background instanceof Array) {
-        var alpha = background[3];
-        if (alpha == null) alpha = 1;
-        if (data.alpha != null) alpha = data.alpha;
-        this.setAlpha('uievent', alpha);
-        this.setLineWidth('uievent', 2);
-        this.fillRect('uievent', x, y, w, h, core.arrayToRGB(background));
-        this.strokeRect('uievent', x, y, w, h, core.status.globalAttribute.borderColor);
+        this.fillRect('uievent', x, y, w, h, core.arrayToRGBA(background));
+        this.strokeRect('uievent', x, y, w, h);
     }
 }
 
@@ -800,7 +796,9 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
     var _textBaseLine = tempCtx.textBaseline;
     tempCtx.textBaseline = 'top';
     tempCtx.font = this._buildFont(config.fontSize, config.bold);
-    tempCtx.fillStyle = config.color;
+    var color = config.color;
+    if (color instanceof Array) color = core.arrayToRGBA(color);
+    tempCtx.fillStyle = color;
     this._drawTextContent_draw(ctx, tempCtx, content, config);
     tempCtx.textBaseline = _textBaseLine;
 }

From 2586ec9b76ff5ce162e21f233d66fef7b5b8d090 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 23:02:46 +0800
Subject: [PATCH 07/23] uievents

---
 _docs/api.md                   |   2 +-
 _docs/event.md                 | 193 +++++++++++++++++
 _server/MotaAction.g4          | 385 +++++++++++++++++++++++++++++++++
 _server/colorPicker/jsColor.js |   6 +-
 _server/editor_blockly.js      |  14 ++
 libs/events.js                 |  10 +
 libs/ui.js                     |  61 +++++-
 project/functions.js           |   3 +-
 8 files changed, 662 insertions(+), 12 deletions(-)

diff --git a/_docs/api.md b/_docs/api.md
index 0aa05bfe..640f74fc 100644
--- a/_docs/api.md
+++ b/_docs/api.md
@@ -1755,7 +1755,7 @@ config为绘制的配置项，目前可以包括如下几项：
  - bold：是否粗体。如果不设置默认为false。
  - align：文字对齐方式，仅在maxWidth设置时有效，默认为'left'。
  - fontSize：字体大小，如果不设置则使用剧情文本设置中的正文字体大小。
- - lineHeight：绘制的行距值，如果不设置则使用fontSize*1.3（即1.3被行距）。
+ - lineHeight：绘制的行距值，如果不设置则使用fontSize*1.3（即1.3倍行距）。
  - time：打字机效果。若不为0，则会逐个字进行绘制，并设置core.status.event.interval定时器。
 
 
diff --git a/_docs/event.md b/_docs/event.md
index dfd2245c..a673d714 100644
--- a/_docs/event.md
+++ b/_docs/event.md
@@ -1863,6 +1863,199 @@ font可选，如果设置则是要绘制的字体。
 
 maxWidth可选，如果设置且不为0，则代表要绘制的最大宽度；超过此宽度会自动放缩。
 
+### fillBoldText：绘制描边文本
+
+UI绘制事件。
+
+此项可以绘制一行描边文本。
+
+```js
+[
+    {"type": "fillText", "text"："要绘制的描边文本", "x": 10, "y": 20, "style": [255,0,0,1]}
+]
+```
+
+text必填，为要绘制的文本，支持`${}`的写法，不支持一切转义字符或换行符。
+
+x和y必填，为要绘制的左上角坐标。请使用`setAttribute`来设置绘制的对齐方式和基准线。
+
+style可选，如果设置需要是三元组RGB或四元组RBGA，代表绘制样式。
+
+font可选，如果设置则是要绘制的字体。
+
+### drawTextContent：绘制多行文本
+
+UI绘制事件。
+
+此项可以绘制多行文本。
+
+```js
+[
+    {"type": "drawTextContent", "text"："要绘制的多行文本", "left": 10, "top": 20, "maxWidth": 100}
+]
+```
+
+text必填，为要绘制的文本，支持所有的文字效果（如\n，${}，\r，\\i等），但不支持支持\t和\b的语法。
+
+left和top必填，为要绘制的起始像素坐标。实际绘制时会将textBaseline设置为'top'，因此只需要考虑第一个字的左上角位置。
+
+maxWidth可选，为单行最大宽度，超过此宽度将自动换行，不设置不会自动换行。
+
+color可选，表示绘制时的颜色，为三元组RGB或四元组RGBA。如果不设置则使用剧情文本设置中的正文颜色。
+
+bold可选，是否粗体。如果不设置默认为false。
+
+align可选，文字对齐方式，仅在maxWidth设置时有效，默认为'left'。
+
+fontSize可选，为字体大小，如果不设置则使用剧情文本设置中的正文字体大小。
+
+lineHeight可选，绘制的行距值，如果不设置则使用fontSize*1.3（即1.3倍行距）。
+
+### fillRect：绘制矩形
+
+UI绘制事件。此项可以绘制一个矩形。
+
+```js
+[
+    {"type": "fillRect", "x": 100, "y": 100, "width": 120, "height": 120, "style": [255,0,0,1]}
+]
+```
+
+x, y, width, height必填，为要绘制的起点坐标和宽高；也可以用`flag:xxx`。
+
+color可选，表示绘制时的颜色，为三元组RGB或四元组RGBA。
+
+### strokeRect：绘制矩形边框
+
+UI绘制事件。此项可以绘制一个矩形边框。
+
+```js
+[
+    {"type": "strokeRect", "x": 100, "y": 100, "width": 120, "height": 120, "style": [255,0,0,1], "lineWidth": 4}
+]
+```
+
+x, y, width, height必填，为要绘制的起点坐标和宽高；也可以用`flag:xxx`。
+
+style可选，表示绘制时的颜色，为三元组RGB或四元组RGBA。
+
+lineWidth可选，表示边框的线宽。
+
+### drawLine：绘制线段
+
+UI绘制事件。此事件可以绘制一个函数。
+
+```js
+[
+    {"type": "drawLine", "x1": 0, "y1": 0, "x2": "flag:x", "y2": 200, "style": [255,0,0,1]}
+]
+```
+
+x1, y1, x2, x2必填，为要绘制的起点和终点坐标；也可以用`flag:xxx`的写法。
+
+style可选，表示绘制时的颜色，为三元组RGB或四元组RGBA。
+
+lineWidth可选，表示边框的线宽。
+
+### drawArrow：绘制箭头
+
+UI绘制事件。此事件可以绘制一个箭头。
+
+参数和写法与`drawLine`完全一致，只不过是会多画一个箭头标记。
+
+### fillPolygon：绘制多边形
+
+UI绘制事件。此事件可以绘制一个多边形。
+
+```js
+[
+   {"type": "fillPolygon", "nodes": [[0,0],[0,100],[100,0]], "style": [255,0,0,1]}
+]
+```
+
+nodes必填，为一个二维数组，其中每一项都是多边形一个顶点坐标。（与显示/隐藏事件写法相同）
+
+style可选，表示绘制时的颜色，为三元组RGB或四元组RGBA。
+
+### strokePolygon：绘制多边形边框
+
+UI绘制事件。此事件可以绘制一个多边形边框。
+
+参数列表和`fillPolygon`基本相同，不过多了一个`lineWidth`表示的绘制线宽。
+
+### drawImage：绘制图片
+
+UI绘制事件。此事件可以绘制一个图片。
+
+```js
+[
+    {"type": "drawImage", "image": "bg.jpg", "x": 0, "y": 0}, // 在(0,0)绘制bg.jpg
+    {"type": "drawImage", "image": "bg.jpg", "x": 0, "y": 0, "w": 100, "h": 100}, // 在(0,0)绘制bg.jpg，且放缩到100x100
+    // 裁剪并放缩图片
+    {"type": "drawImage", "image": "bg.jpg", "x": 0, "y": 0, "w": 100, "h": 100, "x1": 0, "y1": 0, "w1": 100, "h1": 100}
+]
+```
+
+image必填，为图片名。图片必须在全塔属性中被注册过。
+
+此函数有三种写法：
+
+- 只写x和y：表示要绘制到的位置。
+- 写x, y, w, h：表示要绘制到的位置，且将图片放缩到指定宽高。
+- 写x, y, w, h, x1, y1, w1, h1：从原始图片上裁剪[x,y,w,h]的图片，并绘制画布上的[x1,y1,w1,h1]
+
+可以查看下面的文档以了解各项参数的信息：
+http://www.w3school.com.cn/html5/canvas_drawimage.asp
+
+### drawIcon：绘制图标
+
+UI绘制事件。此事件可以绘制一个图标。
+
+```js
+[
+    {"type": "drawIcon", "id": "yellowKey", "x": 100, "y": 100}, // 在(100,100)绘制黄钥匙
+]
+```
+
+id必填，为要绘制的图标ID。可以是一个注册过的图标ID，也可以使用状态栏的图标ID，例如lv, hp, up, save, settings等。
+
+x, y必填，为要绘制的左上角坐标。width和height可选，如果设置则会将图标放缩成对应的宽高。
+
+### drawBackground：绘制背景图
+
+UI绘制事件。此事件可以绘制一个背景图。
+
+```js
+[
+    {"type": "drawBackground", "background": "winskin.png", "x": 0, "y": 0, "width": 100, "height": 100},
+]
+```
+
+background必填，为要绘制的背景图内容。其可以是一个三元组RGB或四元组RGBA（纯色绘制），或一个WindowSkin的图片名。
+
+x, y, width, height必填，分别为要绘制的起点坐标和长宽。
+
+可以使用“设置画布属性”来设置不透明度和纯色绘制时的边框颜色。
+
+### drawSelector：绘制闪烁光标
+
+UI绘制事件。此事件可以绘制闪烁光标。
+
+```js
+[
+    {"type": "drawSelector", "image": "winskin.png", "x": 0, "y": 0, "width": 100, "height": 100},
+    {"type": "drawSelector"} // 清除闪烁光标
+]
+```
+
+image为要绘制的WindowSkin图片名；如果不填则视为“清除闪烁光标”。
+
+x, y, width, height分别为要绘制的起点坐标和长宽。
+
+请注意，同时只会有一个闪烁光标存在，如果创建多个则后者会替换前者。
+
+闪烁光标将会一直存在即使事件流结束；请使用本事件并不填`image`来清除闪烁光标。
+
 ### function: 自定义JS脚本
 
 上述给出了这么多事件，但有时候往往不能满足需求，这时候就需要执行自定义脚本了。
diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index a2adf880..5f8f8425 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -346,6 +346,20 @@ action
     |   clearMap_1_s
     |   setAttribute_s
     |   fillText_s
+    |   fillBoldText_s
+    |   drawTextContent_s
+    |   fillRect_s
+    |   strokeRect_s
+    |   drawLine_s
+    |   drawArrow_s
+    |   fillPolygon_s
+    |   strokePolygon_s
+    |   drawImage_s
+    |   drawImage_1_s
+    |   drawIcon_s
+    |   drawBackground_s
+    |   drawSelector_s
+    |   drawSelector_1_s
     |   unknown_s
     |   function_s
     |   pass_s
@@ -1964,6 +1978,285 @@ var code = '{"type": "fillText", "x": '+PosString_0+', "y": '+PosString_1+EvalSt
 return code;
 */;
 
+fillBoldText_s
+    :   '绘制描边文本' 'x' PosString 'y' PosString '样式' EvalString? Colour '字体' EvalString? BGNL? EvalString Newline
+
+/* fillBoldText_s
+tooltip : fillBoldText：绘制一行描边文本
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=fillBoldText%ef%bc%9a%e7%bb%98%e5%88%b6%e6%8f%8f%e8%be%b9%e6%96%87%e6%9c%ac
+colour : this.subColor
+default : ["0","0","",'rgba(255,255,255,1)',"","绘制一行描边文本"]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+var fontRe = MotaActionFunctions.pattern.fontRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+if (EvalString_1) {
+  if (!fontRe.test(EvalString_1)) throw new Error('字体必须是 [italic] [bold] 14px Verdana 这种形式或不填');
+  EvalString_1 = ', "font": "' + EvalString_1 + '"';
+}
+var code = '{"type": "fillBoldText", "x": '+PosString_0+', "y": '+PosString_1+EvalString_0+EvalString_1+', "text": "'+EvalString_2+'"},\n';
+return code;
+*/;
+
+drawTextContent_s
+    :   '绘制多行文本'  EvalString BGNL? '左上角坐标' 'x' PosString 'y' PosString '最大宽度' EvalString? '颜色' EvalString? Colour BGNL? '对齐' TextAlign_List '字体大小' EvalString? '行距' EvalString? '粗体' Bool Newline
+
+/* drawTextContent_s
+tooltip : drawTextContent：绘制多行文本
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawTextContent%ef%bc%9a%e7%bb%98%e5%88%b6%e5%a4%9a%e8%a1%8c%e6%96%87%e6%9c%ac
+colour : this.subColor
+default : ["绘制多行文本\\n第二行","0","0","","",'rgba(255,255,255,1)',null,"","",false]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+TextAlign_List_0 = TextAlign_List_0==='null'?'': ', "align": "'+TextAlign_List_0+'"';
+Bool_0 = Bool_0 ?  (', "bold": true') : '';
+if (EvalString_1) {
+  if (!/^\d+$/.test(EvalString_1)) throw new Error('最大宽度必须是整数或不填');
+  EvalString_1 = ', "maxWidth": ' + EvalString_1;
+}
+if (EvalString_2) {
+  if (!colorRe.test(EvalString_2))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_2 = ', "color": ['+EvalString_2+']';
+}
+if (EvalString_3) {
+  if (!/^\d+$/.test(EvalString_3)) throw new Error('字体大小必须是整数或不填');
+  EvalString_3 = ', "fontSize": ' + EvalString_3;
+}
+if (EvalString_4) {
+  if (!/^\d+$/.test(EvalString_4)) throw new Error('行距必须是整数或不填');
+  EvalString_4 = ', "lineHeight": ' + EvalString_4;
+}
+var code = '{"type": "drawTextContent", "text": "'+EvalString_0+'", "left": '+PosString_0+', "top": '+PosString_1+TextAlign_List_0+EvalString_1+EvalString_2+EvalString_3+EvalString_4+Bool_0+'},\n';
+return code;
+*/;
+
+fillRect_s
+    :   '绘制矩形' '起点像素坐标' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour Newline
+
+/* fillRect_s
+tooltip : fillRect：绘制矩形
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=fillRect%ef%bc%9a%e7%bb%98%e5%88%b6%e7%9f%a9%e5%bd%a2
+colour : this.subColor
+default : ["0","0","flag:x","300","",null]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+var code = '{"type": "fillRect", "x": '+PosString_0+', "y": '+PosString_1+', "width": '+PosString_2+', "height": '+PosString_3+EvalString_0+'},\n';
+return code;
+*/;
+
+strokeRect_s
+    :   '绘制矩形边框' '起点像素坐标' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+
+/* strokeRect_s
+tooltip : strokeRect：绘制矩形边框
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=strokeRect%ef%bc%9a%e7%bb%98%e5%88%b6%e7%9f%a9%e5%bd%a2%e8%be%b9%e6%a1%86
+colour : this.subColor
+default : ["0","0","flag:x","300","",null,""]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+if (EvalString_1) {
+  if (!/^\d+$/.test(EvalString_1))throw new Error('线宽必须是整数或不填');
+  EvalString_1 = ', "lineWidth": '+EvalString_1;
+}
+var code = '{"type": "strokeRect", "x": '+PosString_0+', "y": '+PosString_1+', "width": '+PosString_2+', "height": '+PosString_3+EvalString_0+EvalString_1+'},\n';
+return code;
+*/;
+
+drawLine_s
+    :   '绘制线段' '起点像素坐标' 'x' PosString 'y' PosString '终点像素坐标' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+
+/* drawLine_s
+tooltip : drawLine：绘制线段
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawLine%ef%bc%9a%e7%bb%98%e5%88%b6%e7%ba%bf%e6%ae%b5
+colour : this.subColor
+default : ["0","0","flag:x","300","",null,""]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+if (EvalString_1) {
+  if (!/^\d+$/.test(EvalString_1))throw new Error('线宽必须是整数或不填');
+  EvalString_1 = ', "lineWidth": '+EvalString_1;
+}
+var code = '{"type": "drawLine", "x1": '+PosString_0+', "y1": '+PosString_1+', "x2": '+PosString_2+', "y2": '+PosString_3+EvalString_0+EvalString_1+'},\n';
+return code;
+*/;
+
+drawArrow_s
+    :   '绘制箭头' '起点像素坐标' 'x' PosString 'y' PosString '终点像素坐标' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+
+/* drawArrow_s
+tooltip : drawArrow：绘制箭头
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawArrow%ef%bc%9a%e7%bb%98%e5%88%b6%e7%ae%ad%e5%a4%b4
+colour : this.subColor
+default : ["0","0","flag:x","300","",null,""]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+if (EvalString_0) {
+  if (!colorRe.test(EvalString_0))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_0 = ', "style": ['+EvalString_0+']';
+}
+if (EvalString_1) {
+  if (!/^\d+$/.test(EvalString_1))throw new Error('线宽必须是整数或不填');
+  EvalString_1 = ', "lineWidth": '+EvalString_1;
+}
+var code = '{"type": "drawArrow", "x1": '+PosString_0+', "y1": '+PosString_1+', "x2": '+PosString_2+', "y2": '+PosString_3+EvalString_0+EvalString_1+'},\n';
+return code;
+*/;
+
+
+fillPolygon_s
+    :   '绘制多边形' '顶点像素列表' 'x' EvalString 'y' EvalString '颜色' EvalString? Colour Newline
+
+/* fillPolygon_s
+tooltip : fillPolygon：绘制多边形
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=fillPolygon%ef%bc%9a%e7%bb%98%e5%88%b6%e5%a4%9a%e8%be%b9%e5%bd%a2
+colour : this.subColor
+default : ["0,0,100","0,100,0","",null]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+var pattern2 = /^([+-]?\d+)(,[+-]?\d+)*$/;
+if(!pattern2.test(EvalString_0) || !pattern2.test(EvalString_1))throw new Error('坐标格式错误,请右键点击帮助查看格式');
+EvalString_0=EvalString_0.split(',');
+EvalString_1=EvalString_1.split(',');
+if(EvalString_0.length!==EvalString_1.length)throw new Error('坐标格式错误,请右键点击帮助查看格式');
+for(var ii=0;ii<EvalString_0.length;ii++)EvalString_0[ii]='['+EvalString_0[ii]+','+EvalString_1[ii]+']';
+if (EvalString_2) {
+  if (!colorRe.test(EvalString_2))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_2 = ', "style": ['+EvalString_2+']';
+}
+var code = '{"type": "fillPolygon", "nodes": ['+EvalString_0+']'+EvalString_2+'},\n';
+return code;
+*/;
+
+
+strokePolygon_s
+    :   '绘制多边形边框' '顶点像素列表' 'x' EvalString 'y' EvalString '颜色' EvalString? Colour '线宽' EvalString? Newline
+
+/* strokePolygon_s
+tooltip : strokePolygon：绘制多边形边框
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=strokePolygon%ef%bc%9a%e7%bb%98%e5%88%b6%e5%a4%9a%e8%be%b9%e5%bd%a2%e8%be%b9%e6%a1%86
+colour : this.subColor
+default : ["0,0,100","0,100,0","",null,""]
+var colorRe = MotaActionFunctions.pattern.colorRe;
+var pattern2 = /^([+-]?\d+)(,[+-]?\d+)*$/;
+if(!pattern2.test(EvalString_0) || !pattern2.test(EvalString_1))throw new Error('坐标格式错误,请右键点击帮助查看格式');
+EvalString_0=EvalString_0.split(',');
+EvalString_1=EvalString_1.split(',');
+if(EvalString_0.length!==EvalString_1.length)throw new Error('坐标格式错误,请右键点击帮助查看格式');
+for(var ii=0;ii<EvalString_0.length;ii++)EvalString_0[ii]='['+EvalString_0[ii]+','+EvalString_1[ii]+']';
+if (EvalString_2) {
+  if (!colorRe.test(EvalString_2))throw new Error('颜色格式错误,形如:0~255,0~255,0~255,0~1');
+  EvalString_2 = ', "style": ['+EvalString_2+']';
+}
+if (EvalString_3) {
+  if (!/^\d+$/.test(EvalString_3))throw new Error('线宽必须是整数或不填');
+  EvalString_3 = ', "lineWidth": '+EvalString_3;
+}
+var code = '{"type": "strokePolygon", "nodes": ['+EvalString_0+']'+EvalString_2+EvalString_3+'},\n';
+return code;
+*/;
+
+drawImage_s
+    :   '绘制图片' '图片' EvalString '起点像素' 'x' PosString 'y' PosString '宽' PosString? '高' PosString? Newline
+
+
+/* drawImage_s
+tooltip : drawImage：绘制图片
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawImage%ef%bc%9a%e7%bb%98%e5%88%b6%e5%9b%be%e7%89%87
+default : ["bg.jpg","0","0","",""]
+colour : this.subColor
+PosString_2 = PosString_2 ? (', "w": '+PosString_2) : '';
+PosString_3 = PosString_3 ? (', "h": '+PosString_3) : '';
+var code = '{"type": "drawImage", "image": "'+EvalString_0+'", "x": '+PosString_0+', "y": '+PosString_1+PosString_2+PosString_3+'},\n';
+return code;
+*/;
+
+drawImage_1_s
+    :   '绘制图片' '图片' EvalString BGNL? '裁剪的起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString BGNL?
+        '绘制的起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
+
+
+/* drawImage_1_s
+tooltip : drawImage：绘制图片
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawImage%ef%bc%9a%e7%bb%98%e5%88%b6%e5%9b%be%e7%89%87
+default : ["bg.jpg","0","0","32","32","0","0","32","32"]
+colour : this.subColor
+var code = '{"type": "drawImage", "image": "'+EvalString_0+'"'+
+           ', "x": '+PosString_0+', "y": '+PosString_1+', "w": '+PosString_2+', "h": '+PosString_3+
+           ', "x1": '+PosString_4+', "y1": '+PosString_5+', "w1": '+PosString_6+', "h1": '+PosString_7+'},\n';
+return code;
+*/;
+
+drawIcon_s
+    :   '绘制图标' 'ID' IdString '起点像素' 'x' PosString 'y' PosString '宽' PosString? '高' PosString? Newline
+
+
+/* drawIcon_s
+tooltip : drawIcon：绘制图标
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawIcon%ef%bc%9a%e7%bb%98%e5%88%b6%e5%9b%be%e6%a0%87
+default : ["yellowKey","0","0","",""]
+colour : this.subColor
+PosString_2 = PosString_2 ? (', "width": '+PosString_2) : '';
+PosString_3 = PosString_3 ? (', "height": '+PosString_3) : '';
+var code = '{"type": "drawIcon", "id": "'+IdString_0+'", "x": '+PosString_0+', "y": '+PosString_1+PosString_2+PosString_3+'},\n';
+return code;
+*/;
+
+drawBackground_s
+    :   '绘制背景图' EvalString Colour '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
+
+
+/* drawBackground_s
+tooltip : drawBackground：绘制背景
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawBackground%ef%bc%9a%e7%bb%98%e5%88%b6%e8%83%8c%e6%99%af%e5%9b%be
+default : ["winskin.png",null,"0","0","100","100"]
+colour : this.subColor
+var colorRe = MotaActionFunctions.pattern.colorRe;
+if (colorRe.test(EvalString_0)) {
+  EvalString_0 = ', "background": ['+EvalString_0+']';
+}
+else if (/^\w+\.png$/.test(EvalString_0)) {
+  EvalString_0 = ', "background": "'+EvalString_0+'"';
+}
+else {
+  throw new Error('背景格式错误,必须是形如0~255,0~255,0~255,0~1的颜色，或一个WindowSkin的png图片名称');
+}
+var code = '{"type": "drawBackground"'+EvalString_0+', "x": '+PosString_0+', "y": '+PosString_1+', "width": '+PosString_2+', "height": '+PosString_3+'},\n';
+return code;
+*/;
+
+drawSelector_s
+    :   '绘制闪烁光标' EvalString Colour '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
+
+
+/* drawSelector_s
+tooltip : drawSelector：绘制闪烁光标
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawSelector%ef%bc%9a%e7%bb%98%e5%88%b6%e9%97%aa%e7%83%81%e5%85%89%e6%a0%87
+default : ["winskin.png",null,"0","0","100","100"]
+colour : this.subColor
+var code = '{"type": "drawSelector", "image": "'+EvalString_0+'", "x": '+PosString_0+', "y": '+PosString_1+', "width": '+PosString_2+', "height": '+PosString_3+'},\n';
+return code;
+*/;
+
+drawSelector_1_s
+    :   '清除闪烁光标' Newline
+
+
+/* drawSelector_1_s
+tooltip : drawSelector：清除闪烁光标
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=showImage%ef%bc%9a%e6%98%be%e7%a4%ba%e5%9b%be%e7%89%87
+colour : this.subColor
+var code = '{"type": "drawSelector"},\n';
+return code;
+*/;
+
 unknown_s
     :   '自定义事件' BGNL? RawEvalString
 
@@ -2948,6 +3241,98 @@ ActionParser.prototype.parseAction = function() {
         data.x, data.y, data.style, 'rgba('+data.style+')', data.font, data.maxWidth, this.EvalString(data.text), this.next
       ]);
       break;
+    case "fillBoldText": // 绘制一行描边文本
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['fillBoldText_s'].xmlText([
+        data.x, data.y, data.style, 'rgba('+data.style+')', data.font, this.EvalString(data.text), this.next
+      ]);
+      break;
+    case "drawTextContent": // 绘制多行文本
+      data.color = this.Colour(data.color);
+      this.next = MotaActionBlocks['drawTextContent_s'].xmlText([
+        this.EvalString(data.text), data.left, data.top, data.maxWidth, data.color, 'rgba('+data.color+')',
+        data.align, data.fontSize, data.lineHeight, data.bold, this.next
+      ]);
+      break;
+    case "fillRect": // 绘制矩形
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['fillRect_s'].xmlText([
+        data.x, data.y, data.width, data.height, data.style, 'rgba('+data.style+')', this.next
+      ]);
+      break;
+    case "strokeRect": // 绘制矩形边框
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['strokeRect_s'].xmlText([
+        data.x, data.y, data.width, data.height, data.style, 'rgba('+data.style+')', data.lineWidth, this.next
+      ]);
+      break;
+    case "drawLine": // 绘制线段
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['drawLine_s'].xmlText([
+        data.x1, data.y1, data.x2, data.y2, data.style, 'rgba('+data.style+')', data.lineWidth, this.next
+      ]);
+      break;
+    case "drawArrow": // 绘制线段
+      data.style = this.Colour(data.style);
+      this.next = MotaActionBlocks['drawArrow_s'].xmlText([
+        data.x1, data.y1, data.x2, data.y2, data.style, 'rgba('+data.style+')', data.lineWidth, this.next
+      ]);
+      break;
+    case "fillPolygon": // 绘制多边形
+      data.style = this.Colour(data.style);
+      var x_str=[],y_str=[];
+      data.nodes.forEach(function (t) {
+        x_str.push(t[0]);
+        y_str.push(t[1]);
+      })
+      this.next = MotaActionBlocks['fillPolygon_s'].xmlText([
+        x_str.join(','), y_str.join(','), data.style, 'rgba('+data.style+')', this.next
+      ]);
+      break;
+    case "strokePolygon": // 绘制多边形
+      data.style = this.Colour(data.style);
+      var x_str=[],y_str=[];
+      data.nodes.forEach(function (t) {
+        x_str.push(t[0]);
+        y_str.push(t[1]);
+      })
+      this.next = MotaActionBlocks['strokePolygon_s'].xmlText([
+        x_str.join(','), y_str.join(','), data.style, 'rgba('+data.style+')', data.lineWidth, this.next
+      ]);
+      break;
+    case "drawImage": // 绘制图片
+      if (data.x1 != null && data.y1 != null && data.w1 != null && data.h1 != null) {
+        this.next = MotaActionBlocks['drawImage_1_s'].xmlText([
+          data.image, data.x, data.y, data.w, data.h, data.x1, data.y1, data.w1, data.h1, this.next
+        ]);
+      }
+      else {
+        this.next = MotaActionBlocks['drawImage_s'].xmlText([
+          data.image, data.x, data.y, data.w, data.h, this.next
+        ]);
+      }
+      break;
+    case "drawIcon": // 绘制图标
+      this.next = MotaActionBlocks['drawIcon_s'].xmlText([
+        data.id, data.x, data.y, data.width, data.height, this.next
+      ]);
+      break;
+    case "drawBackground": // 绘制背景
+      if (!/^\w+\.png$/.test(data.background))
+        data.background=this.Colour(data.background);
+      this.next = MotaActionBlocks['drawBackground_s'].xmlText([
+        data.background, 'rgba('+data.background+')', data.x, data.y, data.width, data.height, this.next
+      ]);
+      break;
+    case "drawSelector": // 绘制光标
+      if (data.image) {
+        this.next = MotaActionBlocks['drawSelector_s'].xmlText([
+          data.image, data.x, data.y, data.width, data.height, this.next
+        ]);
+      }
+      else {
+        this.next = MotaActionBlocks['drawSelector_1_s'].xmlText([this.next]);
+      }
     case "animateImage":  // 兼容 animateImage
       break;
     default:
diff --git a/_server/colorPicker/jsColor.js b/_server/colorPicker/jsColor.js
index b3ca28ea..45dcaf1d 100644
--- a/_server/colorPicker/jsColor.js
+++ b/_server/colorPicker/jsColor.js
@@ -314,7 +314,11 @@ Blockly.FieldColour.prototype.createWidget_ = function() {
 
     var getValue=function(){
         // return self.getValue() // css颜色
-        return pb.getFieldValue(targetf);
+        var f = pb.getFieldValue(targetf);
+        if (/^(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d),(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(,0(\.\d+)?|,1)?$/.test(f)) {
+            return f;
+        }
+        return "";
         // 也可以用 pb.getFieldValue(targetf) 获得颜色块左边的域的内容
     }
 
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index 02964fc0..6fe22edc 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -175,6 +175,20 @@ editor_blockly = function () {
       MotaActionBlocks['clearMap_1_s'].xmlText(),
       MotaActionBlocks['setAttribute_s'].xmlText(),
       MotaActionBlocks['fillText_s'].xmlText(),
+      MotaActionBlocks['fillBoldText_s'].xmlText(),
+      MotaActionBlocks['drawTextContent_s'].xmlText(),
+      MotaActionBlocks['fillRect_s'].xmlText(),
+      MotaActionBlocks['strokeRect_s'].xmlText(),
+      MotaActionBlocks['drawLine_s'].xmlText(),
+      MotaActionBlocks['drawArrow_s'].xmlText(),
+      MotaActionBlocks['fillPolygon_s'].xmlText(),
+      MotaActionBlocks['strokePolygon_s'].xmlText(),
+      MotaActionBlocks['drawImage_s'].xmlText(),
+      MotaActionBlocks['drawImage_1_s'].xmlText(),
+      MotaActionBlocks['drawIcon_s'].xmlText(),
+      MotaActionBlocks['drawBackground_s'].xmlText(),
+      MotaActionBlocks['drawSelector_s'].xmlText(),
+      MotaActionBlocks['drawSelector_1_s'].xmlText(),
     ],
     '原生脚本':[
       MotaActionBlocks['function_s'].xmlText(),
diff --git a/libs/events.js b/libs/events.js
index 49844643..b196aa0e 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1645,11 +1645,21 @@ events.prototype._action_fillRect = function (data, x, y, prefix) {
     core.doAction();
 }
 
+events.prototype._action_fillPolygon = function (data, x, y, prefix) {
+    core.ui._uievent_fillPolygon(data);
+    core.doAction();
+}
+
 events.prototype._action_strokeRect = function (data, x, y, prefix) {
     core.ui._uievent_strokeRect(data);
     core.doAction();
 }
 
+events.prototype._action_strokePolygon = function (data, x, y, prefix) {
+    core.ui._uievent_strokePolygon(data);
+    core.doAction();
+}
+
 events.prototype._action_drawLine = function (data, x, y, prefix) {
     core.ui._uievent_drawLine(data);
     core.doAction();
diff --git a/libs/ui.js b/libs/ui.js
index 6557a452..474f13fd 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -106,6 +106,7 @@ ui.prototype.fillBoldText = function (name, text, x, y, style, font) {
     if (!ctx) return;
     if (font) ctx.font = font;
     if (!style) style = ctx.fillStyle;
+    if (style instanceof Array) style = core.arrayToRGBA(style);
     ctx.fillStyle = '#000000';
     ctx.fillText(text, x-1, y-1);
     ctx.fillText(text, x-1, y+1);
@@ -132,6 +133,27 @@ ui.prototype._uievent_fillRect = function (data) {
     this.fillRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style);
 }
 
+////// 在某个canvas上绘制一个多边形 //////
+ui.prototype.fillPolygon = function (name, nodes, style) {
+    if (style) core.setFillStyle(name, style);
+    var ctx = this.getContextByName(name);
+    if (!ctx) return;
+    if (!nodes || nodes.length<3) return;
+    ctx.beginPath();
+    for (var i = 0; i < nodes.length; ++i) {
+        var x = core.calValue(nodes[i][0]), y = core.calValue(nodes[i][1]);
+        if (i == 0) ctx.moveTo(x, y);
+        else ctx.lineTo(x, y);
+    }
+    ctx.closePath();
+    ctx.fill();
+}
+
+ui.prototype._uievent_fillPolygon = function (data) {
+    this._createUIEvent();
+    this.fillPolygon('uievent', data.nodes, data.style);
+}
+
 ////// 在某个canvas上绘制一个矩形的边框 //////
 ui.prototype.strokeRect = function (name, x, y, width, height, style, lineWidth) {
     if (style) core.setStrokeStyle(name, style);
@@ -145,6 +167,28 @@ ui.prototype._uievent_strokeRect = function (data) {
     this.strokeRect('uievent', core.calValue(data.x), core.calValue(data.y), core.calValue(data.width), core.calValue(data.height), data.style, data.lineWidth);
 }
 
+////// 在某个canvas上绘制一个多边形的边框 //////
+ui.prototype.strokePolygon = function (name, nodes, style, lineWidth) {
+    if (style) core.setStrokeStyle(name, style);
+    if (lineWidth) core.setLineWidth(name, lineWidth);
+    var ctx = this.getContextByName(name);
+    if (!ctx) return;
+    if (!nodes || nodes.length<3) return;
+    ctx.beginPath();
+    for (var i = 0; i < nodes.length; ++i) {
+        var x = core.calValue(nodes[i][0]), y = core.calValue(nodes[i][1]);
+        if (i == 0) ctx.moveTo(x, y);
+        else ctx.lineTo(x, y);
+    }
+    ctx.closePath();
+    ctx.stroke();
+}
+
+ui.prototype._uievent_strokePolygon = function (data) {
+    this._createUIEvent();
+    this.strokePolygon('uievent', data.nodes, data.style, data.lineWidth);
+}
+
 ////// 在某个canvas上绘制一条线 //////
 ui.prototype.drawLine = function (name, x1, y1, x2, y2, style, lineWidth) {
     if (style) core.setStrokeStyle(name, style);
@@ -326,7 +370,7 @@ ui.prototype.drawImage = function (name, image, x, y, w, h, x1, y1, w1, h1) {
 
 ui.prototype._uievent_drawImage = function (data) {
     this._createUIEvent();
-    this.drawImage(data.name, core.calValue(data.x), core.calValue(data.y), core.calValue(data.w), core.calValue(data.h),
+    this.drawImage('uievent', data.image, core.calValue(data.x), core.calValue(data.y), core.calValue(data.w), core.calValue(data.h),
         core.calValue(data.x1), core.calValue(data.y1), core.calValue(data.w1), core.calValue(data.h1));
 }
 
@@ -555,13 +599,13 @@ ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
 }
 
 ui.prototype._uievent_drawSelector = function (data) {
-    if (data.x == null || data.y == null || data.width == null || data.height == null) {
+    if (data.image == null) {
         if (main.mode != 'editor')
             core.deleteCanvas('_uievent_selector');
         return;
     }
 
-    var background = data.background || core.status.textAttribute.background;
+    var background = data.image || core.status.textAttribute.background;
     if (typeof background != 'string') return;
     var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);
     w = Math.round(w); h = Math.round(h);
@@ -775,7 +819,8 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
     config.left = config.left || 0;
     config.right = config.left + (config.maxWidth == null ? ctx.canvas.width : config.maxWidth);
     config.top = config.top || 0;
-    config.color = config.color || core.arrayToRGBA(textAttribute.text);
+    config.color = config.color || textAttribute.text;
+    if (config.color instanceof Array) config.color = core.arrayToRGBA(config.color);
     if (config.bold == null) config.bold = textAttribute.bold;
     config.align = config.align || textAttribute.align || "left";
     config.fontSize = config.fontSize || textAttribute.textfont;
@@ -796,16 +841,16 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
     var _textBaseLine = tempCtx.textBaseline;
     tempCtx.textBaseline = 'top';
     tempCtx.font = this._buildFont(config.fontSize, config.bold);
-    var color = config.color;
-    if (color instanceof Array) color = core.arrayToRGBA(color);
-    tempCtx.fillStyle = color;
+    tempCtx.fillStyle = config.color;
     this._drawTextContent_draw(ctx, tempCtx, content, config);
     tempCtx.textBaseline = _textBaseLine;
 }
 
 ui.prototype._uievent_drawTextContent = function (data) {
     this._createUIEvent();
-    this.drawTextContent('uievent', core.replaceText(data.content), data);
+    data.left = core.calValue(data.left);
+    data.top = core.calValue(data.top);
+    this.drawTextContent('uievent', core.replaceText(data.text), data);
 }
 
 // 绘制的基本逻辑：
diff --git a/project/functions.js b/project/functions.js
index 8e84d5e4..8ff352dc 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -938,8 +938,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		'values': values,
 		'shops': {},
 		'version': core.firstData.version,
-		"time": new Date().getTime(),
-		"hashCode": hashCode
+		"time": new Date().getTime()
 	};
 	if (core.flags.checkConsole) {
 		data.hashCode = core.utils.hashCode(data.hero);

From 1e96491dd4a943f1b680bce8da41ee7008f5e70a Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 23:06:21 +0800
Subject: [PATCH 08/23] uievents

---
 _server/MotaAction.g4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 5f8f8425..27e2f435 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -2233,13 +2233,13 @@ return code;
 */;
 
 drawSelector_s
-    :   '绘制闪烁光标' EvalString Colour '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
+    :   '绘制闪烁光标' EvalString '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
 
 
 /* drawSelector_s
 tooltip : drawSelector：绘制闪烁光标
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawSelector%ef%bc%9a%e7%bb%98%e5%88%b6%e9%97%aa%e7%83%81%e5%85%89%e6%a0%87
-default : ["winskin.png",null,"0","0","100","100"]
+default : ["winskin.png","0","0","100","100"]
 colour : this.subColor
 var code = '{"type": "drawSelector", "image": "'+EvalString_0+'", "x": '+PosString_0+', "y": '+PosString_1+', "width": '+PosString_2+', "height": '+PosString_3+'},\n';
 return code;

From 0c6176f5f6abbc6a14e558675ef6d3ae17c50564 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 23:10:28 +0800
Subject: [PATCH 09/23] uievents

---
 _docs/event.md            |  2 +-
 _server/MotaAction.g4     | 10 +++++-----
 _server/editor_blockly.js |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/_docs/event.md b/_docs/event.md
index a673d714..28a93950 100644
--- a/_docs/event.md
+++ b/_docs/event.md
@@ -1795,7 +1795,7 @@ yes和no均为必填项，即用户点击确认或取消后执行的事件。
 
 该事件会进行等待，直到所有可能的异步事件（异步动画除外）执行完毕。
 
-### previewUI：UI绘制预览
+### previewUI：UI绘制并预览
 
 此项可在地图编辑器中预览UI界面的绘制效果。
 
diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 27e2f435..abaaa615 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1877,13 +1877,13 @@ return code;
 
 
 previewUI_s
-    :   'UI绘制预览' '（双击此项可进行预览）' BGNL? Newline action+  BEND Newline
+    :   'ui绘制并预览' '（双击此项可进行预览）' BGNL? Newline action+  BEND Newline
 
 
 /* previewUI_s
-tooltip : previewUI: UI绘制预览
-helpUrl : https://h5mota.com/games/template/_docs/#/event?id=previewUI%ef%bc%9aUI%e7%bb%98%e5%88%b6%e9%a2%84%e8%a7%88
-colour : this.commentColor
+tooltip : previewUI: ui绘制并预览
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=previewUI%ef%bc%9aUI%e7%bb%98%e5%88%b6%e5%b9%b6%e9%a2%84%e8%a7%88
+colour : this.subColor
 var code = ['{"type": "previewUI", "action": [\n', action_0,']},\n'].join('');
 return code;
 */;
@@ -2007,7 +2007,7 @@ drawTextContent_s
 tooltip : drawTextContent：绘制多行文本
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=drawTextContent%ef%bc%9a%e7%bb%98%e5%88%b6%e5%a4%9a%e8%a1%8c%e6%96%87%e6%9c%ac
 colour : this.subColor
-default : ["绘制多行文本\\n第二行","0","0","","",'rgba(255,255,255,1)',null,"","",false]
+default : ["绘制多行文本\\n可双击编辑","0","0","","",'rgba(255,255,255,1)',null,"","",false]
 var colorRe = MotaActionFunctions.pattern.colorRe;
 TextAlign_List_0 = TextAlign_List_0==='null'?'': ', "align": "'+TextAlign_List_0+'"';
 Bool_0 = Bool_0 ?  (', "bold": true') : '';
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index 6fe22edc..ffc9b010 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -624,6 +624,7 @@ function omitedcheckUpdateFunction(event) {
             'function_s': 'RawEvalString_0',
             'shopsub': 'EvalString_3',
             'confirm_s': 'EvalString_0',
+            'drawTextContent_s': 'EvalString_0',
         }
         var f = b ? textStringDict[b.type] : null;
         if (f) {

From 6b23361b61d624463fc15ba95fd6dd682cf2b396 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sun, 26 May 2019 23:26:50 +0800
Subject: [PATCH 10/23] uievents

---
 _docs/event.md        |  2 ++
 _server/MotaAction.g4 | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/_docs/event.md b/_docs/event.md
index 28a93950..7cd66565 100644
--- a/_docs/event.md
+++ b/_docs/event.md
@@ -1911,6 +1911,8 @@ fontSize可选，为字体大小，如果不设置则使用剧情文本设置中
 
 lineHeight可选，绘制的行距值，如果不设置则使用fontSize*1.3（即1.3倍行距）。
 
+此项不支持字体样式的设置，使用的是全塔属性中的全局字体；如有需要请使用“设置全局属性”事件来设置字体样式。
+
 ### fillRect：绘制矩形
 
 UI绘制事件。此项可以绘制一个矩形。
diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index abaaa615..d4adc924 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1883,7 +1883,6 @@ previewUI_s
 /* previewUI_s
 tooltip : previewUI: ui绘制并预览
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=previewUI%ef%bc%9aUI%e7%bb%98%e5%88%b6%e5%b9%b6%e9%a2%84%e8%a7%88
-colour : this.subColor
 var code = ['{"type": "previewUI", "action": [\n', action_0,']},\n'].join('');
 return code;
 */;
@@ -2001,7 +2000,7 @@ return code;
 */;
 
 drawTextContent_s
-    :   '绘制多行文本'  EvalString BGNL? '左上角坐标' 'x' PosString 'y' PosString '最大宽度' EvalString? '颜色' EvalString? Colour BGNL? '对齐' TextAlign_List '字体大小' EvalString? '行距' EvalString? '粗体' Bool Newline
+    :   '绘制多行文本'  EvalString BGNL? '起点像素' 'x' PosString 'y' PosString '最大宽度' EvalString? '颜色' EvalString? Colour BGNL? '对齐' TextAlign_List '字体大小' EvalString? '行距' EvalString? '粗体' Bool Newline
 
 /* drawTextContent_s
 tooltip : drawTextContent：绘制多行文本
@@ -2032,7 +2031,7 @@ return code;
 */;
 
 fillRect_s
-    :   '绘制矩形' '起点像素坐标' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour Newline
+    :   '绘制矩形' '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour Newline
 
 /* fillRect_s
 tooltip : fillRect：绘制矩形
@@ -2049,7 +2048,7 @@ return code;
 */;
 
 strokeRect_s
-    :   '绘制矩形边框' '起点像素坐标' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+    :   '绘制矩形边框' '起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
 
 /* strokeRect_s
 tooltip : strokeRect：绘制矩形边框
@@ -2070,7 +2069,7 @@ return code;
 */;
 
 drawLine_s
-    :   '绘制线段' '起点像素坐标' 'x' PosString 'y' PosString '终点像素坐标' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+    :   '绘制线段' '起点像素' 'x' PosString 'y' PosString '终点像素' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
 
 /* drawLine_s
 tooltip : drawLine：绘制线段
@@ -2091,7 +2090,7 @@ return code;
 */;
 
 drawArrow_s
-    :   '绘制箭头' '起点像素坐标' 'x' PosString 'y' PosString '终点像素坐标' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
+    :   '绘制箭头' '起点像素' 'x' PosString 'y' PosString '终点像素' 'x' PosString 'y' PosString '颜色' EvalString? Colour '线宽' EvalString? Newline
 
 /* drawArrow_s
 tooltip : drawArrow：绘制箭头
@@ -2164,7 +2163,7 @@ return code;
 */;
 
 drawImage_s
-    :   '绘制图片' '图片' EvalString '起点像素' 'x' PosString 'y' PosString '宽' PosString? '高' PosString? Newline
+    :   '绘制图片' EvalString '起点像素' 'x' PosString 'y' PosString '宽' PosString? '高' PosString? Newline
 
 
 /* drawImage_s
@@ -2179,7 +2178,7 @@ return code;
 */;
 
 drawImage_1_s
-    :   '绘制图片' '图片' EvalString BGNL? '裁剪的起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString BGNL?
+    :   '绘制图片' EvalString '裁剪的起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString BGNL?
         '绘制的起点像素' 'x' PosString 'y' PosString '宽' PosString '高' PosString Newline
 
 

From ba7eccbf5eef8186487ec357437302cf8279be72 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Mon, 27 May 2019 21:56:28 +0800
Subject: [PATCH 11/23] toolboxReplay

---
 _server/MotaAction.g4           | 12 +++++++-----
 _server/editor_file_unsorted.js | 16 +++++++++-------
 libs/actions.js                 | 30 +++++++++++++++++++++++++-----
 libs/control.js                 | 22 ++++++++++++++++++++++
 libs/events.js                  |  2 +-
 5 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index d4adc924..291180ff 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1851,20 +1851,22 @@ return code;
 
 
 autoSave_s
-    :   '自动存档'
+    :   '自动存档' '不提示' Bool Newline
 
 
 /* autoSave_s
 tooltip : autoSave: 自动存档
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=autoSave%ef%bc%9a%e8%87%aa%e5%8a%a8%e5%ad%98%e6%a1%a3
 colour : this.soundColor
-var code = '{"type": "autoSave"},\n';
+default : [false]
+Bool_0 = Bool_0 ? (', "nohint": true') : '';
+var code = '{"type": "autoSave"'+Bool_0+'},\n';
 return code;
 */;
 
 
 callLoad_s
-    :   '呼出读档页面'
+    :   '呼出读档页面' Newline
 
 
 /* callLoad_s
@@ -1903,7 +1905,7 @@ return code;
 
 
 clearMap_1_s
-    : '清空画布'
+    : '清空画布' Newline
 
 /* clearMap_1_s
 tooltip : clearMap: 清除画布
@@ -3202,7 +3204,7 @@ ActionParser.prototype.parseAction = function() {
       break;
     case "autoSave": // 自动存档
       this.next = MotaActionBlocks['autoSave_s'].xmlText([
-        this.next]);
+        this.nohint, this.next]);
       break;
     case "callLoad": // 呼出读档界面
       this.next = MotaActionBlocks['callLoad_s'].xmlText([
diff --git a/_server/editor_file_unsorted.js b/_server/editor_file_unsorted.js
index 04c46d99..c6206fe9 100644
--- a/_server/editor_file_unsorted.js
+++ b/_server/editor_file_unsorted.js
@@ -15,13 +15,15 @@ editor_file = function (editor, callback) {
         var filename = 'project/floors/' + editor.currentFloorId + '.js';
         var datastr = ['main.floors.', editor.currentFloorId, '=\n'];
 
-        for(var ii=0,name;name=['map','bgmap','fgmap'][ii];ii++){
-            var mapArray=editor[name].map(function (v) {
-                return v.map(function (v) {
-                    return v.idnum || v || 0
-                })
-            });
-            editor.currentFloorData[name]=mapArray;
+        if (core.floorIds.indexOf(editor.currentFloorId) >= 0) {
+            for(var ii=0,name;name=['map','bgmap','fgmap'][ii];ii++){
+                var mapArray=editor[name].map(function (v) {
+                    return v.map(function (v) {
+                        return v.idnum || v || 0
+                    })
+                });
+                editor.currentFloorData[name]=mapArray;
+            }
         }
         
         // format 更改实现方式以支持undefined删除
diff --git a/libs/actions.js b/libs/actions.js
index b3885841..e4a79cb4 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -113,7 +113,8 @@ actions.prototype.doRegisteredAction = function (action) {
 
 actions.prototype._checkReplaying = function () {
     if (core.isReplaying() && core.status.event.id != 'save'
-        && (core.status.event.id || "").indexOf('book') != 0 && core.status.event.id != 'viewMaps')
+        && (core.status.event.id || "").indexOf('book') != 0 && core.status.event.id != 'viewMaps'
+        && core.status.event.id != 'toolbox' && core.status.event.id != 'equipbox')
         return true;
     return false;
 }
@@ -170,6 +171,10 @@ actions.prototype._sys_onkeyUp_replay = function (e) {
             core.viewMapReplay();
         else if (e.keyCode == 78) // N
             core.stepReplay();
+        else if (e.keyCode == 84) // T
+            core.toolboxReplay();
+        else if (e.keyCode == 81) // Q
+            core.equipboxReplay();
         else if (e.keyCode >= 49 && e.keyCode <= 51) // 1-3
             core.setReplaySpeed(e.keyCode - 48);
         else if (e.keyCode == 52) // 4
@@ -1317,7 +1322,10 @@ actions.prototype._clickToolbox = function (x, y) {
     // 装备栏
     if (x >= this.LAST - 2 && y == 0) {
         core.ui.closePanel();
-        core.openEquipbox();
+        if (core.isReplaying())
+            core.equipboxReplay();
+        else
+            core.openEquipbox();
         return;
     }
     if (x >= this.LAST - 2 && y == this.LAST) {
@@ -1376,6 +1384,7 @@ actions.prototype._clickToolboxIndex = function (index) {
     if (select >= items.length) return;
     var itemId = items[select];
     if (itemId == core.status.event.data.selectId) {
+        if (core.isReplaying()) return;
         core.events.tryUseItem(itemId);
     }
     else {
@@ -1478,7 +1487,10 @@ actions.prototype._keyDownToolbox = function (keycode) {
 actions.prototype._keyUpToolbox = function (keycode) {
     if (keycode == 81) {
         core.ui.closePanel();
-        core.openEquipbox();
+        if (core.isReplaying())
+            core.equipboxReplay();
+        else
+            core.openEquipbox();
         return;
     }
     if (keycode == 84 || keycode == 27 || keycode == 88) {
@@ -1498,7 +1510,10 @@ actions.prototype._clickEquipbox = function (x, y) {
     // 道具栏
     if (x >= this.LAST - 2 && y == 0) {
         core.ui.closePanel();
-        core.openToolbox();
+        if (core.isReplaying())
+            core.toolboxReplay();
+        else
+            core.openToolbox();
         return;
     }
     // 返回
@@ -1547,6 +1562,7 @@ actions.prototype._clickEquipboxIndex = function (index) {
     if (index < this.LAST) {
         if (index >= core.status.globalAttribute.equipName.length) return;
         if (index == core.status.event.selection && core.status.hero.equipment[index]) {
+            if (core.isReplaying()) return;
             core.unloadEquip(index);
             core.status.route.push("unEquip:" + index);
         }
@@ -1554,6 +1570,7 @@ actions.prototype._clickEquipboxIndex = function (index) {
     else {
         var equips = Object.keys(core.status.hero.items.equips || {}).sort();
         if (index == core.status.event.selection) {
+            if (core.isReplaying()) return;
             var equipId = equips[index - this.LAST + (core.status.event.data.page - 1) * this.LAST];
             core.loadEquip(equipId);
             core.status.route.push("equip:" + equipId);
@@ -1645,7 +1662,10 @@ actions.prototype._keyUpEquipbox = function (keycode, altKey) {
     }
     if (keycode == 84) {
         core.ui.closePanel();
-        core.openToolbox();
+        if (core.isReplaying())
+            core.toolboxReplay();
+        else
+            core.openToolbox();
         return;
     }
     if (keycode == 81 || keycode == 27 || keycode == 88) {
diff --git a/libs/control.js b/libs/control.js
index 4a9c8b84..6a9764a2 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1223,6 +1223,28 @@ control.prototype.viewMapReplay = function () {
     core.ui.drawMaps();
 }
 
+control.prototype.toolboxReplay = function () {
+    if (!core.isPlaying() || !core.isReplaying()) return;
+    if (!core.status.replay.pausing) return core.drawTip("请先暂停录像");
+    if (core.isMoving() || core.status.replay.animate || core.status.event.id)
+        return core.drawTip("请等待当前事件的处理结束");
+
+    core.lockControl();
+    core.status.event.id='toolbox';
+    core.ui.drawToolbox();
+}
+
+control.prototype.equipboxReplay = function () {
+    if (!core.isPlaying() || !core.isReplaying()) return;
+    if (!core.status.replay.pausing) return core.drawTip("请先暂停录像");
+    if (core.isMoving() || core.status.replay.animate || core.status.event.id)
+        return core.drawTip("请等待当前事件的处理结束");
+
+    core.lockControl();
+    core.status.event.id='equipbox';
+    core.ui.drawEquipbox();
+}
+
 ////// 是否正在播放录像 //////
 control.prototype.isReplaying = function () {
     return (core.status.replay||{}).replaying;
diff --git a/libs/events.js b/libs/events.js
index b196aa0e..2b070207 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1603,7 +1603,7 @@ events.prototype._action_callSave = function (data, x, y, prefix) {
 
 events.prototype._action_autoSave = function (data, x, y, prefix) {
     core.autosave();
-    core.drawTip("已自动存档");
+    if (!data.nohint) core.drawTip("已自动存档");
     core.doAction();
 }
 

From 414dd86c81b43ea6d1802f0517523c2a93763ccc Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Mon, 27 May 2019 23:23:32 +0800
Subject: [PATCH 12/23] previewUI part 1

---
 _server/MotaAction.g4        |  2 +-
 _server/css/editor.css       | 49 ++++++++++++++++++++++++++++++++++
 _server/editor_unsorted_3.js | 51 ++++++++++++++++++++++++++++++++++++
 editor-mobile.html           |  2 +-
 editor.html                  | 25 +++++++++++++++++-
 5 files changed, 126 insertions(+), 3 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 291180ff..419688ce 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -3204,7 +3204,7 @@ ActionParser.prototype.parseAction = function() {
       break;
     case "autoSave": // 自动存档
       this.next = MotaActionBlocks['autoSave_s'].xmlText([
-        this.nohint, this.next]);
+        data.nohint||false, this.next]);
       break;
     case "callLoad": // 呼出读档界面
       this.next = MotaActionBlocks['callLoad_s'].xmlText([
diff --git a/_server/css/editor.css b/_server/css/editor.css
index dd9c0e18..f4a372cf 100644
--- a/_server/css/editor.css
+++ b/_server/css/editor.css
@@ -458,4 +458,53 @@ table.row td {
     left: 6px;
     top: 6px;
     background-image:url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWxuczpldj0iaHR0cDovL3d3dy53My5vcmcvMjAwMS94bWwtZXZlbnRzIj4KPGc%2BCgk8cG9seWdvbiBmaWxsPSIjNjY2IiBwb2ludHM9IjkuMjA3LDYuMTI2IDcuNzkzLDcuNTQxIDExLjc5MywxMS41NDEgMTMuMjA3LDEwLjEyNiIgLz4KCTxwYXRoIGZpbGw9IiM2NjYiIGQ9Ik01LjkxNywyYzEuNjA4LDAsMi45MTcsMS4zMDgsMi45MTcsMi45MTdTNy41MjUsNy44MzMsNS45MTcsNy44MzNTMyw2LjUyNSwzLDQuOTE3UzQuMzA4LDIsNS45MTcsMgoJCSBNNS45MTcsMEMzLjIwMSwwLDEsMi4yMDEsMSw0LjkxN3MyLjIwMSw0LjkxNyw0LjkxNyw0LjkxN3M0LjkxNy0yLjIwMSw0LjkxNy00LjkxN0MxMC44MzMsMi4yMDEsOC42MzIsMCw1LjkxNywwTDUuOTE3LDB6IiAvPgo8L2c%2BCjwvc3ZnPgo%3D');
+}
+
+#uieventDiv {
+    display: none;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: rgba(127,127,127,0.6);
+    z-index: 2000
+}
+
+#uieventDialog {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -60%);
+    background: white;
+    width: 436px;
+}
+
+#uieventHead {
+    margin: 10px 20px;
+}
+
+#uieventTitle {
+    font-weight: bold;
+}
+
+#uieventNo {
+    float: right;
+}
+
+#uieventYes {
+    display: none;
+    float: right;
+    margin-right: 15px;
+}
+
+#uievent {
+    width: 416px;
+    height: 416px;
+    position: relative;
+    margin-left: 10px;
+}
+
+#selectPoint {
+    display: none;
 }
\ No newline at end of file
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 170238e9..3c106459 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -367,3 +367,54 @@ selectBox.isSelected=function(value){
     return selectBox._isSelected
 }
 
+// ------ UI预览 & 地图选点相关 ------ //
+
+uievent = {};
+
+uievent.uieventDiv = document.getElementById('uieventDiv');
+
+uievent.uieventNo = document.getElementById('uieventNo');
+uievent.uieventNo.onclick = function () {
+    uievent.close();
+}
+
+uievent.uieventYes = document.getElementById('uieventYes');
+uievent.uieventYes.onclick = function () {
+    uievent.close();
+    if (uievent.callback) {
+        uievent.callback(uievent.floorId, uievent.x, uievent.y);
+    }
+    delete uievent.callback;
+}
+
+uievent.title = document.getElementById('uieventTitle');
+uievent.selectPoint = document.getElementById('selectPoint');
+
+uievent.close = function () {
+    uievent.isOpen = false;
+    uievent.uieventDiv.style.display = 'none';
+}
+
+uievent.previewUI = function (list) {
+    uievent.isOpen = true;
+    uievent.uieventDiv.style.display = 'block';
+    uievent.mode = 'previewUI';
+    uievent.selectPoint.style.display = 'none';
+    uievent.uieventYes.style.display = 'none';
+    uievent.title.innerText = 'UI绘制预览';
+
+    core.clearMap('uievent');
+
+    // 绘制UI
+    core.drawThumbnail(editor.currentFloorId, null, {}, 'uievent');
+    if (list instanceof Array) {
+        list.forEach(function (data) {
+            var type = data.type;
+            if (!type || !core.ui["_uievent_"+type]) return;
+            core.ui["_uievent_"+type](data);
+        })
+    }
+}
+
+
+
diff --git a/editor-mobile.html b/editor-mobile.html
index 67db31dd..33c1f152 100644
--- a/editor-mobile.html
+++ b/editor-mobile.html
@@ -514,7 +514,7 @@
         <canvas class='gameCanvas' id='data' width='416' height='416'>此浏览器不支持HTML5</canvas>
     </div>
 </div>
-<div id='inputBackground' style='display: none'>
+<div id='inputDiv' style='display: none'>
     <div id='inputDialog'>
         <p id="inputMessage">请输入文字...</p>
         <input id='inputBox' type="text"/>
diff --git a/editor.html b/editor.html
index 4ea3654f..65acd529 100644
--- a/editor.html
+++ b/editor.html
@@ -497,7 +497,7 @@
         <canvas class='gameCanvas' id='data' width='416' height='416'>此浏览器不支持HTML5</canvas>
     </div>
 </div>
-<div id='inputBackground' style='display: none'>
+<div id='inputDiv' style='display: none'>
     <div id='inputDialog'>
         <p id="inputMessage">请输入文字...</p>
         <input id='inputBox' type="text"/>
@@ -505,6 +505,29 @@
         <button id='inputNo'>取消</button>
     </div>
 </div>
+<!-- UI预览 & 地图选点 -->
+<div id='uieventDiv' style='display: none'>
+    <div id='uieventDialog'>
+        <div id="uieventHead">
+            <span id="uieventTitle"></span>
+            <button id="uieventNo">关闭</button>
+            <button id="uieventYes">确定</button>
+        </div>
+        <hr style="clear: both; margin-top: 0"/>
+        <canvas class='gameCanvas' id='uievent' width='416' height='416'></canvas>
+        <div id="selectPoint">
+            <select id="selectPointFloor"></select>
+            <div id="selectPointButtons">
+                <input type="button" value="←"/>
+                <input type="button" value="↑"/>
+                <input type="button" value="↓"/>
+                <input type="button" value="→"/>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <!-- */</script> -->
 
 <!-- =========================================================== -->

From dc205877ded7b13f0380dea265033c48bd3e36a6 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Tue, 28 May 2019 00:04:45 +0800
Subject: [PATCH 13/23] previewUI

---
 _server/editor_blockly.js    | 14 +++++++++++++-
 _server/editor_unsorted_1.js |  9 +++++++++
 _server/editor_unsorted_3.js | 26 ++++++++++++--------------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index ffc9b010..a5244fc6 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -612,7 +612,19 @@ function omitedcheckUpdateFunction(event) {
 
     editor_blockly.doubleClickBlock = function (blockId) {
         var b = editor_blockly.workspace.getBlockById(blockId);
-        //console.log(b);
+        // console.log(Blockly.JavaScript.blockToCode(b));
+        if (b && b.type == 'previewUI_s') { // previewUI
+            try {
+                var code = "[" + Blockly.JavaScript.blockToCode(b).replace(/\\i/g, '\\\\i') + "]";
+                eval("var obj="+code);
+                // console.log(obj);
+                if (obj.length > 0 && obj[0].type == 'previewUI') {
+                    uievent.previewUI(obj[0].action);
+                }
+            } catch (e) {main.log(e);}
+            return;
+        }
+
         var textStringDict = {
             'text_0_s': 'EvalString_0',
             'text_1_s': 'EvalString_2',
diff --git a/_server/editor_unsorted_1.js b/_server/editor_unsorted_1.js
index c37078e1..5172a164 100644
--- a/_server/editor_unsorted_1.js
+++ b/_server/editor_unsorted_1.js
@@ -285,6 +285,15 @@ editor.constructor.prototype.listen=function () {
     var shortcut = core.getLocalStorage('shortcut',{48: 0, 49: 0, 50: 0, 51: 0, 52: 0, 53: 0, 54: 0, 55: 0, 56: 0, 57: 0});
     document.body.onkeydown = function (e) {
 
+        // UI预览 & 地图选点
+        if (uievent && uievent.isOpen) {
+            e.preventDefault();
+            if (e.keyCode == 27) uievent.close();
+            if (e.keyCode == 13) uievent.confirm();
+            // TODO：WASD平移大地图
+            return;
+        }
+
         // 监听Ctrl+S保存
         if (e.ctrlKey && e.keyCode == 83) {
             e.preventDefault();
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 3c106459..019d2a94 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -371,38 +371,36 @@ selectBox.isSelected=function(value){
 
 uievent = {};
 
-uievent.uieventDiv = document.getElementById('uieventDiv');
+uievent.div = document.getElementById('uieventDiv');
+uievent.title = document.getElementById('uieventTitle');
+uievent.selectPoint = document.getElementById('selectPoint');
+uievent.yes = document.getElementById('uieventYes');
+uievent.no = document.getElementById('uieventNo');
 
-uievent.uieventNo = document.getElementById('uieventNo');
-uievent.uieventNo.onclick = function () {
-    uievent.close();
-}
-
-uievent.uieventYes = document.getElementById('uieventYes');
-uievent.uieventYes.onclick = function () {
+uievent.confirm = function () {
     uievent.close();
     if (uievent.callback) {
         uievent.callback(uievent.floorId, uievent.x, uievent.y);
     }
     delete uievent.callback;
 }
-
-uievent.title = document.getElementById('uieventTitle');
-uievent.selectPoint = document.getElementById('selectPoint');
+uievent.yes.onclick = uievent.confirm;
 
 uievent.close = function () {
     uievent.isOpen = false;
-    uievent.uieventDiv.style.display = 'none';
+    uievent.div.style.display = 'none';
 }
+uievent.no.onclick = uievent.close;
 
 uievent.previewUI = function (list) {
     uievent.isOpen = true;
-    uievent.uieventDiv.style.display = 'block';
+    uievent.div.style.display = 'block';
     uievent.mode = 'previewUI';
     uievent.selectPoint.style.display = 'none';
-    uievent.uieventYes.style.display = 'none';
+    uievent.yes.style.display = 'none';
     uievent.title.innerText = 'UI绘制预览';
 
+    core.setAlpha('uievent', 1);
     core.clearMap('uievent');
 
     // 绘制UI

From 317ff5d5911a302b85156023be8e8f66657dbdb4 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 29 May 2019 21:35:19 +0800
Subject: [PATCH 14/23] previewUI

---
 _server/css/editor.css       |  1 +
 _server/editor_unsorted_3.js | 39 +++++++++++++++++++++++++++---------
 editor.html                  |  5 +++++
 libs/ui.js                   | 28 ++++++++++++++------------
 4 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/_server/css/editor.css b/_server/css/editor.css
index f4a372cf..ac9304be 100644
--- a/_server/css/editor.css
+++ b/_server/css/editor.css
@@ -503,6 +503,7 @@ table.row td {
     height: 416px;
     position: relative;
     margin-left: 10px;
+    margin-bottom: 5px;
 }
 
 #selectPoint {
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 019d2a94..b97e2905 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -392,21 +392,26 @@ uievent.close = function () {
 }
 uievent.no.onclick = uievent.close;
 
-uievent.previewUI = function (list) {
-    uievent.isOpen = true;
-    uievent.div.style.display = 'block';
-    uievent.mode = 'previewUI';
-    uievent.selectPoint.style.display = 'none';
-    uievent.yes.style.display = 'none';
-    uievent.title.innerText = 'UI绘制预览';
+uievent.background = document.getElementById('uieventBackground');
+uievent.background.onchange = function () {
+    uievent.drawPreviewUI();
+}
 
+uievent.drawPreviewUI = function () {
     core.setAlpha('uievent', 1);
     core.clearMap('uievent');
 
     // 绘制UI
-    core.drawThumbnail(editor.currentFloorId, null, {}, 'uievent');
-    if (list instanceof Array) {
-        list.forEach(function (data) {
+    var background = uievent.background.value;
+    if (background == 'thumbnail') {
+        core.drawThumbnail(editor.currentFloorId, null, {}, 'uievent');
+    }
+    else {
+        core.fillRect('uievent', 0, 0, core.__PIXELS__, core.__PIXELS__, background);
+    }
+
+    if (uievent.list instanceof Array) {
+        uievent.list.forEach(function (data) {
             var type = data.type;
             if (!type || !core.ui["_uievent_"+type]) return;
             core.ui["_uievent_"+type](data);
@@ -414,5 +419,19 @@ uievent.previewUI = function (list) {
     }
 }
 
+uievent.previewUI = function (list) {
+    uievent.isOpen = true;
+    uievent.div.style.display = 'block';
+    uievent.mode = 'previewUI';
+    uievent.selectPoint.style.display = 'none';
+    uievent.yes.style.display = 'none';
+    uievent.title.innerText = 'UI绘制预览';
+    uievent.background.style.display = 'inline';
+    uievent.background.value = 'thumbnail';
+
+    uievent.list = list;
+    uievent.drawPreviewUI();
+}
+
 
 
diff --git a/editor.html b/editor.html
index 65acd529..911c3424 100644
--- a/editor.html
+++ b/editor.html
@@ -510,6 +510,11 @@
     <div id='uieventDialog'>
         <div id="uieventHead">
             <span id="uieventTitle"></span>
+            <select id="uieventBackground" style="margin-left: 20px">
+                <option value="thumbnail" selected>缩略图</option>
+                <option value="#000000">黑色</option>
+                <option value="#FFFFFF">白色</option>
+            </select>
             <button id="uieventNo">关闭</button>
             <button id="uieventYes">确定</button>
         </div>
diff --git a/libs/ui.js b/libs/ui.js
index 474f13fd..c4b5ecbb 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -595,7 +595,7 @@ ui.prototype.drawWindowSelector = function(background, x, y, w, h) {
     w = Math.round(w), h = Math.round(h);
     var ctx = core.ui.createCanvas("_selector", x, y, w, h, 165);
     ctx.canvas.style.opacity = 0.8;
-    this._drawSelector(ctx, background, x, y, w, h);
+    this._drawSelector(ctx, background, w, h);
 }
 
 ui.prototype._uievent_drawSelector = function (data) {
@@ -610,32 +610,34 @@ ui.prototype._uievent_drawSelector = function (data) {
     var x = core.calValue(data.x), y = core.calValue(data.y), w = core.calValue(data.width), h = core.calValue(data.height);
     w = Math.round(w); h = Math.round(h);
     if (main.mode == 'editor') {
-        this._drawSelector('uievent', background, x, y, w, h);
+        this._drawSelector('uievent', background, w, h, x, y);
         return;
     }
     var ctx = core.createCanvas('_uievent_selector', x, y, w, h, 136);
     ctx.canvas.style.opacity = 0.8;
-    this._drawSelector(ctx, background, x, y, w, h);
+    this._drawSelector(ctx, background, w, h);
 }
 
-ui.prototype._drawSelector = function (ctx, background, x, y, w, h) {
+ui.prototype._drawSelector = function (ctx, background, w, h, left, top) {
+    left = left || 0;
+    top = top || 0;
     ctx = this.getContextByName(ctx);
     if (!ctx) return;
     if (typeof background == 'string')
         background = core.material.images.images[background];
     if (!(background instanceof Image)) return;
     // back
-    ctx.drawImage(background, 130, 66, 28, 28,  2,  2,w-4,h-4);
+    ctx.drawImage(background, 130, 66, 28, 28, left+2, top+2, w-4, h-4);
     // corner
-    ctx.drawImage(background, 128, 64,  2,  2,  0,  0,  2,  2);
-    ctx.drawImage(background, 158, 64,  2,  2,w-2,  0,  2,  2);
-    ctx.drawImage(background, 128, 94,  2,  2,  0,h-2,  2,  2);
-    ctx.drawImage(background, 158, 94,  2,  2,w-2,h-2,  2,  2);
+    ctx.drawImage(background, 128, 64,  2,  2, left,  top,  2,  2);
+    ctx.drawImage(background, 158, 64,  2,  2, left+w-2, top,  2,  2);
+    ctx.drawImage(background, 128, 94,  2,  2, left, top+h-2,  2,  2);
+    ctx.drawImage(background, 158, 94,  2,  2, left+w-2, top+h-2,  2,  2);
     // border
-    ctx.drawImage(background, 130, 64, 28,  2,  2,  0,w-4,  2);
-    ctx.drawImage(background, 130, 94, 28,  2,  2,h-2,w-4,  2);
-    ctx.drawImage(background, 128, 66,  2, 28,  0,  2,  2,h-4);
-    ctx.drawImage(background, 158, 66,  2, 28,w-2,  2,  2,h-4);
+    ctx.drawImage(background, 130, 64, 28,  2, left+2, top, w-4,  2);
+    ctx.drawImage(background, 130, 94, 28,  2, left+2, top+h-2, w-4,  2);
+    ctx.drawImage(background, 128, 66,  2, 28, left,  top+2,  2,h-4);
+    ctx.drawImage(background, 158, 66,  2, 28, left+w-2, top+2,  2,h-4);
 }
 
 ////// 绘制 WindowSkin

From 58c9f4ddbeb2cecfbae68534378ea4411f99a7d0 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 29 May 2019 22:40:45 +0800
Subject: [PATCH 15/23] selectPoint

---
 _server/css/editor.css       |  36 ++++++++++++-
 _server/editor_unsorted_1.js |   7 ++-
 _server/editor_unsorted_3.js | 101 ++++++++++++++++++++++++++++++++++-
 editor.html                  |   5 +-
 4 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/_server/css/editor.css b/_server/css/editor.css
index ac9304be..e053cafd 100644
--- a/_server/css/editor.css
+++ b/_server/css/editor.css
@@ -498,14 +498,48 @@ table.row td {
     margin-right: 15px;
 }
 
-#uievent {
+#uieventBody {
     width: 416px;
     height: 416px;
     position: relative;
     margin-left: 10px;
     margin-bottom: 5px;
+    overflow: hidden;
+}
+
+#uievent {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
 }
 
 #selectPoint {
     display: none;
+    margin-left: 10px;
+    margin-bottom: 10px;
+}
+
+#selectPointFloor {
+    margin-right: 10px;
+}
+
+#selectPointButtons {
+    display: inline;
+}
+
+#selectPointBox {
+    position: absolute;
+    z-index: 75;
+    width: 26px;
+    height: 26px;
+    margin: 3px 0 0 3px;
+    padding: 0;
+    /* display: none; */
+    box-sizing: border-box;
+    background-color: rgba(255, 255, 255, 0.0);
+    border: 1px solid #000;
+    box-shadow: 0 0 0 2px #fff,
+    0 0 0 3px #000;
 }
\ No newline at end of file
diff --git a/_server/editor_unsorted_1.js b/_server/editor_unsorted_1.js
index 5172a164..06fda791 100644
--- a/_server/editor_unsorted_1.js
+++ b/_server/editor_unsorted_1.js
@@ -289,8 +289,11 @@ editor.constructor.prototype.listen=function () {
         if (uievent && uievent.isOpen) {
             e.preventDefault();
             if (e.keyCode == 27) uievent.close();
-            if (e.keyCode == 13) uievent.confirm();
-            // TODO：WASD平移大地图
+            else if (e.keyCode == 13) uievent.confirm();
+            else if (e.keyCode==87) uievent.move(0,-1)
+            else if (e.keyCode==65) uievent.move(-1,0)
+            else if (e.keyCode==83) uievent.move(0,1);
+            else if (e.keyCode==68) uievent.move(1,0);
             return;
         }
 
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index b97e2905..37d78506 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -373,10 +373,15 @@ uievent = {};
 
 uievent.div = document.getElementById('uieventDiv');
 uievent.title = document.getElementById('uieventTitle');
-uievent.selectPoint = document.getElementById('selectPoint');
 uievent.yes = document.getElementById('uieventYes');
 uievent.no = document.getElementById('uieventNo');
 
+uievent.selectDiv = document.getElementById('selectPoint');
+uievent.selectFloor = document.getElementById('selectPointFloor');
+uievent.selectPointBox = document.getElementById('selectPointBox');
+uievent.body = document.getElementById('uieventBody');
+uievent.selectPointButtons = document.getElementById('selectPointButtons');
+
 uievent.confirm = function () {
     uievent.close();
     if (uievent.callback) {
@@ -423,15 +428,107 @@ uievent.previewUI = function (list) {
     uievent.isOpen = true;
     uievent.div.style.display = 'block';
     uievent.mode = 'previewUI';
-    uievent.selectPoint.style.display = 'none';
+    uievent.selectDiv.style.display = 'none';
     uievent.yes.style.display = 'none';
     uievent.title.innerText = 'UI绘制预览';
     uievent.background.style.display = 'inline';
     uievent.background.value = 'thumbnail';
+    uievent.selectPointBox.style.display = 'none';
 
     uievent.list = list;
     uievent.drawPreviewUI();
 }
 
+uievent.selectPoint = function (floorId, x, y, forceCurrent, callback) {
+    uievent.forceCurrent = forceCurrent;
+    uievent.callback = callback;
 
+    uievent.isOpen = true;
+    uievent.div.style.display = 'block';
+    uievent.mode = 'selectPoint';
+    uievent.selectDiv.style.display = 'block';
+    uievent.yes.style.display = 'inline';
+    uievent.background.style.display = 'none';
+    uievent.selectFloor.style.display = forceCurrent ? 'none': 'inline';
+    uievent.selectPointBox.style.display = 'block';
+
+    // Append children
+    var floors = "";
+    core.floorIds.forEach(function (f) {
+        floors += "<option value="+f+">"+f+"</option>";
+    })
+    uievent.selectFloor.innerHTML = floors;
+
+    this.setPoint(floorId || editor.currentFloorId, core.calValue(x) || 0, core.calValue(y) || 0);
+}
+
+uievent.updateSelectPoint = function (redraw) {
+    uievent.title.innerText = '地图选点 ('+uievent.x+","+uievent.y+')';
+    if (redraw) {
+        core.drawThumbnail(uievent.floorId, null, null,
+            {ctx: 'uievent', centerX: uievent.left + core.__HALF_SIZE__, centerY: uievent.top + core.__HALF_SIZE__});
+    }
+    uievent.selectPointBox.style.left = 32 * (uievent.x - uievent.left) + "px";
+    uievent.selectPointBox.style.top = 32 * (uievent.y - uievent.top) + "px";
+}
+
+uievent.setPoint = function (floorId, x, y) {
+    uievent.floorId = floorId;
+    uievent.x = x || uievent.x || 0;
+    uievent.y = y || uievent.y || 0;
+    uievent.width = core.floors[uievent.floorId].width || core.__SIZE__;
+    uievent.height = core.floors[uievent.floorId].height || core.__SIZE__;
+    uievent.left = core.clamp(uievent.x - core.__HALF_SIZE__, 0, uievent.width - core.__SIZE__);
+    uievent.top = core.clamp(uievent.y - core.__HALF_SIZE__, 0, uievent.height - core.__SIZE__);
+    uievent.updateSelectPoint(true);
+}
+
+uievent.selectFloor.onchange = function () {
+    uievent.setPoint(uievent.selectFloor.value);
+}
+
+uievent.body.onclick = function (e) {
+    if (uievent.mode != 'selectPoint') return;
+    uievent.x = uievent.left + Math.floor(e.offsetX / 32);
+    uievent.y = uievent.top + Math.floor(e.offsetY / 32);
+    uievent.updateSelectPoint(false);
+}
+
+uievent.move = function (dx, dy) {
+    if (uievent.mode != 'selectPoint') return;
+    uievent.left = core.clamp(uievent.left + dx, 0, uievent.width - core.__SIZE__);
+    uievent.top = core.clamp(uievent.top + dy, 0, uievent.height - core.__SIZE__);
+    this.updateSelectPoint(true);
+}
+
+uievent.selectPointButtons.children[0].onclick = function () {
+    uievent.move(-1, 0);
+}
+
+uievent.selectPointButtons.children[1].onclick = function () {
+    uievent.move(0, -1);
+}
+
+uievent.selectPointButtons.children[2].onclick = function () {
+    uievent.move(0, 1);
+}
+
+uievent.selectPointButtons.children[3].onclick = function () {
+    uievent.move(1, 0);
+}
+
+uievent.div.onmousewheel = function (e) {
+    if (uievent.mode != 'selectPoint' || uievent.forceCurrent) return;
+    var index = core.floorIds.indexOf(uievent.floorId);
+    try {
+        if (e.wheelDelta)
+            index+=Math.sign(e.wheelDelta);
+        else if (e.detail)
+            index+=Math.sign(e.detail);
+    } catch (ee) { main.log(ee); }
+    index = core.clamp(index, 0, core.floorIds.length - 1);
+    var floorId = core.floorIds[index];
+    uievent.selectFloor.value = floorId;
+    uievent.setPoint(floorId);
+}
 
diff --git a/editor.html b/editor.html
index 911c3424..5926201f 100644
--- a/editor.html
+++ b/editor.html
@@ -519,7 +519,10 @@
             <button id="uieventYes">确定</button>
         </div>
         <hr style="clear: both; margin-top: 0"/>
-        <canvas class='gameCanvas' id='uievent' width='416' height='416'></canvas>
+        <div id='uieventBody'>
+            <canvas class='gameCanvas' id='uievent' width='416' height='416'></canvas>
+            <div id="selectPointBox"></div>
+        </div>
         <div id="selectPoint">
             <select id="selectPointFloor"></select>
             <div id="selectPointButtons">

From 550252817c7c35fc3245b9dce0faaf96381a07c4 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 29 May 2019 22:48:41 +0800
Subject: [PATCH 16/23] selectPoint

---
 _server/editor_unsorted_3.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 37d78506..d8979079 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -439,8 +439,8 @@ uievent.previewUI = function (list) {
     uievent.drawPreviewUI();
 }
 
-uievent.selectPoint = function (floorId, x, y, forceCurrent, callback) {
-    uievent.forceCurrent = forceCurrent;
+uievent.selectPoint = function (floorId, x, y, hideFloor, callback) {
+    uievent.hideFloor = hideFloor;
     uievent.callback = callback;
 
     uievent.isOpen = true;
@@ -449,7 +449,7 @@ uievent.selectPoint = function (floorId, x, y, forceCurrent, callback) {
     uievent.selectDiv.style.display = 'block';
     uievent.yes.style.display = 'inline';
     uievent.background.style.display = 'none';
-    uievent.selectFloor.style.display = forceCurrent ? 'none': 'inline';
+    uievent.selectFloor.style.display = hideFloor ? 'none': 'inline';
     uievent.selectPointBox.style.display = 'block';
 
     // Append children
@@ -474,6 +474,7 @@ uievent.updateSelectPoint = function (redraw) {
 
 uievent.setPoint = function (floorId, x, y) {
     uievent.floorId = floorId;
+    uievent.selectFloor.value = floorId;
     uievent.x = x || uievent.x || 0;
     uievent.y = y || uievent.y || 0;
     uievent.width = core.floors[uievent.floorId].width || core.__SIZE__;
@@ -518,7 +519,7 @@ uievent.selectPointButtons.children[3].onclick = function () {
 }
 
 uievent.div.onmousewheel = function (e) {
-    if (uievent.mode != 'selectPoint' || uievent.forceCurrent) return;
+    if (uievent.mode != 'selectPoint' || uievent.hideFloor) return;
     var index = core.floorIds.indexOf(uievent.floorId);
     try {
         if (e.wheelDelta)
@@ -527,8 +528,6 @@ uievent.div.onmousewheel = function (e) {
             index+=Math.sign(e.detail);
     } catch (ee) { main.log(ee); }
     index = core.clamp(index, 0, core.floorIds.length - 1);
-    var floorId = core.floorIds[index];
-    uievent.selectFloor.value = floorId;
-    uievent.setPoint(floorId);
+    uievent.setPoint(core.floorIds[index]);
 }
 

From 1cee65b7ffe33b9c68a0723100448f239783c389 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 29 May 2019 23:53:08 +0800
Subject: [PATCH 17/23] selectPoint

---
 _server/MotaAction.g4        |   2 +-
 _server/editor_unsorted_3.js | 139 ++++++++++++++++++-----------------
 2 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 419688ce..00bb44e8 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1897,7 +1897,7 @@ clearMap_s
 tooltip : clearMap: 清除画布
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=clearMap%ef%bc%9a%e6%b8%85%e9%99%a4%e7%94%bb%e5%b8%83
 colour : this.subColor
-default : ["0", "0", "416", "480"]
+default : ["0", "0", "100", "100"]
 var code = '{"type": "clearMap", "x": ' + PosString_0 + ', "y": ' + PosString_1 +
     ', "width": ' + PosString_2 + ', "height": ' + PosString_3 + '},\n';
 return code;
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index d8979079..49c4cbb9 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -369,36 +369,42 @@ selectBox.isSelected=function(value){
 
 // ------ UI预览 & 地图选点相关 ------ //
 
-uievent = {};
+uievent = {
+    div: {},
+    values: {},
+    isOpen: false,
+    mode: ""
+};
 
-uievent.div = document.getElementById('uieventDiv');
-uievent.title = document.getElementById('uieventTitle');
-uievent.yes = document.getElementById('uieventYes');
-uievent.no = document.getElementById('uieventNo');
-
-uievent.selectDiv = document.getElementById('selectPoint');
-uievent.selectFloor = document.getElementById('selectPointFloor');
-uievent.selectPointBox = document.getElementById('selectPointBox');
-uievent.body = document.getElementById('uieventBody');
-uievent.selectPointButtons = document.getElementById('selectPointButtons');
+uievent.div.div = document.getElementById('uieventDiv');
+uievent.div.title = document.getElementById('uieventTitle');
+uievent.div.yes = document.getElementById('uieventYes');
+uievent.div.no = document.getElementById('uieventNo');
+uievent.div.selectBackground = document.getElementById('uieventBackground');
+uievent.div.selectPoint = document.getElementById('selectPoint');
+uievent.div.selectFloor = document.getElementById('selectPointFloor');
+uievent.div.selectPointBox = document.getElementById('selectPointBox');
+uievent.div.body = document.getElementById('uieventBody');
+uievent.div.selectPointButtons = document.getElementById('selectPointButtons');
 
 uievent.confirm = function () {
+    var callback = uievent.values.callback, floorId = uievent.values.floorId,
+        x = uievent.values.x, y = uievent.values.y;
     uievent.close();
-    if (uievent.callback) {
-        uievent.callback(uievent.floorId, uievent.x, uievent.y);
+    if (callback) {
+        callback(floorId, x, y);
     }
-    delete uievent.callback;
 }
-uievent.yes.onclick = uievent.confirm;
+uievent.div.yes.onclick = uievent.confirm;
 
 uievent.close = function () {
     uievent.isOpen = false;
-    uievent.div.style.display = 'none';
+    uievent.div.div.style.display = 'none';
+    uievent.values = {};
 }
-uievent.no.onclick = uievent.close;
+uievent.div.no.onclick = uievent.close;
 
-uievent.background = document.getElementById('uieventBackground');
-uievent.background.onchange = function () {
+uievent.div.selectBackground.onchange = function () {
     uievent.drawPreviewUI();
 }
 
@@ -407,7 +413,7 @@ uievent.drawPreviewUI = function () {
     core.clearMap('uievent');
 
     // 绘制UI
-    var background = uievent.background.value;
+    var background = uievent.div.selectBackground.value;
     if (background == 'thumbnail') {
         core.drawThumbnail(editor.currentFloorId, null, {}, 'uievent');
     }
@@ -415,8 +421,8 @@ uievent.drawPreviewUI = function () {
         core.fillRect('uievent', 0, 0, core.__PIXELS__, core.__PIXELS__, background);
     }
 
-    if (uievent.list instanceof Array) {
-        uievent.list.forEach(function (data) {
+    if (uievent.values.list instanceof Array) {
+        uievent.values.list.forEach(function (data) {
             var type = data.type;
             if (!type || !core.ui["_uievent_"+type]) return;
             core.ui["_uievent_"+type](data);
@@ -426,101 +432,102 @@ uievent.drawPreviewUI = function () {
 
 uievent.previewUI = function (list) {
     uievent.isOpen = true;
-    uievent.div.style.display = 'block';
+    uievent.div.div.style.display = 'block';
     uievent.mode = 'previewUI';
-    uievent.selectDiv.style.display = 'none';
-    uievent.yes.style.display = 'none';
-    uievent.title.innerText = 'UI绘制预览';
-    uievent.background.style.display = 'inline';
-    uievent.background.value = 'thumbnail';
-    uievent.selectPointBox.style.display = 'none';
+    uievent.div.selectPoint.style.display = 'none';
+    uievent.div.yes.style.display = 'none';
+    uievent.div.title.innerText = 'UI绘制预览';
+    uievent.div.selectBackground.style.display = 'inline';
+    uievent.div.selectBackground.value = 'thumbnail';
+    uievent.div.selectPointBox.style.display = 'none';
 
-    uievent.list = list;
+    uievent.values.list = list;
     uievent.drawPreviewUI();
 }
 
 uievent.selectPoint = function (floorId, x, y, hideFloor, callback) {
-    uievent.hideFloor = hideFloor;
-    uievent.callback = callback;
+    uievent.values.hideFloor = hideFloor;
+    uievent.values.callback = callback;
 
     uievent.isOpen = true;
-    uievent.div.style.display = 'block';
+    uievent.div.div.style.display = 'block';
     uievent.mode = 'selectPoint';
-    uievent.selectDiv.style.display = 'block';
-    uievent.yes.style.display = 'inline';
-    uievent.background.style.display = 'none';
-    uievent.selectFloor.style.display = hideFloor ? 'none': 'inline';
-    uievent.selectPointBox.style.display = 'block';
+    uievent.div.selectPoint.style.display = 'block';
+    uievent.div.yes.style.display = 'inline';
+    uievent.div.selectBackground.style.display = 'none';
+    uievent.div.selectFloor.style.display = hideFloor ? 'none': 'inline';
+    uievent.div.selectPointBox.style.display = 'block';
 
     // Append children
     var floors = "";
     core.floorIds.forEach(function (f) {
         floors += "<option value="+f+">"+f+"</option>";
     })
-    uievent.selectFloor.innerHTML = floors;
+    uievent.div.selectFloor.innerHTML = floors;
 
     this.setPoint(floorId || editor.currentFloorId, core.calValue(x) || 0, core.calValue(y) || 0);
 }
 
 uievent.updateSelectPoint = function (redraw) {
-    uievent.title.innerText = '地图选点 ('+uievent.x+","+uievent.y+')';
+    uievent.div.title.innerText = '地图选点 ('+uievent.values.x+","+uievent.values.y+')';
     if (redraw) {
-        core.drawThumbnail(uievent.floorId, null, null,
-            {ctx: 'uievent', centerX: uievent.left + core.__HALF_SIZE__, centerY: uievent.top + core.__HALF_SIZE__});
+        core.drawThumbnail(uievent.values.floorId, null, null,
+            {ctx: 'uievent', centerX: uievent.values.left + core.__HALF_SIZE__,
+                centerY: uievent.values.top + core.__HALF_SIZE__});
     }
-    uievent.selectPointBox.style.left = 32 * (uievent.x - uievent.left) + "px";
-    uievent.selectPointBox.style.top = 32 * (uievent.y - uievent.top) + "px";
+    uievent.div.selectPointBox.style.left = 32 * (uievent.values.x - uievent.values.left) + "px";
+    uievent.div.selectPointBox.style.top = 32 * (uievent.values.y - uievent.values.top) + "px";
 }
 
 uievent.setPoint = function (floorId, x, y) {
-    uievent.floorId = floorId;
-    uievent.selectFloor.value = floorId;
-    uievent.x = x || uievent.x || 0;
-    uievent.y = y || uievent.y || 0;
-    uievent.width = core.floors[uievent.floorId].width || core.__SIZE__;
-    uievent.height = core.floors[uievent.floorId].height || core.__SIZE__;
-    uievent.left = core.clamp(uievent.x - core.__HALF_SIZE__, 0, uievent.width - core.__SIZE__);
-    uievent.top = core.clamp(uievent.y - core.__HALF_SIZE__, 0, uievent.height - core.__SIZE__);
+    uievent.values.floorId = floorId;
+    uievent.div.selectFloor.value = floorId;
+    uievent.values.x = x || uievent.values.x || 0;
+    uievent.values.y = y || uievent.values.y || 0;
+    uievent.values.width = core.floors[uievent.values.floorId].width || core.__SIZE__;
+    uievent.values.height = core.floors[uievent.values.floorId].height || core.__SIZE__;
+    uievent.values.left = core.clamp(uievent.values.x - core.__HALF_SIZE__, 0, uievent.values.width - core.__SIZE__);
+    uievent.values.top = core.clamp(uievent.values.y - core.__HALF_SIZE__, 0, uievent.values.height - core.__SIZE__);
     uievent.updateSelectPoint(true);
 }
 
-uievent.selectFloor.onchange = function () {
-    uievent.setPoint(uievent.selectFloor.value);
+uievent.div.selectFloor.onchange = function () {
+    uievent.setPoint(uievent.div.selectFloor.value);
 }
 
-uievent.body.onclick = function (e) {
+uievent.div.body.onclick = function (e) {
     if (uievent.mode != 'selectPoint') return;
-    uievent.x = uievent.left + Math.floor(e.offsetX / 32);
-    uievent.y = uievent.top + Math.floor(e.offsetY / 32);
+    uievent.values.x = uievent.values.left + Math.floor(e.offsetX / 32);
+    uievent.values.y = uievent.values.top + Math.floor(e.offsetY / 32);
     uievent.updateSelectPoint(false);
 }
 
 uievent.move = function (dx, dy) {
     if (uievent.mode != 'selectPoint') return;
-    uievent.left = core.clamp(uievent.left + dx, 0, uievent.width - core.__SIZE__);
-    uievent.top = core.clamp(uievent.top + dy, 0, uievent.height - core.__SIZE__);
+    uievent.values.left = core.clamp(uievent.values.left + dx, 0, uievent.values.width - core.__SIZE__);
+    uievent.values.top = core.clamp(uievent.values.top + dy, 0, uievent.values.height - core.__SIZE__);
     this.updateSelectPoint(true);
 }
 
-uievent.selectPointButtons.children[0].onclick = function () {
+uievent.div.selectPointButtons.children[0].onclick = function () {
     uievent.move(-1, 0);
 }
 
-uievent.selectPointButtons.children[1].onclick = function () {
+uievent.div.selectPointButtons.children[1].onclick = function () {
     uievent.move(0, -1);
 }
 
-uievent.selectPointButtons.children[2].onclick = function () {
+uievent.div.selectPointButtons.children[2].onclick = function () {
     uievent.move(0, 1);
 }
 
-uievent.selectPointButtons.children[3].onclick = function () {
+uievent.div.selectPointButtons.children[3].onclick = function () {
     uievent.move(1, 0);
 }
 
-uievent.div.onmousewheel = function (e) {
-    if (uievent.mode != 'selectPoint' || uievent.hideFloor) return;
-    var index = core.floorIds.indexOf(uievent.floorId);
+uievent.div.div.onmousewheel = function (e) {
+    if (uievent.mode != 'selectPoint' || uievent.values.hideFloor) return;
+    var index = core.floorIds.indexOf(uievent.values.floorId);
     try {
         if (e.wheelDelta)
             index+=Math.sign(e.wheelDelta);

From 06a0d5153df92c40a229887289b13505f5c291ee Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Fri, 31 May 2019 00:29:03 +0800
Subject: [PATCH 18/23] uievent.elements

---
 _server/editor_unsorted_3.js | 84 ++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 49c4cbb9..20b2ec80 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -370,22 +370,22 @@ selectBox.isSelected=function(value){
 // ------ UI预览 & 地图选点相关 ------ //
 
 uievent = {
-    div: {},
+    elements: {},
     values: {},
     isOpen: false,
     mode: ""
 };
 
-uievent.div.div = document.getElementById('uieventDiv');
-uievent.div.title = document.getElementById('uieventTitle');
-uievent.div.yes = document.getElementById('uieventYes');
-uievent.div.no = document.getElementById('uieventNo');
-uievent.div.selectBackground = document.getElementById('uieventBackground');
-uievent.div.selectPoint = document.getElementById('selectPoint');
-uievent.div.selectFloor = document.getElementById('selectPointFloor');
-uievent.div.selectPointBox = document.getElementById('selectPointBox');
-uievent.div.body = document.getElementById('uieventBody');
-uievent.div.selectPointButtons = document.getElementById('selectPointButtons');
+uievent.elements.div = document.getElementById('uieventDiv');
+uievent.elements.title = document.getElementById('uieventTitle');
+uievent.elements.yes = document.getElementById('uieventYes');
+uievent.elements.no = document.getElementById('uieventNo');
+uievent.elements.selectBackground = document.getElementById('uieventBackground');
+uievent.elements.selectPoint = document.getElementById('selectPoint');
+uievent.elements.selectFloor = document.getElementById('selectPointFloor');
+uievent.elements.selectPointBox = document.getElementById('selectPointBox');
+uievent.elements.body = document.getElementById('uieventBody');
+uievent.elements.selectPointButtons = document.getElementById('selectPointButtons');
 
 uievent.confirm = function () {
     var callback = uievent.values.callback, floorId = uievent.values.floorId,
@@ -395,16 +395,16 @@ uievent.confirm = function () {
         callback(floorId, x, y);
     }
 }
-uievent.div.yes.onclick = uievent.confirm;
+uievent.elements.yes.onclick = uievent.confirm;
 
 uievent.close = function () {
     uievent.isOpen = false;
-    uievent.div.div.style.display = 'none';
+    uievent.elements.div.style.display = 'none';
     uievent.values = {};
 }
-uievent.div.no.onclick = uievent.close;
+uievent.elements.no.onclick = uievent.close;
 
-uievent.div.selectBackground.onchange = function () {
+uievent.elements.selectBackground.onchange = function () {
     uievent.drawPreviewUI();
 }
 
@@ -413,7 +413,7 @@ uievent.drawPreviewUI = function () {
     core.clearMap('uievent');
 
     // 绘制UI
-    var background = uievent.div.selectBackground.value;
+    var background = uievent.elements.selectBackground.value;
     if (background == 'thumbnail') {
         core.drawThumbnail(editor.currentFloorId, null, {}, 'uievent');
     }
@@ -432,14 +432,14 @@ uievent.drawPreviewUI = function () {
 
 uievent.previewUI = function (list) {
     uievent.isOpen = true;
-    uievent.div.div.style.display = 'block';
+    uievent.elements.div.style.display = 'block';
     uievent.mode = 'previewUI';
-    uievent.div.selectPoint.style.display = 'none';
-    uievent.div.yes.style.display = 'none';
-    uievent.div.title.innerText = 'UI绘制预览';
-    uievent.div.selectBackground.style.display = 'inline';
-    uievent.div.selectBackground.value = 'thumbnail';
-    uievent.div.selectPointBox.style.display = 'none';
+    uievent.elements.selectPoint.style.display = 'none';
+    uievent.elements.yes.style.display = 'none';
+    uievent.elements.title.innerText = 'UI绘制预览';
+    uievent.elements.selectBackground.style.display = 'inline';
+    uievent.elements.selectBackground.value = 'thumbnail';
+    uievent.elements.selectPointBox.style.display = 'none';
 
     uievent.values.list = list;
     uievent.drawPreviewUI();
@@ -450,38 +450,38 @@ uievent.selectPoint = function (floorId, x, y, hideFloor, callback) {
     uievent.values.callback = callback;
 
     uievent.isOpen = true;
-    uievent.div.div.style.display = 'block';
+    uievent.elements.div.style.display = 'block';
     uievent.mode = 'selectPoint';
-    uievent.div.selectPoint.style.display = 'block';
-    uievent.div.yes.style.display = 'inline';
-    uievent.div.selectBackground.style.display = 'none';
-    uievent.div.selectFloor.style.display = hideFloor ? 'none': 'inline';
-    uievent.div.selectPointBox.style.display = 'block';
+    uievent.elements.selectPoint.style.display = 'block';
+    uievent.elements.yes.style.display = 'inline';
+    uievent.elements.selectBackground.style.display = 'none';
+    uievent.elements.selectFloor.style.display = hideFloor ? 'none': 'inline';
+    uievent.elements.selectPointBox.style.display = 'block';
 
     // Append children
     var floors = "";
     core.floorIds.forEach(function (f) {
         floors += "<option value="+f+">"+f+"</option>";
     })
-    uievent.div.selectFloor.innerHTML = floors;
+    uievent.elements.selectFloor.innerHTML = floors;
 
     this.setPoint(floorId || editor.currentFloorId, core.calValue(x) || 0, core.calValue(y) || 0);
 }
 
 uievent.updateSelectPoint = function (redraw) {
-    uievent.div.title.innerText = '地图选点 ('+uievent.values.x+","+uievent.values.y+')';
+    uievent.elements.title.innerText = '地图选点 ('+uievent.values.x+","+uievent.values.y+')';
     if (redraw) {
         core.drawThumbnail(uievent.values.floorId, null, null,
             {ctx: 'uievent', centerX: uievent.values.left + core.__HALF_SIZE__,
                 centerY: uievent.values.top + core.__HALF_SIZE__});
     }
-    uievent.div.selectPointBox.style.left = 32 * (uievent.values.x - uievent.values.left) + "px";
-    uievent.div.selectPointBox.style.top = 32 * (uievent.values.y - uievent.values.top) + "px";
+    uievent.elements.selectPointBox.style.left = 32 * (uievent.values.x - uievent.values.left) + "px";
+    uievent.elements.selectPointBox.style.top = 32 * (uievent.values.y - uievent.values.top) + "px";
 }
 
 uievent.setPoint = function (floorId, x, y) {
     uievent.values.floorId = floorId;
-    uievent.div.selectFloor.value = floorId;
+    uievent.elements.selectFloor.value = floorId;
     uievent.values.x = x || uievent.values.x || 0;
     uievent.values.y = y || uievent.values.y || 0;
     uievent.values.width = core.floors[uievent.values.floorId].width || core.__SIZE__;
@@ -491,11 +491,11 @@ uievent.setPoint = function (floorId, x, y) {
     uievent.updateSelectPoint(true);
 }
 
-uievent.div.selectFloor.onchange = function () {
-    uievent.setPoint(uievent.div.selectFloor.value);
+uievent.elements.selectFloor.onchange = function () {
+    uievent.setPoint(uievent.elements.selectFloor.value);
 }
 
-uievent.div.body.onclick = function (e) {
+uievent.elements.body.onclick = function (e) {
     if (uievent.mode != 'selectPoint') return;
     uievent.values.x = uievent.values.left + Math.floor(e.offsetX / 32);
     uievent.values.y = uievent.values.top + Math.floor(e.offsetY / 32);
@@ -509,23 +509,23 @@ uievent.move = function (dx, dy) {
     this.updateSelectPoint(true);
 }
 
-uievent.div.selectPointButtons.children[0].onclick = function () {
+uievent.elements.selectPointButtons.children[0].onclick = function () {
     uievent.move(-1, 0);
 }
 
-uievent.div.selectPointButtons.children[1].onclick = function () {
+uievent.elements.selectPointButtons.children[1].onclick = function () {
     uievent.move(0, -1);
 }
 
-uievent.div.selectPointButtons.children[2].onclick = function () {
+uievent.elements.selectPointButtons.children[2].onclick = function () {
     uievent.move(0, 1);
 }
 
-uievent.div.selectPointButtons.children[3].onclick = function () {
+uievent.elements.selectPointButtons.children[3].onclick = function () {
     uievent.move(1, 0);
 }
 
-uievent.div.div.onmousewheel = function (e) {
+uievent.elements.div.onmousewheel = function (e) {
     if (uievent.mode != 'selectPoint' || uievent.values.hideFloor) return;
     var index = core.floorIds.indexOf(uievent.values.floorId);
     try {

From af9e541268ca1733ceaf0dff3816235cba189a59 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Fri, 31 May 2019 00:30:14 +0800
Subject: [PATCH 19/23] uievent.elements

---
 _server/editor_unsorted_3.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 20b2ec80..e8b4905b 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -482,8 +482,8 @@ uievent.updateSelectPoint = function (redraw) {
 uievent.setPoint = function (floorId, x, y) {
     uievent.values.floorId = floorId;
     uievent.elements.selectFloor.value = floorId;
-    uievent.values.x = x || uievent.values.x || 0;
-    uievent.values.y = y || uievent.values.y || 0;
+    uievent.values.x = x != null ? x : ( uievent.values.x || 0);
+    uievent.values.y = y != null ? y : ( uievent.values.x || 0);
     uievent.values.width = core.floors[uievent.values.floorId].width || core.__SIZE__;
     uievent.values.height = core.floors[uievent.values.floorId].height || core.__SIZE__;
     uievent.values.left = core.clamp(uievent.values.x - core.__HALF_SIZE__, 0, uievent.values.width - core.__SIZE__);

From cbad40d773d673a91ade6fa36995ed75fa852b8c Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 31 May 2019 19:30:44 +0800
Subject: [PATCH 20/23] blockly selectPoint

---
 _server/MotaAction.g4     |  2 +-
 _server/editor_blockly.js | 53 +++++++++++++++++++++++++++++++++++++++
 editor.html               |  1 +
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index 00bb44e8..2d0a5276 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -1087,7 +1087,7 @@ changePos_0_s
 /* changePos_0_s
 tooltip : changePos: 当前位置切换
 helpUrl : https://h5mota.com/games/template/_docs/#/event?id=changepos%EF%BC%9A%E5%BD%93%E5%89%8D%E4%BD%8D%E7%BD%AE%E5%88%87%E6%8D%A2%E5%8B%87%E5%A3%AB%E8%BD%AC%E5%90%91
-default : ["","",null]
+default : ["0","0",null]
 colour : this.dataColor
 DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"');
 var code = '{"type": "changePos", "loc": ['+PosString_0+','+PosString_1+']'+DirectionEx_List_0+'},\n';
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index a5244fc6..2fa83442 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -624,6 +624,10 @@ function omitedcheckUpdateFunction(event) {
             } catch (e) {main.log(e);}
             return;
         }
+        if (b && b.type in selectPointBlocks) { // selectPoint
+            this.selectPoint();
+            return;
+        }
 
         var textStringDict = {
             'text_0_s': 'EvalString_0',
@@ -728,6 +732,55 @@ function omitedcheckUpdateFunction(event) {
         return results.length == 0 ? editor_blockly.lastUsedType : results;
     }
 
+    // ------ select point ------
+
+    // id: [x, y, floorId]
+    var selectPointBlocks = {
+        "changeFloor_m": ["Number_0", "Number_1", "IdString_0"],
+        "jumpHero_s": ["PosString_0", "PosString_1"],
+        "changeFloor_s": ["PosString_0", "PosString_1", "IdString_0"],
+        "changePos_0_s": ["PosString_0", "PosString_1"],
+        "battle_1_s": ["PosString_0", "PosString_1"],
+        "openDoor_s": ["PosString_0", "PosString_1", "IdString_0"],
+        "closeDoor_s": ["PosString_0", "PosString_1"],
+        "show_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "hide_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "setBlock_s": ["PosString_0", "PosString_1"],
+        "move_s": ["PosString_0", "PosString_1"],
+        "jump_s": ["PosString_2", "PosString_3"], // 跳跃暂时只考虑终点
+        "showBgFgMap_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "hideBgFgMap_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "setBgFgBlock_s": ["PosString_0", "PosString_1", "IdString_0"],
+        "showFloorImg_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "hideFloorImg_s": ["EvalString_0", "EvalString_1", "IdString_0"],
+        "trigger_s": ["PosString_0", "PosString_1"],
+        "insert_2_s": ["PosString_0", "PosString_1", "IdString_0"]
+    }
+
+    editor_blockly.selectPoint = function () {
+        var block = Blockly.selected, x_area = null, y_area = null, floor_area = null;
+        var floorId = editor.currentFloorId, pos = editor.pos, x = pos.x, y = pos.y;
+        if (block != null && block.type in selectPointBlocks) {
+            var arr = selectPointBlocks[block.type];
+            x_area = arr[0];
+            y_area = arr[1];
+            floor_area = arr[2];
+            var xv = parseInt(block.getFieldValue(x_area)), yv = parseInt(block.getFieldValue(y_area));
+            if (!isNaN(xv)) x = xv;
+            if (!isNaN(yv)) y = yv;
+            if (floor_area != null) floorId = block.getFieldValue(floor_area) || floorId;
+        }
+        uievent.selectPoint(floorId, x, y, floor_area == null, function (fv, xv, yv) {
+            if (x_area == null || y_area == null) return;
+            if (floor_area != null) {
+                if (fv != editor.currentFloorId) block.setFieldValue(fv, floor_area);
+                else block.setFieldValue("", floor_area);
+            }
+            block.setFieldValue(xv, x_area);
+            block.setFieldValue(yv, y_area);
+        });
+    }
+
     return editor_blockly;
 }
 //editor_blockly=editor_blockly();
\ No newline at end of file
diff --git a/editor.html b/editor.html
index 5926201f..0a0f0d96 100644
--- a/editor.html
+++ b/editor.html
@@ -211,6 +211,7 @@
                         <input class="color" id="colorPicker" value="255,215,0,1"/>
                         <button onclick="confirmColor()">确定</button>
                     </div>
+                    <button class="cpPanel" onclick="editor_blockly.selectPoint()" style="margin-left:5px">地图选点</button>
                 </div>
                 <xml id="toolbox" style="display:none">
                 </xml>

From b15782228ad1bad0aac9042a4e51073bd0f56656 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 31 May 2019 19:56:57 +0800
Subject: [PATCH 21/23] uievent mobile

---
 _server/css/editor_mobile.css | 84 +++++++++++++++++++++++++++++++++++
 _server/editor_unsorted_3.js  | 11 +++--
 editor-mobile.html            | 30 +++++++++++++
 3 files changed, 121 insertions(+), 4 deletions(-)

diff --git a/_server/css/editor_mobile.css b/_server/css/editor_mobile.css
index 1120c9fd..ef6d2f72 100644
--- a/_server/css/editor_mobile.css
+++ b/_server/css/editor_mobile.css
@@ -482,4 +482,88 @@ div.row .rowtd .rowtext{
     margin: 2px 0;
     border-radius: 3px;
     width: 90px;
+}
+
+#uieventDiv {
+    display: none;
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: rgba(127,127,127,0.6);
+    z-index: 2000
+}
+
+#uieventDialog {
+    position: fixed;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+    background: white;
+    width: 100vw;
+}
+
+#uieventHead {
+    margin: 10px 20px;
+}
+
+#uieventTitle {
+    font-weight: bold;
+}
+
+#uieventNo {
+    float: right;
+}
+
+#uieventYes {
+    display: none;
+    float: right;
+    margin-right: 15px;
+}
+
+#uieventBody {
+    width: 100vw;
+    height: 100vw;
+    position: relative;
+    margin-left: 0;
+    margin-bottom: 5px;
+    overflow: hidden;
+}
+
+#uievent {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+#selectPoint {
+    display: none;
+    margin-left: 10px;
+    margin-bottom: 10px;
+}
+
+#selectPointFloor {
+    margin-right: 10px;
+}
+
+#selectPointButtons {
+    display: inline;
+}
+
+#selectPointBox {
+    position: absolute;
+    z-index: 75;
+    width: 26px;
+    height: 26px;
+    margin: 3px 0 0 3px;
+    padding: 0;
+    /* display: none; */
+    box-sizing: border-box;
+    background-color: rgba(255, 255, 255, 0.0);
+    border: 1px solid #000;
+    box-shadow: 0 0 0 2px #fff,
+    0 0 0 3px #000;
 }
\ No newline at end of file
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index e8b4905b..55e92389 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -448,6 +448,7 @@ uievent.previewUI = function (list) {
 uievent.selectPoint = function (floorId, x, y, hideFloor, callback) {
     uievent.values.hideFloor = hideFloor;
     uievent.values.callback = callback;
+    uievent.values.size = editor.isMobile ? window.innerWidth / core.__SIZE__ : 32;
 
     uievent.isOpen = true;
     uievent.elements.div.style.display = 'block';
@@ -475,8 +476,10 @@ uievent.updateSelectPoint = function (redraw) {
             {ctx: 'uievent', centerX: uievent.values.left + core.__HALF_SIZE__,
                 centerY: uievent.values.top + core.__HALF_SIZE__});
     }
-    uievent.elements.selectPointBox.style.left = 32 * (uievent.values.x - uievent.values.left) + "px";
-    uievent.elements.selectPointBox.style.top = 32 * (uievent.values.y - uievent.values.top) + "px";
+    uievent.elements.selectPointBox.style.width = (uievent.values.size - 6) + "px";
+    uievent.elements.selectPointBox.style.height = (uievent.values.size - 6) + "px";
+    uievent.elements.selectPointBox.style.left = uievent.values.size * (uievent.values.x - uievent.values.left) + "px";
+    uievent.elements.selectPointBox.style.top = uievent.values.size * (uievent.values.y - uievent.values.top) + "px";
 }
 
 uievent.setPoint = function (floorId, x, y) {
@@ -497,8 +500,8 @@ uievent.elements.selectFloor.onchange = function () {
 
 uievent.elements.body.onclick = function (e) {
     if (uievent.mode != 'selectPoint') return;
-    uievent.values.x = uievent.values.left + Math.floor(e.offsetX / 32);
-    uievent.values.y = uievent.values.top + Math.floor(e.offsetY / 32);
+    uievent.values.x = uievent.values.left + Math.floor(e.offsetX / uievent.values.size);
+    uievent.values.y = uievent.values.top + Math.floor(e.offsetY / uievent.values.size);
     uievent.updateSelectPoint(false);
 }
 
diff --git a/editor-mobile.html b/editor-mobile.html
index 33c1f152..d76491b1 100644
--- a/editor-mobile.html
+++ b/editor-mobile.html
@@ -216,6 +216,7 @@
                     <input class="color" id="colorPicker" value="255,215,0,1"/>
                     <button onclick="confirmColor()">确定</button>
                 </div>
+                <button class="cpPanel" onclick="editor_blockly.selectPoint()">选点</button>
                 <xml id="toolbox" style="display:none">
                 </xml>
             </h3>
@@ -522,6 +523,35 @@
         <button id='inputNo'>取消</button>
     </div>
 </div>
+<!-- UI预览 & 地图选点 -->
+<div id='uieventDiv' style='display: none'>
+    <div id='uieventDialog'>
+        <div id="uieventHead">
+            <span id="uieventTitle"></span>
+            <select id="uieventBackground" style="margin-left: 20px">
+                <option value="thumbnail" selected>缩略图</option>
+                <option value="#000000">黑色</option>
+                <option value="#FFFFFF">白色</option>
+            </select>
+            <button id="uieventNo">关闭</button>
+            <button id="uieventYes">确定</button>
+        </div>
+        <hr style="clear: both; margin-top: 0"/>
+        <div id='uieventBody'>
+            <canvas class='gameCanvas' id='uievent' width='416' height='416'></canvas>
+            <div id="selectPointBox"></div>
+        </div>
+        <div id="selectPoint">
+            <select id="selectPointFloor"></select>
+            <div id="selectPointButtons">
+                <input type="button" value="←"/>
+                <input type="button" value="↑"/>
+                <input type="button" value="↓"/>
+                <input type="button" value="→"/>
+            </div>
+        </div>
+    </div>
+</div>
 <!-- */</script> -->
 
 <!-- =========================================================== -->

From 4391e8cd7d20cfb1078a4e7f2df03d352716f2cc Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 31 May 2019 20:12:50 +0800
Subject: [PATCH 22/23] selectPoint fix bug

---
 _server/editor_blockly.js    | 31 ++++++++++++++-----------------
 _server/editor_unsorted_3.js |  1 +
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index 2fa83442..b236153f 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -734,11 +734,11 @@ function omitedcheckUpdateFunction(event) {
 
     // ------ select point ------
 
-    // id: [x, y, floorId]
+    // id: [x, y, floorId, forceFloor]
     var selectPointBlocks = {
-        "changeFloor_m": ["Number_0", "Number_1", "IdString_0"],
+        "changeFloor_m": ["Number_0", "Number_1", "IdString_0", true],
         "jumpHero_s": ["PosString_0", "PosString_1"],
-        "changeFloor_s": ["PosString_0", "PosString_1", "IdString_0"],
+        "changeFloor_s": ["PosString_0", "PosString_1", "IdString_0", true],
         "changePos_0_s": ["PosString_0", "PosString_1"],
         "battle_1_s": ["PosString_0", "PosString_1"],
         "openDoor_s": ["PosString_0", "PosString_1", "IdString_0"],
@@ -758,26 +758,23 @@ function omitedcheckUpdateFunction(event) {
     }
 
     editor_blockly.selectPoint = function () {
-        var block = Blockly.selected, x_area = null, y_area = null, floor_area = null;
+        var block = Blockly.selected, arr = null;
         var floorId = editor.currentFloorId, pos = editor.pos, x = pos.x, y = pos.y;
         if (block != null && block.type in selectPointBlocks) {
-            var arr = selectPointBlocks[block.type];
-            x_area = arr[0];
-            y_area = arr[1];
-            floor_area = arr[2];
-            var xv = parseInt(block.getFieldValue(x_area)), yv = parseInt(block.getFieldValue(y_area));
+            arr = selectPointBlocks[block.type];
+            var xv = parseInt(block.getFieldValue(arr[0])), yv = parseInt(block.getFieldValue(arr[1]));
             if (!isNaN(xv)) x = xv;
             if (!isNaN(yv)) y = yv;
-            if (floor_area != null) floorId = block.getFieldValue(floor_area) || floorId;
+            if (arr[2] != null) floorId = block.getFieldValue(arr[2]) || floorId;
         }
-        uievent.selectPoint(floorId, x, y, floor_area == null, function (fv, xv, yv) {
-            if (x_area == null || y_area == null) return;
-            if (floor_area != null) {
-                if (fv != editor.currentFloorId) block.setFieldValue(fv, floor_area);
-                else block.setFieldValue("", floor_area);
+        uievent.selectPoint(floorId, x, y, arr && arr[2] == null, function (fv, xv, yv) {
+            if (!arr) return;
+            if (arr[2] != null) {
+                if (fv != editor.currentFloorId) block.setFieldValue(fv, arr[2]);
+                else block.setFieldValue(arr[3] ? fv : "", arr[2]);
             }
-            block.setFieldValue(xv, x_area);
-            block.setFieldValue(yv, y_area);
+            block.setFieldValue(xv+"", arr[0]);
+            block.setFieldValue(yv+"", arr[1]);
         });
     }
 
diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 55e92389..34d9fc38 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -483,6 +483,7 @@ uievent.updateSelectPoint = function (redraw) {
 }
 
 uievent.setPoint = function (floorId, x, y) {
+    if (core.floorIds.indexOf(floorId) == -1) floorId = editor.currentFloorId;
     uievent.values.floorId = floorId;
     uievent.elements.selectFloor.value = floorId;
     uievent.values.x = x != null ? x : ( uievent.values.x || 0);

From b4a702f9280db0b89809dd260faace235b510a41 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 31 May 2019 20:14:06 +0800
Subject: [PATCH 23/23] selectPoint fix bug

---
 _server/editor_unsorted_3.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js
index 34d9fc38..5be3711f 100644
--- a/_server/editor_unsorted_3.js
+++ b/_server/editor_unsorted_3.js
@@ -449,6 +449,8 @@ uievent.selectPoint = function (floorId, x, y, hideFloor, callback) {
     uievent.values.hideFloor = hideFloor;
     uievent.values.callback = callback;
     uievent.values.size = editor.isMobile ? window.innerWidth / core.__SIZE__ : 32;
+    uievent.elements.selectPointBox.style.width = (uievent.values.size - 6) + "px";
+    uievent.elements.selectPointBox.style.height = (uievent.values.size - 6) + "px";
 
     uievent.isOpen = true;
     uievent.elements.div.style.display = 'block';
@@ -476,8 +478,6 @@ uievent.updateSelectPoint = function (redraw) {
             {ctx: 'uievent', centerX: uievent.values.left + core.__HALF_SIZE__,
                 centerY: uievent.values.top + core.__HALF_SIZE__});
     }
-    uievent.elements.selectPointBox.style.width = (uievent.values.size - 6) + "px";
-    uievent.elements.selectPointBox.style.height = (uievent.values.size - 6) + "px";
     uievent.elements.selectPointBox.style.left = uievent.values.size * (uievent.values.x - uievent.values.left) + "px";
     uievent.elements.selectPointBox.style.top = uievent.values.size * (uievent.values.y - uievent.values.top) + "px";
 }