diff --git a/data/MapInfos.json b/data/MapInfos.json
index 1c86082..ca50932 100644
--- a/data/MapInfos.json
+++ b/data/MapInfos.json
@@ -13,11 +13,7 @@ null,
 {"id":11,"expanded":false,"name":"密室","order":14,"parentId":9,"scrollX":1029.3333333333333,"scrollY":982.6666666666666},
 {"id":12,"expanded":true,"name":"大护壁及大漩涡","order":16,"parentId":7,"scrollX":1040,"scrollY":636},
 {"id":13,"expanded":true,"name":"渡鸦12345的办公室1F","order":4,"parentId":30,"scrollX":1040,"scrollY":636},
-<<<<<<< HEAD
-{"id":14,"expanded":false,"name":"梦位面宇宙","order":22,"parentId":0,"scrollX":1029.3333333333333,"scrollY":802.6666666666666},
-=======
 {"id":14,"expanded":false,"name":"梦位面宇宙","order":22,"parentId":0,"scrollX":1252,"scrollY":1053.2},
->>>>>>> 42897c099356ca6470de33ebd24938c91b98e5f9
 {"id":15,"expanded":false,"name":"艾欧","order":23,"parentId":14,"scrollX":1850.6666666666667,"scrollY":1958.6666666666667},
 {"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":24,"parentId":15,"scrollX":2058.6666666666665,"scrollY":1958.6666666666667},
 {"id":17,"expanded":true,"name":"艾欧同步轨道","order":25,"parentId":15,"scrollX":832,"scrollY":640},
diff --git a/data/System.json b/data/System.json
index 9fed789..41f02c5 100644
--- a/data/System.json
+++ b/data/System.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"airship":{"bgm":{"name":"Ship3","pan":0,"pitch":100,"volume":90},"characterIndex":3,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"armorTypes":["","轻甲","重甲","魔法护甲","普通饰品","魔法饰品","魔法球"],"attackMotions":[{"type":0,"weaponImageId":0},{"type":1,"weaponImageId":1},{"type":1,"weaponImageId":2},{"type":1,"weaponImageId":3},{"type":1,"weaponImageId":4},{"type":1,"weaponImageId":5},{"type":1,"weaponImageId":6},{"type":2,"weaponImageId":7},{"type":2,"weaponImageId":8},{"type":2,"weaponImageId":9},{"type":0,"weaponImageId":10},{"type":0,"weaponImageId":11},{"type":0,"weaponImageId":12}],"battleBgm":{"name":"Battle1","pan":0,"pitch":100,"volume":90},"battleback1Name":"Grassland","battleback2Name":"Grassland","battlerHue":0,"battlerName":"Dragon","boat":{"bgm":{"name":"Ship1","pan":0,"pitch":100,"volume":90},"characterIndex":0,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"currencyUnit":"G","defeatMe":{"name":"Defeat1","pan":0,"pitch":100,"volume":90},"editMapId":14,"elements":["","物理","地","风","水","火","电","冰","圣","暗","精神","力场","混沌","幽能","毒","生命吸取"],"equipTypes":["","武器","副手","帽子","甲衣","靴子","项链","戒指"],"gameTitle":"异常生物见闻录","gameoverMe":{"name":"Gameover1","pan":0,"pitch":100,"volume":90},"locale":"zh_CN","magicSkills":[1],"menuCommands":[true,true,true,true,true,true],"optDisplayTp":true,"optDrawTitle":true,"optExtraExp":false,"optFloorDeath":false,"optFollowers":true,"optSideView":false,"optSlipDeath":false,"optTransparent":false,"partyMembers":[1,2,3,4],"ship":{"bgm":{"name":"Ship2","pan":0,"pitch":100,"volume":90},"characterIndex":1,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"skillTypes":["","特技","魔法","神术或独有技能"],"sounds":[{"name":"Cursor2","pan":0,"pitch":100,"volume":90},{"name":"Decision1","pan":0,"pitch":100,"volume":90},{"name":"Cancel2","pan":0,"pitch":100,"volume":90},{"name":"Buzzer1","pan":0,"pitch":100,"volume":90},{"name":"Equip1","pan":0,"pitch":100,"volume":90},{"name":"Save","pan":0,"pitch":100,"volume":90},{"name":"Load","pan":0,"pitch":100,"volume":90},{"name":"Battle1","pan":0,"pitch":100,"volume":90},{"name":"Run","pan":0,"pitch":100,"volume":90},{"name":"Attack3","pan":0,"pitch":100,"volume":90},{"name":"Damage4","pan":0,"pitch":100,"volume":90},{"name":"Collapse1","pan":0,"pitch":100,"volume":90},{"name":"Collapse2","pan":0,"pitch":100,"volume":90},{"name":"Collapse3","pan":0,"pitch":100,"volume":90},{"name":"Damage5","pan":0,"pitch":100,"volume":90},{"name":"Collapse4","pan":0,"pitch":100,"volume":90},{"name":"Recovery","pan":0,"pitch":100,"volume":90},{"name":"Miss","pan":0,"pitch":100,"volume":90},{"name":"Evasion1","pan":0,"pitch":100,"volume":90},{"name":"Evasion2","pan":0,"pitch":100,"volume":90},{"name":"Reflection","pan":0,"pitch":100,"volume":90},{"name":"Shop1","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90}],"startMapId":17,"startX":5,"startY":2,"switches":["","","","","","","","","","","","","","","","","","","","",""],"terms":{"basic":["等级","Lv","HP","HP","MP","MP","TP","TP","经验值","EXP"],"commands":["战斗","逃跑","攻击","防御","物品","技能","装备","状态","整队","保存","游戏结束","设置","武器","护甲","重要物品","装备","最强装备","清空","开始游戏","继续游戏",null,"回到标题","取消",null,"购买","出售"],"params":["最大 HP","最大 MP","攻击力","防御力","魔法攻击","魔法防御","敏捷","幸运","命中率","回避率"],"messages":{"actionFailure":"对%1没有效果！","actorDamage":"%1受到了 %2 点伤害！","actorDrain":"%1被吸收了 %3 点 %2！","actorGain":"%1的 %2 增加了 %3 点！","actorLoss":"%1的 %2 减少了 %3 点！","actorNoDamage":"%1没有受到伤害！","actorNoHit":"Miss！ %1没有受到伤害！","actorRecovery":"%1恢复了 %3 点 %2！","alwaysDash":"始终跑步","bgmVolume":"BGM 音量","bgsVolume":"BGS 音量","buffAdd":"%1的%2上升了！","buffRemove":"%1的%2恢复正常了！","commandRemember":"记住指令","counterAttack":"%1的反击！","criticalToActor":"痛恨一击！","criticalToEnemy":"会心一击！","debuffAdd":"%1的%2下降了！","defeat":"%1被击败了。","emerge":"%1出现了！","enemyDamage":"%1受到了 %2 点伤害！","enemyDrain":"%1被吸收了 %3 点 %2！","enemyGain":"%1的 %2 增加了 %3 点！","enemyLoss":"%1的 %2 减少了 %3 点！","enemyNoDamage":"没有对%1造成伤害！","enemyNoHit":"Miss！没有对%1造成伤害！","enemyRecovery":"%1恢复了 %3 点 %2！","escapeFailure":"但是没有逃跑成功！","escapeStart":"%1开始逃跑了！","evasion":"%1躲开了攻击！","expNext":"距离下一%1","expTotal":"现在的%1","file":"文件","levelUp":"%1升到了 %2 %3！","loadMessage":"读取哪个文件？","magicEvasion":"%1抵消了魔法！","magicReflection":"%1反射了魔法！","meVolume":"ME 音量","obtainExp":"获得了 %1 点%2！","obtainGold":"获得了 %1\\G！","obtainItem":"获得了%1！","obtainSkill":"学会了%1！","partyName":"%1的队伍","possession":"持有数","preemptive":"%1先发制人！","saveMessage":"保存到哪个文件？","seVolume":"SE 音量","substitute":"%1保护了%2！","surprise":"%1被偷袭了！","useItem":"%1使用了%2！","victory":"%1胜利了！"}},"testBattlers":[{"actorId":1,"equips":[1,1,2,3,0],"level":1},{"actorId":2,"equips":[2,1,2,3,0],"level":1},{"actorId":3,"equips":[3,0,2,3,4],"level":1},{"actorId":4,"equips":[4,0,2,3,4],"level":1}],"testTroopId":4,"title1Name":"Plain","title2Name":"","titleBgm":{"name":"Theme6","pan":0,"pitch":100,"volume":90},"variables":["","薇薇安的技能数值","数据判断","狗炮计数","狗炮能量余额","","","","","","","","","","","","","","","",""],"versionId":58943449,"victoryMe":{"name":"Victory1","pan":0,"pitch":100,"volume":90},"weaponTypes":["","剑","长枪","匕首","斧","爪","弓弩","枪炮","法杖","专属武器"],"windowTone":[0,0,0,0]}
-=======
-{"airship":{"bgm":{"name":"Ship3","pan":0,"pitch":100,"volume":90},"characterIndex":3,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"armorTypes":["","轻甲","重甲","魔法护甲","普通饰品","魔法饰品","魔法球"],"attackMotions":[{"type":0,"weaponImageId":0},{"type":1,"weaponImageId":2},{"type":1,"weaponImageId":9},{"type":1,"weaponImageId":1},{"type":1,"weaponImageId":4},{"type":1,"weaponImageId":10},{"type":1,"weaponImageId":7},{"type":2,"weaponImageId":21},{"type":1,"weaponImageId":14},{"type":1,"weaponImageId":11},{"type":0,"weaponImageId":10},{"type":0,"weaponImageId":11},{"type":0,"weaponImageId":12}],"battleBgm":{"name":"Battle1","pan":0,"pitch":100,"volume":90},"battleback1Name":"Grassland","battleback2Name":"Grassland","battlerHue":0,"battlerName":"Dragon","boat":{"bgm":{"name":"Ship1","pan":0,"pitch":100,"volume":90},"characterIndex":0,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"currencyUnit":"经费","defeatMe":{"name":"Defeat1","pan":0,"pitch":100,"volume":90},"editMapId":14,"elements":["","物理","地","风","水","火","电","冰","圣","暗","精神","力场","混沌","幽能","毒","生命吸取"],"equipTypes":["","武器","副手","帽子","甲衣","靴子","项链","戒指"],"gameTitle":"异常生物见闻录","gameoverMe":{"name":"Gameover1","pan":0,"pitch":100,"volume":90},"locale":"zh_CN","magicSkills":[2],"menuCommands":[true,true,true,true,true,true],"optDisplayTp":true,"optDrawTitle":true,"optExtraExp":false,"optFloorDeath":false,"optFollowers":true,"optSideView":false,"optSlipDeath":false,"optTransparent":false,"partyMembers":[1,2,3,4],"ship":{"bgm":{"name":"Ship2","pan":0,"pitch":100,"volume":90},"characterIndex":1,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"skillTypes":["","特技","魔法","神术或独有技能"],"sounds":[{"name":"Cursor2","pan":0,"pitch":100,"volume":90},{"name":"Decision1","pan":0,"pitch":100,"volume":90},{"name":"Cancel2","pan":0,"pitch":100,"volume":90},{"name":"Buzzer1","pan":0,"pitch":100,"volume":90},{"name":"Equip1","pan":0,"pitch":100,"volume":90},{"name":"Save","pan":0,"pitch":100,"volume":90},{"name":"Load","pan":0,"pitch":100,"volume":90},{"name":"Battle1","pan":0,"pitch":100,"volume":90},{"name":"Run","pan":0,"pitch":100,"volume":90},{"name":"Attack3","pan":0,"pitch":100,"volume":90},{"name":"Damage4","pan":0,"pitch":100,"volume":90},{"name":"Collapse1","pan":0,"pitch":100,"volume":90},{"name":"Collapse2","pan":0,"pitch":100,"volume":90},{"name":"Collapse3","pan":0,"pitch":100,"volume":90},{"name":"Damage5","pan":0,"pitch":100,"volume":90},{"name":"Collapse4","pan":0,"pitch":100,"volume":90},{"name":"Recovery","pan":0,"pitch":100,"volume":90},{"name":"Miss","pan":0,"pitch":100,"volume":90},{"name":"Evasion1","pan":0,"pitch":100,"volume":90},{"name":"Evasion2","pan":0,"pitch":100,"volume":90},{"name":"Reflection","pan":0,"pitch":100,"volume":90},{"name":"Shop1","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90}],"startMapId":17,"startX":5,"startY":2,"switches":["","","","","","","","","","","","","","","","","","","","",""],"terms":{"basic":["等级","Lv","HP","HP","MP","MP","TP","TP","经验值","EXP"],"commands":["战斗","逃跑","攻击","防御","物品","技能","装备","状态","整队","保存","游戏结束","设置","武器","护甲","重要物品","装备","最强装备","清空","开始游戏","继续游戏",null,"回到标题","取消",null,"购买","出售"],"params":["最大 HP","最大 MP","攻击力","防御力","魔法攻击","魔法防御","敏捷","幸运","命中率","回避率"],"messages":{"actionFailure":"对%1没有效果！","actorDamage":"%1受到了 %2 点伤害！","actorDrain":"%1被吸收了 %3 点 %2！","actorGain":"%1的 %2 增加了 %3 点！","actorLoss":"%1的 %2 减少了 %3 点！","actorNoDamage":"%1没有受到伤害！","actorNoHit":"Miss！ %1没有受到伤害！","actorRecovery":"%1恢复了 %3 点 %2！","alwaysDash":"始终跑步","bgmVolume":"BGM 音量","bgsVolume":"BGS 音量","buffAdd":"%1的%2上升了！","buffRemove":"%1的%2恢复正常了！","commandRemember":"记住指令","counterAttack":"%1的反击！","criticalToActor":"痛恨一击！","criticalToEnemy":"会心一击！","debuffAdd":"%1的%2下降了！","defeat":"%1被击败了。","emerge":"%1出现了！","enemyDamage":"%1受到了 %2 点伤害！","enemyDrain":"%1被吸收了 %3 点 %2！","enemyGain":"%1的 %2 增加了 %3 点！","enemyLoss":"%1的 %2 减少了 %3 点！","enemyNoDamage":"没有对%1造成伤害！","enemyNoHit":"Miss！没有对%1造成伤害！","enemyRecovery":"%1恢复了 %3 点 %2！","escapeFailure":"但是没有逃跑成功！","escapeStart":"%1开始逃跑了！","evasion":"%1躲开了攻击！","expNext":"距离下一%1","expTotal":"现在的%1","file":"文件","levelUp":"%1升到了 %2 %3！","loadMessage":"读取哪个文件？","magicEvasion":"%1抵消了魔法！","magicReflection":"%1反射了魔法！","meVolume":"ME 音量","obtainExp":"获得了 %1 点%2！","obtainGold":"获得了 %1\\G！","obtainItem":"获得了%1！","obtainSkill":"学会了%1！","partyName":"%1的队伍","possession":"持有数","preemptive":"%1先发制人！","saveMessage":"保存到哪个文件？","seVolume":"SE 音量","substitute":"%1保护了%2！","surprise":"%1被偷袭了！","useItem":"%1使用了%2！","victory":"%1胜利了！"}},"testBattlers":[{"actorId":1,"equips":[1,1,2,3,0],"level":1},{"actorId":2,"equips":[2,1,2,3,0],"level":1},{"actorId":3,"equips":[3,0,2,3,4],"level":1},{"actorId":4,"equips":[4,0,2,3,4],"level":1}],"testTroopId":4,"title1Name":"Plain","title2Name":"","titleBgm":{"name":"Theme6","pan":0,"pitch":100,"volume":90},"variables":["","薇薇安的技能数值","数据判断","狗炮计数","狗炮能量余额","","","","","","","","","","","","","","","",""],"versionId":33079012,"victoryMe":{"name":"Victory1","pan":0,"pitch":100,"volume":90},"weaponTypes":["","剑","长枪","匕首","斧","爪","弓弩","枪炮","法杖","专属武器"],"windowTone":[0,0,0,0]}
->>>>>>> 42897c099356ca6470de33ebd24938c91b98e5f9
+{"airship":{"bgm":{"name":"Ship3","pan":0,"pitch":100,"volume":90},"characterIndex":3,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"armorTypes":["","轻甲","重甲","魔法护甲","普通饰品","魔法饰品","魔法球"],"attackMotions":[{"type":0,"weaponImageId":0},{"type":1,"weaponImageId":2},{"type":1,"weaponImageId":9},{"type":1,"weaponImageId":1},{"type":1,"weaponImageId":4},{"type":1,"weaponImageId":10},{"type":1,"weaponImageId":7},{"type":2,"weaponImageId":21},{"type":1,"weaponImageId":14},{"type":1,"weaponImageId":11},{"type":0,"weaponImageId":10},{"type":0,"weaponImageId":11},{"type":0,"weaponImageId":12}],"battleBgm":{"name":"Battle1","pan":0,"pitch":100,"volume":90},"battleback1Name":"Grassland","battleback2Name":"Grassland","battlerHue":0,"battlerName":"Dragon","boat":{"bgm":{"name":"Ship1","pan":0,"pitch":100,"volume":90},"characterIndex":0,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"currencyUnit":"经费","defeatMe":{"name":"Defeat1","pan":0,"pitch":100,"volume":90},"editMapId":14,"elements":["","物理","地","风","水","火","电","冰","圣","暗","精神","力场","混沌","幽能","毒","生命吸取"],"equipTypes":["","武器","副手","帽子","甲衣","靴子","项链","戒指"],"gameTitle":"异常生物见闻录","gameoverMe":{"name":"Gameover1","pan":0,"pitch":100,"volume":90},"locale":"zh_CN","magicSkills":[2],"menuCommands":[true,true,true,true,true,true],"optDisplayTp":true,"optDrawTitle":true,"optExtraExp":false,"optFloorDeath":false,"optFollowers":true,"optSideView":false,"optSlipDeath":false,"optTransparent":false,"partyMembers":[1,2,3,4],"ship":{"bgm":{"name":"Ship2","pan":0,"pitch":100,"volume":90},"characterIndex":1,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"skillTypes":["","特技","魔法","神术或独有技能"],"sounds":[{"name":"Cursor2","pan":0,"pitch":100,"volume":90},{"name":"Decision1","pan":0,"pitch":100,"volume":90},{"name":"Cancel2","pan":0,"pitch":100,"volume":90},{"name":"Buzzer1","pan":0,"pitch":100,"volume":90},{"name":"Equip1","pan":0,"pitch":100,"volume":90},{"name":"Save","pan":0,"pitch":100,"volume":90},{"name":"Load","pan":0,"pitch":100,"volume":90},{"name":"Battle1","pan":0,"pitch":100,"volume":90},{"name":"Run","pan":0,"pitch":100,"volume":90},{"name":"Attack3","pan":0,"pitch":100,"volume":90},{"name":"Damage4","pan":0,"pitch":100,"volume":90},{"name":"Collapse1","pan":0,"pitch":100,"volume":90},{"name":"Collapse2","pan":0,"pitch":100,"volume":90},{"name":"Collapse3","pan":0,"pitch":100,"volume":90},{"name":"Damage5","pan":0,"pitch":100,"volume":90},{"name":"Collapse4","pan":0,"pitch":100,"volume":90},{"name":"Recovery","pan":0,"pitch":100,"volume":90},{"name":"Miss","pan":0,"pitch":100,"volume":90},{"name":"Evasion1","pan":0,"pitch":100,"volume":90},{"name":"Evasion2","pan":0,"pitch":100,"volume":90},{"name":"Reflection","pan":0,"pitch":100,"volume":90},{"name":"Shop1","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90}],"startMapId":17,"startX":5,"startY":2,"switches":["","","","","","","","","","","","","","","","","","","","",""],"terms":{"basic":["等级","Lv","HP","HP","MP","MP","TP","TP","经验值","EXP"],"commands":["战斗","逃跑","攻击","防御","物品","技能","装备","状态","整队","保存","游戏结束","设置","武器","护甲","重要物品","装备","最强装备","清空","开始游戏","继续游戏",null,"回到标题","取消",null,"购买","出售"],"params":["最大 HP","最大 MP","攻击力","防御力","魔法攻击","魔法防御","敏捷","幸运","命中率","回避率"],"messages":{"actionFailure":"对%1没有效果！","actorDamage":"%1受到了 %2 点伤害！","actorDrain":"%1被吸收了 %3 点 %2！","actorGain":"%1的 %2 增加了 %3 点！","actorLoss":"%1的 %2 减少了 %3 点！","actorNoDamage":"%1没有受到伤害！","actorNoHit":"Miss！ %1没有受到伤害！","actorRecovery":"%1恢复了 %3 点 %2！","alwaysDash":"始终跑步","bgmVolume":"BGM 音量","bgsVolume":"BGS 音量","buffAdd":"%1的%2上升了！","buffRemove":"%1的%2恢复正常了！","commandRemember":"记住指令","counterAttack":"%1的反击！","criticalToActor":"痛恨一击！","criticalToEnemy":"会心一击！","debuffAdd":"%1的%2下降了！","defeat":"%1被击败了。","emerge":"%1出现了！","enemyDamage":"%1受到了 %2 点伤害！","enemyDrain":"%1被吸收了 %3 点 %2！","enemyGain":"%1的 %2 增加了 %3 点！","enemyLoss":"%1的 %2 减少了 %3 点！","enemyNoDamage":"没有对%1造成伤害！","enemyNoHit":"Miss！没有对%1造成伤害！","enemyRecovery":"%1恢复了 %3 点 %2！","escapeFailure":"但是没有逃跑成功！","escapeStart":"%1开始逃跑了！","evasion":"%1躲开了攻击！","expNext":"距离下一%1","expTotal":"现在的%1","file":"文件","levelUp":"%1升到了 %2 %3！","loadMessage":"读取哪个文件？","magicEvasion":"%1抵消了魔法！","magicReflection":"%1反射了魔法！","meVolume":"ME 音量","obtainExp":"获得了 %1 点%2！","obtainGold":"获得了 %1\\G！","obtainItem":"获得了%1！","obtainSkill":"学会了%1！","partyName":"%1的队伍","possession":"持有数","preemptive":"%1先发制人！","saveMessage":"保存到哪个文件？","seVolume":"SE 音量","substitute":"%1保护了%2！","surprise":"%1被偷袭了！","useItem":"%1使用了%2！","victory":"%1胜利了！"}},"testBattlers":[{"actorId":1,"equips":[1,1,2,3,0],"level":1},{"actorId":2,"equips":[2,1,2,3,0],"level":1},{"actorId":3,"equips":[3,0,2,3,4],"level":1},{"actorId":4,"equips":[4,0,2,3,4],"level":1}],"testTroopId":4,"title1Name":"Plain","title2Name":"","titleBgm":{"name":"Theme6","pan":0,"pitch":100,"volume":90},"variables":["","薇薇安的技能数值","数据判断","狗炮计数","狗炮能量余额","","","","","","","","","","","","","","","",""],"versionId":33079012,"victoryMe":{"name":"Victory1","pan":0,"pitch":100,"volume":90},"weaponTypes":["","剑","长枪","匕首","斧","爪","弓弩","枪炮","法杖","专属武器"],"windowTone":[0,0,0,0]}
\ No newline at end of file