diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index f2f4fc01..22069f27 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -57,7 +57,7 @@ autoEvent_m
 /* autoEvent_m
 tooltip : 自动事件
 helpUrl : https://h5mota.com/games/template/_docs/#/event
-default : ["flag:__door__==2",0,true,false,false,null]
+default : ["flag:__door__===2",0,true,false,false,null]
 var code = {
     "condition": EvalString_0, // 条件不可为null
     "currentFloor": Bool_0, // 是否仅在本层检测
@@ -487,7 +487,7 @@ return code;
 
 // doorInfo 事件编辑器入口之一
 doorInfo_m 
-    :   '门信息' '开关门时间' Int '开门音效' EvalString? '关门音效' EvalString? BGNL? Newline '需要钥匙' doorKeyList+ BEND
+    :   '门信息' '开关门时间' Int '开门音效' EvalString? '关门音效' EvalString? BGNL? Newline '需要钥匙' doorKeyList+ '如需撞到开门还需要把图块触发器改成 openDoor' BEND
 
 
 /* doorInfo_m
@@ -2951,7 +2951,7 @@ var orders = {
     '-': Blockly.JavaScript.ORDER_SUBTRACTION,
     '*': Blockly.JavaScript.ORDER_MULTIPLICATION,
     '/': Blockly.JavaScript.ORDER_DIVISION,
-    '^': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
+    '**': Blockly.JavaScript.ORDER_MEMBER, //recieveOrder : ORDER_COMMA
     '==': Blockly.JavaScript.ORDER_EQUALITY,
     '!=': Blockly.JavaScript.ORDER_EQUALITY,
     '===': Blockly.JavaScript.ORDER_EQUALITY,
@@ -3158,8 +3158,8 @@ ShopUse_List
     /*ShopUse_List ['money','exp']*/;
 
 Arithmetic_List
-    :   '+'|'-'|'*'|'/'|'^'|'=='|'!='|'==='|'!=='|'>'|'<'|'>='|'<='|'且'|'或'
-    /*Arithmetic_List ['+','-','*','/','^','==','!=','===','!==','>','<','>=','<=','&&','||']*/;
+    :   '加'|'减'|'乘'|'除'|'乘方'|'等于'|'不等于'|'大于'|'小于'|'大于等于'|'小于等于'|'且'|'或'|'弱等于'|'弱不等于'
+    /*Arithmetic_List ['+','-','*','/','**','===','!==','>','<','>=','<=','&&','||','==','!=']*/;
 
 AssignOperator_List
     :   '='|'+='|'-='|'*='|'/='|'**='|'//='|'%='
@@ -3261,8 +3261,8 @@ Id_List
     /*Id_List ['flag','status','item', 'switch', 'temp', 'global']*/;
 
 EnemyId_List
-    :   '生命'|'攻击'|'防御'|'金币'|'经验'|'加点'|'属性'|'名称'|'映射名'|'value'|'atkValue'|'defValue'|'notBomb'|'zoneSquare'|'range'|'n'|'add'|'damage'
-    /*EnemyId_List ['hp','atk','def','money','exp','point','special','name','displayInBook','属性值','退化扣攻','退化扣防','不可炸','九宫格领域','领域范围','连击数','吸血到自身','固伤值']*/;
+    :   '生命'|'攻击'|'防御'|'金币'|'经验'|'加点'|'属性'|'名称'|'映射名'|'属性值'|'退化扣攻'|'退化扣防'|'不可炸'|'九宫格领域'|'领域范围'|'连击数'|'吸血到自身'|'固伤值'
+    /*EnemyId_List ['hp','atk','def','money','exp','point','special','name','displayInBook','value','atkValue','defValue','notBomb','zoneSquare','range','n','add','damage']*/;
 
 Equip_List
     :   '生命'|'生命上限'|'攻击'|'防御'|'护盾'|'魔力'|'魔力上限'
diff --git a/_server/editor.js b/_server/editor.js
index aefd65fb..ec93c476 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -240,14 +240,22 @@ editor.prototype.init = function (callback) {
         
                 // --- 所有用到的flags
                 editor.used_flags = {};
+                // 楼层属性
                 for (var floorId in editor.main.floors) {
                     editor.addUsedFlags(JSON.stringify(editor.main.floors[floorId]));
                 }
+                // 公共事件
                 if (events_c12a15a8_c380_4b28_8144_256cba95f760.commonEvent) {
                     for (var name in events_c12a15a8_c380_4b28_8144_256cba95f760.commonEvent) {
                         editor.addUsedFlags(JSON.stringify(events_c12a15a8_c380_4b28_8144_256cba95f760.commonEvent[name]));
                     }
                 }
+                // 道具效果
+                for (var id in items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a) {
+                    editor.addUsedFlags(JSON.stringify(items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a[id]));
+                }
+                // 全局商店
+                editor.addUsedFlags(JSON.stringify(editor.main.core.firstData.shops));
         
                 if (editor.useCompress == null) editor.useCompress = useCompress;
                 if (Boolean(callback)) callback();
diff --git a/_server/editor_blocklyconfig.js b/_server/editor_blocklyconfig.js
index 9fec43a7..5961514a 100644
--- a/_server/editor_blocklyconfig.js
+++ b/_server/editor_blocklyconfig.js
@@ -24,7 +24,7 @@ editor_blocklyconfig=(function(){
         {"type": "hide", "time": 500},
       ],'event'),
       MotaActionFunctions.actionParser.parse({
-        "condition": "flag:__door__==2",
+        "condition": "flag:__door__===2",
         "currentFloor": true,
         "priority": 0,
         "delayExecute": false,
@@ -302,7 +302,7 @@ editor_blocklyconfig=(function(){
       '<label text="打怪开门"></label>',
       MotaActionFunctions.actionParser.parse([
         {"type": "setValue", "name": "flag:__door__", "operator": "+=", "value": "1"},
-        {"type": "if", "condition": "flag:__door__==2", 
+        {"type": "if", "condition": "flag:__door__===2", 
           "true": [
             {"type": "openDoor", "loc": [10,5]}
           ],
diff --git a/libs/ui.js b/libs/ui.js
index ab653296..4825563a 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -2577,10 +2577,11 @@ ui.prototype._drawEquipbox_drawStatusChanged = function (info, y, equip, equipTy
         if (nowValue == newValue) continue;
         var text = this._drawEquipbox_getStatusName(name);
         this._drawEquipbox_drawStatusChanged_draw(text + " ", '#CCCCCC', obj);
+        var color = newValue>nowValue?'#00FF00':'#FF0000';
         nowValue = core.formatBigNumber(nowValue);
         newValue = core.formatBigNumber(newValue);
         this._drawEquipbox_drawStatusChanged_draw(nowValue+"->", '#CCCCCC', obj);
-        this._drawEquipbox_drawStatusChanged_draw(newValue, newValue>nowValue?'#00FF00':'#FF0000', obj);
+        this._drawEquipbox_drawStatusChanged_draw(newValue, color, obj);
         obj.drawOffset += 8;
     }
 }