修复飞船操纵事件BUG

Readme.md

@@ -22,7 +22,7 @@
 
 
 ## 更新记录
-- **2024/2/11**；**乐子人**；细节修改，新增风之地地图；
+- **2024/2/11**；**乐子人**；细节修改，新增风之地地图；2.12, 修复飞船操纵事件BUG；
 - **2024/2/8**；**枪兵**；改bgm删图片；
 - **2024/2/7**；**枪兵**；去艾欧前剧情；
 - **2024/2/7**；**乐子人**；数值修改完成；2.8 新增祝福；改动部分事件BUG；替换插件；再次修少量BUG；2.8 缩小素材体积；

data/CommonEvents.json

@@ -88,7 +88,7 @@ null,
 {"id":86,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":87,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":88,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
-{"id":89,"list":[{"code":121,"indent":0,"parameters":[137,137,1]},{"code":111,"indent":0,"parameters":[13,2]},{"code":0,"indent":1,"parameters":[]},{"code":411,"indent":0,"parameters":[]},{"code":111,"indent":1,"parameters":[0,134,1]},{"code":101,"indent":2,"parameters":["",0,0,2]},{"code":401,"indent":2,"parameters":["此处不能召唤飞船"]},{"code":0,"indent":2,"parameters":[]},{"code":411,"indent":1,"parameters":[]},{"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":101,"indent":2,"parameters":["",0,0,2]},{"code":401,"indent":2,"parameters":["去船舱还是开船？"]},{"code":102,"indent":2,"parameters":[["开船","去船舱","取消"],2,0,2,0]},{"code":402,"indent":2,"parameters":[0,"开船"]},{"code":206,"indent":3,"parameters":[]},{"code":0,"indent":3,"parameters":[]},{"code":402,"indent":2,"parameters":[1,"去船舱"]},{"code":122,"indent":3,"parameters":[21,21,0,3,7,0,0]},{"code":122,"indent":3,"parameters":[22,22,0,3,5,-1,0]},{"code":122,"indent":3,"parameters":[23,23,0,3,5,-1,1]},{"code":202,"indent":3,"parameters":[2,1,21,22,23]},{"code":201,"indent":3,"parameters":[0,43,25,21,0,0]},{"code":0,"indent":3,"parameters":[]},{"code":402,"indent":2,"parameters":[2,"取消"]},{"code":202,"indent":3,"parameters":[2,0,1,0,0]},{"code":0,"indent":3,"parameters":[]},{"code":404,"indent":2,"parameters":[]},{"code":0,"indent":2,"parameters":[]},{"code":412,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"name":"飞船效果","switchId":1,"trigger":0},
+{"id":89,"list":[{"code":121,"indent":0,"parameters":[137,137,1]},{"code":111,"indent":0,"parameters":[13,2]},{"code":101,"indent":1,"parameters":["",0,1,1]},{"code":401,"indent":1,"parameters":["你已经在飞船上了"]},{"code":0,"indent":1,"parameters":[]},{"code":411,"indent":0,"parameters":[]},{"code":111,"indent":1,"parameters":[0,134,1]},{"code":101,"indent":2,"parameters":["",0,0,2]},{"code":401,"indent":2,"parameters":["此处不能召唤飞船"]},{"code":0,"indent":2,"parameters":[]},{"code":411,"indent":1,"parameters":[]},{"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":101,"indent":2,"parameters":["",0,0,2]},{"code":401,"indent":2,"parameters":["去船舱还是开船？"]},{"code":102,"indent":2,"parameters":[["开船","去船舱","取消"],2,0,2,0]},{"code":402,"indent":2,"parameters":[0,"开船"]},{"code":206,"indent":3,"parameters":[]},{"code":0,"indent":3,"parameters":[]},{"code":402,"indent":2,"parameters":[1,"去船舱"]},{"code":122,"indent":3,"parameters":[21,21,0,3,7,0,0]},{"code":122,"indent":3,"parameters":[22,22,0,3,5,-1,0]},{"code":122,"indent":3,"parameters":[23,23,0,3,5,-1,1]},{"code":202,"indent":3,"parameters":[2,1,21,22,23]},{"code":201,"indent":3,"parameters":[0,43,25,21,0,0]},{"code":0,"indent":3,"parameters":[]},{"code":402,"indent":2,"parameters":[2,"取消"]},{"code":202,"indent":3,"parameters":[2,0,1,0,0]},{"code":0,"indent":3,"parameters":[]},{"code":404,"indent":2,"parameters":[]},{"code":0,"indent":2,"parameters":[]},{"code":412,"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":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},

data/MapInfos.json

@@ -1,6 +1,6 @@
 [
 null,
-{"id":1,"expanded":true,"name":"地球","order":47,"parentId":32,"scrollX":1366.8,"scrollY":752.4},
+{"id":1,"expanded":false,"name":"地球","order":47,"parentId":32,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":2,"expanded":false,"name":"星港","order":11,"parentId":27,"scrollX":1152,"scrollY":1584},
 {"id":3,"expanded":true,"name":"好人家二层","order":68,"parentId":22,"scrollX":824,"scrollY":466.5},
 {"id":4,"expanded":true,"name":"好人家地下室","order":69,"parentId":22,"scrollX":1476,"scrollY":640.1999999999999},
@@ -14,7 +14,7 @@ null,
 {"id":12,"expanded":true,"name":"大护壁及大漩涡","order":64,"parentId":7,"scrollX":1366.8,"scrollY":752.4},
 {"id":13,"expanded":true,"name":"渡鸦12345的办公室1F","order":50,"parentId":30,"scrollX":1366.8,"scrollY":752.4},
 {"id":14,"expanded":true,"name":"梦位面宇宙","order":1,"parentId":0,"scrollX":1081.3333333333333,"scrollY":807.3333333333334},
-{"id":15,"expanded":true,"name":"艾欧","order":2,"parentId":14,"scrollX":1798.6666666666667,"scrollY":2258},
+{"id":15,"expanded":true,"name":"艾欧","order":2,"parentId":14,"scrollX":1081.3333333333333,"scrollY":755.3333333333334},
 {"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":3,"parentId":15,"scrollX":1081.3333333333333,"scrollY":751.3333333333334},
 {"id":17,"expanded":false,"name":"艾欧同步轨道","order":4,"parentId":15,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":18,"expanded":true,"name":"飞船遗迹内部","order":5,"parentId":17,"scrollX":1131,"scrollY":2081},
@@ -33,15 +33,15 @@ null,
 {"id":31,"expanded":true,"name":"世界地图","order":48,"parentId":1,"scrollX":8284.363636363636,"scrollY":2969.4545454545455},
 {"id":32,"expanded":true,"name":"表世界宇宙","order":19,"parentId":0,"scrollX":1357.2,"scrollY":1647.6},
 {"id":33,"expanded":true,"name":"柯伊伯站","order":20,"parentId":32,"scrollX":1798.6666666666667,"scrollY":1922},
-{"id":34,"expanded":true,"name":"豆豆星系","order":21,"parentId":32,"scrollX":832,"scrollY":640},
-{"id":35,"expanded":true,"name":"豆豆星","order":22,"parentId":34,"scrollX":4658,"scrollY":4808},
-{"id":36,"expanded":true,"name":"群星之城","order":23,"parentId":35,"scrollX":1081.3333333333333,"scrollY":1778},
+{"id":34,"expanded":true,"name":"豆豆星系","order":21,"parentId":32,"scrollX":1092,"scrollY":632.6666666666666},
+{"id":35,"expanded":true,"name":"豆豆星","order":22,"parentId":34,"scrollX":2262.6666666666665,"scrollY":4808.666666666667},
+{"id":36,"expanded":false,"name":"群星之城","order":23,"parentId":35,"scrollX":1318.6666666666667,"scrollY":1778},
 {"id":37,"expanded":false,"name":"测试用的地图","order":82,"parentId":0,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":38,"expanded":false,"name":"艾瑞姆皇宫","order":24,"parentId":36,"scrollX":1357.2,"scrollY":1119.6},
 {"id":39,"expanded":true,"name":"艾瑞姆皇宫：1F","order":25,"parentId":38,"scrollX":1131,"scrollY":1533},
 {"id":40,"expanded":false,"name":"炼金商店","order":26,"parentId":36,"scrollX":982.8,"scrollY":569.4},
 {"id":41,"expanded":false,"name":"世界之门","order":46,"parentId":32,"scrollX":2485.090909090909,"scrollY":1368},
-{"id":42,"expanded":true,"name":"魔王城","order":31,"parentId":35,"scrollX":1081.3333333333333,"scrollY":807.3333333333334},
+{"id":42,"expanded":false,"name":"魔王城","order":31,"parentId":35,"scrollX":1081.3333333333333,"scrollY":807.3333333333334},
 {"id":43,"expanded":true,"name":"巨龟岩台号控制室","order":77,"parentId":1,"scrollX":2485.090909090909,"scrollY":1368},
 {"id":44,"expanded":true,"name":"走廊","order":78,"parentId":43,"scrollX":2467.6363636363635,"scrollY":1368},
 {"id":45,"expanded":false,"name":"走廊","order":79,"parentId":44,"scrollX":2467.6363636363635,"scrollY":2952},
@@ -50,18 +50,18 @@ null,
 {"id":48,"expanded":false,"name":"装备店","order":34,"parentId":47,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":49,"expanded":false,"name":"物品商店","order":35,"parentId":47,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":50,"expanded":false,"name":"旅馆：1F","order":36,"parentId":47,"scrollX":1366.8,"scrollY":752.4},
-{"id":51,"expanded":true,"name":"豆豆主星B","order":40,"parentId":34,"scrollX":1334.6666666666667,"scrollY":622},
+{"id":51,"expanded":false,"name":"豆豆主星B","order":40,"parentId":34,"scrollX":1140,"scrollY":622},
 {"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":41,"parentId":51,"scrollX":1366.6666666666667,"scrollY":1035.3333333333333},
 {"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":42,"parentId":52,"scrollX":1366.6666666666667,"scrollY":742},
 {"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":43,"parentId":53,"scrollX":1081.3333333333333,"scrollY":632.6666666666666},
 {"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":70,"parentId":22,"scrollX":1522.8,"scrollY":640.1999999999999},
 {"id":56,"expanded":false,"name":"护甲商店","order":27,"parentId":36,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":57,"expanded":false,"name":"武器商店","order":28,"parentId":36,"scrollX":1092,"scrollY":632.6666666666666},
-{"id":58,"expanded":false,"name":"豆豆主星C","order":44,"parentId":34,"scrollX":1108,"scrollY":1288.6666666666667},
+{"id":58,"expanded":false,"name":"豆豆主星C","order":44,"parentId":34,"scrollX":1798.6666666666667,"scrollY":2258},
 {"id":59,"expanded":false,"name":"旅馆 1F","order":29,"parentId":36,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":60,"expanded":true,"name":"皇宫（剧情）","order":62,"parentId":26,"scrollX":1357.2,"scrollY":1368},
 {"id":61,"expanded":false,"name":"大漩涡","order":63,"parentId":26,"scrollX":1357.2,"scrollY":1167.6},
-{"id":62,"expanded":false,"name":"伊娃之战","order":7,"parentId":15,"scrollX":2485.090909090909,"scrollY":1368},
+{"id":62,"expanded":false,"name":"伊娃之战","order":7,"parentId":15,"scrollX":1092,"scrollY":632.6666666666666},
 {"id":63,"expanded":true,"name":"大海（过剧情）","order":65,"parentId":23,"scrollX":2485.090909090909,"scrollY":1368},
 {"id":64,"expanded":true,"name":"塔纳古斯","order":12,"parentId":14,"scrollX":1366.6666666666667,"scrollY":622},
 {"id":65,"expanded":true,"name":"阿拉曼达广场","order":13,"parentId":64,"scrollX":1081.3333333333333,"scrollY":1326},
@@ -74,12 +74,12 @@ null,
 {"id":72,"expanded":false,"name":"次元间隙","order":80,"parentId":1,"scrollX":2467.6363636363635,"scrollY":1368},
 {"id":73,"expanded":true,"name":"王八坨子","order":73,"parentId":20,"scrollX":1081.3333333333333,"scrollY":807.3333333333334},
 {"id":74,"expanded":false,"name":"蘑菇密林","order":81,"parentId":1,"scrollX":2002.6666666666667,"scrollY":1968.6666666666667},
-{"id":75,"expanded":false,"name":"豆豆主星D-I","order":45,"parentId":34,"scrollX":1081.3333333333333,"scrollY":2224.6666666666665},
+{"id":75,"expanded":false,"name":"豆豆主星D-I","order":45,"parentId":34,"scrollX":1798.6666666666667,"scrollY":1555.3333333333333},
 {"id":76,"expanded":true,"name":"异次元","order":75,"parentId":31,"scrollX":1081.3333333333333,"scrollY":807.3333333333334},
 {"id":77,"expanded":false,"name":"异次元","order":76,"parentId":76,"scrollX":2485.090909090909,"scrollY":1368},
 {"id":78,"expanded":false,"name":"王八坨子（鸡神彩蛋）","order":74,"parentId":73,"scrollX":2485.090909090909,"scrollY":1368},
 {"id":79,"expanded":true,"name":"好人家一层（604艾欧前）","order":71,"parentId":55,"scrollX":2486,"scrollY":624},
 {"id":80,"expanded":true,"name":"风之草原第一层","order":38,"parentId":35,"scrollX":1081.3333333333333,"scrollY":622},
 {"id":81,"expanded":false,"name":"巨龟岩台号控制室（艾欧剧情）","order":18,"parentId":14,"scrollX":1366.6666666666667,"scrollY":1922},
-{"id":82,"expanded":true,"name":"艾欧（剧情）","order":8,"parentId":15,"scrollX":2467.6363636363635,"scrollY":1368}
+{"id":82,"expanded":true,"name":"艾欧（剧情）","order":8,"parentId":15,"scrollX":1798.6666666666667,"scrollY":1368.6666666666667}
 ]