Merge branch 'main' of https://git.xyzzgame.com/xyzzgzs/ycrpg

Game.rpgproject

@@ -1 +1 @@
-RPGMV 1.6.1
+RPGMV 1.6.2

Readme.md

@@ -22,6 +22,8 @@
 
 
 ## 更新记录
+- **2022/10/17**；**不明枪兵**；彩蛋完成
+- **2022/10/16**；**不明枪兵**；推进剧情
 - **2022/10/16**；**乐子人**；优化地图，确认内容丢失情况
 - **2022/10/07**；**不明枪兵**；前置剧情完成
 - **2022/10/07**；**不明枪兵**；把异常一的音效复制过来了，调整了飞船事件。

data/Actors.json

@@ -1,6 +1,6 @@
 [
 null,
-{"id":1,"battlerName":"","characterIndex":0,"characterName":"郝仁行走图改","classId":1,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"主角团","traits":[{"code":14,"dataId":34,"value":1},{"code":14,"dataId":63,"value":1}],"initialLevel":1,"maxLevel":99,"name":"郝仁","nickname":"","note":"","profile":""},
+{"id":1,"battlerName":"","characterIndex":0,"characterName":"郝仁行走图改","classId":1,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"主角团","traits":[{"code":14,"dataId":34,"value":1},{"code":14,"dataId":63,"value":1},{"code":43,"dataId":500,"value":1},{"code":43,"dataId":435,"value":1},{"code":43,"dataId":414,"value":1}],"initialLevel":1,"maxLevel":99,"name":"郝仁","nickname":"","note":"","profile":""},
 {"id":2,"battlerName":"","characterIndex":0,"characterName":"vva","classId":2,"equips":[0,0,0,0,0],"faceIndex":1,"faceName":"主角团","traits":[{"code":14,"dataId":34,"value":1}],"initialLevel":1,"maxLevel":99,"name":"薇薇安","nickname":"","note":"","profile":""},
 {"id":3,"battlerName":"","characterIndex":0,"characterName":"五月","classId":1,"equips":[0,0,0,0,0],"faceIndex":2,"faceName":"主角团","traits":[],"initialLevel":1,"maxLevel":99,"name":"南宫五月","nickname":"","note":"","profile":""},
 {"id":4,"battlerName":"","characterIndex":2,"characterName":"People1","classId":5,"equips":[0,0,0,0,0],"faceIndex":3,"faceName":"主角团","traits":[{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":7,"value":0.95}],"initialLevel":1,"maxLevel":99,"name":"南宫三八","nickname":"","note":"","profile":""},

data/CommonEvents.json

@@ -90,8 +90,8 @@ null,
 {"id":88,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":89,"list":[{"code":111,"indent":0,"parameters":[13,2]},{"code":101,"indent":1,"parameters":["",0,0,2]},{"code":401,"indent":1,"parameters":["你已经在飞船上了。"]},{"code":0,"indent":1,"parameters":[]},{"code":411,"indent":0,"parameters":[]},{"code":122,"indent":1,"parameters":[21,21,0,3,7,0,0]},{"code":122,"indent":1,"parameters":[22,22,0,3,5,-1,0]},{"code":122,"indent":1,"parameters":[23,23,0,3,5,-1,1]},{"code":202,"indent":1,"parameters":[2,1,21,22,23]},{"code":101,"indent":1,"parameters":["",0,0,2]},{"code":401,"indent":1,"parameters":["去船舱还是开船？"]},{"code":102,"indent":1,"parameters":[["开船","去船舱","取消"],2,0,2,0]},{"code":402,"indent":1,"parameters":[0,"开船"]},{"code":206,"indent":2,"parameters":[]},{"code":0,"indent":2,"parameters":[]},{"code":402,"indent":1,"parameters":[1,"去船舱"]},{"code":122,"indent":2,"parameters":[21,21,0,3,7,0,0]},{"code":122,"indent":2,"parameters":[22,22,0,3,5,-1,0]},{"code":122,"indent":2,"parameters":[23,23,0,3,5,-1,1]},{"code":202,"indent":2,"parameters":[2,1,21,22,23]},{"code":201,"indent":2,"parameters":[0,43,25,21,0,0]},{"code":0,"indent":2,"parameters":[]},{"code":402,"indent":1,"parameters":[2,"取消"]},{"code":202,"indent":2,"parameters":[2,0,1,0,0]},{"code":0,"indent":2,"parameters":[]},{"code":404,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"name":"飞船效果","switchId":1,"trigger":0},
 {"id":90,"list":[{"code":111,"indent":0,"parameters":[0,1,0]},{"code":111,"indent":1,"parameters":[0,3,0]},{"code":111,"indent":2,"parameters":[0,8,0]},{"code":111,"indent":3,"parameters":[0,10,0]},{"code":111,"indent":4,"parameters":[1,6,0,11,0]},{"code":101,"indent":5,"parameters":["",0,0,2]},{"code":401,"indent":5,"parameters":["任务："]},{"code":401,"indent":5,"parameters":["    与海妖交谈或者从南郊右侧道路出发前往海滩"]},{"code":0,"indent":5,"parameters":[]},{"code":412,"indent":4,"parameters":[]},{"code":111,"indent":4,"parameters":[1,6,0,16,0]},{"code":101,"indent":5,"parameters":["",0,0,2]},{"code":401,"indent":5,"parameters":["任务："]},{"code":401,"indent":5,"parameters":["    向右上走观察海妖"]},{"code":0,"indent":5,"parameters":[]},{"code":412,"indent":4,"parameters":[]},{"code":0,"indent":4,"parameters":[]},{"code":411,"indent":3,"parameters":[]},{"code":101,"indent":4,"parameters":["",0,0,2]},{"code":401,"indent":4,"parameters":["任务："]},{"code":401,"indent":4,"parameters":["    去地下室。"]},{"code":0,"indent":4,"parameters":[]},{"code":412,"indent":3,"parameters":[]},{"code":0,"indent":3,"parameters":[]},{"code":411,"indent":2,"parameters":[]},{"code":101,"indent":3,"parameters":["",0,0,2]},{"code":401,"indent":3,"parameters":["任务："]},{"code":401,"indent":3,"parameters":["    进入水塔。"]},{"code":0,"indent":3,"parameters":[]},{"code":412,"indent":2,"parameters":[]},{"code":0,"indent":2,"parameters":[]},{"code":411,"indent":1,"parameters":[]},{"code":101,"indent":2,"parameters":["",0,0,2]},{"code":401,"indent":2,"parameters":["任务："]},{"code":401,"indent":2,"parameters":["     回家与五月对话然后出门向上去水泵站"]},{"code":0,"indent":2,"parameters":[]},{"code":412,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":411,"indent":0,"parameters":[]},{"code":101,"indent":1,"parameters":["",0,0,2]},{"code":401,"indent":1,"parameters":["任务："]},{"code":401,"indent":1,"parameters":["    前往研究站大厅（进入研究站后一路向上走，到达"]},{"code":401,"indent":1,"parameters":["大厅后和薇薇安对话，之后到家和莉莉对话。）"]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"name":"任务提示","switchId":1,"trigger":0},
-{"id":91,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
-{"id":92,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":91,"list":[{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["任务：搜集材料"]},{"code":401,"indent":0,"parameters":["    去豆豆主星C"]},{"code":0,"indent":0,"parameters":[]}],"name":"主线任务提示","switchId":1,"trigger":0},
+{"id":92,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"支线任务","switchId":1,"trigger":0},
 {"id":93,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":94,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":95,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},

data/Enemies.json

@@ -13,7 +13,7 @@ null,
 {"id":11,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412}],"battlerHue":274,"battlerName":"海蜇","dropItems":[{"kind":1,"dataId":26,"denominator":30},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":6,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.95},{"code":11,"dataId":4,"value":0.95},{"code":11,"dataId":14,"value":0.9}],"gold":5,"name":"海蜇","note":"","params":[180,100,19,13,19,15,30,10]},
 {"id":12,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":417}],"battlerHue":358,"battlerName":"海蜇2","dropItems":[{"kind":1,"dataId":26,"denominator":20},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":10,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":14,"value":0.8}],"gold":12,"name":"潜渊海蜇","note":"","params":[260,100,30,19,36,20,35,10]},
 {"id":13,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":435}],"battlerHue":29,"battlerName":"蛇","dropItems":[{"kind":0,"dataId":0,"denominator":50},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":8,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":14,"value":0.95}],"gold":6,"name":"海蛇","note":"","params":[220,0,30,22,1,20,22,10]},
-{"id":14,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":4,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":4,"skillId":414},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":4,"skillId":418},{"conditionParam1":0.7,"conditionParam2":1,"conditionType":2,"rating":5,"skillId":415},{"conditionParam1":0,"conditionParam2":0.5,"conditionType":2,"rating":4,"skillId":413},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0.8,"conditionType":2,"rating":3,"skillId":419},{"conditionParam1":0,"conditionParam2":0.6,"conditionType":2,"rating":4,"skillId":417}],"battlerHue":52,"battlerName":"蝎子","dropItems":[{"kind":1,"dataId":61,"denominator":1},{"kind":1,"dataId":28,"denominator":1},{"dataId":1,"denominator":1,"kind":0}],"exp":80,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":32,"dataId":58,"value":0.05}],"gold":500,"name":"熔岩巨蝎","note":"","params":[600,600,45,40,53,35,40,10]},
+{"id":14,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":4,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":4,"skillId":418},{"conditionParam1":0.7,"conditionParam2":1,"conditionType":2,"rating":5,"skillId":415},{"conditionParam1":0,"conditionParam2":0.5,"conditionType":2,"rating":4,"skillId":413},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0.8,"conditionType":2,"rating":3,"skillId":419},{"conditionParam1":0,"conditionParam2":0.6,"conditionType":2,"rating":4,"skillId":417},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":414}],"battlerHue":52,"battlerName":"蝎子","dropItems":[{"kind":1,"dataId":61,"denominator":1},{"kind":1,"dataId":28,"denominator":1},{"dataId":1,"denominator":1,"kind":0}],"exp":80,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":32,"dataId":58,"value":0.05}],"gold":500,"name":"熔岩巨蝎","note":"","params":[600,600,45,40,53,35,40,10]},
 {"id":15,"actions":[{"conditionParam1":0,"conditionParam2":0.4,"conditionType":2,"rating":5,"skillId":413},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":435},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0.8,"conditionType":2,"rating":4,"skillId":420}],"battlerHue":40,"battlerName":"拟态怪2","dropItems":[{"kind":1,"dataId":59,"denominator":1},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":50,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":200,"name":"硫酸拟态怪","note":"","params":[500,300,38,35,45,30,35,10]},
 {"id":16,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
 {"id":17,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},

data/LargeFace.json

@@ -1 +1 @@
-{"jinling":{"1":{"FileName":"jinling_1","@c":3},"2":{"FileName":"jinling_2","@c":4},"3":{"FileName":"jinling_3","@c":5},"@c":2},"主角团":{"1":{"FileName":"主角团_1","@c":7},"2":{"FileName":"主角团_2","@c":8},"3":{"FileName":"主角团_3","@c":9},"4":{"FileName":"主角团_4","@c":10},"5":{"FileName":"主角团_5","@c":11},"6":{"FileName":"主角团_6","@c":12},"7":{"FileName":"主角团_7","@c":13},"8":{"FileName":"主角团_8","@c":14},"@c":6},"希尔妲":{"1":{"FileName":"希尔妲_1","@c":16},"2":{"FileName":"希尔妲_2","@c":17},"@c":15},"范达尔锅盔":{"1":{"FileName":"范达尔锅盔_1","@c":19},"@c":18},"配角团":{"1":{"FileName":"配角团_1","@c":21},"2":{"FileName":"配角团_2","@c":22},"3":{"FileName":"配角团_3","@c":23},"4":{"FileName":"配角团_4","@c":24},"5":{"FileName":"配角团_5","@c":25},"6":{"FileName":"配角团_6","@c":26},"7":{"FileName":"配角团_7","@c":27},"8":{"FileName":"配角团_8","@c":28},"@c":20},"顺子花嫁":{"1":{"FileName":"顺子花嫁_1","@c":30},"@c":29},"@c":1}
+{"jinling":{"1":{"FileName":"jinling_1","@c":3},"2":{"FileName":"jinling_2","@c":4},"3":{"FileName":"jinling_3","@c":5},"4":{"FileName":"jinling_4","@c":6},"5":{"FileName":"jinling_5","@c":7},"6":{"FileName":"jinling_6","@c":8},"7":{"FileName":"jinling_7","@c":9},"@c":2},"主角团":{"1":{"FileName":"主角团_1","@c":11},"2":{"FileName":"主角团_2","@c":12},"3":{"FileName":"主角团_3","@c":13},"4":{"FileName":"主角团_4","@c":14},"5":{"FileName":"主角团_5","@c":15},"6":{"FileName":"主角团_6","@c":16},"7":{"FileName":"主角团_7","@c":17},"8":{"FileName":"主角团_8","@c":18},"@c":10},"希尔妲":{"1":{"FileName":"希尔妲_1","@c":20},"2":{"FileName":"希尔妲_2","@c":21},"@c":19},"范达尔锅盔":{"1":{"FileName":"范达尔锅盔_1","@c":23},"@c":22},"配角团":{"1":{"FileName":"配角团_1","@c":25},"2":{"FileName":"配角团_2","@c":26},"3":{"FileName":"配角团_3","@c":27},"4":{"FileName":"配角团_4","@c":28},"5":{"FileName":"配角团_5","@c":29},"6":{"FileName":"配角团_6","@c":30},"7":{"FileName":"配角团_7","@c":31},"8":{"FileName":"配角团_8","@c":32},"@c":24},"顺子花嫁":{"1":{"FileName":"顺子花嫁_1","@c":34},"@c":33},"@c":1}

data/Map056.json

@@ -0,0 +1 @@
+{"autoplayBgm":false,"autoplayBgs":false,"battleback1Name":"SF_Metal2","battleback2Name":"","bgm":{"name":"","pan":0,"pitch":100,"volume":90},"bgs":{"name":"","pan":0,"pitch":100,"volume":90},"disableDashing":false,"displayName":"","encounterList":[],"encounterStep":30,"height":13,"note":"","parallaxLoopX":false,"parallaxLoopY":false,"parallaxName":"","parallaxShow":true,"parallaxSx":0,"parallaxSy":0,"scrollType":0,"specifyBattleback":true,"tilesetId":6,"width":17,"data":[1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,7027,7025,7025,7025,7025,7025,7025,7025,7025,7029,1536,1536,1536,1536,1536,1536,1536,7024,6323,6322,6322,6322,6322,6322,6322,6326,7024,1536,1536,1536,1536,1536,1536,1536,7024,6329,6328,6328,6328,6328,6328,6328,6332,7024,1536,1536,1536,1536,1536,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,7024,1536,1536,1536,1536,1536,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,7033,7025,7025,7025,7025,7029,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,6323,6322,6322,6322,6326,7024,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,6329,6328,6328,6328,6332,7024,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,7024,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,7024,1536,1536,7024,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,1606,7024,1536,1536,7033,7029,1606,7027,7025,7025,7025,7025,7025,7025,7025,7025,7025,7025,7031,1536,1536,1536,7024,1606,7024,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,1536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3571,3569,3569,3569,3581,0,0,0,0,0,0,0,0,0,0,0,0,3568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3580,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,319,0,0,0,0,319,0,0,0,0,0,0,0,0,0,0,180,180,180,73,73,179,179,179,0,0,0,0,0,0,0,0,0,188,188,188,81,81,187,187,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,97,97,97,97,97,97,97,0,19,319,19,0,0,0,0,0,182,0,182,0,0,0,0,349,0,27,0,27,0,0,0,0,0,190,0,190,0,0,0,0,357,129,132,131,135,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,294,0,294,0,0,0,0,0,0,218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,13,12,12,12,12,12,12,12,0,0,0,0,0,0,5,0,0,5,5,0,5,0,0,0,0,0,0,0,0,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,5,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"events":[]}

data/Map056Ext.json

@@ -0,0 +1 @@
+{"events":{}}

data/Map057Ext.json

@@ -0,0 +1 @@
+{"events":{}}

data/Map058Ext.json

@@ -0,0 +1 @@
+{"events":{}}

data/Map059Ext.json

@@ -0,0 +1 @@
+{"events":{}}

data/MapInfos.json

@@ -1,10 +1,10 @@
 [
 null,
-{"id":1,"expanded":true,"name":"地球","order":1,"parentId":0,"scrollX":832,"scrollY":640},
-{"id":2,"expanded":false,"name":"星港","order":54,"parentId":27,"scrollX":1042.2,"scrollY":954},
+{"id":1,"expanded":true,"name":"地球","order":1,"parentId":0,"scrollX":779.5,"scrollY":477},
+{"id":2,"expanded":false,"name":"星港","order":58,"parentId":27,"scrollX":771.5,"scrollY":469},
 {"id":3,"expanded":true,"name":"好人家二层","order":19,"parentId":22,"scrollX":925.8,"scrollY":562.8},
-{"id":4,"expanded":true,"name":"好人家地下室","order":20,"parentId":22,"scrollX":1560,"scrollY":624},
-{"id":5,"expanded":false,"name":"海滩","order":6,"parentId":31,"scrollX":994.1999999999999,"scrollY":1357.2},
+{"id":4,"expanded":true,"name":"好人家地下室","order":20,"parentId":22,"scrollX":1724.5,"scrollY":731},
+{"id":5,"expanded":false,"name":"海滩","order":6,"parentId":31,"scrollX":1148.5,"scrollY":1451},
 {"id":6,"expanded":true,"name":"深海及纳萨托恩外围","order":10,"parentId":10,"scrollX":1474.2,"scrollY":1635.6},
 {"id":7,"expanded":true,"name":"纳萨托恩","order":11,"parentId":6,"scrollX":2672.5714285714284,"scrollY":1635.4285714285713},
 {"id":8,"expanded":true,"name":"通往皇宫的管道","order":12,"parentId":7,"scrollX":2672.5714285714284,"scrollY":1635.4285714285713},
@@ -13,46 +13,50 @@ null,
 {"id":11,"expanded":false,"name":"密室","order":14,"parentId":9,"scrollX":615.6,"scrollY":1303.2},
 {"id":12,"expanded":true,"name":"大护壁及大漩涡","order":16,"parentId":7,"scrollX":2672.5714285714284,"scrollY":1635.4285714285713},
 {"id":13,"expanded":true,"name":"渡鸦12345的办公室1F","order":4,"parentId":30,"scrollX":925.8,"scrollY":627.6},
-{"id":14,"expanded":false,"name":"梦位面宇宙","order":46,"parentId":0,"scrollX":994,"scrollY":816},
-{"id":15,"expanded":false,"name":"艾欧","order":47,"parentId":14,"scrollX":1542.6,"scrollY":1485.6},
-{"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":48,"parentId":15,"scrollX":2742,"scrollY":1486},
-{"id":17,"expanded":true,"name":"艾欧同步轨道","order":49,"parentId":15,"scrollX":935.4,"scrollY":572.4},
-{"id":18,"expanded":true,"name":"飞船遗迹内部","order":50,"parentId":17,"scrollX":994.1999999999999,"scrollY":2373.6},
-{"id":19,"expanded":false,"name":"操作仓","order":51,"parentId":18,"scrollX":935.4,"scrollY":572.4},
-{"id":20,"expanded":true,"name":"南郊（有水泵站）","order":17,"parentId":31,"scrollX":1542.6,"scrollY":1686},
-{"id":21,"expanded":false,"name":"传送阵","order":55,"parentId":14,"scrollX":1559,"scrollY":954},
-{"id":22,"expanded":true,"name":"好人家一层","order":18,"parentId":20,"scrollX":1474.2,"scrollY":637.1999999999999},
+{"id":14,"expanded":true,"name":"梦位面宇宙","order":50,"parentId":0,"scrollX":1150.5,"scrollY":977},
+{"id":15,"expanded":false,"name":"艾欧","order":51,"parentId":14,"scrollX":1542.5,"scrollY":1486},
+{"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":52,"parentId":15,"scrollX":2742,"scrollY":1486},
+{"id":17,"expanded":true,"name":"艾欧同步轨道","order":53,"parentId":15,"scrollX":935.4,"scrollY":572.4},
+{"id":18,"expanded":true,"name":"飞船遗迹内部","order":54,"parentId":17,"scrollX":994.1999999999999,"scrollY":2373.6},
+{"id":19,"expanded":false,"name":"操作仓","order":55,"parentId":18,"scrollX":935.4,"scrollY":572.4},
+{"id":20,"expanded":true,"name":"南郊（有水泵站）","order":17,"parentId":31,"scrollX":1724.5,"scrollY":2171},
+{"id":21,"expanded":false,"name":"传送阵","order":59,"parentId":14,"scrollX":771.5,"scrollY":954},
+{"id":22,"expanded":true,"name":"好人家一层","order":18,"parentId":20,"scrollX":832,"scrollY":624},
 {"id":23,"expanded":true,"name":"大海","order":7,"parentId":5,"scrollX":1559,"scrollY":954},
 {"id":24,"expanded":true,"name":"迷雾之岛","order":8,"parentId":23,"scrollX":994.1999999999999,"scrollY":877.1999999999999},
 {"id":25,"expanded":false,"name":"水塔2","order":22,"parentId":20,"scrollX":935.4,"scrollY":572.4},
 {"id":26,"expanded":true,"name":"皇宫","order":15,"parentId":9,"scrollX":738,"scrollY":1840.8},
-{"id":27,"expanded":true,"name":"晶核研究站","order":52,"parentId":14,"scrollX":925.8,"scrollY":867.5999999999999},
-{"id":28,"expanded":false,"name":"实验室","order":53,"parentId":27,"scrollX":935.4,"scrollY":572.4},
+{"id":27,"expanded":true,"name":"晶核研究站","order":56,"parentId":14,"scrollX":769.5,"scrollY":969},
+{"id":28,"expanded":false,"name":"实验室","order":57,"parentId":27,"scrollX":769.5,"scrollY":471},
 {"id":29,"expanded":false,"name":"渡鸦12345的办公室2F","order":5,"parentId":13,"scrollX":2672.5714285714284,"scrollY":1635.4285714285713},
-{"id":30,"expanded":false,"name":"渡鸦12345的办公室","order":3,"parentId":31,"scrollX":1330.2,"scrollY":1029.6},
-{"id":31,"expanded":true,"name":"世界地图","order":2,"parentId":1,"scrollX":8344,"scrollY":3128},
-{"id":32,"expanded":true,"name":"宇宙","order":23,"parentId":1,"scrollX":1474.2,"scrollY":1837.1999999999998},
-{"id":33,"expanded":true,"name":"柯伊伯站","order":24,"parentId":32,"scrollX":1490,"scrollY":1744.5},
-{"id":34,"expanded":true,"name":"豆豆星系","order":25,"parentId":32,"scrollX":819,"scrollY":474.5},
-{"id":35,"expanded":true,"name":"豆豆星","order":26,"parentId":34,"scrollX":1540,"scrollY":4233.2},
-{"id":36,"expanded":true,"name":"群星之城","order":28,"parentId":35,"scrollX":1540,"scrollY":1760},
-{"id":37,"expanded":false,"name":"迷失森林","order":27,"parentId":35,"scrollX":1546,"scrollY":2720},
-{"id":38,"expanded":true,"name":"城堡（外观）","order":29,"parentId":36,"scrollX":648.8,"scrollY":1157.2},
-{"id":39,"expanded":true,"name":"城堡（内部）：2F","order":30,"parentId":38,"scrollX":648.8,"scrollY":1412.4},
-{"id":40,"expanded":false,"name":"装备店","order":31,"parentId":36,"scrollX":648.8,"scrollY":452.4},
-{"id":41,"expanded":false,"name":"世界之门","order":42,"parentId":32,"scrollX":1390.2857142857142,"scrollY":1586.5714285714284},
-{"id":42,"expanded":true,"name":"魔王城","order":32,"parentId":35,"scrollX":811,"scrollY":867.5},
-{"id":43,"expanded":false,"name":"控制室","order":43,"parentId":1,"scrollX":1522.2,"scrollY":954},
-{"id":44,"expanded":true,"name":"走廊","order":44,"parentId":43,"scrollX":1543,"scrollY":1432},
-{"id":45,"expanded":false,"name":"走廊","order":45,"parentId":44,"scrollX":928,"scrollY":1384},
-{"id":46,"expanded":true,"name":"魔王城堡：1F","order":33,"parentId":42,"scrollX":1330.4,"scrollY":778.8},
-{"id":47,"expanded":true,"name":"魔王城堡：4F","order":34,"parentId":42,"scrollX":811,"scrollY":813.5},
-{"id":48,"expanded":false,"name":"装备店","order":35,"parentId":47,"scrollX":648.8,"scrollY":532.4},
-{"id":49,"expanded":false,"name":"物品商店","order":36,"parentId":47,"scrollX":648.8,"scrollY":580.4},
-{"id":50,"expanded":false,"name":"旅馆：1F","order":37,"parentId":47,"scrollX":819,"scrollY":474.5},
-{"id":51,"expanded":true,"name":"豆豆主星B","order":38,"parentId":34,"scrollX":811,"scrollY":566.5},
-{"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":39,"parentId":51,"scrollX":1637,"scrollY":813.5},
-{"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":40,"parentId":52,"scrollX":1567,"scrollY":542.5},
-{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":41,"parentId":53,"scrollX":997,"scrollY":614.5},
-{"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":21,"parentId":22,"scrollX":994.1999999999999,"scrollY":637.1999999999999}
+{"id":30,"expanded":false,"name":"渡鸦12345的办公室","order":3,"parentId":31,"scrollX":1484.5,"scrollY":1835},
+{"id":31,"expanded":true,"name":"世界地图","order":2,"parentId":1,"scrollX":8344.5,"scrollY":2952},
+{"id":32,"expanded":true,"name":"宇宙","order":23,"parentId":1,"scrollX":1628.5,"scrollY":1931},
+{"id":33,"expanded":true,"name":"柯伊伯站","order":24,"parentId":32,"scrollX":1482.5,"scrollY":1737},
+{"id":34,"expanded":true,"name":"豆豆星系","order":25,"parentId":32,"scrollX":777.5,"scrollY":471},
+{"id":35,"expanded":true,"name":"豆豆星","order":26,"parentId":34,"scrollX":1714.5,"scrollY":4471},
+{"id":36,"expanded":true,"name":"群星之城","order":27,"parentId":35,"scrollX":1630.5,"scrollY":1937},
+{"id":37,"expanded":false,"name":"迷失森林","order":40,"parentId":35,"scrollX":2518.3636363636365,"scrollY":2848.3636363636365},
+{"id":38,"expanded":true,"name":"城堡（外观）","order":28,"parentId":36,"scrollX":771.5,"scrollY":1403},
+{"id":39,"expanded":true,"name":"城堡（内部）：2F","order":29,"parentId":38,"scrollX":771.5,"scrollY":469},
+{"id":40,"expanded":false,"name":"炼金商店","order":30,"parentId":36,"scrollX":777.5,"scrollY":471},
+{"id":41,"expanded":false,"name":"世界之门","order":46,"parentId":32,"scrollX":1683.2727272727273,"scrollY":1359.2727272727273},
+{"id":42,"expanded":true,"name":"魔王城","order":34,"parentId":35,"scrollX":769.5,"scrollY":969},
+{"id":43,"expanded":false,"name":"控制室","order":47,"parentId":1,"scrollX":1522.5,"scrollY":1982},
+{"id":44,"expanded":true,"name":"走廊","order":48,"parentId":43,"scrollX":1522.2,"scrollY":4429.2},
+{"id":45,"expanded":false,"name":"走廊","order":49,"parentId":44,"scrollX":928.1999999999999,"scrollY":1407.6},
+{"id":46,"expanded":true,"name":"魔王城堡：1F","order":35,"parentId":42,"scrollX":841.6363636363636,"scrollY":1689.818181818182},
+{"id":47,"expanded":true,"name":"魔王城堡：4F","order":36,"parentId":42,"scrollX":841.6363636363636,"scrollY":813.8181818181819},
+{"id":48,"expanded":false,"name":"装备店","order":37,"parentId":47,"scrollX":769.5,"scrollY":489},
+{"id":49,"expanded":false,"name":"物品商店","order":38,"parentId":47,"scrollX":769.5,"scrollY":489},
+{"id":50,"expanded":false,"name":"旅馆：1F","order":39,"parentId":47,"scrollX":777.5,"scrollY":471},
+{"id":51,"expanded":true,"name":"豆豆主星B","order":41,"parentId":34,"scrollX":771.5,"scrollY":531},
+{"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":42,"parentId":51,"scrollX":769.5,"scrollY":1920},
+{"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":43,"parentId":52,"scrollX":1616.5,"scrollY":642},
+{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":44,"parentId":53,"scrollX":1054.5,"scrollY":562},
+{"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":21,"parentId":22,"scrollX":1656.5,"scrollY":714},
+{"id":56,"expanded":false,"name":"护甲商店","order":31,"parentId":36,"scrollX":777.5,"scrollY":471},
+{"id":57,"expanded":false,"name":"武器商店","order":32,"parentId":36,"scrollX":777.5,"scrollY":471},
+{"id":58,"expanded":false,"name":"豆豆主星C","order":45,"parentId":34,"scrollX":1851.5,"scrollY":1145},
+{"id":59,"expanded":false,"name":"旅馆 1F","order":33,"parentId":36,"scrollX":769.5,"scrollY":489}
 ]

data/Skills.json

@@ -434,7 +434,7 @@ null,
 {"id":432,"animationId":71,"damage":{"critical":false,"elementId":2,"formula":"10+1.2*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"施放了%1！","message2":"崩石","mpCost":0,"name":"崩石","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":433,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":434,"animationId":80,"damage":{"critical":false,"elementId":5,"formula":"a.mat*2+a.hp-b.mde*0.5","type":1,"variance":20},"description":"","effects":[{"code":44,"dataId":11,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"自爆","mpCost":0,"name":"自爆","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":435,"animationId":50,"damage":{"critical":false,"elementId":5,"formula":"10+1.3*(a.mat*3.5-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":91,"value1":0.5,"value2":0}],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"毒液喷射","mpCost":0,"name":"酸液喷射","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":435,"animationId":50,"damage":{"critical":false,"elementId":5,"formula":"5+1.2*(3.5*a.mat-b.mdf)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":91,"value1":0.5,"value2":0}],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"毒液喷射","mpCost":0,"name":"酸液喷射","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":436,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":437,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":438,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -499,5 +499,5 @@ null,
 {"id":497,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":498,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":499,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":500,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0}
+{"id":500,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"9999999","type":1,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"测试","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0}
 ]

data/Test_LargeFace.json

@@ -1 +1 @@
-{"jinling":{"1":{"FileName":"jinling_1","@c":3},"2":{"FileName":"jinling_2","@c":4},"3":{"FileName":"jinling_3","@c":5},"@c":2},"主角团":{"1":{"FileName":"主角团_1","@c":7},"2":{"FileName":"主角团_2","@c":8},"3":{"FileName":"主角团_3","@c":9},"4":{"FileName":"主角团_4","@c":10},"5":{"FileName":"主角团_5","@c":11},"6":{"FileName":"主角团_6","@c":12},"7":{"FileName":"主角团_7","@c":13},"8":{"FileName":"主角团_8","@c":14},"@c":6},"希尔妲":{"1":{"FileName":"希尔妲_1","@c":16},"2":{"FileName":"希尔妲_2","@c":17},"@c":15},"范达尔锅盔":{"1":{"FileName":"范达尔锅盔_1","@c":19},"@c":18},"配角团":{"1":{"FileName":"配角团_1","@c":21},"2":{"FileName":"配角团_2","@c":22},"3":{"FileName":"配角团_3","@c":23},"4":{"FileName":"配角团_4","@c":24},"5":{"FileName":"配角团_5","@c":25},"6":{"FileName":"配角团_6","@c":26},"7":{"FileName":"配角团_7","@c":27},"8":{"FileName":"配角团_8","@c":28},"@c":20},"顺子花嫁":{"1":{"FileName":"顺子花嫁_1","@c":30},"@c":29},"@c":1}
+{"jinling":{"1":{"FileName":"jinling_1","@c":3},"2":{"FileName":"jinling_2","@c":4},"3":{"FileName":"jinling_3","@c":5},"4":{"FileName":"jinling_4","@c":6},"5":{"FileName":"jinling_5","@c":7},"6":{"FileName":"jinling_6","@c":8},"7":{"FileName":"jinling_7","@c":9},"@c":2},"主角团":{"1":{"FileName":"主角团_1","@c":11},"2":{"FileName":"主角团_2","@c":12},"3":{"FileName":"主角团_3","@c":13},"4":{"FileName":"主角团_4","@c":14},"5":{"FileName":"主角团_5","@c":15},"6":{"FileName":"主角团_6","@c":16},"7":{"FileName":"主角团_7","@c":17},"8":{"FileName":"主角团_8","@c":18},"@c":10},"希尔妲":{"1":{"FileName":"希尔妲_1","@c":20},"2":{"FileName":"希尔妲_2","@c":21},"@c":19},"范达尔锅盔":{"1":{"FileName":"范达尔锅盔_1","@c":23},"@c":22},"配角团":{"1":{"FileName":"配角团_1","@c":25},"2":{"FileName":"配角团_2","@c":26},"3":{"FileName":"配角团_3","@c":27},"4":{"FileName":"配角团_4","@c":28},"5":{"FileName":"配角团_5","@c":29},"6":{"FileName":"配角团_6","@c":30},"7":{"FileName":"配角团_7","@c":31},"8":{"FileName":"配角团_8","@c":32},"@c":24},"顺子花嫁":{"1":{"FileName":"顺子花嫁_1","@c":34},"@c":33},"@c":1}

data/Troops.json

@@ -2,7 +2,7 @@
 null,
 {"id":1,"members":[{"enemyId":5,"x":408,"y":436,"hidden":false}],"name":"幽灵船","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,1]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,1]},{"code":117,"indent":0,"parameters":[12]},{"code":101,"indent":0,"parameters":["主角团",4,0,2]},{"code":401,"indent":0,"parameters":["【伊扎克斯】"]},{"code":401,"indent":0,"parameters":["幽灵船？！这就是你们书上写的幽灵船？没想到真有这东西啊，这玩意儿怎么形成的？"]},{"code":101,"indent":0,"parameters":["主角团",5,0,2]},{"code":401,"indent":0,"parameters":["【伊丽莎白】"]},{"code":401,"indent":0,"parameters":["爸爸你把我扔上去！"]},{"code":101,"indent":0,"parameters":["主角团",0,0,2]},{"code":401,"indent":0,"parameters":["【郝仁】"]},{"code":401,"indent":0,"parameters":["别闹，提高警惕，可能是海妖搞出来的，莎琪拉，索玛，你们知道这是什么玩意儿么？"]},{"code":101,"indent":0,"parameters":["",3,0,2]},{"code":401,"indent":0,"parameters":["【莎琪拉】"]},{"code":401,"indent":0,"parameters":["她在警告我们不要靠近，说什么漩涡就要开启……她一直在重复这几句话，听上去不太清醒的样子。"]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【索玛】"]},{"code":401,"indent":0,"parameters":["#￥……&%&*￥*（海妖之歌）"]},{"code":339,"indent":0,"parameters":[0,0,431,-1]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":1,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【索玛】"]},{"code":401,"indent":0,"parameters":["攻击船的中段！第二桅杆下面！她疯了！"]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【数据终端】"]},{"code":401,"indent":0,"parameters":["一个超级巨大的气旋正在附近海域形成，一旦它合拢，这恐怕将是人类有史以来记载过的最大的风暴之一！！"]},{"code":124,"indent":0,"parameters":[0,480]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【莎琪拉】"]},{"code":401,"indent":0,"parameters":["到底招谁惹谁了！到底招谁惹谁了！"]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":true,"turnValid":false},"list":[{"code":122,"indent":0,"parameters":[2,2,0,0,0]},{"code":122,"indent":0,"parameters":[2,2,0,3,4,0,0]},{"code":122,"indent":0,"parameters":[2,2,4,3,4,0,2]},{"code":122,"indent":0,"parameters":[2,2,3,0,10]},{"code":111,"indent":0,"parameters":[1,2,0,2,2]},{"code":124,"indent":1,"parameters":[1]},{"code":101,"indent":1,"parameters":["主角团",0,0,2]},{"code":401,"indent":1,"parameters":["【郝仁】"]},{"code":401,"indent":1,"parameters":["呼，结束了"]},{"code":122,"indent":1,"parameters":[2,2,0,0,0]},{"code":340,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":2,"members":[{"enemyId":1,"x":223,"y":439,"hidden":false},{"enemyId":1,"x":581,"y":424,"hidden":false},{"enemyId":1,"x":348,"y":250,"hidden":false}],"name":"火山蝙蝠*3","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,1]},{"code":121,"indent":0,"parameters":[20,20,0]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":3,"members":[{"enemyId":2,"x":213,"y":364,"hidden":false},{"enemyId":2,"x":691,"y":307,"hidden":false},{"enemyId":2,"x":381,"y":259,"hidden":false},{"enemyId":2,"x":486,"y":430,"hidden":false}],"name":"火山鼠*4","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,0]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":3,"members":[{"enemyId":2,"x":691,"y":307,"hidden":false},{"enemyId":2,"x":381,"y":259,"hidden":false},{"enemyId":2,"x":486,"y":430,"hidden":false}],"name":"火山鼠*4","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,0]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":4,"members":[{"enemyId":4,"x":275,"y":337,"hidden":false},{"enemyId":4,"x":568,"y":388,"hidden":false}],"name":"熔岩怪*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,1]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":5,"members":[{"enemyId":3,"x":389,"y":292,"hidden":false},{"enemyId":2,"x":220,"y":424,"hidden":false},{"enemyId":4,"x":618,"y":427,"hidden":false}],"name":"火山鼠, 爆弹怪, 熔岩怪","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,0]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":339,"indent":0,"parameters":[0,1,388,0]},{"code":339,"indent":0,"parameters":[0,2,394,0]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":4,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":339,"indent":0,"parameters":[0,0,434,-1]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":6,"members":[{"enemyId":6,"x":269,"y":427,"hidden":false},{"enemyId":6,"x":580,"y":373,"hidden":false},{"enemyId":6,"x":405,"y":304,"hidden":false}],"name":"硫酸史莱姆*3","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":121,"indent":0,"parameters":[18,18,1]},{"code":121,"indent":0,"parameters":[19,19,1]},{"code":121,"indent":0,"parameters":[20,20,1]},{"code":121,"indent":0,"parameters":[21,21,0]},{"code":117,"indent":0,"parameters":[12]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},