Merge branch 'map' into story

2025-09-07 12:13:50 +08:00 · 2025-09-07 12:13:50 +08:00 · 49a600ccc5
commit 49a600ccc5
parent f3f9c9cb3a 52b7e18592
66 changed files with 21524 additions and 13486 deletions
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@ -39,6 +39,23 @@ var code = '[\n'+action_0+']\n';
 return code;
 */;

+//taskEvent 事件编辑器入口之一
+taskEvent_m
+    :     '任务描述' EvalString_Multi?  BGNL? Newline
+    '需完成的最低子任务数' Int BGNL? Newline
+    tasksList+ Newline
+     '完成奖励' BGNL? Newline action+
+
+
+/* taskEvent_m
+colour : this.tasksColor
+default :["任务描述",1]
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var code = '{"type":"taskEvent"'+EvalString_Multi_0+',"n":'+Int_0+',"info":['+tasksList_0+'\n]'+', "action": [\n' + action_0 + ']}\n'
+return code;
+*/;
+
+

 //事件 事件编辑器入口之一
 event_m
@ -867,6 +884,7 @@ action
    |   battle_s
    |   battle_1_s
    |   openDoor_s
+    |   specialDoor_s 
    |   closeDoor_s
    |   changebg_s
    |   changeFloor_s
@ -935,6 +953,7 @@ action
    |   input_s
    |   input2_s
    |   choices_s
+    |   menu_s
    |   confirm_s
    |   callBook_s
    |   callSave_s
@ -976,6 +995,15 @@ action
    |   over_s
    |   overlist_s
    |   cgtextList_s
+    |   setTask_s
+    |   removeTask_s
+    |   removeTaskByName_s
+    |   successTask_s
+    |   successTaskByName_s    
+    |   clearTask_s
+    |   submitTask_s
+    |   trymitTask_s
+    |   trymitTaskByName_s
    |   pass_s
    ;

@ -1183,7 +1211,7 @@ tooltip : over：这段话将出现在屏幕中心
 helpUrl : /_docs/#/instruction
 allImages : ['EvalString_1']
 allSounds : ['EvalString_2']
-default : ["这段话将在屏幕中心","bg_5043.webp",false,50,30,"","255,255,255,1",'rgba(255,255,255,1)',"0,0,0,1",'rgba(0,0,0,1)','bold 48px Verdana']
+default : ["这段话将在屏幕中心","bg_5043.webp",false,20,10,"","255,255,255,1",'rgba(255,255,255,1)',"0,0,0,1",'rgba(0,0,0,1)','bold 16px Verdana']
 var code = '{"type": "over", "text": "'+EvalString_0+'","image":"'+EvalString_1+'","memory":'+Bool_0+',"time":'+Int_0+',"hidetime":'+Int_1+',"sound":"'+EvalString_2+'","textColor": ['+ColorString_0+'], "boldColor": ['+ColorString_1+'],   "font": "'+EvalString_3+'"},\n';
 return code;
 */;
@ -1195,7 +1223,7 @@ overlist_s
 tooltip : overlist：多行滚动旁白
 helpUrl : /_docs/#/instruction
 allImages : ['EvalString_0']
-default : ["bg_5043.webp",false,30,[{ "text":"" ,"sound":"","time":50,"textColor":"255,255,255,1","boldColor":"0,0,0,1","font":"bold 48px Verdana","frame":0}]]
+default : ["bg_5043.webp",false,30,[{ "text":"" ,"sound":"","time":20,"textColor":"255,255,255,1","boldColor":"0,0,0,1","font":"bold 48px Verdana","frame":0}]]
 var list=',"list": [\n'+overtextList_0.slice(0,-1)+'\n]'
 var code = '{"type": "overlist", "image": "'+EvalString_0+'","memory":'+Bool_0+',"hidetime":'+Int_0+''+list+' },\n';
 return code;
@ -1248,7 +1276,7 @@ cgtext_s
 tooltip : cgtext：显示一段包含cg的文字（剧情）
 helpUrl : /_docs/#/instruction
 allImages : ['EvalString_0']
-default : [false,0,"face_050445.webp",-300,0,2000,"","这句话显示在对话框内",[{ "name":"tati_050145a.webp" , "px": 100,"filter":false }]]
+default : [false,0,"face_050445.webp",-100,0,2000,"","这句话显示在对话框内",[{ "name":"tati_050145a.webp" , "px": 33,"filter":false }]]
 var head ='{ "name": "'+EvalString_0+'", "px": '+Number_0+' }'
 var list=',"bodyList": [\n'+textcgDrawingList_0.slice(0,-1)+'\n]'
 var code = '{"type": "cgtext","WindowSkin":'+Bool_0+',"head":'+head+' ,"index":"'+Int_0+'","time":'+Int_1+',"wait":'+Int_2+list+' },\n';
@ -1259,12 +1287,12 @@ textcgDrawingList
    | textcgDrawingEmpty;

 textcgDrawing
-    : '立绘' EvalString? '绘制坐标' 'x' Number '变暗'Bool? '绘制大小w' IntString? 'h' IntString? '绘制比例(填写后w、h失效,此项默认1.7)' EvalString? Newline
+    : '立绘' EvalString? '绘制坐标' 'x' Number '变暗'Bool? '绘制大小w' IntString? 'h' IntString? '绘制比例(填写后w、h失效,此项默认0.6)' EvalString? Newline

 /* textcgDrawing
 tooltip : 立绘
 helpUrl : /_docs/#/instruction
-default : ["tati_050145a.webp",100,false,"","",""]
+default : ["tati_050145a.webp",200,false,"","",""]
 colour : this.subColor
 allImages : ['EvalString_0']
 if(EvalString_1&&!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数、整数或不填");
@ -2061,7 +2089,7 @@ changebg_s
 /* changebg_s
 tooltip : changebg: 剧情转场
 helpUrl : /_docs/#/instruction
-default : ["",false,"",false,30,"引入"]
+default : ["",false,"",false,10,"引入"]
 colour : this.soundColor
 allImages : ['EvalString_0','EvalString_1']
 var code = '{"type": "changebg", "img1": "'+EvalString_0+'","memory1":'+Bool_0+',"img2": "'+EvalString_1+'","memory2":'+Bool_1+',"time": '+Int_0+',"style": "'+Changebg_List_0+'"},\n';
@ -2193,6 +2221,23 @@ var code = '{"type": "openDoor"'+floorstr+IdString_0+Bool_0+Bool_1+'},\n';
 return code;
 */;

+
+specialDoor_s
+    :   '怪物坐标 x' EvalString? ',y' EvalString? ',' '门坐标x'EvalString? 'y'EvalString? '战后开启机关门' Newline
+    
+
+/* specialDoor_s
+tooltip : specialDoor: 战后开启机关门，需在每个机关怪物使用该战后事件，
+helpUrl : /_docs/#/instruction
+default : ["","","",""]
+selectPoint : ["EvalString_2", "EvalString_3"]
+colour : this.mapColor
+var enemy =MotaActionFunctions.processMultiLoc(EvalString_0, EvalString_1)
+var doors=MotaActionFunctions.processMultiDoors(EvalString_2, EvalString_3);
+var code = '{"type": "specialDoor"'+enemy+doors+'},\n';
+return code;
+*/;
+
 closeDoor_s
    :   '关门' 'x' PosString? ',' 'y' PosString? 'ID' IdString '不等待执行完毕' Bool Newline

@ -2614,7 +2659,7 @@ return code;


 animateResize_s
- :   '显示动画（60Fps）' EvalString '编号'PosString? '中心像素' 'x' PosString? 'y' PosString?'以勇士为中心' Bool'倒放' Bool'循环'Bool'不等待执行完毕' Bool Newline
+ :   '显示动画' EvalString '编号'PosString? '中心像素' 'x' PosString? 'y' PosString?'以勇士为中心' Bool'倒放' Bool'循环'Bool'不等待执行完毕' Bool Newline
    

 /* animateResize_s
@ -2668,7 +2713,7 @@ return code;
 */;

 stopAnimate_s
-    :   '停止动画编号'PosString?'（不填写编号为继续所有）' '执行动画回调' Bool Newline
+    :   '停止动画编号'PosString?'（不填写编号为停止所有）' '执行动画回调' Bool Newline

 /* stopAnimate_s
 tooltip : stopAnimate：停止动画（不填写编号为继续所有）
@ -3000,7 +3045,7 @@ return code;
 */;

 setWeather_s
-    :   '更改天气' Weather_List '强度' Int '持续到下个本事件' Bool Newline
+    :   '更改天气' Weather_List '强度' Int  Newline
    

 /* setWeather_s
@ -3009,8 +3054,8 @@ helpUrl : /_docs/#/instruction
 default : [null,1,true]
 colour : this.soundColor
 if(Int_0<1 || Int_0>10) throw new Error('天气的强度等级, 在1-10之间');
-Bool_0 = Bool_0 ? ', "keep": true' : ''
-var code = '{"type": "setWeather", "name": "'+Weather_List_0+'", "level": '+Int_0+Bool_0+'},\n';
+
+var code = '{"type": "setWeather", "name": "'+Weather_List_0+'", "level": '+Int_0+'},\n';
 if(Weather_List_0===''||Weather_List_0==='null'||Weather_List_0==null)code = '{"type": "setWeather"},\n';
 return code;
 */;
@ -3482,6 +3527,63 @@ var code = ['{"type": "choices"',EvalString_Multi_0,Int_0,IntString_0,
 return code;
 */;

+menu_s
+    :   'NPC名字' ':' EvalString_Multi BGNL?  Newline choicesList+ BEND Newline
+
+
+/* menu_s
+tooltip : menu: 给NPC提供选项
+helpUrl : /_docs/#/instruction
+previewBlock : true
+colour : this.taskColor
+default : ["流浪者"]
+EvalString_Multi_0 = ', "text": "'+EvalString_Multi_0+'"';
+var code = ['{"type": "menu"',EvalString_Multi_0,
+    block.isCollapsed()?', "_collapsed": true':'',
+    block.isEnabled()?'':', "_disabled": true',
+    ', "choices": [\n',
+    choicesList_0,
+']},\n'].join('');
+return code;
+*/;
+choicesList
+    : chooseContext
+    | taskContext;
+
+chooseContext
+    :   '子选项' EvalString '启用条件' EvalString? '出现条件' EvalString? BGNL? Newline action+
+
+
+/* chooseContext
+tooltip : 选项的选择
+helpUrl : /_docs/#/instruction
+default : ["对话","",""]
+colour : this.subColor
+EvalString_1 = EvalString_1 && (', "need": "'+EvalString_1+'"');
+EvalString_2 = EvalString_2 && (', "condition": "'+EvalString_2+'"');
+var collapsed=block.isCollapsed()?', "_collapsed": true':'';
+var disabled=block.isEnabled()?'':', "_disabled": true';
+var code = '{"type":"context","text": "'+EvalString_0+'"'+EvalString_1+EvalString_2+collapsed+disabled+', "action": [\n'+action_0+']},\n';
+return code;
+*/;
+
+taskContext
+    :   '可接取任务名'EvalString?  Newline
+        '可提交任务名' EvalString? BGNL? Newline action+
+
+
+/* taskContext
+tooltip : 选项的选择
+helpUrl : /_docs/#/instruction
+default : ["新手任务","task1,task2"]
+colour : this.subColor
+var condition = ', "condition": "\''+EvalString_0+'\'.split(\',\').some(v=>core.plugin.可接取任务.includes(v))||\''+EvalString_1+'\'.split(\',\').some(v=>core.taskSystem.tasksInfo.find(a => a.name ===v.name))"';
+var collapsed=block.isCollapsed()?', "_collapsed": true':'';
+var disabled=block.isEnabled()?'':', "_disabled": true';
+var code = '{"type":"taskContext","text":"任务","text1": "'+EvalString_0+'","text2":"'+EvalString_1+'"'+condition+collapsed+disabled+', "action": [\n'+action_0+']},\n';
+return code;
+*/;
+
 choicesContext
    :   '子选项' EvalString '图标' IdString? '颜色' ColorString? Colour '启用条件' EvalString? '出现条件' EvalString? BGNL? Newline action+

@ -4271,6 +4373,298 @@ var code = ' \n';
 return code;
 */;

+setTask_s
+    :   '接取任务 任务名' EvalString Newline
+
+/* setTask_s
+tooltip :接取任务
+colour : this.tasksColor
+default :["mission name"]
+
+var code = '{"type":"setTask","name":"'+EvalString_0+'"},\n'
+return code;
+*/;
+
+tasksList
+    : checkItem
+    | checkStatus
+    | checkFlag
+    | checkBlock
+    | kill
+    | killLocs
+    | killSpecial
+    | killAll
+    | specialBlock
+    | gosthFloor
+    | arrival
+    | empty;
+
+checkItem
+    : '道具ID' IdString TaskOperator_List '数量' Int '子任务描述' EvalString_Multi?   BGNL? Newline
+/*  checkItem
+tooltip : 检查道具数量
+default : ["yellowKey",">=",0,""]
+colour : this.childColor
+allItems : ['IdString_0']
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var code = '{"type":"checkItem","checkItem":"'+IdString_0+'","operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},';
+return code;
+ */;
+
+checkStatus
+    :'检查' Status_List '属性' TaskOperator_List Int '子任务描述' EvalString_Multi?   BGNL? Newline  
+/*  checkStatus
+tooltip : 检查属性数值
+default : ["atk",">=",10,""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var code = '{"type":"checkStatus","checkStatus":"'+Status_List_0+'","operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},';
+return code;
+ */;
+
+checkFlag
+    :'检查Flag变量' EvalString TaskOperator_List expression '子任务描述'EvalString_Multi?   BGNL? Newline  
+/*  checkFlag
+tooltip : 检查Flag变量
+default : ["flag1","=","",""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var code = '{"type":"checkFlag","checkFlag":"'+EvalString_0+'","operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":"'+expression_0+'"},';
+return code;
+*/;
+
+checkBlock
+    :'检查地面图块数量' EvalString '楼层' EvalString TaskOperator_List Int '子任务描述' EvalString_Multi?   BGNL? Newline  
+/*  checkBlock
+tooltip : 检查地面图块数量
+default : ["ju87b","MT1,MT2","<=",0,""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var thisFloorId=EvalString_1.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+var code = '{"type":"checkBlock","checkBlock":"'+EvalString_0+'"'+floorstr+',"operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},';
+return code;
+*/;
+
+
+kill
+    :'击杀' IdString? '敌人楼层' EvalString? TaskOperator_List Int'子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  kill
+tooltip : 击杀一定数量的敌人
+default : ["","",">",0,""]
+colour : this.childColor
+allEnemys : ['IdString_0']
+IdString_0=IdString_0?(',"kill": "'+IdString_0+'"'):'';
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+if(EvalString_0){
+var thisFloorId=EvalString_0.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+}else {
+var floorstr=""    
+}
+var code = '{"type":"kill"'+IdString_0+floorstr+',"operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},';
+return code;
+*/;
+
+killLocs
+    :'击杀x' EvalString 'y' EvalString '楼层' IdString '位置的敌人' TaskOperator_List Int'子任务描述' EvalString_Multi?   BGNL? Newline
+/*  killLocs
+tooltip : 击杀某些位置的敌人
+default : ["1","1","MT1",">=",1,""]
+colour : this.childColor
+allFloorIds : ['IdString_0']
+selectPoint : ["EvalString_0","EvalString_1","IdString_0"]
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var floorstr = MotaActionFunctions.processMultiLoc(EvalString_0,EvalString_1);
+var code = '{"type":"killLocs"'+floorstr+',"floorId":"'+IdString_0+'","operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},';
+return code;
+*/;
+
+killSpecial
+    :'击杀拥有' Int '技能的敌人楼层'  EvalString? TaskOperator_List Int  '子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  killSpecial
+tooltip : 击杀一定数量的某种敌人
+default : [61,"MT1,MT2",">=",1,""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+if(EvalString_0){
+var thisFloorId=EvalString_0.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+}else {
+var floorstr=""    
+}
+var code = '{"type":"killSpecial","killSpecial":"'+Int_0+'"'+floorstr+',"operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_1+'},';
+return code;
+*/;
+
+killAll
+    :'击杀楼层' EvalString '所有敌人'  '子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  killAll
+tooltip : 击杀某些楼层所有敌人
+default : ["MT1",""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var thisFloorId=EvalString_0.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+var code = '{"type":"killAll"'+floorstr+EvalString_Multi_0+'},';
+return code;
+*/;
+
+specialBlock
+    :'在楼层' EvalString? '受到' MapDamage_List '地图伤害次数' TaskOperator_List Int  '子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  specialBlock
+tooltip : 在某些楼层受到一定次数的地图伤害
+default : ["MT1","血网伤害","<",1,""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+if(EvalString_0){
+var thisFloorId=EvalString_0.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+}else {
+var floorstr=""    
+}
+var code = '{"type":"specialBlock"'+floorstr+',"specialBlock":"'+MapDamage_List_0+'"'+',"operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},'
+return code;
+*/;
+
+gosthFloor
+    :'切换至楼层' EvalString? '次数' TaskOperator_List Int  '子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  gosthFloor
+tooltip : 切换/到达某楼层不超过一定次数
+default : ["MT1","<",1,""]
+colour : this.childColor
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+if(EvalString_0){
+var thisFloorId=EvalString_0.split(",")
+thisFloorId=thisFloorId.map(function(v){return '"'+v.trim()+'"'})
+var floorstr=',"floorId":['+thisFloorId.join(",")+']'
+}else {
+var floorstr=""    
+}
+var code = '{"type":"gosthFloor"'+floorstr+',"operator":"'+TaskOperator_List_0+'"'+EvalString_Multi_0+',"count":'+Int_0+'},'
+return code;
+*/;
+
+arrival
+    :'抵达' IdString  '子任务描述' EvalString_Multi?   BGNL? Newline 
+/*  arrival
+tooltip : 抵达某楼层
+default : ["MT1",""]
+colour : this.childColor
+allFloorIds : ['IdString_0']
+EvalString_Multi_0=EvalString_Multi_0?(',"text": "'+EvalString_Multi_0+'"'): '';
+var code = '{"type":"arrival","floorId":"'+IdString_0+'"'+EvalString_Multi_0+'},'
+return code;
+*/;
+
+empty
+    :   Newline
+    
+
+/* empty
+var code = ' \n';
+return code;
+*/;
+
+
+
+removeTask_s
+    :   '移除第' Int '项任务'
+
+
+/* removeTask_s
+tooltip : 移除第n项任务。
+colour : this.tasksColor
+default :[0]
+var code = '{"type":"removeTask","index":'+Int_0+'},\n';
+return code;
+*/;
+
+removeTaskByName_s
+    :   '移除名为' EvalString '的任务'
+
+
+/* removeTaskByName_s
+tooltip : 移除某一任务。
+colour : this.tasksColor
+default :["mission's name"]
+var code = '{"type":"removeTaskByName","name":"'+EvalString_0+'"},\n';
+return code;
+*/;
+
+successTask_s
+    :   '完成第' Int '项任务'
+
+
+/* successTask_s
+tooltip : 强制完成第n项任务时。
+colour : this.tasksColor
+default :[0]
+var code = '{"type":"successTask","index":'+Int_0+'},\n';
+return code;
+*/;
+
+successTaskByName_s
+    :   '完成名为' EvalString '的任务'
+
+
+/* successTaskByName_s
+tooltip : 强制完成某一任务时。
+colour : this.tasksColor
+default :["mission's name"]
+var code = '{"type":"successTaskByName","name":"'+EvalString_0+'"},\n';
+return code;
+*/;
+
+clearTask_s
+    :   '删除所有任务'
+
+
+/* clearTask_s
+tooltip : 删除所有任务。
+colour : this.tasksColor
+var code = '{"type":"clearTask"},\n';
+return code;
+*/;
+
+submitTask_s
+    :   '提交并清空任务'
+
+
+/* submitTask_s
+tooltip : 关卡结束时清空任务并提交。
+colour : this.tasksColor
+var code = '{"type":"submitTask"},\n';
+return code;
+*/;
+trymitTask_s
+    :   '尝试提交第' Int '项任务'
+
+
+/* trymitTask_s
+tooltip : 尝试提交第n项任务时（未完成时无效果）。
+colour : this.tasksColor
+default :[0]
+var code = '{"type":"trymitTask","index":'+Int_0+'},\n';
+return code;
+*/;
+
+trymitTaskByName_s
+    :   '尝试提交名为' EvalString '的任务'
+
+
+/* trymitTaskByName_s
+tooltip :  尝试提交某一任务时（未完成时无效果）。
+colour : this.tasksColor
+default :["mission's name"]
+var code = '{"type":"trymitTaskByName","name":"'+EvalString_0+'"},\n';
+return code;
+*/;
 statExprSplit : '=== statement ^ === expression v ===' ;
 //===blockly表达式===

@ -4812,6 +5206,15 @@ EnemyId_List
 EnemyPoint_List
    :   '生命'|'攻击'|'防御'|'金币'|'经验'|'加点'|'名称'
    /*EnemyPoint_List ['hp','atk','def','money','exp','point','name']*/;
+TaskOperator_List
+    :   '等于'|'小于'|'小于等于'|'大于'|'大于等于'
+    /*TaskOperator_List ['=','<','<=','>','>=']*/;
+Status_List
+    :   '生命'|'攻击'|'防御'|'法强'|'速度'|'金币'
+    /*Status_List ['hp','atk','def','spell','speed','money']*/;
+MapDamage_List
+    :   '血网伤害'|'领域伤害'|'阻击伤害'|'激光伤害'|'夹击伤害'
+    /*MapDamage_List ['血网伤害','领域伤害','阻击伤害','激光伤害','夹击伤害']*/;

 Equip_List
    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'法抗百分比'|'魔力'|'魔力上限'|'速度'
@ -4890,7 +5293,8 @@ LineComment
 this.evisitor.valueColor=330;
 this.evisitor.statementColor=70;
 this.evisitor.entryColor=250;
-
+this.evisitor.tasksColor=210 
+this.evisitor.childColor=35 
 this.evisitor.idstring_eColor=310;
 this.evisitor.subColor=250;
 this.evisitor.dataColor=130;
--- a/_server/MotaActionParser.js
+++ b/_server/MotaActionParser.js
@ -3,6 +3,125 @@ MotaActionParser = function () {

  ActionParser.prototype.parse = function (obj, type) {
    switch (type) {
+      case  "taskEvent": // 设置任务
+      if (!obj) obj = {"type":"taskEvent","text": "任务描述","n":1,"info":[
+								  {"type":"checkItem","checkItem":"yellowKey","operator":"&gt;=","count":0},
+								  {"type":"checkStatus","checkStatus":"atk","operator":"&gt;=","count":10},
+								  {"type":"checkFlag","checkFlag":"flag1","operator":"=","count":"\"value\""},
+								  {"type":"checkBlock","checkBlock":"bat","floorId":["MT1","MT2"],"operator":"&lt;=","count":0},
+								  {"type":"kill","operator":"&gt;=","count":0},
+								  {"type":"killLocs", "loc": [[1,1]],"floorId":"MT1","operator":"&gt;=","count":1},
+								  {"type":"killSpecial","killSpecial":"61","floorId":["61"],"operator":"&gt;=","count":1},
+								  {"type":"killAll","floorId":["MT1"]},
+								  {"type":"specialBlock","floorId":["MT1"],"specialBlock":"血网伤害","operator":"&lt;","count":1},
+								  {"type":"gosthFloor","floorId":["MT1"],"operator":"&lt;","count":1},
+								  {"type":"arrival","floorId":"MT1"},
+								], "action": [
+								]};
+    var that=this
+      var bulidTaskList = function (obj) {  
+          var res = null;
+          for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) {
+            if(one.type==="checkItem"){
+              res = MotaActionBlocks["checkItem"].xmlText([
+              one.checkItem,
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="checkStatus"){
+              res = MotaActionBlocks["checkStatus"].xmlText([
+              one.checkStatus,
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="checkFlag"){
+              res = MotaActionBlocks["checkFlag"].xmlText([
+              one.checkFlag,
+              one.operator,
+              that.expandEvalBlock([one.count]),
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="checkBlock"){
+              res = MotaActionBlocks["checkBlock"].xmlText([
+              one.checkBlock,
+              one.floorId.join(","), 
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="kill"){
+              res = MotaActionBlocks["kill"].xmlText([
+              one.kill||"",
+              one.floorId?one.floorId.join(","):"", 
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="killLocs"){
+              var x_str = [],
+                y_str = [];
+              one.loc.forEach(function(t){
+                x_str.push(t[0]);
+                y_str.push(t[1]);
+              });
+              res = MotaActionBlocks["killLocs"].xmlText([
+              x_str.join(","),
+              y_str.join(","),
+              one.floorId, 
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="killSpecial"){
+              res = MotaActionBlocks["killSpecial"].xmlText([
+              one.floorId.join(","), 
+              one.killSpecial,
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+             }else if(one.type==="killAll"){
+              res = MotaActionBlocks["killAll"].xmlText([
+              one.floorId.join(","), 
+              one.text||"",
+              res,
+            ]);
+             }else if(one.type==="specialBlock"){
+              res = MotaActionBlocks["specialBlock"].xmlText([
+              one.floorId.join(","), 
+              one.specialBlock,  
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="gosthFloor"){
+              res = MotaActionBlocks["gosthFloor"].xmlText([ 
+              one.floorId.join(","), 
+              one.operator,
+              one.count,
+              one.text||"",
+              res,
+            ]);
+            }else if(one.type==="empty"){
+              res = MotaActionBlocks["empty"].xmlText([ 
+              res,
+            ]);
+            }
+         
+          }
+          return res;
+    };
+      return MotaActionBlocks['taskEvent_m'].xmlText([obj.text||"",obj.n,bulidTaskList(obj.info),this.insertActionList(obj.action)]);
      case "event":
        if (!obj) obj = {};
        if (typeof obj === typeof "") obj = { data: [obj] };
@ -569,7 +688,7 @@ MotaActionParser = function () {
          data.WindowSkin,
          data.index,
          data.head.name,
-          data.head.px || -300,
+          data.head.px || -100,
          data.time,
          data.wait,
          buildcgDrawing(data.bodyList),
@ -691,14 +810,14 @@ MotaActionParser = function () {
          data.text ?? "",
          data.image ?? "",
          data.memory ?? false,
-          data.time ?? 3000,
-          data.hidetime ?? 100,
+          data.time ?? 20,
+          data.hidetime ?? 10,
          data.sound ?? "",
          data.textColor,
          "rgba(" + data.textColor + ")",
          data.boldColor,
          "rgba(" + data.boldColor + ")",
-          data.font ?? "bold 48px Verdana",
+          data.font ?? "bold 16px Verdana",
          this.next,
        ]);
        break;
@ -1494,7 +1613,6 @@ MotaActionParser = function () {
        this.next = MotaActionBlocks["setWeather_s"].xmlText([
          data.name,
          data.level || 1,
-          data.keep || false,
          this.next,
        ]);
        break;
@ -1509,6 +1627,32 @@ MotaActionParser = function () {
          this.next,
        ]);
        break;
+        case "specialDoor": // 机关门
+      data.loc = data.loc || [];
+      data.doors = data.doors || [];
+        if (!(data.loc[0] instanceof Array)) data.loc = [data.loc];
+        if (!(data.doors[0] instanceof Array)) data.doors = [data.doors];
+        var x_str = [],
+          y_str = [],
+          door_x=[],
+          door_y=[];
+        data.loc.forEach(function (t) {
+          x_str.push(t[0]);
+          y_str.push(t[1]);
+        });
+        data.doors.forEach(function (t) {
+          door_x.push(t[0]);
+          door_y.push(t[1]);
+        });
+      
+        this.next = MotaActionBlocks["specialDoor_s"].xmlText([
+          x_str.join(","),
+          y_str.join(","),
+          door_x.join(","),
+          door_y.join(","),
+          this.next,
+        ]);
+        break;
      case "closeDoor": // 关一个门，需要该点无事件
        data.loc = data.loc || ["", ""];
        this.next = MotaActionBlocks["closeDoor_s"].xmlText([
@ -1881,6 +2025,44 @@ MotaActionParser = function () {
          /*disabled*/ data._disabled
        );
        break;
+         case "menu": // 提供NPC菜单
+         var that = this;
+         var bulidmenuList = function(obj) {  
+          var res = null;
+          for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) {
+          if(one.type==="context"){
+  res = MotaActionBlocks["chooseContext"].xmlText([
+              one.text||"",
+              one.need || "",
+              one.condition || "",
+              that.insertActionList(one.action),
+              res,
+            ]);
+          }
+          else if(one.type==="taskContext"){
+              res = MotaActionBlocks["taskContext"].xmlText([
+              one.text1||"",
+              one.text2||"",
+              that.insertActionList(one.action),
+              res,
+            ]);
+          }
+        }
+       return res;
+      }
+        this.next = MotaActionFunctions.xmlText(
+          "menu_s",
+          [
+            data.text,
+            bulidmenuList(data.choices),
+            this.next,
+          ],
+          /* isShadow */ false,
+          /*comment*/ null,
+          /*collapsed*/ data._collapsed,
+          /*disabled*/ data._disabled
+        );
+        break;
      case "choices": // 提供选项
        var text_choices = null;
        for (
@ -2070,7 +2252,7 @@ MotaActionParser = function () {
          data.memory1 ?? false,
          data.img2 ?? "",
          data.memory2 ?? false,
-          data.time ?? 30,
+          data.time ?? 10,
          data.style,
          this.next,
        ]);
@ -2546,6 +2728,34 @@ MotaActionParser = function () {
          ]);
        }
      case "animateImage": // 兼容 animateImage
+        break;
+         case  "setTask": // 设置任务
+      this.next = MotaActionBlocks['setTask_s'].xmlText([data.name,this.next ]);
+      break;
+
+    case "removeTask":  // 移除第n项任务  
+      this.next = MotaActionBlocks['removeTask_s'].xmlText([data.index,this.next ]);
+      break;    
+    case "removeTaskByName":  // 移除某一任务  
+      this.next = MotaActionBlocks['removeTaskByName_s'].xmlText([data.name,this.next ]);
+      break;    
+    case "successTask":  // 强制完成第n项任务  
+      this.next = MotaActionBlocks['successTask_s'].xmlText([data.index,this.next ]);
+      break;    
+    case "successTaskByName":  // 强制完成某一任务  
+      this.next = MotaActionBlocks['successTaskByName_s'].xmlText([data.name,this.next ]);
+      break;  
+      case "trymitTask":  // 尝试提交第n项任务  
+      this.next = MotaActionBlocks['trymitTask_s'].xmlText([data.index,this.next ]);
+      break;    
+    case "trymitTaskTaskByName":  // 尝试提交某一任务  
+      this.next = MotaActionBlocks['trymitTaskByName_s'].xmlText([data.name,this.next ]);
+      break;  
+    case "clearTask":  // 删除所有任务  
+      this.next = MotaActionBlocks['clearTask_s'].xmlText([this.next ]);
+      break;
+    case "submitTask":  // 清除并提交任务
+      this.next = MotaActionBlocks['submitTask_s'].xmlText([this.next ]);
      break;
      default:
        this.next = MotaActionBlocks["unknown_s"].xmlText([
@ -3075,6 +3285,30 @@ MotaActionParser = function () {
    return floorstr;
  };

+  MotaActionFunctions.processMultiDoors = function (EvalString_0, EvalString_1) {
+    var floorstr = "";
+    if (EvalString_0 && EvalString_1) {
+      var x = EvalString_0,
+        y = EvalString_1;
+      var pattern = /^([+-]?\d+)(, ?[+-]?\d+)*$/;
+      if (
+        pattern.test(x) &&
+        pattern.test(y) &&
+        x.split(",").length == y.split(",").length
+      ) {
+        x = x.split(",");
+        y = y.split(",");
+        for (var ii = 0; ii < x.length; ii++)
+          x[ii] = "[" + x[ii].trim() + "," + y[ii].trim() + "]";
+        floorstr = ', "doors": [' + x.join(",") + "]";
+      }
+      if (floorstr == "") {
+        floorstr = ', "doors": ["' + x + '","' + y + '"]';
+      }
+    }
+    return floorstr;
+  };
+
  MotaActionFunctions.StepString_pre = function (StepString) {
    //StepString='上右3下2左上左2'
    var route = StepString.replace(/上/g, "U")
--- a/_server/editor_blocklyconfig.js
+++ b/_server/editor_blocklyconfig.js
@ -692,6 +692,7 @@ editor_blocklyconfig = function () {
        "eachArrive",
        "commonEvent",
        "item",
+        "taskEvent"
      ];
      return commonEntries.indexOf(editor_blockly.entryType) >= 0;
    };
--- a/_server/editor_file.js
+++ b/_server/editor_file.js
@ -941,6 +941,7 @@ editor_file = function (editor, callback) {
    }

    var saveSetting = function (file, actionList, callback) {
+
        var _update = function (name, value) {
            if (value[2] === undefined) {
                eval("delete " + name + value[1]);
@ -1089,6 +1090,7 @@ editor_file = function (editor, callback) {
            });
            return;
        }
+        
        if (file == 'plugins') {
            actionList.forEach(function (value) {
                if(value[0]==='add'){
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@ -653,7 +653,7 @@ editor_mappanel_wrapper = function (editor) {
        }
        if (bindSpecialDoor.loc == null || bindSpecialDoor.enemys.length != bindSpecialDoor.n) return;
        // 添加机关门自动事件
-        var doorFlag = "flag:door_" + editor.currentFloorId + "_" + bindSpecialDoor.loc.replace(',', '_');
+        /*var doorFlag = "flag:door_" + editor.currentFloorId + "_" + bindSpecialDoor.loc.replace(',', '_');
        editor.currentFloorData.autoEvent[bindSpecialDoor.loc] = {
            '0': {
                "condition": doorFlag + "==" + bindSpecialDoor.n,
@ -666,11 +666,14 @@ editor_mappanel_wrapper = function (editor) {
                    { "type": "setValue", "name": doorFlag, "operator": "=", "value": "null" },
                ]
            }
-        };
-        bindSpecialDoor.enemys.forEach(function (loc) {
+        };*/
+        var enemys=bindSpecialDoor.enemys.map(function (loc) {
+            return loc.split(",")
+            })
+        bindSpecialDoor.enemys.forEach(function (loc,_i,arr){
            if (!editor.currentFloorData.afterBattle[loc])
                editor.currentFloorData.afterBattle[loc] = [];
-            editor.currentFloorData.afterBattle[loc].push({ "type": "setValue", "name": doorFlag, "operator": "+=", "value": "1" });
+            editor.currentFloorData.afterBattle[loc].push({"type": "specialDoor", "loc": enemys, "doors": [bindSpecialDoor.loc.split(",")]},);
        });
        editor.file.saveFloorFile(function (err) {
            if (err) {
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@ -79,6 +79,7 @@ editor_mode = function (editor) {
            if (callback) callback();
        }
        switch (mode) {
+          
            case 'loc':
                editor.file.editLoc(editor_mode.pos.x, editor_mode.pos.y, actionList, function (objs_) {
                    cb(objs_);
@ -106,9 +107,14 @@ editor_mode = function (editor) {
            case 'commonevent':
                editor.file.editCommonEvent(actionList, cb);
                break;
+            case 'CommonEventTemplate':
+                editor.file.editCommonEventTemplate(actionList, cb)
            case 'plugins':
                editor.file.editPlugins(actionList, cb);
                break;
+            case 'task':
+                editor.file.editTask(actionList, cb);
+                break;
            default:
                break;
        }
--- a/_server/editor_uievent.js
+++ b/_server/editor_uievent.js
@ -587,12 +587,12 @@ editor_uievent_wrapper = function (editor) {
                var disabled = _isTileset && value.indexOf(one) >= 0 ? 'disabled' : ''
                html += `<input type="checkbox" key="${one}" class="materialCheckbox" ${checked} ${disabled}/> ${one}`;
                // 预览图片
-                if (one.endsWith('.png') || one.endsWith('.jpg') || one.endsWith('.jpeg') || one.endsWith('.gif')) {
+                if (one.endsWith('.png') || one.endsWith('.jpg') || one.endsWith('.jpeg') || one.endsWith('.gif')||one.endsWith('.webp')) {
                    html += "<button onclick='editor.uievent._previewMaterialImage(this)' style='margin-left: 10px'>预览</button>";
                    html += '<br style="display:none"/><img key="' + directory + one + '" style="display:none; max-width: 100%"/>';
                }
                // 试听音频
-                if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac')) {
+                if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac')||one.endsWith('.opus')) {
                    html += "<button onclick='editor.uievent._previewMaterialAudio(this)' style='margin-left: 10px'>播放</button>"
                    html += "<small> 音调：<input value='100' style='width:28px' onchange='editor.uievent._previewMaterialAudio_onPitchChange(this)'></small>";
                    html += `<small style='display:none; margin-left: 15px'>0:00 / 0:00</small><br style="display:none"/>
--- a/_server/table/comment.js
+++ b/_server/table/comment.js
@ -255,41 +255,107 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 					"_docs": "特殊属性数值",
 					"_data": "特殊属性的数值\n如：领域/阻激/激光怪的伤害值；光环怪增加生命的比例"
 				},
-				"zone": {
+				"baoshang": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_docs": "领域伤害",
-					"_data": "领域怪的伤害值"
+					"_docs": "暴击伤害",
+					"_data": "暴击伤害的数值，此项为百分数。如20为20%"
 				},
-				"repulse": {
+				"baoji": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_docs": "阻击伤害",
-					"_data": "阻击怪的伤害值"
+					"_docs": "暴击回合",
+					"_data": "怪物每进行多少回合进行一次暴击"
 				},
-				"laser": {
+				"duck": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_docs": "激光伤害",
-					"_data": "激光怪的伤害值"
+					"_docs": "闪避回合",
+					"_data": "怪物每受到多少次普通攻击进行一次闪避"
+				},
+				"absorb": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "汲取效果",
+					"_data": "怪物对角色护盾造成破坏时，将窃取破坏数值的一定比例作为自身护盾，此项为百分数。如20为20%"
+				},
+				"gravity": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "重力效果",
+					"_data": "怪物操纵角色的重力，每携带一件双手装备速度下降4x%，每携带一件单手装备速度下降2x%，每携带一件其他装备速度下降x%，此项为百分数。如20为20%"
+				},
+				"cold": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "寒霜回合",
+					"_data": "怪物前多少次回合附加寒霜，0为每回合"
+				},
+				"coldValue": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "寒霜效果",
+					"_data": "每层寒霜下降的速度"
+				},
+				"fire": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "灼炎效果",
+					"_data": "每层灼炎熔毁的防御"
+				},
+				"wind": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "风行效果",
+					"_data": "每层风行提高的速度"
+				},
+				"light": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "闪电效果",
+					"_data": "闪电对护盾伤害提升效果百分比，此项为百分数。如20为20%"
+				},
+				"poison": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "毒素效果",
+					"_data": "每层毒素造成的生命流失"
+				},
+				"tear": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "撕裂效果",
+					"_data": "怪物的普通攻击附加角色当前已损失生命值的百分比，此项为百分数。如20为20%"
+				},
+				"immolate": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "献祭伤害",
+					"_data": "每次献祭造成的伤害"
 				},
 				"breakArmor": {
 					"_leaf": true,
 					"_type": "textarea",
 					"_docs": "破甲比例",
-					"_data": "破甲百分比"
+					"_data": "破甲百分比，此项为百分数。如20为20%"
 				},
-				"counterAttack": {
+				"onceBreakArmor": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_docs": "反击比例",
-					"_data": "反击百分比"
+					"_docs": "首次额外破甲比例",
+					"_data": "额外破甲百分比，此项为百分数。如20为20%,首次伤害与破甲比例加算"
 				},
 				"vampire": {
 					"_leaf": true,
 					"_type": "textarea",
 					"_docs": "吸血比例",
-					"_data": "吸血怪的吸血百分比"
+					"_data": "吸血怪的吸血百分比,此项为百分数。如20为20%,仅计算破盾后伤害"
+				},
+				"curseValue": {
+					"_leaf": true,
+					"_type": "textarea",
+					"_docs": "诅咒倍率",
+					"_data": "触发诅咒时魔法伤害提升比例，此项为百分数。如20为20%"
 				},
 				"hpBuff": {
 					"_leaf": true,
@ -297,6 +363,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 					"_docs": "光环加血",
 					"_data": "光环怪增加生命的比例"
 				},
+
 				"atkBuff": {
 					"_leaf": true,
 					"_type": "textarea",
@ -341,53 +408,14 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 					"_docs": "不可炸",
 					"_data": "该怪物不可被炸"
 				},
-				"n": {
-					"_leaf": true,
-					"_type": "textarea",
-					"_range": "(thiseval==~~thiseval && thiseval>0)||thiseval==null",
-					"_docs": "连击数",
-					"_data": "多连击的连击数，净化怪的净化倍率"
-				},
-				"purify": {
-					"_leaf": true,
-					"_type": "textarea",
-					"_range": "(thiseval==~~thiseval && thiseval>0)||thiseval==null",
-					"_docs": "净化倍率",
-					"_data": "净化百分比"
-				},
-				"add": {
-					"_leaf": true,
-					"_type": "checkbox",
-					"_docs": "吸血加到自身",
-					"_data": "吸血后是否加到自身"
-				},
+
 				"haloAdd": {
 					"_leaf": true,
 					"_type": "checkbox",
 					"_docs": "光环是否叠加",
 					"_data": "光环是否叠加"
 				},
-				"atkValue": {
-					"_leaf": true,
-					"_type": "textarea",
-					"_range": "thiseval==~~thiseval||thiseval==null",
-					"_docs": "退化扣攻",
-					"_data": "退化时勇士下降的攻击力点数"
-				},
-				"defValue": {
-					"_leaf": true,
-					"_type": "textarea",
-					"_range": "thiseval==~~thiseval||thiseval==null",
-					"_docs": "退化扣防",
-					"_data": "退化时勇士下降的防御力点数"
-				},
-				"damage": {
-					"_leaf": true,
-					"_type": "textarea",
-					"_range": "thiseval==~~thiseval||thiseval==null",
-					"_docs": "固伤",
-					"_data": "战前扣血的点数"
-				},
+
 				"beforeBattle": {
 					"_leaf": true,
 					"_type": "event",
--- a/_server/table/plugins.comment.js
+++ b/_server/table/plugins.comment.js
@ -15,6 +15,7 @@ var plugins_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 				"_range": "typeof(thiseval)=='string'",
 				"_data": "初始化"
 			},
+
 			"shop": {
 				"_leaf": true,
 				"_type": "textarea",
--- a/libs/actions.js
+++ b/libs/actions.js
--- a/libs/control.js
+++ b/libs/control.js
@ -233,6 +233,7 @@ control.prototype._animationFrame_globalAnimate = function (timestamp) {
  }
  // Box animate
  core.drawBoxAnimate();
+  if(core.status.event.id==="book"&&!core.book.isAnimate)core.book.update()
  core.animateFrame.globalTime = timestamp;
 };

@ -1438,6 +1439,9 @@ control.prototype.checkBlock = function () {
  var damage = core.status.checkBlock.damage[loc];
  if (damage) {
    core.status.hero.hp -= damage;
+    core.taskSystem.tasksInfo.forEach(v => v.tasks.forEach(a => {
+			if (a.type==="specialBlock"&&(!a.floorId||a.floorId.includes(core.status.floorId)) &&(core.status.checkBlock.type[loc]|| {})[a.specialType])a.has++ 
+		}))
    var text =
      Object.keys(core.status.checkBlock.type[loc] || {}).join("，") || "伤害";
    core.drawTip("受到" + text + damage + "点");
@ -2310,7 +2314,7 @@ control.prototype._replayAction_fly = function (action) {
  var toIndex = core.floorIds.indexOf(floorId);
  if (
    !core.canUseItem("fly") ||
-    (core.flags.flyNearStair && !core.nearStair() && !flags.canMoveFloor)
+    (core.flags.flyNearStair && !core.nearStair())
  )
    return false;
  core.ui.drawFly(toIndex);
@ -2424,7 +2428,8 @@ control.prototype._replayAction_ignoreInput = function (action) {
    action.indexOf("input:") == 0 ||
    action.indexOf("input2:") == 0 ||
    action.indexOf("choices:") == 0 ||
-    action.indexOf("random:") == 0
+    action.indexOf("random:") == 0||
+     action.indexOf("menu:")
  ) {
    console.warn("警告！录像播放中出现了未知的 " + action + "！");
    core.replay();
@ -2489,6 +2494,7 @@ control.prototype.checkAutosave = function () {

 ////// 实际进行存读档事件 //////
 control.prototype.doSL = function (id, type) {
+ 
  switch (type) {
    case "save":
      this._doSL_save(id);
--- a/libs/core.js
+++ b/libs/core.js
@ -289,6 +289,7 @@ core.prototype.init = function (coreData, callback) {
            core.canvas[name].canvas.width = (b ? core.__PIXELS__ : core._PX_);
            core.canvas[name].canvas.height = (b ? core.__PIXELS__ : core._PY_);
        }
+        core.canvas[name].imageSmoothingEnabled = false
    }

    core.loader._load(function () {
--- a/libs/enemys.js
+++ b/libs/enemys.js
@ -204,12 +204,12 @@ enemys.prototype.getDamageString = function (enemy, x, y, floorId) {
        else color = '#FF2222';

        damage = core.formatBigNumber(damage, true);
-        if (core.enemys.hasSpecial(enemy, 19))
+       /* if (core.enemys.hasSpecial(enemy, 19))
            damage += "+";
        if (core.enemys.hasSpecial(enemy, 21))
            damage += "-";
        if (core.enemys.hasSpecial(enemy, 11))
-            damage += "^";
+            damage += "^";*/
    }

    return {
@ -219,13 +219,13 @@ enemys.prototype.getDamageString = function (enemy, x, y, floorId) {
 }

 ////// 接下来N个临界值和临界减伤计算 //////
-enemys.prototype.nextCriticals = function (enemy, number, x, y, floorId) {
+enemys.prototype.nextCriticals = function (enemy, number, x, y, floorId,config={}) {
    if (typeof enemy == 'string') enemy = core.material.enemys[enemy];
    number = number || 1;

    var specialCriticals = this._nextCriticals_special(enemy, number, x, y, floorId);
    if (specialCriticals != null) return specialCriticals;
-    var info = this.getDamageInfo(enemy, null, x, y, floorId);
+    var info = this.getDamageInfo(enemy, config, x, y, floorId);
    if (info == null) { // 如果未破防...
        var overAtk = this._nextCriticals_overAtk(enemy, x, y, floorId);
        if (overAtk == null) return [];
@ -245,7 +245,7 @@ enemys.prototype.nextCriticals = function (enemy, number, x, y, floorId) {
            return this._nextCriticals_useLoop(enemy, info, number, x, y, floorId);
        }
        else {
-            return this._nextCriticals_useBinarySearch(enemy, info, number, x, y, floorId);
+            return this._nextCriticals_useBinarySearch(enemy, info, number, x, y, floorId,config);
        }
    }
    else {
@ -274,7 +274,7 @@ enemys.prototype._nextCriticals_overAtk = function (enemy, x, y, floorId) {
 }

 enemys.prototype._nextCriticals_special = function (enemy, number, x, y, floorId) {
-    if (this.hasSpecial(enemy.special, 10) || this.hasSpecial(enemy.special, 3))
+    if (this.hasSpecial(enemy.special, 3))
        return []; // 模仿or坚固临界
    return null;
 }
--- a/libs/events.js
+++ b/libs/events.js
@ -8,6 +8,7 @@ function events() {
 events.prototype._init = function () {
  this.eventdata = functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.events;
  this.commonEvent = events_c12a15a8_c380_4b28_8144_256cba95f760.commonEvent;
+  this.task = events_c12a15a8_c380_4b28_8144_256cba95f760.task;
  this.systemEvents = {};
  this.actions = {};
 };
--- a/libs/maps.js
+++ b/libs/maps.js
@ -35,6 +35,7 @@ maps.prototype._resetFloorImages = function () {
 }

 maps.prototype._setHDCanvasSize = function (ctx, width, height) {
+    if(main.replyChecking)return
    ctx.setTransform(1, 0, 0, 1, 0, 0);
    var ratio = core.domStyle.scale;
    ratio *= devicePixelRatio;
@ -1756,7 +1757,11 @@ maps.prototype._drawThumbnail_drawTempCanvas = function (floorId, blocks, option
        } else core.maps._setHDCanvasSize(tempCanvas, width * 32, height * 32);
    }
    options.ctx = tempCanvas;
-
+    if(options.noEnabled){
+    tempCanvas.imageSmoothingEnabled= false
+    }else{
+        tempCanvas.imageSmoothingEnabled= true
+    }
    // 地图过大的缩略图不绘制显伤
    if (width * height > core.bigmap.threshold)
        options.damage = false;
@ -1803,6 +1808,12 @@ maps.prototype._drawThumbnail_realDrawTempCanvas = function (floorId, blocks, op

 maps.prototype._drawThumbnail_drawToTarget = function (floorId, options) {
    var ctx = core.getContextByName(options.ctx);
+    let imageSmoothingEnabled=ctx.imageSmoothingEnabled
+     if(options.noEnabled){
+    ctx.imageSmoothingEnabled= false
+    }else{
+        ctx.imageSmoothingEnabled= true
+    }
    if (ctx == null) return;
    var x = options.x || 0, y = options.y || 0, size = options.size || 1;
    // size的含义改为(0,1]范围的系数以适配长方形，默认为1，楼传为3/4，SL界面为0.3
@ -1860,6 +1871,7 @@ maps.prototype._drawThumbnail_drawToTarget = function (floorId, options) {
            }
        }
    }
+    ctx.imageSmoothingEnabled= imageSmoothingEnabled
 }

 // -------- 获得某个点的图块信息 -------- //
@ -2973,7 +2985,6 @@ maps.prototype.drawBoxAnimate = function () {
        core.createCanvas('ui2', 0, 0, core._PX_, core._PY_, 142);
    }
    core.clearMap('ui2');
-
    core.status.boxAnimateObjs.forEach(function (obj) {
        if (obj.bigImage) {
            var ctx = obj.ctx || 'ui2';
@ -2982,14 +2993,18 @@ maps.prototype.drawBoxAnimate = function () {
            var actual_width = Math.min(per_width, obj.max_width || per_width), actual_height = per_height * actual_width / per_width;
            var x = obj.centerX - actual_width / 2, y = obj.centerY - actual_height / 2;
            core.clearMap(ctx, x, y, actual_width, actual_height);
+            if(!obj.nobackground){
            core.fillRect(ctx, x, y, actual_width, actual_height, core.material.groundPattern);
-            core.strokeRect(ctx, x, y, actual_width, actual_height, 'gold', 2);
+            core.strokeRect(ctx, x, y, actual_width, actual_height, 'gold', 2)
+        };
            core.drawImage(ctx, obj.bigImage, sx, sy, per_width, per_height,
                obj.centerX - actual_width / 2, obj.centerY - actual_height / 2, actual_width, actual_height);
        } else {
            var ctx = obj.ctx || 'ui';
           core.clearMap(ctx, obj.bgx, obj.bgy, obj.bgWidth, obj.bgHeight);
+           if(!obj.nobackground){
           core.fillRect(ctx, obj.bgx, obj.bgy, obj.bgWidth, obj.bgHeight,core.material.groundPattern);
+           }
            core.drawImage(ctx, obj.image, core.status.globalAnimateStatus % obj.animate * 32, obj.pos,
                32, obj.height, obj.x, obj.y, obj.dw || 32, obj.dh || obj.height);
        }
--- a/libs/ui.js
+++ b/libs/ui.js
@ -1241,6 +1241,7 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)
    // 检查是不是自动换行
    var charwidth = core.calWidth(tempCtx, ch) + config.letterSpacing;
    if (config.maxWidth != null) {
+       
        if (config.offsetX + charwidth > config.maxWidth) {
            // --- 当前应当换行，然而还是检查一下是否是forbidStart
            if (!config.forceChangeLine && forbidStart.indexOf(ch) >= 0) {
@ -1269,7 +1270,9 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)

    // 输出
    var left = config.offsetX, top = config.offsetY + config.topMargin;
-    core.fillText(tempCtx, ch, left, top);
+    tempCtx.lineWidth = 2;
+   
+    tempCtx.fillText( ch, left, top);
    config.blocks.push({
        left: config.offsetX, top: config.offsetY,
        width: charwidth, height: config.currfont + config.lineMargin,
@ -2355,7 +2358,7 @@ ui.prototype._drawBookDetail = function (index) {
    if (!enemy) return;
    var content = info[1].join("\n");
    core.status.event.id = 'book-detail';
-    core.animateFrame.tip = null;
+    core.animateFrame.tip = [];
    core.clearMap('data');

    var left = 10, width = core._PX_ - 2 * left, right = left + width;
@ -2553,7 +2556,7 @@ ui.prototype.drawFly = function (page) {
    }
    var size = 0.75;
    core.strokeRect('ui', 16, 64, size * core._PX_, size * core._PY_, '#FFFFFF', 2);
-    core.drawThumbnail(floorId, null, { ctx: 'ui', x: 16, y: 64, size: size, damage: true, all: true });
+    core.drawThumbnail(floorId, null, { ctx: 'ui', x: 16, y: 64, size: size, damage: true, all: true , noEnabled: true });
 }

 ////// 绘制中心对称飞行器
@ -2565,7 +2568,7 @@ ui.prototype._drawCenterFly = function () {
    var toX = core.bigmap.width - 1 - core.getHeroLoc('x'), toY = core.bigmap.height - 1 - core.getHeroLoc('y');
    this.clearUI();
    core.fillRect('ui', 0, 0, core._PX_, core._PY_, '#000000');
-    core.drawThumbnail(null, null, { heroLoc: core.status.hero.loc, heroIcon: core.status.hero.image, ctx: 'ui', centerX: toX, centerY: toY });
+    core.drawThumbnail(null, null, { heroLoc: core.status.hero.loc, heroIcon: core.status.hero.image, ctx: 'ui', centerX: toX, centerY: toY, noEnabled: true  });
    var offsetX = core.clamp(toX - core._HALF_WIDTH_, 0, core.bigmap.width - core._WIDTH_),
        offsetY = core.clamp(toY - core._HALF_HEIGHT_, 0, core.bigmap.height - core._HEIGHT_);
    core.fillRect('ui', (toX - offsetX) * 32, (toY - offsetY) * 32, 32, 32, fillstyle);
@ -2581,11 +2584,11 @@ ui.prototype._drawViewMaps = function (index, x, y) {
    core.status.event.id = 'viewMaps';
    this.clearUI();
    if (index == null) return this._drawViewMaps_drawHint();
-    core.animateFrame.tip = null;
+    core.animateFrame.tip = [];
    core.status.checkBlock.cache = {};
    var data = this._drawViewMaps_buildData(index, x, y);
    core.fillRect('ui', 0, 0, core._PX_, core._PY_, '#000000');
-    core.drawThumbnail(data.floorId, null, { damage: data.damage, ctx: 'ui', centerX: data.x, centerY: data.y, all: data.all });
+    core.drawThumbnail(data.floorId, null, { damage: data.damage, ctx: 'ui', centerX: data.x, centerY: data.y, all: data.all , noEnabled: true });
    core.clearMap('data');
    core.setTextAlign('data', 'left');
    core.setFont('data', '16px Arial');
--- a/project/animates/hand.animate
+++ b/project/animates/hand.animate
--- a/project/animates/jianji.animate
+++ b/project/animates/jianji.animate
--- a/project/animates/jianji2.animate
+++ b/project/animates/jianji2.animate
--- a/project/animates/sword.animate
+++ b/project/animates/sword.animate
@ -1 +1 @@
-{"ratio":2,"bitmaps":["data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD6SURBVHhe7dQ9SsVAFAXg+MNTeAhaWCrWLsHGUlCwsHMXgo2NjZ31a1yBVtaCrSvQ1i24hSSegbuEBAS/Dw7M3JnqZEgHAAAAAAAAAAAAAP/NOI5rySI5GobhNDlJ9uuYqaXo9RR83Pf9U/KevGV/kxwkW+2D1FWmkmKXKfYuZf8k38lrZpeZHSaLusaU2ktOyRcp+zP5Sl6yv858t53VNaaWcrdT9mPSXvpHskrxO3XMnNpvJYW3F/+Q9XmNmVv7raT055R+n/VejZlbyt5M6VfJbdYbNWZureyUvkzOagQAAAAAAAAAAAAAAAAAAAAAAAAAAADwd3XdL135q9NaPZ6+AAAAAElFTkSuQmCC","data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ4SURBVHhe7de7alRRFMbx3DSIgqiNIBJsBUUESyutBAsLO9/CWtL4BtorlgFBRGIEEQwxMSBiMWouGo2TCyaTC0lmJjM5ey+/HVfeYPZB8P+DNefsS/WdxZ5zugAAAAAAAAAAAAAAAAAAAID/lZkdVnX7ELmkkA+C1rU3xngthHBf1xsa9+1vQmcdhK7qUdAXFPh4URSjur+r6vdt6DQP/ZDqkkL/ZlZs6jqh8WnfghzU1UcOQlclmop3fBk5KPA+hXxRYb9LiWtsujR0Oe5b0Gke+hUF/TaFLtHrh29BDgr9jEJOoReqeur2RPfTvgWdpnzTG8yAQm6oYgq8uWfWLvaD1y+vkNko3G6FPJ9CT7ZbZpVVs9m1/Ydw3bchB3X9+dTxqVLwk4tmH1T1VnjlW5CDGj11/XDq+HTgfFwye/rVbKpmNjzDx1N2Cn8jhb+qF8mRObOX381m1sPww4od8y3IQZn3KPzdogjNyorZ8xmzaXX9cjOe8y3IxcNvNtq2OV41ezFrttYMv30ZOSn8dOavqBrjC3+PnfVGvOfLyE0P4HH6qhr9Zfbmp7p/Lg74EnJT+LdbeyGk4F/PhfhgMp7yJeSm9/yTavza2HyIYwuhPTRkvb6E3NT5fQr/2cRS2HhfDfVB/Qn7EnJLf7rq/pvTq6H9uRa2fBplSOGrTixvhdrUWqj7NMqi8HsV/shsLez5FMq004qXq+th14cok879/upO+FKp2GGfQll09PSsNOLVxXq85VMoUzr7F7fDIx+iTOnNR8fP2UGOnvKl8NPx8+RTPOpTKFt6CH4LAAAAAAAAAAAAAAAAAAAAAAAAAACAf1RX1x9x4x3SPdhnTAAAAABJRU5ErkJggg==","","","","","","","","","","","","","","","","","",""],"frame_max":5,"frames":[[[0,8,32,30,100]],[[0,-16,32,50,130]],[[0,-24,40,80,150]],[[0,-48,24,90,180],[1,-8,40,100,255]],[[0,-56,24,100,200],[1,-8,24,100,255]]],"se":{},"pitch":{}}
+{"ratio":2,"bitmaps":["data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD6SURBVHhe7dQ9SsVAFAXg+MNTeAhaWCrWLsHGUlCwsHMXgo2NjZ31a1yBVtaCrSvQ1i24hSSegbuEBAS/Dw7M3JnqZEgHAAAAAAAAAAAAAP/NOI5rySI5GobhNDlJ9uuYqaXo9RR83Pf9U/KevGV/kxwkW+2D1FWmkmKXKfYuZf8k38lrZpeZHSaLusaU2ktOyRcp+zP5Sl6yv858t53VNaaWcrdT9mPSXvpHskrxO3XMnNpvJYW3F/+Q9XmNmVv7raT055R+n/VejZlbyt5M6VfJbdYbNWZureyUvkzOagQAAAAAAAAAAAAAAAAAAAAAAAAAAADwd3XdL135q9NaPZ6+AAAAAElFTkSuQmCC","data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ4SURBVHhe7de7alRRFMbx3DSIgqiNIBJsBUUESyutBAsLO9/CWtL4BtorlgFBRGIEEQwxMSBiMWouGo2TCyaTC0lmJjM5ey+/HVfeYPZB8P+DNefsS/WdxZ5zugAAAAAAAAAAAAAAAAAAAID/lZkdVnX7ELmkkA+C1rU3xngthHBf1xsa9+1vQmcdhK7qUdAXFPh4URSjur+r6vdt6DQP/ZDqkkL/ZlZs6jqh8WnfghzU1UcOQlclmop3fBk5KPA+hXxRYb9LiWtsujR0Oe5b0Gke+hUF/TaFLtHrh29BDgr9jEJOoReqeur2RPfTvgWdpnzTG8yAQm6oYgq8uWfWLvaD1y+vkNko3G6FPJ9CT7ZbZpVVs9m1/Ydw3bchB3X9+dTxqVLwk4tmH1T1VnjlW5CDGj11/XDq+HTgfFwye/rVbKpmNjzDx1N2Cn8jhb+qF8mRObOX381m1sPww4od8y3IQZn3KPzdogjNyorZ8xmzaXX9cjOe8y3IxcNvNtq2OV41ezFrttYMv30ZOSn8dOavqBrjC3+PnfVGvOfLyE0P4HH6qhr9Zfbmp7p/Lg74EnJT+LdbeyGk4F/PhfhgMp7yJeSm9/yTavza2HyIYwuhPTRkvb6E3NT5fQr/2cRS2HhfDfVB/Qn7EnJLf7rq/pvTq6H9uRa2fBplSOGrTixvhdrUWqj7NMqi8HsV/shsLez5FMq004qXq+th14cok879/upO+FKp2GGfQll09PSsNOLVxXq85VMoUzr7F7fDIx+iTOnNR8fP2UGOnvKl8NPx8+RTPOpTKFt6CH4LAAAAAAAAAAAAAAAAAAAAAAAAAACAf1RX1x9x4x3SPdhnTAAAAABJRU5ErkJggg==","","","","","","","","","","","","","","","","","",""],"frame_max":5,"frames":[[[0,8,32,30,100]],[[0,-16,32,50,130]],[[0,-24,40,80,150]],[[0,-48,24,90,180],[1,-8,40,100,255]],[[0,-56,24,100,200],[1,-8,24,100,255]]]}
--- a/project/animates/thunder.animate
+++ b/project/animates/thunder.animate
--- a/project/animates/yongchang.animate
+++ b/project/animates/yongchang.animate
--- a/project/animates/zone.animate
+++ b/project/animates/zone.animate
--- a/project/data.js
+++ b/project/data.js
@ -28,6 +28,9 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"yiqu8",
 			"yiqu9",
 			"yiqu10",
+			"yiqu11",
+			"yiqu12",
+			"yiqu13",
 			"changguan1",
 			"yushou",
 			"zhujuejia",
@ -907,7 +910,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"7.webp",
 			"10.webp",
 			"C5.webp",
-			"c6.png"
+			"c6.png",
+			"2233.png"
 		],
 		"animates": [
 			"hand",
@ -1453,8 +1457,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"HATTEN",
 			"Verdana",
 			"number",
-			"pala",
-			"simhei"
+			"pala"
 		],
 		"nameMap": {
 			"确定": "confirm.opus",
@ -1555,7 +1558,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			},
 			"flags": {
 				"itemDetail": true,
-				"useBetweenLight": true,
 				"__mdef_buff__": 0,
 				"popmove": true
 			},
@ -2126,7 +2128,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"animateSpeed": 300,
 		"moveSpeed": 100,
 		"statusCanvasRowsOnMobile": 3,
-		"floorChangeTime": 0,
+		"floorChangeTime": 500,
 		"yellowGem": 2
 	},
 	"flags": {
@ -2161,7 +2163,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"ignoreChangeFloor": true,
 		"canGoDeadZone": false,
 		"enableMoveDirectly": true,
-		"enableRouteFolding": true,
+		"enableRouteFolding": false,
 		"disableShopOnDamage": false,
 		"blurFg": true,
 		"hideLeftStatusBar": false
--- a/project/enemys.js
+++ b/project/enemys.js
@ -1,21 +1,21 @@
 var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = 
 {
-	"greenSlime": {"name":"绿头怪","hp":64,"atk":32,"def":2,"money":0,"exp":1,"point":0,"special":[],"mdef":0,"spell":0,"speed":17},
+	"greenSlime": {"name":"绿头怪","hp":64,"atk":32,"def":2,"money":0,"exp":1,"point":0,"special":[],"mdef":0,"spell":0,"speed":18},
 	"redSlime": {"name":"红头怪","hp":84,"atk":27,"def":6,"money":0,"exp":1,"point":0,"special":[],"value":null,"mdef":0,"spell":0,"speed":19},
-	"blackSlime": {"name":"青头怪","hp":222,"atk":46,"def":10,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":0,"speed":15,"damage":null},
-	"slimelord": {"name":"怪王","hp":790,"atk":48,"def":8,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":0,"speed":20},
-	"bat": {"name":"小蝙蝠","hp":46,"atk":49,"def":0,"money":0,"exp":1,"point":0,"special":[1],"mdef":0,"speed":29,"spell":0},
-	"bigBat": {"name":"大蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
+	"blackSlime": {"name":"青头怪","hp":222,"atk":46,"def":10,"money":0,"exp":2,"point":0,"special":[],"mdef":0,"spell":0,"speed":16,"damage":null},
+	"slimelord": {"name":"怪王","hp":810,"atk":48,"def":8,"money":0,"exp":4,"point":0,"special":[],"mdef":0,"spell":0,"speed":20},
+	"bat": {"name":"小蝙蝠","hp":46,"atk":49,"def":0,"money":0,"exp":1,"point":0,"special":[1],"mdef":0,"speed":34,"spell":0},
+	"bigBat": {"name":"大蝙蝠","hp":88,"atk":94,"def":12,"money":0,"exp":2,"point":0,"special":[1],"mdef":0,"speed":52,"spell":0,"displayIdInBook":null},
 	"redBat": {"name":"红蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":0,"speed":1},
 	"vampire": {"name":"冥灵魔王","hp":888,"atk":888,"def":888,"money":888,"exp":888,"point":0,"special":[6],"n":8,"mdef":0,"spell":0,"speed":1},
-	"skeleton": {"name":"骷髅人","hp":77,"atk":77,"def":7,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":17},
+	"skeleton": {"name":"骷髅人","hp":77,"atk":77,"def":7,"money":0,"exp":2,"point":0,"special":0,"mdef":0,"spell":0,"speed":20},
 	"skeletonCaptain": {"name":"骷髅队长","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18},
 	"zombie": {"name":"兽人","hp":444,"atk":43,"def":9,"money":0,"exp":3,"point":0,"special":[],"mdef":0,"spell":0,"speed":27},
 	"zombieKnight": {"name":"兽人武士","hp":10000,"atk":100,"def":100,"money":0,"exp":0,"point":0,"special":[22],"speed":10,"mdef":0,"damage2":20,"spell":0},
 	"rock": {"name":"石头人","hp":50,"atk":50,"def":0,"money":3,"exp":0,"point":0,"special":3,"damage2":15,"mdef":0,"spell":0,"speed":1},
-	"bluePriest": {"name":"初级法师","hp":108,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":270,"speed":12},
-	"redPriest": {"name":"高级法师","hp":162,"atk":0,"def":1,"money":0,"exp":0,"point":0,"special":[1],"mdef":0,"spell":308,"speed":14},
-	"brownWizard": {"name":"初级巫师","hp":162,"atk":120,"def":1,"money":16,"exp":0,"point":0,"special":[],"value":null,"range":2,"mdef":0,"spell":66,"speed":14},
+	"bluePriest": {"name":"初级法师教程","hp":108,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"mdef":0,"spell":270,"speed":12},
+	"redPriest": {"name":"高级法师","hp":162,"atk":0,"def":1,"money":0,"exp":0,"point":0,"special":[1],"mdef":0,"spell":308,"speed":16},
+	"brownWizard": {"name":"初级巫师","hp":162,"atk":120,"def":1,"money":16,"exp":0,"point":0,"special":[],"value":null,"range":2,"mdef":0,"spell":66,"speed":16},
 	"redWizard": {"name":"高级巫师","hp":1000,"atk":1200,"def":0,"money":160,"exp":0,"point":0,"special":15,"value":200,"zoneSquare":true,"mdef":0,"spell":0,"speed":1},
 	"swordsman": {"name":"双手剑士","hp":100,"atk":120,"def":0,"money":6,"exp":3,"point":0,"special":4,"mdef":0,"spell":0,"speed":1},
 	"soldier": {"name":"冥战士","hp":120,"atk":50,"def":8,"money":10,"exp":7,"point":0,"special":0,"mdef":0,"spell":0,"speed":8},
@ -43,19 +43,19 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"evilBat": {"name":"邪恶蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"silverSlimelord": {"name":"银怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"goldSlimelord": {"name":"金怪王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"skeletonWarrior": {"name":"骷髅士兵","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null},
+	"skeletonWarrior": {"name":"骷髅士兵","hp":107,"atk":97,"def":21,"money":0,"exp":4,"point":0,"special":0,"mdef":0,"spell":0,"speed":20,"displayIdInBook":null},
 	"whiteSlimeman": {"name":"水银战士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"slimeman": {"name":"影子战士","hp":243,"atk":28,"def":5,"money":0,"exp":0,"point":0,"special":[],"atkValue":2,"defValue":3,"mdef":0,"spell":0,"speed":69},
-	"yellowGateKeeper": {"name":"初级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
+	"slimeman": {"name":"影子战士","hp":243,"atk":28,"def":5,"money":0,"exp":2,"point":0,"special":[],"atkValue":2,"defValue":3,"mdef":0,"spell":0,"speed":73},
+	"yellowGateKeeper": {"name":"初级卫兵","hp":192,"atk":49,"def":33,"money":0,"exp":4,"point":0,"special":0,"mdef":0,"spell":0,"speed":19},
 	"blueGateKeeper": {"name":"中级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"redGateKeeper": {"name":"高级卫兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"magicMaster": {"name":"黑暗大法师","hp":100,"atk":120,"def":0,"money":12,"exp":0,"point":0,"special":11,"value":0.3333333333333333,"add":true,"notBomb":true,"mdef":0,"spell":0,"speed":1},
 	"devilWarrior": {"name":"魔神武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"fairyEnemy": {"name":"仙子","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"dragon": {"name":"魔龙","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"bigImage":null,"mdef":0,"spell":0,"speed":1},
-	"skeletonKnight": {"name":"骷髅武士","hp":330,"atk":113,"def":2,"money":0,"exp":4,"point":0,"special":0,"mdef":0,"spell":0,"speed":20},
+	"skeletonKnight": {"name":"猩红骷髅","hp":330,"atk":113,"def":2,"money":0,"exp":4,"point":0,"special":0,"mdef":0,"spell":0,"speed":22},
 	"skeletonPresbyter": {"name":"骷髅巫师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
-	"ironRock": {"name":"铁面人","hp":111,"atk":97,"def":37,"money":0,"exp":0,"point":0,"special":[3],"mdef":0,"spell":0,"speed":14},
+	"ironRock": {"name":"铁面人","hp":110,"atk":97,"def":37,"money":0,"exp":0,"point":0,"special":[3],"mdef":0,"spell":0,"speed":15},
 	"grayRock": {"name":"灰色石头人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"yellowPriest": {"name":"中级法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":1},
 	"evilPrincess": {"name":"痛苦魔女","hp":1000,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[10],"mdef":0,"spell":0,"speed":1},
@ -81,8 +81,17 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"bearLeft": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1},
 	"bearRight": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1},
 	"bearUp": {"name":"熊出没","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"faceIds":{"down":"bearDown","left":"bearLeft","right":"bearRight","up":"bearUp"},"mdef":0,"spell":0,"speed":1},
-	"E421": {"name":"蓝头怪","hp":104,"atk":33,"def":8,"money":0,"exp":1,"point":0,"special":[],"value":null,"mdef":0,"spell":0,"speed":19,"displayIdInBook":null},
+	"E421": {"name":"蓝头怪","hp":104,"atk":33,"def":8,"money":0,"exp":1,"point":0,"special":[],"value":null,"mdef":0,"spell":0,"speed":20,"displayIdInBook":null},
 	"E422": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
-	"E425": {"name":"黄骷髅","hp":226,"atk":66,"def":1,"money":0,"exp":0,"point":0,"special":0,"mdef":0,"spell":0,"speed":18,"displayIdInBook":null},
-	"E426": {"name":"小偷","hp":377,"atk":53,"def":17,"mdef":0,"speed":34,"money":50,"exp":10,"point":0,"special":[],"spell":0}
+	"E425": {"name":"黄骷髅","hp":226,"atk":66,"def":1,"money":0,"exp":3,"point":0,"special":0,"mdef":0,"spell":0,"speed":20,"displayIdInBook":null},
+	"E426": {"name":"小偷","hp":377,"atk":53,"def":17,"mdef":0,"speed":34,"money":50,"exp":10,"point":0,"special":[],"spell":0},
+	"E428": {"name":"初级法师","hp":216,"atk":0,"def":21,"money":0,"exp":4,"point":0,"special":[],"mdef":0,"spell":55,"speed":14,"displayIdInBook":null},
+	"E429": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E430": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E431": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E432": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E433": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E434": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E435": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]},
+	"E436": {"name":"新敌人","hp":0,"atk":0,"def":0,"mdef":0,"speed":1,"money":0,"exp":0,"point":0,"special":[]}
 }
--- a/project/events.js
+++ b/project/events.js
--- a/project/floors/KTV.js
+++ b/project/floors/KTV.js
@ -13,178 +13,13 @@ main.floors.KTV=
    "defaultGround": "grass",
    "firstArrive": [
        {
-            "type": "changebg",
-            "img1": "",
-            "memory1": false,
-            "img2": "bg_3531.webp",
-            "memory2": false,
-            "time": 30,
-            "style": "引入"
+            "type": "insert",
+            "name": "序章零一"
        },
        {
-            "type": "cgtextList",
-            "textList": "chapter002"
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "0",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "1",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "2",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "3",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "4",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "5",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "6",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "cgtext",
-            "WindowSkin": false,
-            "head": {
-                "name": "",
-                "px": -300
-            },
-            "index": "7",
-            "time": 0,
-            "wait": 2000,
-            "bodyList": [
-                {
-                    "name": "",
-                    "px": 0,
-                    "filter": false
-                }
-            ]
-        },
-        {
-            "type": "changebg",
-            "img1": "bg_3531.webp",
-            "memory1": false,
-            "img2": "",
-            "memory2": false,
-            "time": 30,
-            "style": "引出"
-        },
-        {
-            "type": "setHeroOpacity",
-            "opacity": 1
-        },
-        {
-            "type": "setCurtain",
-            "time": 1000
+            "type": "setValue",
+            "name": "flag:剧情进度",
+            "value": "1"
        }
    ],
    "eachArrive": [],
@ -194,8 +29,8 @@ main.floors.KTV=
        "12,10": {
            "floorId": "changguan2",
            "loc": [
-                2,
-                1
+                4,
+                2
            ]
        },
        "10,1": {
@ -204,6 +39,13 @@ main.floors.KTV=
                10,
                4
            ]
+        },
+        "3,12": {
+            "floorId": "changguan2",
+            "loc": [
+                0,
+                7
+            ]
        }
    },
    "beforeBattle": {},
--- a/project/floors/changguan1.js
+++ b/project/floors/changguan1.js
@ -19,7 +19,7 @@ main.floors.changguan1=
        {
            "type": "autoText",
            "text": "通称——",
-            "time": 2000
+            "time": 1500
        },
        {
            "type": "setCurtain",
@ -52,13 +52,6 @@ main.floors.changguan1=
                12
            ]
        },
-        "5,12": {
-            "floorId": "changguan2",
-            "loc": [
-                5,
-                0
-            ]
-        },
        "6,12": {
            "floorId": "changguan2",
            "loc": [
@ -67,7 +60,7 @@ main.floors.changguan1=
            ]
        },
        "12,7": {
-            "floorId": "yiqu1",
+            "floorId": "street01",
            "loc": [
                0,
                7
@ -92,9 +85,9 @@ main.floors.changguan1=
    [110289,110290,110291,110292,  0,  0,  0,  0,  0,  0,  0,  0, 94],
    [110297,110298,110299,110300,  0,  0,  0,  0,  0,110116,  0,  0,  0],
    [110305,110306,110307,110308,  0,  0,  0,  0,  0,110261,110262,110262,110263],
-    [110313,110314,110315,110316,110122,110122,  0,110122,110122,110269,110270,110270,110271],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,110277,110278,110278,110279],
-    [140,140186,120002,120003,  0, 93, 93,  0,  0,110285,110286,110286,110286]
+    [140099,110314,110315,110316,110122,110122,  0,110122,110122,110269,110270,110270,110271],
+    [140107,140108,  0,  0,  0,  0,  0,  0,  0,110277,110278,110278,110279],
+    [110258,110259,110260,  0,  0,  0, 93,  0,  0,110285,110286,110286,110286]
 ],
    "bgmap": [
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
@ -122,9 +115,9 @@ main.floors.changguan1=
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,110246,110246,110246,110246],
    [140091,140092,140093,  0,110114,110114,  0,110114,110114,  0,  0,  0,  0],
-    [140099,140100,140101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140107,140108,140109,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+    [110242,140100,140101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [110250,110251,140109,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [110258,  0,  0,120002,120003,  0,  0,  0,110114,  0,  0,  0,  0]
 ],
    "bg2map": [
    [  0,  0,  0,  0,130046,130046,130046,130046,130046,210178,  0,  0,210178],
@ -137,7 +130,7 @@ main.floors.changguan1=
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [110313,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
--- a/project/floors/changguan2.js
+++ b/project/floors/changguan2.js
@ -12,6 +12,10 @@ main.floors.changguan2=
    "ratio": 1,
    "defaultGround": "X20003",
    "firstArrive": [
+        {
+            "type": "comment",
+            "text": "太慢了调一下速度，提醒我到时候改回去"
+        },
        {
            "type": "setCurtain",
            "time": 1000
@ -19,7 +23,7 @@ main.floors.changguan2=
        {
            "type": "autoText",
            "text": "《牢狱》",
-            "time": 2000
+            "time": 1000
        },
        {
            "type": "setCurtain",
@ -38,20 +42,30 @@ main.floors.changguan2=
            "loc": [
                10,
                8
+            ],
+            "direction": "down"
+        }
+    ],
+    "eachArrive": [
+        {
+            "type": "if",
+            "condition": "(flag:剧情进度===1)",
+            "true": [
+                {
+                    "type": "insert",
+                    "name": "序章零二"
+                },
+                {
+                    "type": "setValue",
+                    "name": "flag:剧情进度",
+                    "value": "2"
+                }
            ]
        }
    ],
-    "eachArrive": [],
    "parallelDo": "",
    "events": {},
    "changeFloor": {
-        "5,0": {
-            "floorId": "changguan1",
-            "loc": [
-                5,
-                12
-            ]
-        },
        "6,0": {
            "floorId": "changguan1",
            "loc": [
@ -59,19 +73,33 @@ main.floors.changguan2=
                12
            ]
        },
-        "12,8": {
-            "floorId": "street01",
+        "12,9": {
+            "floorId": "zhujuejia",
            "loc": [
                0,
-                8
+                9
            ]
        },
-        "2,1": {
+        "0,7": {
+            "floorId": "KTV",
+            "loc": [
+                3,
+                12
+            ]
+        },
+        "4,2": {
            "floorId": "KTV",
            "loc": [
                12,
                10
            ]
+        },
+        "8,12": {
+            "floorId": "goldkey",
+            "loc": [
+                6,
+                12
+            ]
        }
    },
    "beforeBattle": {},
@ -82,19 +110,19 @@ main.floors.changguan2=
    "cannotMove": {},
    "cannotMoveIn": {},
    "map": [
-    [140193,130178,120010,120011,  0, 91, 91,  0,140184,140,140,140,140186],
-    [140193,130178, 90,  0,  0,  0,  0,  0,140192,140,140,140,140194],
-    [140193,130178,40163,120019,  0,  0,  0,  0,140200,140195,140,140,140194],
-    [140193,143,143,120027,  0,  0,  0,  0,70128,140192,140,140,140194],
-    [140193,210148,143,143,  0,  0,  0,71826,70136,140192,140,140,140194],
-    [140193,143,143,143,71226,  0,  0,  0,50151,140200,140201,140201,140202],
-    [70165,70165,70165,70166,71819,  0,  0,  0,  0,70128,70129,70129,70130],
-    [140193,210153,143,70174,71827,  0,  0,  0,71826,120056,70137,70137,70138],
-    [140193,210153,210156,143,71695,  0,  0,  0,  0,  0,  0,  0, 94],
-    [140193,143,143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140193,140193,130178,70130,  0,  0,  0,  0,  0,  0,  0,140,140],
-    [140193,140193,130178,40165,200199,  0,  0,71791,  0,  0,140192,140,140],
-    [140193,140193,130186,110114,110114, 93, 93,  0,143,  0,140192,140,140]
+    [110266,110267,110268,120010,120011,  0, 91,  0,110122,  0,110261,110262,110263],
+    [110274,110275,110276,  0,120047,  0,  0,  0,  0,71826,110269,110270,110271],
+    [110282,110283,110284,  0, 90,  0,  0,  0,  0,  0,110277,110278,110279],
+    [110290,110289,110292,  0,120019,  0,  0,  0,  0,  0,110285,110286,110286],
+    [110298,110297,110300,120026,120027,  0,  0,  0,  0,  0,110293,110294,110294],
+    [200550,110304,110308,40163,  0,  0,  0,  0,  0,  0,110301,110302,110302],
+    [200558,110312,110316,  0,  0,  0,  0,  0,110122,110122,110309,110310,110310],
+    [ 90,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,200199,  0,  0,  0,  0,  0,  0,  0],
+    [200033,200033,200034,200035,200036,200038,  0,  0,  0,  0,  0,  0, 94],
+    [200041,200041,200042,200043,200044,200046,  0,  0,  0,  0,  0,  0,  0],
+    [200049,200049,200050,200051,200052,200054,210068,210069,  0,210070,210071,140184,140],
+    [200057,200057,200058,200059,200060,200062,210076,210077, 90,210078,210079,140192,140]
 ],
    "areas": "牢狱",
    "bgmap": [
@ -113,34 +141,34 @@ main.floors.changguan2=
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078]
 ],
    "fgmap": [
-    [140,140194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140,140,140186,  0,  0,  0,71818,  0,  0,  0,  0,  0],
-    [140,140,140,140194,71218,  0,  0,  0,71818,  0,  0,  0,  0],
-    [140201,140201,140201,140202,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,71685,  0,  0,  0,71818,  0,90587,  0,  0],
-    [140,140,140,140186,71844,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140,140,140194,200175,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140,140196,140202,200183,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,140,140194,  0,200191,  0,  0,  0,  0,71818,140184,140,140],
-    [140,140,140194,  0,  0,  0,  0,  0,71832,71833,140192,140,140],
-    [140,140,140194,  0,110117,  0,  0,140184,140,140,140,140,140]
+    [  0,  0,  0,140087,  0,  0,  0,  0,  0,71818,  0,  0,  0],
+    [  0,  0,  0,140095,  0,  0,  0,  0,  0,50166,  0,  0,  0],
+    [  0,  0,  0,140103,  0,  0,  0,  0,  0,71818,  0,  0,  0],
+    [  0,90442,  0,140111,  0,  0,  0,  0,  0,50151,  0,  0,  0],
+    [  0,90450,  0,  0,  0,  0,  0,  0,  0,71818,  0,  0,  0],
+    [140092,140093,  0,  0,  0,200175,  0,  0,110114,110114,140091,140092,140092],
+    [140100,140101,  0,  0,  0,200183,  0,  0,  0,  0,140099,140100,140100],
+    [140108,140109,  0,  0,  0,200191,  0,  0,  0,  0,140107,140108,140108],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
-    [  0,  0,  0,  0,  0,  0,  0,  0,110293,110294,110294,110294,110294],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,110293,110294,110294,110294],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,71826,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,120034,120035,  0,  0,  0,  0,71826,  0,  0,  0],
+    [  0,  0,  0,40171,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,71826,  0,  0,  0,  0],
-    [  0,  0,  0,  0,71693,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,70136,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,120064,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,70138,  0,  0,  0,  0,  0,71826,  0,  0,  0],
-    [  0,  0,  0,40173,  0,  0,  0,71799,71840,71841,  0,  0,  0]
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/goldkey.js
+++ b/project/floors/goldkey.js
@ -15,7 +15,15 @@ main.floors.goldkey=
    "eachArrive": [],
    "parallelDo": "",
    "events": {},
-    "changeFloor": {},
+    "changeFloor": {
+        "6,12": {
+            "floorId": "changguan2",
+            "loc": [
+                8,
+                12
+            ]
+        }
+    },
    "beforeBattle": {},
    "afterBattle": {},
    "afterGetItem": {},
--- a/project/floors/guangchang.js
+++ b/project/floors/guangchang.js
@ -26,7 +26,7 @@ main.floors.guangchang=
                6,
                7
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "async": true,
            "steps": [
@ -45,7 +45,7 @@ main.floors.guangchang=
                8,
                8
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "async": true,
            "steps": [
@ -63,7 +63,7 @@ main.floors.guangchang=
                4,
                9
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "steps": [
                "right:1"
@ -75,7 +75,7 @@ main.floors.guangchang=
        {
            "type": "autoText",
            "text": "浮游都市，《诺瓦斯·艾蒂尔》。",
-            "time": 2000
+            "time": 1000
        },
        {
            "type": "move",
@ -83,7 +83,7 @@ main.floors.guangchang=
                6,
                5
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "async": true,
            "steps": [
@ -96,7 +96,7 @@ main.floors.guangchang=
                6,
                7
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "steps": [
                "up:1"
@ -115,7 +115,7 @@ main.floors.guangchang=
                6,
                3
            ],
-            "time": 500,
+            "time": 400,
            "async": true,
            "steps": [
                "down:9"
@ -127,7 +127,7 @@ main.floors.guangchang=
                5,
                4
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "async": true,
            "steps": [
@ -141,7 +141,7 @@ main.floors.guangchang=
                6,
                6
            ],
-            "time": 300,
+            "time": 400,
            "keep": true,
            "async": true,
            "steps": [
@ -158,7 +158,7 @@ main.floors.guangchang=
                8,
                6
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "steps": [
                "left:1"
@ -181,7 +181,7 @@ main.floors.guangchang=
                7,
                6
            ],
-            "time": 500,
+            "time": 400,
            "keep": true,
            "async": true
        },
@ -191,7 +191,7 @@ main.floors.guangchang=
                6,
                3
            ],
-            "time": 500,
+            "time": 400,
            "async": true,
            "steps": [
                "up:2"
@ -203,7 +203,7 @@ main.floors.guangchang=
                7,
                9
            ],
-            "time": 500,
+            "time": 400,
            "async": true,
            "steps": [
                "up:1",
@ -332,8 +332,8 @@ main.floors.guangchang=
    [140091,140092,140093,  0,  0,  0,  0,  0,  0,200191,  0,  0,  0],
    [140099,140100,140101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [362,362,362,  0,  0,  0,  0,  0,  0,  0,  0,110242,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110249,110250,110251],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,110256,110257,110258,110259]
+    [  0,110327,  0,  0,  0,  0,  0,  0,  0,  0,110249,110250,110251],
+    [  0,110335,  0,  0,  0,  0,  0,  0,  0,110256,110257,110258,110259]
 ],
    "bg2map": [
    [200195,200196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
--- a/project/floors/guangchang2.js
+++ b/project/floors/guangchang2.js
@ -18,7 +18,7 @@ main.floors.guangchang2=
        },
        {
            "type": "sleep",
-            "time": 2000
+            "time": 1500
        },
        {
            "type": "setCurtain",
@ -78,8 +78,8 @@ main.floors.guangchang2=
    [ 92,  0,  0,  0,110384,110385,110376,  0,90652,90648,90649,  0,120168],
    [  0,  0,  0,  0,110384,  0,122,  0,90653,  0,122,  0,120176],
    [362,362,363,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266],
-    [210181,210181,210181,  0,  0,  0,  0,  0,  0,  0,  0,  0,110189],
-    [210186,210186,210186,361,362,362,362,362,362,362,362,362,110197]
+    [210181,210181,210181,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [210186,210186,210186,361,362,362,362,362,362,362,362,362,362]
 ],
    "areas": "牢狱",
    "bgmap": [
@ -108,9 +108,9 @@ main.floors.guangchang2=
    [  0,  0,  0,  0,  0,140094,140095,  0,  0,140094,140095,  0,  0],
    [  0,  0,  0,  0,  0,140102,140103,  0,  0,140102,140103,  0,  0],
    [  0,  0,  0,  0,  0,140110,140111,  0,  0,140110,140111,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+    [  0,110319,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,110327,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,110335,200032,200033,200033,200033,200033,200033,200033,200033,200033,200038,  0]
 ],
    "bg2map": [
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
@ -125,7 +125,7 @@ main.floors.guangchang2=
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [110239,110239,110239,364,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,364,  0,  0,  0,  0,  0,  0,  0,  0,90266],
-    [  0,  0,  0,110239,110239,110239,110239,110239,110239,110239,110239,110239,  0]
+    [  0,  0,  0,110239,110239,110239,110239,110239,110239,110239,110239,110239,110239]
 ],
    "fg2map": [

--- a/project/floors/guangchang3.js
+++ b/project/floors/guangchang3.js
@ -18,7 +18,7 @@ main.floors.guangchang3=
        },
        {
            "type": "sleep",
-            "time": 2000
+            "time": 1500
        },
        {
            "type": "setCurtain",
--- a/project/floors/guangchang4.js
+++ b/project/floors/guangchang4.js
@ -19,7 +19,7 @@ main.floors.guangchang4=
        {
            "type": "autoText",
            "text": "是被险峻的峭壁环绕，与世隔绝的，都市的最底部",
-            "time": 2000
+            "time": 1000
        },
        {
            "type": "setCurtain",
--- a/project/floors/guangchang5.js
+++ b/project/floors/guangchang5.js
@ -19,7 +19,7 @@ main.floors.guangchang5=
        {
            "type": "autoText",
            "text": "《特别受灾地区》——",
-            "time": 2000
+            "time": 1000
        },
        {
            "type": "setCurtain",
@ -41,9 +41,22 @@ main.floors.guangchang5=
            ]
        }
    ],
-    "eachArrive": [],
+    "eachArrive": null,
    "parallelDo": "",
-    "events": {},
+    "events": {
+        "11,9": [
+            {
+                "type": "comment",
+                "text": "这里暂且拿个东西堵住吧，剧情结束扣掉这个块"
+            }
+        ],
+        "6,11": [
+            {
+                "type": "insert",
+                "name": "序章零三"
+            }
+        ]
+    },
    "changeFloor": {
        "6,12": {
            "floorId": "guangchang",
@ -84,7 +97,7 @@ main.floors.guangchang5=
    [362,363,210070,210071,210184,  0,  0,  0,210184,210068,210069,210178,210166],
    [210181,210184,210078,210079,210192,  0,  0,  0,210192,210076,210077,210194,210194],
    [210178,210184,210086,210087,  0,  0,  0,  0,  0,210084,210085,110239,110239],
-    [210194,210192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94],
+    [210194,210192,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 94],
    [200171,200172,120031,120031,120020,  0,  0,  0,  0,  0,  0,  0,  0],
    [200179,200180,122,  0,  0,  0,  0,  0,200199,  0,130180,130181,130182],
    [200187,200188,  0,  0,  0,  0, 93,  0,  0,130187,130188,130189,130190]
--- a/project/floors/guangchang6.js
+++ b/project/floors/guangchang6.js
@ -52,17 +52,17 @@ main.floors.guangchang6=
    "map": [
    [140095,120160,120161,120162,120163,120164,365,  0,  0,  0,  0,143,143],
    [140095,120168,120169,120170,120171,120172,365,  0,  0,  0,  0,143,143],
-    [140103,120176,120177,20122,120179,120180,365,  0,  0,  0,  0,143,143],
-    [140111,20110,140107,140108,140109,20110,365,  0,  0,  0,  0,130192,130193],
-    [362,362,362,362,362,362,362,  0,  0,  0,  0,130200,130201],
-    [210178,210178,210178,210167,210178,210178,210176,  0,  0,  0,  0,140099,140100],
-    [210178,210178,210178,210178,210178,210178,210184,  0,  0,  0,  0,140107,140108],
-    [210194,210175,210194,210194,210194,210194,210192,  0,  0,  0,  0,  0, 94],
-    [110239,  0,  0,  0,  0,  0,365,  0,  0,  0,  0,120109,120110],
-    [ 92,  0,  0,  0,362,  0,363,  0,  0,  0,  0,120117,120118],
-    [  0,  0,  0,  0, 17,130046, 17,  0,  0,  0,140086,120125,120126],
-    [130183,  0,  0,  0, 17,130046, 17,  0,  0,  0,140094,120133,120134],
-    [130191,  0, 93,  0, 17,  0,  0,  0,  0,  0,140102,120141,120142]
+    [140103,120176,120177,20122,120179,120180,365,20122,122,  0,  0,143,143],
+    [140111,20110,140107,140108,140109,20110,365,20130,  0,  0,130075,130192,130193],
+    [362,362,362,362,362,362,362,20113,  0,  0,130082,130200,130201],
+    [210178,210178,210178,210167,210178,210178,210176,  0,  0,  0,137,140099,140100],
+    [210178,210178,210178,120072,210178,210178,210184,20113,121,  0,  0,140107,140108],
+    [210194,210175,210194,120080,210194,210194,210192,20114,  0,  0,  0,  0, 94],
+    [110239,  0,  0,  0,  0,  0,365,  0,  0,  0,  0,  0,  0],
+    [ 92,  0,  0,  0,362,  0,363,128,  0,  0,10165,120117,120118],
+    [  0,  0,  0,  0, 17,  0, 17,  0,  0,  0,10173,120125,120126],
+    [130183,  0,  0,  0, 17,  0, 17,  0,  0,  0,10173,120133,120134],
+    [130191,  0, 93,  0, 17,  0,  0,  0,  0,138,10157,120141,120142]
 ],
    "areas": "牢狱",
    "bgmap": [
@ -71,9 +71,9 @@ main.floors.guangchang6=
    [30052,30052,30052,30052,30052,30052,30052,90078,  0,90078,90078,90078,90078],
    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
-    [30052,30052,30052,30052,  0,  0,  0,90078,90078,90078,90078,90078,90078],
-    [30052,30052,30052,30052,  0,  0,  0,  0,90078,90078,90078,90078,90078],
-    [30052,30052,30052,30052,  0,  0,  0,90078,90078,90078,90078,90078,90078],
+    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
+    [30052,30052,30052,30052,30052,30052,30052,  0,90078,90078,90078,90078,90078],
+    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
    [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078],
    [30052,30052,30052,30052,210187,210178,210187,90078,90078,90078,90078,90078,90078],
@ -81,29 +81,29 @@ main.floors.guangchang6=
    [30052,30052,30052,30052,90078,90078,90078,90078,90078,90078,90078,90078,90078]
 ],
    "fgmap": [
-    [  0,  0,  0,  0,  0,  0,  0,140087,  0,  0,  0,  0,  0],
-    [  0,  0,140091,140092,140093,  0,  0,140095,  0,  0,  0,  0,  0],
-    [  0,20102,140099,140100,140101,20102,  0,140103,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,140087,  0,  0,140094,  0,  0],
+    [  0,  0,140091,140092,140093,  0,  0,140095,  0,  0,140102,  0,  0],
+    [  0,20102,140099,140100,140101,20102,  0,140103,  0,  0,140110,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,140111,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,140087,  0,  0,  0,140091,140092],
-    [  0,  0,  0,  0,  0,  0,  0,140095,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,140103,  0,  0,  0,  0,  0],
+    [  0,210142,  0,  0,210142,  0,  0,140095,  0,  0,  0,  0,  0],
+    [  0,210150,  0,  0,210150,  0,  0,140103,  0,  0,  0,  0,  0],
    [110231,  0,  0,  0,  0,  0,365,140111,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120109,120110],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140086,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140094,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140102,  0,  0]
 ],
    "bg2map": [
    [  0,  0,  0,  0,  0,  0,160032,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,160032,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,120178,  0,  0,160032,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,20130,  0,  0,160032,  0,  0,  0,  0,  0,  0],
-    [120103,120103,120103,120103,120103,120103,120103,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,20130,  0,  0,160032,  0,  0,  0,130088,  0,  0],
+    [120103,120103,120103,120103,120103,120103,120103,  0,  0,  0,130096,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130076,130076],
+    [  0,  0,  0,210178,  0,  0,  0,  0,  0,  0,  0,130084,130084],
+    [  0,  0,  0,210194,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,365,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,365,130045,130046,130047,  0,  0,  0,  0,  0,  0],
--- a/project/floors/jiaocheng01.js
+++ b/project/floors/jiaocheng01.js
@ -237,6 +237,31 @@ main.floors.jiaocheng01=
                ]
            }
        ],
+        "5,11": [
+            {
+                "type": "menu",
+                "text": "流浪者",
+                "choices": [
+                    {
+                        "type": "context",
+                        "text": "对话",
+                        "action": [
+                            "\t[流浪者]你好啊"
+                        ]
+                    },
+                    {
+                        "type": "taskContext",
+                        "text": "任务",
+                        "text1": "新手任务",
+                        "text2": "task1,task2",
+                        "condition": "'新手任务'.split(',').some(v=>core.plugin.可接取任务.includes(v))||'task1,task2'.split(',').some(v=>core.taskSystem.tasksInfo.find(a => a.name ===v.name))",
+                        "action": [
+                            "这个东西还没做"
+                        ]
+                    }
+                ]
+            }
+        ],
        "2,11": [
            {
                "type": "insert",
@ -272,7 +297,7 @@ main.floors.jiaocheng01=
    [  0,  0,  0,  1, 21,  1,  1,  1,  0,  1,  0,  0,  0],
    [403,  0,404,  1, 23,  1, 21,  1,  0,  1, 34,  0, 33],
    [  1,  1,  1,  1,  1,  1,  0,  1, 81,  1,  1,  1,  1],
-    [129,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,129],
+    [129,  0,  0,  0,  0,121,  0,  0,  0,  0,  0,  0,129],
    [  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1]
 ],
    "areas": "教程",
--- a/project/floors/jiaocheng02.js
+++ b/project/floors/jiaocheng02.js
@ -76,9 +76,9 @@ main.floors.jiaocheng02=
        ],
        "11,4": [
            "\t[小妖精,fairy]与其他魔塔游戏不同的是，本作不仅引入了“速度”属性，还引入了实时战斗系统。\n这将带来比回合制战斗更丰富，更具有策略性的战斗体验。",
-            "\t[小妖精,fairy]在本作中，“速度”意味着角色进行一次攻击前摇的快慢程度。没有特殊说明的话，本作不涉及攻击后摇。\n现在角色的速度为16，这意味着在单位时间内，角色可以攻击16次。\n战斗开始时，参战的双方互相向对方表露敌意，并开始分别计算攻击前摇。\n另一方面，速度和攻击前摇挂钩，意味着角色下一次攻击的时刻以上一次攻击落下时的速度为准；在此之后受到任何额外的减速效果，都只会影响到再下一次攻击。",
-            "\t[小妖精,fairy]在刚才的战斗中，怪物的速度为18，角色的速度为16。\n因此在互相展现敌意后，怪物的攻击先命中角色，随后才是角色对怪物造成伤害。\n此后双方一直匀速造成伤害。",
-            "\t[小妖精,fairy]战斗结束于8次攻击/16速度=0.5时刻。\n此时角色攻击8次，完成对怪物的击杀；与此同时，怪物的第9次攻击前摇刚好准备完毕。\n在本作的战斗系统中，如果怪物死亡时刻正好作出一次攻击（时刻完全相同）的话，视为这次攻击有效！\n因此，角色在之前的战斗中受到怪物刚好9次伤害。",
+            "\t[小妖精,fairy]在本作中，“速度”意味着角色进行一次攻击前摇的快慢程度。没有特殊说明的话，本作不涉及攻击后摇。\n现在角色的速度为16，这意味着在单位时间内，角色可以攻击16次。\n战斗开始时，参战的双方互相向对方表露敌意，并开始分别计算攻击前摇。\n由于角色是主动出击的一方，角色的首次攻击仅需一半的时间即可完成准备\n另一方面，速度和攻击前摇挂钩，意味着角色下一次攻击的时刻以上一次攻击落下时的速度为准；在此之后受到任何额外的减速效果，都只会影响到再下一次攻击。",
+            "\t[小妖精,fairy]在刚才的战斗中，怪物的速度为20，角色的速度为16。\n因此在互相展现敌意后，角色借助主动战斗的优势先攻击怪物，随后才是怪物对角色造成伤害。\n此后双方一直匀速造成伤害。",
+            "\t[小妖精,fairy]战斗结束于(8次攻击-0.5)/16速度=0.47时刻。\n此时角色攻击8次，完成对怪物的击杀；在此前，怪物刚刚完成第9次攻击。\n另外，在本作的战斗系统中，如果怪物死亡时刻正好作出一次攻击（时刻完全相同）的话，视为这次攻击有效！",
            "\t[小妖精,fairy]接下来，请获取黄门中的2颗黄宝石，将角色的速度从16提升到20。\n面对相同的敌人，提升速度又会展现什么效果呢？",
            {
                "type": "jump",
@ -104,14 +104,14 @@ main.floors.jiaocheng02=
                ],
                "false": [
                    "\t[小妖精,fairy]在提升速度后，角色可以在更短的时间内打出足以击杀怪物的攻击频率。\n相比获取宝石之前，角色的攻击前摇快了25%。",
-                    "\t[小妖精,fairy]虽然攻击威力没有变化，仍然需要8次攻击才能击杀怪物，但战斗时间却实打实地从0.5降低到了0.4。\n在0.4时刻之前，怪物最多只能打出18*0.4=7次攻击。\n当然，提升攻击力降低战斗伤害的本质也是缩短战斗时间，从而让怪物的攻击频率缩短。",
-                    "\t[小妖精,fairy]但要注意——不是所有时候提升速度都能降低角色受到的攻击次数。\n如果角色的速度从21提升到24，击杀怪物需要的时间将由8/21=0.381变为0.333。（实际计算中具体时刻将保留14位小数，确保精确）\n怪物的第6次攻击于0.333时刻落下，而第7次攻击将于0.389时刻落下。\n因此，将击杀怪物的时刻从0.381提前到0.333，不影响怪物的第6和第7次攻击，从而不会降低伤害。",
-                    "\t[小妖精,fairy]因此，能带来战斗伤害减少的速度提升节点也特别重要——我们也称之为“临界”。\n从最初的需要8次攻击击杀，16点速度，0.5时刻击杀怪物开始计算（当然是计算怪物的时间轴）——\n怪物的第8次攻击落于0.444时刻，第9次攻击落于0.5时刻。\n速度达到17时，击杀时刻为8/17=0.471；速度达到19时，击杀时刻为8/19=0.421，刚好在怪物的第9次和第8次攻击之前。",
+                    "\t[小妖精,fairy]虽然攻击威力没有变化，仍然需要8次攻击才能击杀怪物，但战斗时间却实打实地从0.47降低到了0.375。\n在0.375时刻之前，怪物最多只能打出20*0.375=7次攻击。\n当然，提升攻击力降低战斗伤害的本质也是缩短战斗时间，从而让怪物的攻击频率缩短。",
+                    "\t[小妖精,fairy]但要注意——不是所有时候提升速度都能降低角色受到的攻击次数。\n如果角色的速度从20提升到21，击杀怪物需要的时间将由7.5/20=0.375变为0.357。（实际计算中具体时刻将保留14位小数，确保精确）\n怪物的第7次攻击于0.35时刻落下，而第8次攻击将于0.4时刻落下。\n因此，将击杀怪物的时刻从0.375提前到0.357，不影响怪物的第7和第8次攻击，从而不会降低伤害。",
+                    "\t[小妖精,fairy]因此，能带来战斗伤害减少的速度提升节点也特别重要——我们也称之为“临界”。\n",
                    {
                        "type": "callBook"
                    },
-                    "\t[小妖精,fairy]同理，以现在的状态开始计算。现在我们需要0.4的攻击时间击杀怪物。\n怪物最后一次的攻击时刻为0.389；我们提升1点速度将会使我们的最后一次攻击时刻提前到0.381，从而少受到一次怪物的攻击——这1点速度就是一个速度临界值。继续提升速度，就需要考虑怪物在0.333时刻的攻击。",
-                    "\t[小妖精,fairy]我们的速度距离下一个临界点还差1点；达到临界点可以让我们受到的伤害减少50点。\n在怪物手册中记作[1,50]或\"1:50\"。速度临界值和临界表暂时需要到怪物手册中才能查阅。",
+                    "\t[小妖精,fairy]以现在的状态开始计算。现在我们需要0.375的攻击时间击杀怪物。\n怪物最后一次的攻击时刻为0.35；我们提升2点速度将会使我们的最后一次攻击时刻提前到0.341，从而少受到一次怪物的攻击——这2点速度就是一个速度临界值。继续提升速度，就需要考虑怪物在0.3时刻的攻击。",
+                    "\t[小妖精,fairy]我们的速度距离下一个临界点还差2点；达到临界点可以让我们受到的伤害减少50点。\n在怪物手册中记作[2,50]或\"2:50\"。速度临界值和临界表暂时需要到怪物手册中才能查阅。",
                    "\t[小妖精,fairy]捡起后面的血瓶和黄钥匙，补充生命值继续后面的内容吧！",
                    {
                        "type": "jump",
@ -284,29 +284,6 @@ main.floors.jiaocheng02=
                "type": "hide",
                "remove": true
            }
-        ],
-        "3,8": [
-            {
-                "type": "animationDrawable",
-                "allFarme": 30,
-                "color": [
-                    0,
-                    0,
-                    0
-                ],
-                "imageList": [
-                    {
-                        "image": ""
-                    }
-                ],
-                "soundList": [
-                    {
-                        "sound": "",
-                        "startfarme": 0,
-                        "stopbefore": false
-                    }
-                ]
-            }
        ]
    },
    "changeFloor": {
--- a/project/floors/jiaocheng03.js
+++ b/project/floors/jiaocheng03.js
@ -101,8 +101,8 @@ main.floors.jiaocheng03=
            "\t[小妖精,fairy]刚才你应该是选择了1黄宝石1红宝石的组合，但——到底是什么原理？",
            "\t[小妖精,fairy]接下来要讲的是本作一个非常隐蔽的现象——混合临界。\n混合临界仅会出现在角色的速度高于怪物速度的时候。\n出现混合临界的条件是，在怪物对角色进行最后一次攻击后，角色进行了两次以上的攻击才击杀了怪物。\n为了方便理解，可以画一个时间轴，从怪物最后一次攻击算起。",
            "\t[小妖精,fairy]单纯提高攻击力来降低被攻击次数的话，需要让角色击杀怪物的攻击次数减少2，而不是1。\n在刚才的战斗中，角色的攻击力为32，击杀怪物需要162/(32-1)=6次攻击。\n要达到降低被攻击次数效果的话，将攻击力提升至162/5+1=34点并不足够。\n需要将攻击力提升至162/4+1=42点。",
-            "\t[小妖精,fairy]同样地，单纯提高速度来降低被攻击次数的话，需要让角色的最后一次攻击提前到怪物攻击之前，而不是倒数第二次攻击。\n在刚才的战斗中，怪物最后一次攻击的时刻为3/14=0.214。\n角色在5/22=0.227，6/22=0.273两个时刻分别攻击了怪物，其中0.273时刻对怪物的攻击造成了击杀。\n要达到降低被攻击次数效果的话，将速度提升至5+/0.214=24点并不足够，因为角色需要6次攻击才能击杀怪物。\n需要将速度提升至6+/0.214=29点。",
-            "\t[小妖精,fairy]但值得庆幸的是，我们还要第三种办法——同时增强速度和攻击。\n我们少量提升攻击力至34点，使击杀怪物仅需要5次攻击。\n然后再少量提升速度至24点，使我们的第5次攻击落在0.214时刻，即怪物的最后一次攻击前。\n这样，我们仅用了4点能力提升，就达到了单独提升某项能力10点或7点的效果。",
+            "\t[小妖精,fairy]同样地，单纯提高速度来降低被攻击次数的话，需要让角色的最后一次攻击提前到怪物攻击之前，而不是倒数第二次攻击。\n在刚才的战斗中，怪物最后一次攻击的时刻为3.5/16=0.219。\n角色在5/22=0.227，6/22=0.273两个时刻分别攻击了怪物，其中0.273时刻对怪物的攻击造成了击杀。\n要达到降低被攻击次数效果的话，将速度提升至5+/0.219=23点并不足够，因为角色需要6次攻击才能击杀怪物。\n需要将速度提升至6+/0.214=28点。",
+            "\t[小妖精,fairy]但值得庆幸的是，我们还要第三种办法——同时增强速度和攻击。\n我们少量提升攻击力至34点，使击杀怪物仅需要5次攻击。\n然后再少量提升速度至23点，使我们的第5次攻击落在0.217时刻，即怪物的最后一次攻击前。\n这样，我们仅用了3点能力提升，就达到了单独提升某项能力10点或6点的效果。",
            "\t[小妖精,fairy]接下来是法强（护盾）和防御的价值判断。\n希望你能在这三扇黄门中打开正确的一扇。",
            {
                "type": "jump",
@ -156,7 +156,7 @@ main.floors.jiaocheng03=
    [  1,  1,  1,  1,  1,  1,240,  1,  1,  1,  1,  1,  1],
    [  0, 33,  0, 21,  0,403,  0,  1,401,  1,402,  1, 31],
    [ 83,  1, 83,  1, 83,  1,204,  1, 81,  1, 81,  1, 81],
-    [402,  1,404,  1,401,129,124,204,  0, 33,  0, 23,  0],
+    [402,  1,404,  1,401,  1,124,204,  0, 33,  0, 23,  0],
    [  1,  1,  1,  1,  1,  1, 93,  1,  1,  1,  1,  1,  1]
 ],
    "areas": "牢狱",
--- a/project/floors/jiuguan.js
+++ b/project/floors/jiuguan.js
@ -26,30 +26,6 @@ main.floors.jiuguan=
                ],
                "direction": "down"
            }
-        ],
-        "4,10": [
-            {
-                "type": "over",
-                "text": "这段话将在屏幕中心",
-                "image": "bg_5043.png",
-                "memory": false,
-                "time": 3000,
-                "hidetime": 30,
-                "sound": "",
-                "textColor": [
-                    255,
-                    255,
-                    255,
-                    1
-                ],
-                "boldColor": [
-                    0,
-                    0,
-                    0,
-                    1
-                ],
-                "font": "bold 48px Verdana"
-            }
        ]
    },
    "changeFloor": {},
--- a/project/floors/street01.js
+++ b/project/floors/street01.js
@ -28,18 +28,11 @@ main.floors.street01=
        ]
    },
    "changeFloor": {
-        "12,9": {
-            "floorId": "zhujuejia",
-            "loc": [
-                0,
-                9
-            ]
-        },
-        "0,8": {
-            "floorId": "changguan2",
+        "0,7": {
+            "floorId": "changguan1",
            "loc": [
                12,
-                8
+                7
            ]
        }
    },
@ -61,25 +54,25 @@ main.floors.street01=
        ]
    },
    "map": [
-    [110121,110122,200040,200225,200138,200227,200228,200225,200250,200227,200228,200046,130090],
-    [110124,  0,200048,200233,200146,200235,200236,200233,200250,200235,200228,200054,130098],
-    [110124,  0,200056,200153,200154,200155,200244,200272,200154,200276,200228,200054,130060],
-    [110124,  0,200272,200161,200162,200163,200276,200168,200171,200172,  0,70327,130068],
-    [110124,  0,200168,200169,200170,200171,200172,200080,200081,200086,  0,70335,110114],
-    [110124,  0,200176,200177,200178,200179,71786,90064,90064,90064,  0,90064,110125],
-    [110124,  0,200088,200089,200004,200005,200006,71795,  0,  0,  0,  0,110125],
-    [110118,110118,200096,110116,110020,  0,200014,  0,  0,  0,  0,  0,110125],
-    [ 92,  0,  0,110124,  0,  0,  0,  0,110125,110122,110122,110122,110122],
-    [  0,  0,  0,110118,110118,  0,110118,110118,110122,  0,  0,  0, 94],
-    [140,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,140],
-    [140,140,140,140,140,140186,110138,110138,140184,140,140,140,140]
+    [110276,  0,200040,200225,200138,200227,200228,200225,200250,200227,200228,200046,  0],
+    [110284,  0,200048,200233,200146,200235,200236,200233,200250,200235,200228,200054,130090],
+    [110292,  0,200056,200153,200154,200155,200244,200272,200154,200276,200228,200054,130098],
+    [110300,  0,200272,200161,200162,200163,200276,200168,200171,200172,  0,70327,130060],
+    [110308,  0,200168,200169,200170,200171,200172,200080,200081,200086,  0,70335,110114],
+    [110316,110138,200176,200177,200178,200179,71786,90064,90064,90064,  0,90064,110125],
+    [  0,110130,200088,200089,200004,200005,200006,71795,  0,  0,  0,  0,110125],
+    [ 92,  0,200096,110116,110020,  0,200014,  0,  0,  0,  0,  0,110125],
+    [120111,  0,  0,110124,  0,  0,  0,  0,110125,110122,110122,110122,110122],
+    [120119,  0,  0,110118,110118,  0,110118,110118,110122,  0,  0,  0,  0],
+    [120127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [120135,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [120151,  0,  0,120117,120118,120118,120118,120118,120118,120118,120118,120119,  0]
 ],
    "areas": "牢狱",
    "bgmap": [
-    [90078,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90078],
-    [90078,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90078],
-    [90078,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90078],
+    [90078,210177,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,210177],
+    [90078,210185,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,210185],
+    [90078,210193,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,210193],
    [90078,71818,71819,  0,  0,  0,  0,  0,  0,  0,10036,  0,90078],
    [90078,71826,71827,  0,  0,  0,  0,  0,  0,  0,  0,  0,90078],
    [90078,  0,  0,  0,  0,  0,71786,  0,60135,60135,60135,60135,90078],
@ -92,18 +85,18 @@ main.floors.street01=
    [  0,  0,  0,  0,  0,  0,90078,90078,  0,  0,  0,  0,  0]
 ],
    "fgmap": [
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130076],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130084],
-    [  0,  0,200110,200111,  0,200108,200109,  0,  0,  0,  0,  0,  0],
+    [  0,  0,200110,200111,  0,200108,200109,  0,  0,  0,  0,  0,130084],
    [  0,  0,200118,200119,  0,200116,200117,  0,  0,  0,  0,  0,  0],
    [  0,20241,  0,  0,  0,  0,  0,  0,  0,70552,  0,70554,  0],
-    [  0,  0,  0,  0,  0, 93,200180,71787,  0,70560,  0,70562,  0],
-    [110114,110114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,90173,  0, 93,200180,71787,  0,70560,  0,70562,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,110143,110114,110114,110114,110114],
    [  0,  0,  0,110114,120095,  0,120095,120095,110114,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,140186,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,140194,  0,  0,  0,  0,  0,  0,  0,  0,140184,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,120109,120110,120110,120110,120110,120110,120110,120110,120111,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
@ -111,9 +104,9 @@ main.floors.street01=
    [  0,90650,90651,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,90658,90659,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,70163,70325,70325,70326,  0,200162,  0],
-    [  0,  0,  0,  0,  0,  0,70171,70333,70333,70334,70553,200162,  0],
-    [  0,71834,71835,  0,  0,  0,90064,  0,  0,  0,70561,  0,110122],
-    [  0,71842,71843,200089,200004,200005,71794,  0,90617,70568,70569,70570,  0],
+    [  0,  0,  0,  0,  0,  0,70171,70333,70333,70334,70553,200162,130068],
+    [  0,  0,110138,  0,  0,  0,90064,  0,  0,  0,70561,  0,110122],
+    [  0,110146,110146,200089,200004,200005,71794,  0,90617,70568,70569,70570,  0],
    [  0,  0,  0,200097,200012,200013,110012,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,110028,90244,  0,120108,120108,110134,110134,110134,110134],
    [  0,  0,  0,  0,120103,90244,120103,120103,  0,  0,  0,  0,  0],
--- a/project/floors/xiaoxiang01.js
+++ b/project/floors/xiaoxiang01.js
@ -29,13 +29,6 @@ main.floors.xiaoxiang01=
                6,
                0
            ]
-        },
-        "0,7": {
-            "floorId": "guangchang2",
-            "loc": [
-                12,
-                10
-            ]
        }
    },
    "beforeBattle": {},
@ -56,7 +49,7 @@ main.floors.xiaoxiang01=
    [120164,225,200998,200999,201037, 81,201029,  0,  0,  0,110116,  0, 94],
    [120172,  0,222,  0,221,  0,201029, 81,110116,225,110137,110138,90650],
    [120180,201037,201037, 81,201037,201037,201037,246,110124,  0, 81, 31,90658],
-    [ 92, 32, 32, 22, 21,80089, 31,  0,110132,  0,110122,110122,110197],
+    [  0, 32, 32, 22, 21,80089, 31,  0,110132,  0,110122,110122,110197],
    [140,110191, 21, 21, 21,80089,  0,246, 81,  0,222, 29,110197],
    [140,140,140,110191,80083,80097, 93,110138,110138,140189,140,140,140]
 ],
--- a/project/floors/yiqu1.js
+++ b/project/floors/yiqu1.js
@ -60,15 +60,15 @@ main.floors.yiqu1=
    [143,143,143,143,130060,130061,130062,130201,130201,143,143,143,143],
    [143,130193,130193,130194,130068,130069,130070,  0,120023,130192,130193,130193,143],
    [130194,130201,130201,130202,130007,130006,130099,130098,120031,130200,130201,130201,143],
-    [130202, 32,  0, 21,201021,401,110116,  0,201, 81,  0, 21,130192],
-    [140101,  0,205,  0,201037,421,110124, 31,  0,110116, 31,  0,130200],
-    [140109,201037,  0,201037,200199, 81,110140,110138, 81,110138,110138,202,90667],
-    [ 92,201,  0,  0, 31,  0,202,  0,  0, 82,  0,  0,90675],
-    [120111,  0,  0, 21,  0,  0,201021,205,110138,110138,201021,  0, 94],
-    [120119,110122, 81,110122,201037,201,201029,402,  0, 21,201029,205,90650],
+    [130202, 32,  0, 21,201021,401,220008,  0,201, 81,  0, 21,130192],
+    [140101,  0,205,  0,201037,421,220008, 31,  0,220008, 31,  0,130200],
+    [140109,201037,  0,201037,200199, 81,220013,220013, 81,220012,220013,202,140099],
+    [ 92,201,  0,  0, 31,  0,202,  0,  0, 82,  0,  0,140107],
+    [120041,  0,  0, 21,201021,  0,110138,205,110138,110138,110138,  0, 94],
+    [120119,220013, 81,220013,201037,201,201029,402,  0, 21,201029,205,90650],
    [120127,202, 31,202,201037,  0,201029,  0, 21,  0,201029,  0,110189],
-    [120135, 22,205,403,201037,202,201037,110122,110122, 81,201037,201,110197],
-    [120143,110138,110138,110138,201029,  0,201,  0, 31,  0, 21,  0,110197]
+    [120135, 22,205,403,201037,202,201037,220013,220013, 81,201037,201,110197],
+    [120143,220001,220001,220001,201037,  0,201,  0, 31,  0, 21,  0,110197]
 ],
    "bgmap": [
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
@ -90,27 +90,27 @@ main.floors.yiqu1=
    [  0,  0,  0,  0,  0,  0,  0,  0,120074,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,130091,130090,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,200175,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140093,  0,  0,  0,200183,  0,  0,  0,  0,110152,  0,  0,  0],
-    [  0,201021,  0,201021,200191,  0,  0,  0,  0,110160,  0,  0,90667],
+    [140093,  0,  0,  0,200183,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,201021,  0,201021,200191,  0,  0,220009,  0,  0,220009,  0,140091],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,110114,  0,110114,201021,  0,  0,  0,  0,  0,  0,  0,  0],
+    [120111,220009,  0,220009,  0,  0,201021,  0,  0,  0,201021,  0,  0],
    [  0,  0,  0,  0,201021,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,201021,  0,  0,110114,110114,  0,  0,  0,  0],
+    [  0,  0,  0,  0,201021,  0,  0,220009,220009,  0,  0,  0,  0],
    [  0,  0,  0,  0,201021,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+    [  0,  0,  0,  0,220001,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,120082,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,130193,  0,  0,  0,  0,  0,120082,  0,130193,  0,  0],
+    [  0,  0,130201,  0,  0,  0,  0,  0,  0,  0,130201,  0,  0],
    [  0,  0,  0,  0,130015,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,110129,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,110146,110146,  0,110146,110146,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,110146,110146,  0,  0,  0],
+    [130076,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [130084,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130058],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130066],
+    [  0,  0,  0,  0,120041,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,220013,  0,  0,  0,110146,110146,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90658],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
--- a/project/floors/yiqu11.js
+++ b/project/floors/yiqu11.js
@ -0,0 +1,53 @@
+main.floors.yiqu11=
+{
+    "floorId": "yiqu11",
+    "title": "主塔 10 层",
+    "name": "10",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "X90078",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}
--- a/project/floors/yiqu12.js
+++ b/project/floors/yiqu12.js
@ -0,0 +1,53 @@
+main.floors.yiqu12=
+{
+    "floorId": "yiqu12",
+    "title": "主塔 6 层",
+    "name": "6",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "X90078",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}
--- a/project/floors/yiqu13.js
+++ b/project/floors/yiqu13.js
@ -0,0 +1,53 @@
+main.floors.yiqu13=
+{
+    "floorId": "yiqu13",
+    "title": "主塔 6 层",
+    "name": "6",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "X90078",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}
--- a/project/floors/yiqu2.js
+++ b/project/floors/yiqu2.js
@ -14,7 +14,43 @@ main.floors.yiqu2=
    "firstArrive": [],
    "eachArrive": [],
    "parallelDo": "",
-    "events": {},
+    "events": {
+        "3,3": {
+            "trigger": "action",
+            "enable": true,
+            "noPass": true,
+            "displayDamage": true,
+            "opacity": 1,
+            "filter": {
+                "blur": 0,
+                "hue": 0,
+                "grayscale": 0,
+                "invert": false,
+                "shadow": 0
+            },
+            "data": [
+                {
+                    "type": "if",
+                    "condition": "(!switch:A)",
+                    "true": [
+                        {
+                            "type": "function",
+                            "function": "function(){\ncore.getItem(\"blueKey\", null, 3,3)\n}"
+                        },
+                        {
+                            "type": "setBlock",
+                            "number": "X130061"
+                        },
+                        {
+                            "type": "setValue",
+                            "name": "switch:A",
+                            "value": "true"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
    "changeFloor": {
        "12,7": {
            "floorId": "yiqu3",
@ -39,22 +75,22 @@ main.floors.yiqu2=
    "cannotMove": {},
    "cannotMoveIn": {},
    "map": [
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1, 22,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1, 81,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0, 22],
-    [  1, 81,  1,  1,  1,  1,  1,  1,  1,  0, 83,  0,403],
-    [ 31,  0,401,209,  0,402,  1,  0, 34,  0,  1,209,  0],
-    [  0,202,  0,  1, 32,  0,  1,405,  0,408,  1, 81,  1],
-    [  1, 81,  1,  1,  0,421,  1,  0,204,  0,  1,  0, 94],
-    [ 92,  0, 21,  1,  1, 81,  1,  1, 82,  1,  1,205,  1],
-    [  1,  1,  0,202,  0,  0, 32,209,  0,  1, 21,  0,  1],
-    [  0,201,  0,  1, 81,  1,  1,  1,  0,205,  0,  0,421],
-    [202,  1,  1,  1,  0,  1,402,  1,201,  1, 31,  1,  0],
-    [  0, 21, 21,  1,  0,202,  0,201,  0,  1,  1,  1, 22]
+    [143,120034,200990,200991,120034,120012,120033,  0,110089,110090,  0,110024,140],
+    [143,170007,200998,200999,170007,120019,120017,  0,110097,110098,  0,100378,140],
+    [143,  0,  0,  0,  0,120019,120017,  0,110105,110106,  0,110016,140],
+    [143, 81,  0, 22,  0,120020,120003,  0,140128,140129,  0,110024,130192],
+    [130194, 81,120014,110015,120010,120010,120011, 22,  0,403,  0,209,130200],
+    [130202, 31,  0,209,  0,402,120029,120010, 83,110015,120010, 81,140099],
+    [140101,401,202,120041, 32,  0,201029,  0, 34,  0,201029,  0,140107],
+    [140109,120041, 81,201029,  0,421,201029,405,204,408,201029,  0, 94],
+    [ 92,  0, 21,201037,220013, 81,201037,220013, 82,220013,201037,205,130058],
+    [90651,120048,  0,  0,202,  0, 32,209,  0,120041, 21,  0,130066],
+    [110190,110191,201,201023,120041, 81,220013,220013,  0,205,  0,  0,421],
+    [110198,110199,202,201031,201029,202,  0,10173,201,90667, 31,90667,  0],
+    [110198,110199, 21, 21,201029,  0,402,201,  0,90667,90667,90667, 22]
 ],
    "bgmap": [
-    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
+    [90078,90078,180025,180025,90078,90078,90078,90078,90078,90078,90078,90078,90078],
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078],
@ -69,10 +105,34 @@ main.floors.yiqu2=
    [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078]
 ],
    "fgmap": [
-
+    [  0,  0,  0,  0,  0,  0,120017,110088,  0,  0,110091,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,110096,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,140120,140121,  0,  0,  0],
+    [  0,  0,120002,120002,120002,120002,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,120001,120002,  0,120002,120002,  0,140091],
+    [140093,  0,  0,  0,  0,  0,201021,  0,  0,  0,201021,  0,  0],
+    [  0,  0,  0,201021,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,220009,  0,  0,220009,  0,220009,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,120048,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,220009,220009,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,201021,  0,  0,10165,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
-
+    [  0,180025,120034,120034,180025,180026,  0,120034,120034,120034,120034,120034,  0],
+    [  0,180025,180025,180025,180025,180026,  0,  0,  0,  0,110099,  0,  0],
+    [  0,180025,180025,180025,180025,180026,  0,  0,  0,  0,110107,100402,  0],
+    [  0,  0,180025,130061,130060,180026,120017,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130056],
+    [130059,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130064],
+    [130067,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,120041,  0,  0,  0,  0,  0,  0,  0,120064,  0,  0,  0],
+    [  0,120064,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,201039,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/yiqu3.js
+++ b/project/floors/yiqu3.js
@ -14,21 +14,57 @@ main.floors.yiqu3=
    "firstArrive": [],
    "eachArrive": [],
    "parallelDo": "",
-    "events": {},
+    "events": {
+        "12,8": {
+            "trigger": "action",
+            "enable": true,
+            "noPass": true,
+            "displayDamage": true,
+            "opacity": 1,
+            "filter": {
+                "blur": 0,
+                "hue": 0,
+                "grayscale": 0,
+                "invert": false,
+                "shadow": 0
+            },
+            "data": [
+                {
+                    "type": "if",
+                    "condition": "(!switch:A)",
+                    "true": [
+                        {
+                            "type": "function",
+                            "function": "function(){\ncore.getItem(\"redPotion\", null, 8, 12)\n}"
+                        },
+                        {
+                            "type": "setBlock",
+                            "number": "X60150"
+                        },
+                        {
+                            "type": "setValue",
+                            "name": "switch:A",
+                            "value": "true"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
    "changeFloor": {
+        "5,1": {
+            "floorId": "yiqu4",
+            "loc": [
+                5,
+                12
+            ]
+        },
        "0,7": {
            "floorId": "yiqu2",
            "loc": [
                12,
                7
            ]
-        },
-        "5,0": {
-            "floorId": "yiqu4",
-            "loc": [
-                5,
-                12
-            ]
        }
    },
    "beforeBattle": {},
@ -37,30 +73,56 @@ main.floors.yiqu3=
    "afterOpenDoor": {},
    "autoEvent": {},
    "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "12,8": []
+    },
    "map": [
-    [  1,  1,  1,  1,  1, 91,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  1,  1,  0,  1,  1,  1, 31, 21,  1,  1],
-    [  1,  1,  1,  1,  1,203,  1,  1,  1,  1, 21,  1,  1],
-    [  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  0,  1,  1],
-    [  1,  1,  1,  1,  1,205,  1,  1,  1,  1, 82,  1,  1],
-    [  1,  0,202,  0,421,  0,421,  0, 31,  0,  0,  1,  1],
-    [  1,201,  1,  1, 81,  1,  1,  1,  1,  1, 81,  1,  1],
-    [ 92,  0,  1, 31,  0,209,  0,  1,403,  0,209,  1,  1],
-    [  1, 81,  1,  0,244,  0, 31,  1,  0,403,  0,  1, 23],
-    [205,  0,  1,  1,  1,  1, 82,  1,205,  1,  1,  1,  0],
-    [  0,209,  1,401,402,  0,  0,  1,  0,  1,244,  0, 31],
-    [205,  0,  1,  1,  1,  1,216,  1, 81,  1,  0, 81,  0],
-    [ 21,  0,203,  0, 31, 21,  0, 81,  0, 82,216,  0,203]
+    [140,140,140204,140206,140206,  0,140206,140206,140203,140,110204,110206,110206],
+    [140,140,140199,170255,170252, 91,170254,170255,140197,140,140199,130192,130193],
+    [140206,140206,140207,170263,170260,203,170262,170263,140205,140206,140207,130200,130201],
+    [130193,130193,130194,71835,170268,  0,170270,90648,130192,130193,130194, 31,  0],
+    [130201,130201,130202,71843,110122,205,110122,90649,130200,130201,130202,  0, 21],
+    [140101,  0,202,  0,421,  0,421,  0, 31,  0, 82, 21,  0],
+    [140109,201,201021,220013, 81,220013,220013,201021, 81,220013,220013,220013,220013],
+    [ 92,  0,201029, 31,  0,209,  0,201029,209,  0,403,201029,71792],
+    [130059,  0,201029,  0,244,  0, 31,201029,  0,403,  0,201029, 31],
+    [130067, 81,201029,220013,220013, 82,220013,201029, 81,220013,220013,201037,  0],
+    [205,  0,201029,401,  0,  0,402,201029,205,120041,244,  0, 23],
+    [  0,209,201037,220013,216,220013,220013,201037,  0,201037,  0, 81,  0],
+    [205, 21,  0,203,  0, 31, 21, 81,  0, 82,216,  0,203]
 ],
    "bgmap": [

 ],
    "fgmap": [
-
+    [  0,  0,  0,  0,  0,140206,110319,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,170253,110327,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,110335,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,110114,  0,110114,  0,  0,  0,  0,  0,  0],
+    [140093,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201021,71784],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,201021,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
-
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,170271,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [130057,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [130065,  0,220013,  0,  0,  0,  0,220013,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,60150],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,60158],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/yiqu4.js
+++ b/project/floors/yiqu4.js
@ -39,28 +39,64 @@ main.floors.yiqu4=
    "cannotMove": {},
    "cannotMoveIn": {},
    "map": [
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,421,  0,205,  0,421,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  0,  1, 81,  1,  0, 81, 81,  0,205,  0],
-    [  0,244,  0, 31,  1,  0,  1, 31,  1,  1,216,  1, 31],
-    [  0,  1,425,  1,  1, 31,  1,  1, 22,  1,  0,  1,  1],
-    [ 31,  1,  0,  1,401,  1,402,  1,  0,  1, 32,  1,403],
-    [  0, 81, 21,  1,  0,  1,  0,  1,244, 81,  0, 81,  0],
-    [403,  1,  0,  1, 82,  1, 82,  1,  1,  1,216,  1,  1],
-    [  0,  1,421,  0, 21,  0, 32,  0,240, 21,  0,425, 94],
-    [  0,216,  0,  1,  1, 93,  1,  1,  1,  1,  1,  1,  1]
+    [120138,120139,120140,200072,200073,200074,200075,200076,200077,200078,120144,120145,120146],
+    [120146,120147,120148,200176,200177,200178,200083,200084,200085,200086,120152,120153,120154],
+    [120154,120155,120156,200184,200185,200186,200091,200092,200093,200094,120160,120161,120162],
+    [120162,120163,120164,120056,200193,200194,200099,200100,140017,140018,120168,120169,120170],
+    [120170,120171,120172,  0,110071,  0, 31,  0,  0,  0,120176,120177,120178],
+    [120178,120179,120180,120010,120018, 81,120010,120010,120010,120010,120028,  0, 31],
+    [244,  0,  0, 31,421,205,421, 31, 81, 81,  0,205,  0],
+    [  0,110004,425,201021,220013,201021,220013,201021,220013,201021,216,201021,220013],
+    [  0, 81,  0,401,201029,201029,402,201029, 22,201037, 32,201037,403],
+    [ 31,200199, 21,201029,  0,201029,  0,201029,244, 81,  0, 81,  0],
+    [  0,216,  0,201037, 82,201037, 82,201037,220013,130006,216,130006,220013],
+    [403,201021,421,  0, 21,  0, 32,  0,240, 21,  0,425, 94],
+    [140,140,140,140,140, 93,140,140,140,140,140,140,140]
 ],
    "bgmap": [
-
+    [  0,  0,  0,210186,  0,  0,  0,  0,  0,210186,  0,  0,  0],
+    [  0,  0,  0,210194,  0,  0,  0,  0,  0,210194,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,201037,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fgmap": [
-
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,120006,120006,  0,120006,120006,120006,120006,120020,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,200175,  0,220009,220009,220009,220009,220009,220009,220009,  0,220009,220009],
+    [  0,200183,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,200191,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,220009,  0,  0,  0,220009],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
-
+    [  0,  0,  0,210184,  0,  0,  0,  0,  0,120066,  0,  0,  0],
+    [  0,  0,  0,210192,  0,  0,  0,  0,  0,120074,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,120082,  0,  0,  0],
+    [  0,  0,  0,200096,  0,  0,  0,  0,200101,200102,  0,  0,  0],
+    [  0,  0,  0,120064,  0,  0,  0,  0,140025,140026,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,220013,  0,220013,  0,220013,  0,220013,  0,220013,220013],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,120041,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/yiqu5.js
+++ b/project/floors/yiqu5.js
@ -14,7 +14,78 @@ main.floors.yiqu5=
    "firstArrive": [],
    "eachArrive": [],
    "parallelDo": "",
-    "events": {},
+    "events": {
+        "9,3": {
+            "trigger": "action",
+            "enable": true,
+            "noPass": true,
+            "displayDamage": true,
+            "opacity": 1,
+            "filter": {
+                "blur": 0,
+                "hue": 0,
+                "grayscale": 0,
+                "invert": false,
+                "shadow": 0
+            },
+            "data": [
+                {
+                    "type": "if",
+                    "condition": "(!switch:A)",
+                    "true": [
+                        {
+                            "type": "function",
+                            "function": "function(){\ncore.getItem(\"redPotion\", null, 3, 9)\n}"
+                        },
+                        {
+                            "type": "setBlock",
+                            "number": "X60150"
+                        },
+                        {
+                            "type": "setValue",
+                            "name": "switch:A",
+                            "value": "true"
+                        }
+                    ]
+                }
+            ]
+        },
+        "3,2": {
+            "trigger": "action",
+            "enable": true,
+            "noPass": true,
+            "displayDamage": true,
+            "opacity": 1,
+            "filter": {
+                "blur": 0,
+                "hue": 0,
+                "grayscale": 0,
+                "invert": false,
+                "shadow": 0
+            },
+            "data": [
+                {
+                    "type": "if",
+                    "condition": "(!switch:A)",
+                    "true": [
+                        {
+                            "type": "function",
+                            "function": "function(){\ncore.getItem(\"bluePotion\", null, 2, 3)\n}"
+                        },
+                        {
+                            "type": "setBlock",
+                            "number": "X60150"
+                        },
+                        {
+                            "type": "setValue",
+                            "name": "switch:A",
+                            "value": "true"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
    "changeFloor": {
        "0,11": {
            "floorId": "yiqu4",
@ -25,35 +96,89 @@ main.floors.yiqu5=
        }
    },
    "beforeBattle": {},
-    "afterBattle": {},
+    "afterBattle": {
+        "6,2": [
+            {
+                "type": "setValue",
+                "name": "item:I427",
+                "operator": "+=",
+                "value": "1"
+            },
+            "一段剧情（奖励是匕首），然后飞去2区",
+            {
+                "type": "changeFloor",
+                "floorId": "yiqu6",
+                "loc": [
+                    12,
+                    6
+                ]
+            }
+        ]
+    },
    "afterGetItem": {},
    "afterOpenDoor": {},
    "autoEvent": {},
    "cannotMove": {},
    "cannotMoveIn": {},
    "map": [
-    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
-    [  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1],
-    [  1,  0, 32,  1,  1,  1,426,  1,  1,  1,  1,  1,  1],
-    [  1, 82,  1,  1,  1,  1,  0,  1,  1, 31,  1,  1,  1],
-    [216,  0,216,  1,  1,  1, 83,  1,  1,  0,  1,  1,  1],
-    [  0,  1,  0,  1,  1,209,  0,209,  1, 81,  1,  1,  1],
-    [ 32,  1, 32,  0, 81,  0, 82,  0, 32,  0,216,  0, 22],
-    [  1,  1,  0,  1,  1,244,  1,  1, 81,  1,  1,  1,  1],
-    [ 31,  1,209,  1, 31,  0,403,  1,203,  0,244,  1, 31],
-    [  0,216,  0,  1,  1,  1,  1,  1,  0,203,  0,  1,  0],
-    [  1,  1, 32, 82,  0,402,  1,  1,209,  0, 34,  1, 81],
-    [ 92,  0,  0,  1,  1,  1,  1, 21,  1,  1, 21,  1, 22],
-    [  1,  1, 31, 82,  0,401,  1, 32,  0,425,  0,213,  0]
+    [210194,210194,210186,210186,210186,210192,210185,210186,210186,210186,210194,210194,210194],
+    [120155,120156,210194,210194,210194,210192,210193,210194,210194,210194,120144,120145,120146],
+    [120163,120164,  0, 32,120012,  0,426,  0,120013,120030,120152,120153,120154],
+    [120171,120172,  0,  0,120020,  0,  0,  0,120019, 31,120160,120161,120162],
+    [120179,120180, 82,120015,120010,120010, 83,120010,120045,  0,120168,120169,120170],
+    [216,  0,216,71792,71793,209,  0,209,120029, 81,120176,120177,120178],
+    [ 32,120041,  0, 32, 81,  0, 82,  0, 32,  0,216,  0, 22],
+    [220013,220013,  0,220013,220013,244,220013,220013, 81,220013,220013,220013,220013],
+    [ 31,120064,209,201029, 31,  0,403,201029,209,  0,244,201029, 31],
+    [  0,216,  0,201037,220013,220013,220013,201029,  0,209,  0,201029,  0],
+    [220013,220013, 32, 82,  0,  0,402,201029,203,  0, 34,201029, 81],
+    [ 92,  0,  0,220013,220013,220013,220013,220012,220013,220013, 21,220014, 22],
+    [140,110191, 31, 82,  0,401,120064, 21, 32,425,  0,213,  0]
 ],
    "bgmap": [
-
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,120031,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fgmap": [
-
+    [120147,120148,  0,  0,  0,  0,  0,  0,  0,  0,120136,120137,120138],
+    [  0,  0,120023,120023,120004,  0,  0,  0,120005,120022,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,120007,110023,110023,  0,110023,120020,  0,  0,  0,  0],
+    [  0,  0,  0,71784,71785,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [220009,220009,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,120056,  0,201021,  0,  0,  0,201021,  0,  0,  0,201021,  0],
+    [  0,120041,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [220009,220009,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,120056,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,120041,  0,  0,  0,  0,  0,  0]
 ],
    "bg2map": [
-
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,120031,50134,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,50142,  0,  0,  0,  0,  0,50134,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,50142,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,201037,  0,  0,  0,201037,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
    "fg2map": [

--- a/project/floors/yiqu6.js
+++ b/project/floors/yiqu6.js
@ -14,29 +14,52 @@ main.floors.yiqu6=
    "firstArrive": [],
    "eachArrive": [],
    "parallelDo": "",
-    "events": {},
-    "changeFloor": {},
+    "events": {
+        "10,5": [
+            "\t[冥蓝海,sign]想要做的怪物特性：\n1. 暴击：怪物的首次攻击必定暴击，暴击额外造成x%的伤害；除此以外，怪物每y次攻击就将打出一次暴击。\n2. 硬化/抗魔：怪物受到的物理/魔法伤害将减免x%。\n3. 反击：怪物的首次攻击附加怪物当前已损失生命值的100%作为伤害。\n4. 破甲：怪物攻击时无视角色x%的防御力；首次攻击时，怪物额外无视角色y%的防御力（加算）。\n5. 吸血：怪物造成的物理伤害以x%回复怪物自身的生命值，不计对护盾造成的破坏。\n6. 诅咒：当怪物的攻击同时造成了物理伤害和魔法伤害（不计对护盾造成的破坏），则魔法伤害按x倍计算。\n7. 闪避：怪物受到的首次普通攻击将被闪避而无效化；除此以外，怪物每受到x次普通攻击造成的伤害就将闪避一次。\n8. 寒霜：怪物的前x次（x=0则为所有）普通攻击命中角色时，将使角色在该场战斗中的速度下降y点。\n9. 灼炎：怪物的普通攻击命中角色时，将在该场战斗中熔毁角色的防御x点。\n10. 风行：怪物的基础速度将不低于角色的基础速度；怪物每次攻击命中或闪避攻击时，其速度提高x点。\n11. 撕裂：怪物的普通攻击附加角色当前已损失生命值的x%作为伤害，不计对护盾造成的破坏。\n12. 献祭：怪物身周萦绕着火焰，火焰每次对角色造成x点魔法伤害，伤害速度等于怪物的初始生命。\n13. 闪电：怪物对角色护盾的破坏效率提升x倍。[ver2：完全破坏护盾时，剩余的伤害也按x倍结算]\n14. 毒素：怪物的普通攻击造成物理伤害时（不计对护盾造成的破坏）将附加一层毒素效果，每层毒素效果将使角色在该场战斗中攻击时流失x点生命值。\n15. 汲取：怪物对角色护盾造成破坏时，将窃取破坏数值的x%作为自身护盾。\n16. 重力：怪物操纵角色的重力，每携带一件双手装备速度下降4x%，每携带一件单手装备速度下降2x%，每携带一件其他装备速度下降x%。\n17. 潜影：角色可穿过怪物。穿过怪物并行走x步之后，若角色仍处于怪物可见直线内，则与怪物强制战斗，且怪物首先攻击，其首次攻击攻击力提升至x倍。"
+        ]
+    },
+    "changeFloor": {
+        "12,6": {
+            "floorId": "yiqu5",
+            "loc": [
+                0,
+                11
+            ]
+        },
+        "0,5": {
+            "floorId": "yiqu7",
+            "loc": [
+                12,
+                5
+            ]
+        }
+    },
    "beforeBattle": {},
    "afterBattle": {},
-    "afterGetItem": {},
+    "afterGetItem": {
+        "11,6": [
+            "这个血瓶也放到间章剧情部分"
+        ]
+    },
    "afterOpenDoor": {},
    "autoEvent": {},
    "cannotMove": {},
    "cannotMoveIn": {},
    "map": [
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1],
+    [ 92,  1,  1,  1,  1,  1,  1,  1,  1,  1,129,  1,  1],
+    [213,  0, 32,204,  0,203,  0, 22,  0,213,  0, 33, 94],
+    [  1, 81,  1,  1, 81,  1,  1,  1, 81,  1, 81,  1,  1],
+    [  0,  0,244, 21,  0,  1, 31,  0,213,  1,203,  0,403],
+    [206,  1,  1,  1,210,  1,  0,402,  0,  1,  0, 31,  0],
+    [  0,221, 22,  1,  0,  1, 81,  1,  1,  1,  1,  1, 81],
+    [ 21,  0,221,  1, 31,  1,428,  0, 32,  1, 32,  0,425],
+    [  0, 34,  0,240,  0, 81,  0,404,  0, 82,  0,401,  0]
 ],
    "bgmap": [

--- a/project/floors/yiqu7.js
+++ b/project/floors/yiqu7.js
@ -15,7 +15,15 @@ main.floors.yiqu7=
    "eachArrive": [],
    "parallelDo": "",
    "events": {},
-    "changeFloor": {},
+    "changeFloor": {
+        "12,5": {
+            "floorId": "yiqu6",
+            "loc": [
+                0,
+                5
+            ]
+        }
+    },
    "beforeBattle": {},
    "afterBattle": {},
    "afterGetItem": {},
@ -29,7 +37,7 @@ main.floors.yiqu7=
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
--- a/project/floors/zhujuejia.js
+++ b/project/floors/zhujuejia.js
@ -19,7 +19,7 @@ main.floors.zhujuejia=
    "events": {},
    "changeFloor": {
        "0,9": {
-            "floorId": "street01",
+            "floorId": "changguan2",
            "loc": [
                12,
                9
@ -44,13 +44,13 @@ main.floors.zhujuejia=
    [120125,120126,120127,120157,120164,120161,120160,120159,120149,120150,120151,120159,120002],
    [120133,120134,120135,120165,120172,200550,120168,120167,120157,120158,120159,120167,120010],
    [120141,120142,120143,120173,120065,200558,120176,120175,120165,120166,120167,140132,140133],
-    [120149,120150,120151,120017,  0,90244,  0,  0,120173,120174,120175,110011,140141],
-    [120157,120158,120159,120017,  0,90244,  0,  0,  0,  0,120021,120002,120002],
-    [120165,120166,120167,110030,  0,  0,  0,120015,120010,120010,120010,120010,120010],
-    [120173,120174,120175,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266],
+    [110286,120150,120151,120017,  0,  0,  0,  0,120173,120174,120175,110011,140141],
+    [110294,120158,120159,120017,  0,  0,  0,  0,  0,  0,120021,120002,120002],
+    [110302,120166,120167,110030,  0,  0,  0,120015,120010,120010,120010,120010,120010],
+    [110310,120174,120175,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266],
-    [ 92,  0,  0,  0,  0,  0,200199,  0,  0,  0,  0,140184,140],
+    [  0,  0,  0,  0,  0,  0,210113,210114,210115,  0,  0,  0,90266],
+    [ 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140184,140],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140192,140],
    [140,140,140186,  0,  0,  0,  0,  0,  0,  0,  0,140192,140],
    [140,140,140,140,140,140,140,140,140,140,140,140,140]
@ -76,10 +76,10 @@ main.floors.zhujuejia=
    [  0,  0,  0,120038,  0, 90,140099,140100,  0,90223,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,140107,140108,  0,90231,120039,  0,  0],
    [  0,  0,  0,110022,  0,  0,  0,120007,120007,120007,120007,  0,  0],
-    [140091,140092,140093,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
-    [140099,140100,140101,  0,  0,  0,200175,  0,  0,  0,  0,  0,  0],
-    [140107,140108,140109,  0,  0,  0,200183,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,200191,  0,  0,  0,  0,  0,  0],
+    [140092,140092,140093,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [140100,140100,140101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [140108,140108,140109,  0,  0,  0,210105,210106,210107,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,140186,71832,71833,71759,71758,71786,71787,71784,71785,  0,  0],
@ -89,13 +89,13 @@ main.floors.zhujuejia=
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,120180,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,120073,  0,  0,  0,  0,  0,  0,  0,  0],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110004,140149],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,120073,90244,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,90244,  0,  0,  0,  0,  0,110004,140149],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,210121,210122,210123,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
--- a/project/fonts/Verdana.ttf
+++ b/project/fonts/Verdana.ttf
--- a/project/fonts/simhei.ttf
+++ b/project/fonts/simhei.ttf
--- a/project/functions.js
+++ b/project/functions.js
--- a/project/icons.js
+++ b/project/icons.js
@ -152,7 +152,8 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"rightPortal": 25,
 		"upPortal": 26,
 		"ice": 27,
-		"magentaWall": 28
+		"magentaWall": 28,
+		"A437": 29
 	},
 	"npcs": {
 		"man": 0,
@ -259,7 +260,16 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"E421": 73,
 		"E422": 73,
 		"E425": 74,
-		"E426": 75
+		"E426": 75,
+		"E428": 76,
+		"E429": 77,
+		"E430": 78,
+		"E431": 79,
+		"E432": 80,
+		"E433": 81,
+		"E434": 82,
+		"E435": 83,
+		"E436": 84
 	},
 	"enemy48": {
 		"angel": 0,
@ -356,7 +366,8 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"I419": 81,
 		"I420": 82,
 		"I423": 83,
-		"I424": 84
+		"I424": 84,
+		"I427": 85
 	},
 	"autotile": {
 		"autotile": 0,
--- a/project/items.js
+++ b/project/items.js
@ -298,8 +298,8 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"text": "可以自由往来去过的楼层",
 		"hideInReplay": true,
 		"hideInToolbox": true,
-		"useItemEffect": "//core.ui.drawFly(core.floorIds.indexOf(core.status.floorId));\nflags.canMoveFloor = core.canMoveFloor()\nif (!main.replayChecking && !core.isReplaying()) core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId));",
-		"canUseItemEffect": "(function () {\n\tif (core.flags.flyNearStair && !core.nearStair() && !core.canMoveFloor())\n\t\treturn false;\n\treturn core.status.maps[core.status.floorId].canFlyFrom;\n})();"
+		"useItemEffect": "core.ui.drawFly(core.floorIds.indexOf(core.status.floorId));",
+		"canUseItemEffect": "(function () {\n\tif (core.flags.flyNearStair && !core.nearStair())\n\t\treturn false;\n\treturn core.status.maps[core.status.floorId].canFlyFrom;\n})();"
 	},
 	"coin": {
 		"cls": "constants",
@ -813,5 +813,21 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "items",
 		"name": "新物品",
 		"canUseItemEffect": "true"
+	},
+	"I427": {
+		"cls": "equips",
+		"name": "生铁短匕",
+		"text": "匕首有些沉重，也不太合手，但它的边缘相当锐利，可以完成一些基础的刺杀工作。",
+		"equip": {
+			"type": 0,
+			"animate": "sword",
+			"value": {
+				"atk": 6
+			},
+			"percentage": {}
+		},
+		"itemEffect": "core.status.hero.atk += 0",
+		"itemEffectTip": "，攻击+0",
+		"equipCls": "匕首"
 	}
 }
--- a/project/maps.js
+++ b/project/maps.js
@ -325,6 +325,17 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"424": {"cls":"items","id":"I424"},
 	"425": {"cls":"enemys","id":"E425"},
 	"426": {"cls":"enemys","id":"E426"},
+	"427": {"cls":"items","id":"I427"},
+	"428": {"cls":"enemys","id":"E428"},
+	"429": {"cls":"enemys","id":"E429"},
+	"430": {"cls":"enemys","id":"E430"},
+	"431": {"cls":"enemys","id":"E431"},
+	"432": {"cls":"enemys","id":"E432"},
+	"433": {"cls":"enemys","id":"E433"},
+	"434": {"cls":"enemys","id":"E434"},
+	"435": {"cls":"enemys","id":"E435"},
+	"436": {"cls":"enemys","id":"E436"},
+	"437": {"cls":"animates","id":"A437"},
 	"20034": {"cls":"tileset","id":"X20034","canPass":true},
 	"20154": {"cls":"tileset","id":"X20154","canPass":true},
 	"20216": {"cls":"tileset","id":"X20216","canPass":true},
--- a/project/materials/animates.png
+++ b/project/materials/animates.png
--- a/project/materials/enemys.png
+++ b/project/materials/enemys.png
--- a/project/materials/items.png
+++ b/project/materials/items.png
--- a/project/plugins.js
+++ b/project/plugins.js
--- a/project/table/CommonEventTemplate_comment.js
+++ b/project/table/CommonEventTemplate_comment.js
@ -1,5 +1,5 @@
-
-				var CommonEventTemplate_comment = {"_type": "object",
+var CommonEventTemplate_comment = {
+	"_type": "object",
 	"_data": {
 		"CommonEventTemplate": {
 			"_type": "object",
@ -39,5 +39,5 @@
 				}
 			}
 		}
-				}}
-			
+	}
+}
--- a/project/table/task_comment.js
+++ b/project/table/task_comment.js
@ -0,0 +1,121 @@
+var task_comment = {
+	"_type": "object",
+	"_data": {
+		"task": {
+			"_type": "object",
+			"_data": function (key) {
+				var obj = {
+					"新手任务": {
+						"_leaf": true,
+						"_type": "event",
+						"_event": "taskEvent",
+						"_data": "开局就有"
+					},
+					"task1": {
+						"_leaf": true,
+						"_type": "event",
+						"_event": "taskEvent",
+						"_data": "新"
+					},
+				}
+				if (obj[key]) return obj[key];
+				return {
+					"_leaf": true,
+					"_type": "event",
+					"_event": "taskEvent",
+					"_template": `{
+			"type": "taskEvent",
+			"name": "mission name",
+			"n": 1,
+			"text": "任务描述",
+			"info": [
+				{
+					"type": "checkItem",
+					"checkItem": "yellowKey",
+					"operator": ">=",
+					"count": 0
+				},
+				{
+					"type": "checkStatus",
+					"checkStatus": "atk",
+					"operator": ">=",
+					"count": 10
+				},
+				{
+					"type": "checkFlag",
+					"checkFlag": "flag1",
+					"operator": "=",
+					"count": "\"value\""
+				},
+				{
+					"type": "checkBlock",
+					"checkBlock": "bat",
+					"floorId": [
+						"MT1",
+						"MT2"
+					],
+					"operator": "<=",
+					"count": 0
+				},
+				{
+					"type": "kill",
+					"operator": ">=",
+					"count": 0
+				},
+				{
+					"type": "killLocs",
+					"loc": [
+						[
+							1,
+							1
+						]
+					],
+					"floorId": "MT1",
+					"operator": ">=",
+					"count": 1
+				},
+				{
+					"type": "killSpecial",
+					"killSpecial": "61",
+					"floorId": [
+						"61"
+					],
+					"operator": ">=",
+					"count": 1
+				},
+				{
+					"type": "killAll",
+					"floorId": [
+						"MT1"
+					]
+				},
+				{
+					"type": "specialBlock",
+					"floorId": [
+						"MT1"
+					],
+					"specialBlock": "血网伤害",
+					"operator": "<",
+					"count": 1
+				},
+				{
+					"type": "gosthFloor",
+					"floorId": [
+						"MT1"
+					],
+					"operator": "<",
+					"count": 1
+				}
+			],
+			"action": [
+				{
+					"type": "setmusics"
+				}
+			]
+		}`,
+					"_data": "..."
+				}
+			}
+		}
+	}
+}
--- a/project/tilesets/2233.png
+++ b/project/tilesets/2233.png