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

data/Actors.json

@@ -8,7 +8,7 @@ null,
 {"id":6,"battlerName":"","characterIndex":0,"characterName":"$伊丽莎白","classId":7,"equips":[0,0,0,0,0],"faceIndex":5,"faceName":"主角团","traits":[],"initialLevel":1,"maxLevel":99,"name":"伊丽莎白","nickname":"","note":"","profile":""},
 {"id":7,"battlerName":"","characterIndex":0,"characterName":"莉莉1","classId":3,"equips":[0,0,0,0,0],"faceIndex":6,"faceName":"主角团","traits":[],"initialLevel":1,"maxLevel":99,"name":"刘莉莉","nickname":"","note":"","profile":""},
 {"id":8,"battlerName":"","characterIndex":0,"characterName":"滚","classId":9,"equips":[0,0,0,0,0],"faceIndex":7,"faceName":"主角团","traits":[],"initialLevel":1,"maxLevel":99,"name":"滚","nickname":"","note":"","profile":""},
-{"id":9,"battlerName":"","characterIndex":0,"characterName":"耗子","classId":10,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"","traits":[],"initialLevel":1,"maxLevel":99,"name":"郝籽","nickname":"","note":"","profile":""},
+{"id":9,"battlerName":"","characterIndex":0,"characterName":"$ 耗子","classId":10,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"","traits":[],"initialLevel":1,"maxLevel":99,"name":"郝籽","nickname":"","note":"","profile":""},
 {"id":10,"battlerName":"","characterIndex":0,"characterName":"","classId":11,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"","traits":[],"initialLevel":1,"maxLevel":99,"name":"诺兰","nickname":"","note":"","profile":""},
 {"id":11,"battlerName":"","characterIndex":0,"characterName":"","classId":4,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"","traits":[],"initialLevel":1,"maxLevel":99,"name":"白火","nickname":"","note":"","profile":""},
 {"id":12,"battlerName":"","characterIndex":0,"characterName":"YZKS","classId":16,"equips":[0,0,0,0,0],"faceIndex":0,"faceName":"","traits":[],"initialLevel":1,"maxLevel":99,"name":"伊扎克斯","nickname":"","note":"","profile":""},

data/Animations.json

@@ -57,7 +57,7 @@ null,
 {"id":55,"animation1Hue":0,"animation1Name":"State6","animation2Hue":0,"animation2Name":"","frames":[[[0,0,-56,200,0,0,150,1]],[[2,0,-56,200,0,0,200,1],[0,0,0,200,0,0,150,1]],[[4,0,-56,200,0,0,255,1],[2,0,0,200,0,0,200,1],[0,0,56,200,0,0,150,1]],[[6,0,-56,200,0,0,255,1],[4,0,0,200,0,0,255,1],[2,0,56,200,0,0,200,1],[11,0,8,160,0,0,200,1]],[[7,0,-56,200,0,0,255,1],[6,0,0,200,0,0,255,1],[4,0,56,200,0,0,255,1],[8,0,40,150,0,0,50,1],[13,0,0,160,0,0,255,1]],[[7,0,-56,210,0,0,255,1],[7,0,0,210,0,0,255,1],[6,0,56,200,0,0,255,1],[8,0,40,200,0,0,100,1],[12,0,0,150,0,0,255,1]],[[7,0,-56,200,0,0,255,1],[7,0,0,200,0,0,255,1],[7,0,56,200,0,0,255,1],[9,0,40,200,0,0,120,1],[13,0,0,150,0,0,255,1]],[[7,0,-56,210,0,0,255,1],[7,0,0,210,0,0,255,1],[7,0,56,210,0,0,255,1],[10,0,40,200,0,0,120,1],[12,0,0,150,0,0,255,1]],[[7,0,-56,200,0,0,255,1],[7,0,0,200,0,0,255,1],[7,0,56,200,0,0,255,1],[9,0,40,200,0,0,120,1],[13,0,0,150,0,0,255,1]],[[7,0,-56,210,0,0,255,1],[7,0,0,210,0,0,255,1],[7,0,56,210,0,0,255,1],[10,0,40,200,0,0,120,1],[12,0,0,150,0,0,255,1]],[[7,0,-56,200,0,0,255,1],[7,0,0,200,0,0,255,1],[7,0,56,200,0,0,255,1],[9,0,40,200,0,0,120,1],[13,0,0,150,0,0,255,1]],[[7,0,-56,210,0,0,200,1],[7,0,0,210,0,0,200,1],[7,0,56,210,0,0,200,1],[10,0,40,200,0,0,80,1],[12,0,0,150,0,0,255,1]],[[7,0,-56,200,0,0,150,1],[7,0,0,200,0,0,150,1],[7,0,56,200,0,0,150,1],[9,0,40,200,0,0,50,1],[13,0,0,150,0,0,255,1]],[[7,0,-56,210,0,0,100,1],[7,0,0,210,0,0,100,1],[7,0,56,210,0,0,100,1]]],"name":"麻痹","position":1,"timings":[{"flashColor":[255,255,255,255],"flashDuration":5,"flashScope":0,"frame":0,"se":{"name":"Push","pan":0,"pitch":100,"volume":100}},{"flashColor":[204,238,255,204],"flashDuration":7,"flashScope":1,"frame":4,"se":{"name":"Paralyze3","pan":0,"pitch":125,"volume":90}}]},
 {"id":56,"animation1Hue":0,"animation1Name":"Death1","animation2Hue":0,"animation2Name":"Heal2","frames":[[[5,0,-56,100,0,0,100,0]],[[6,0,-64,100,0,0,150,0]],[[5,0,-72,100,0,0,200,0]],[[6,0,-72,100,0,0,255,0]],[[5,0,-72,100,0,0,255,0]],[[6,0,-72,100,0,0,255,0],[0,0,-32,200,0,0,255,1]],[[5,0,-72,100,0,0,255,0],[104,-16,-88,70,0,0,255,1],[1,0,-32,200,0,0,255,1]],[[6,0,-72,100,0,0,255,0],[23,-16,-88,110,0,0,255,1],[105,-16,-88,100,0,0,255,1],[2,0,-32,200,0,0,255,1]],[[5,0,-72,100,0,0,255,0],[23,-16,-88,100,0,0,255,1],[107,-16,-88,100,0,0,255,1],[3,0,-32,200,0,0,200,1]],[[6,0,-72,100,0,0,255,0],[22,-16,-88,120,0,0,255,1],[4,0,-32,200,0,0,150,1],[11,0,0,150,0,0,255,1]],[[5,0,-72,100,0,0,255,0],[22,-16,-88,100,0,0,200,1],[12,0,0,150,0,0,255,1]],[[5,0,-72,100,0,0,255,0],[22,-16,-88,60,0,0,200,1],[13,0,0,150,0,0,255,1]],[[7,0,-72,100,0,0,255,0],[14,0,0,170,0,0,255,1]],[[8,0,-72,100,0,0,255,0],[15,0,0,180,0,0,255,1]],[[9,0,-72,100,0,0,255,0],[16,0,0,180,0,0,255,1]],[[10,0,-72,100,0,0,255,0],[17,0,0,180,0,0,255,1]],[[10,0,-72,100,0,0,255,0],[18,0,0,180,0,0,255,1]],[[10,0,-72,100,0,0,255,0],[19,0,0,180,0,0,255,1]],[[10,0,-72,100,0,0,200,0],[20,0,0,180,0,0,255,1]],[[10,0,-72,100,0,0,150,0],[21,0,0,180,0,0,255,1]],[[21,0,0,180,0,0,150,1],[10,0,-72,100,0,0,100,0]]],"name":"即死","position":1,"timings":[{"flashColor":[153,0,68,238],"flashDuration":5,"flashScope":1,"frame":0,"se":{"name":"Darkness5","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,0,136,255],"flashDuration":5,"flashScope":1,"frame":6,"se":{"name":"Thunder1","pan":0,"pitch":125,"volume":90}},{"flashColor":[255,102,119,204],"flashDuration":3,"flashScope":2,"frame":6,"se":null}]},
 {"id":57,"animation1Hue":0,"animation1Name":"Fire1","animation2Hue":0,"animation2Name":"","frames":[[[0,0,-80,130,0,0,255,1]],[[1,0,-64,100,0,0,255,1]],[[1,0,-88,140,0,0,255,1]],[[2,0,-88,150,0,0,255,1]],[[3,0,-88,150,0,0,255,1]],[[4,0,-88,150,0,0,255,1]],[[5,0,-80,140,0,0,255,1]],[[5,0,-80,140,0,0,150,1]]],"name":"炎/单体1","position":2,"timings":[{"flashColor":[255,102,34,221],"flashDuration":3,"flashScope":1,"frame":0,"se":{"name":"Fire4","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,102,34,204],"flashDuration":5,"flashScope":1,"frame":2,"se":null}]},
-{"id":58,"animation1Hue":0,"animation1Name":"Fire1","animation2Hue":0,"animation2Name":"","frames":[[[-1,0,16,150,0,0,255,1],[1,0,-64,100,0,0,255,1]],[[6,0,-144,150,0,0,255,1]],[[7,0,-144,150,0,0,255,1]],[[8,0,-152,160,0,0,255,1]],[[9,0,-152,160,0,0,255,1]],[[7,0,-152,160,0,0,255,1]],[[8,0,-152,160,0,0,255,1]],[[9,0,-152,160,0,0,255,1]],[[7,0,-152,160,0,0,180,1]],[[8,0,-152,160,0,0,100,1]],[[9,0,-152,160,0,0,70,1]]],"name":"炎/单体2","position":2,"timings":[{"flashColor":[255,255,255,255],"flashDuration":5,"flashScope":0,"frame":0,"se":{"name":"Fire6","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,119,34,255],"flashDuration":10,"flashScope":1,"frame":2,"se":null},{"flashColor":[255,170,0,170],"flashDuration":6,"flashScope":2,"frame":2,"se":null}]},
+{"id":58,"animation1Hue":0,"animation1Name":"Fire1","animation2Hue":0,"animation2Name":"","frames":[[[-1,0,16,150,0,0,255,1],[1,0,-64,100,0,0,255,1]],[[6,0,-144,150,0,0,255,1]],[[7,0,-144,150,0,0,255,1]],[[8,0,-152,160,0,0,255,1]],[[9,0,-152,160,0,0,255,1]],[[7,0,-152,160,0,0,255,1]],[[8,0,-152,160,0,0,255,1]],[[9,0,-152,160,0,0,255,1]],[[7,0,-152,160,0,0,180,1]],[[8,0,-152,160,0,0,100,1]],[[9,0,-152,160,0,0,70,1]]],"name":"炎/单体2","position":2,"timings":[{"flashColor":[255,119,34,255],"flashDuration":10,"flashScope":1,"frame":2,"se":null},{"flashColor":[255,170,0,170],"flashDuration":6,"flashScope":2,"frame":2,"se":null}]},
 {"id":59,"animation1Hue":0,"animation1Name":"Fire1","animation2Hue":0,"animation2Name":"","frames":[[[0,0,-16,170,0,0,255,1]],[[1,0,-16,170,0,0,255,1]],[[2,0,-16,170,0,0,255,1],[0,-200,-32,170,0,0,255,1],[7,0,-72,160,0,0,200,1]],[[3,0,-16,170,0,0,255,1],[1,-200,-32,170,0,0,255,1],[8,0,-72,160,0,0,150,1]],[[4,0,-16,170,0,0,255,1],[2,-200,-32,170,0,0,255,1],[7,-200,-72,160,0,0,200,1]],[[3,-200,-32,170,0,0,255,1],[5,0,-16,170,0,0,255,1],[0,192,-32,170,0,0,255,1],[0,-88,8,100,0,0,255,1],[8,-200,-72,160,0,0,150,1]],[[5,0,-16,170,0,0,180,1],[4,-200,-32,170,0,0,255,1],[1,192,-32,170,0,0,255,1],[1,-88,-8,130,0,0,255,1]],[[5,-200,-32,170,0,0,255,1],[2,192,-32,170,0,0,255,1],[2,-88,-8,120,0,0,255,1],[0,80,8,100,0,0,255,1],[7,192,-72,160,0,0,200,1]],[[5,-200,-32,170,0,0,150,1],[3,192,-32,170,0,0,255,1],[3,-88,-8,120,0,0,255,1],[1,80,-8,120,0,0,255,1],[8,192,-72,160,0,0,150,1]],[[4,192,-32,170,0,0,255,1],[4,-88,-8,120,0,0,255,1],[-1,64,0,120,0,0,255,1],[2,80,-8,120,0,0,255,1]],[[5,192,-32,170,0,0,255,1],[5,-88,-8,120,0,0,255,1],[3,80,-8,120,0,0,200,1]],[[5,192,-32,170,0,0,150,1],[5,-88,-8,120,0,0,150,1],[4,80,-8,120,0,0,200,1]],[[5,80,-8,120,0,0,200,1]],[[5,80,-8,120,0,0,100,1]]],"name":"炎/全体1","position":3,"timings":[{"flashColor":[255,187,68,153],"flashDuration":5,"flashScope":2,"frame":0,"se":{"name":"Fire7","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,102,0,187],"flashDuration":5,"flashScope":1,"frame":0,"se":null},{"flashColor":[255,153,0,204],"flashDuration":3,"flashScope":1,"frame":3,"se":null},{"flashColor":[255,187,68,153],"flashDuration":5,"flashScope":2,"frame":5,"se":null},{"flashColor":[255,119,0,187],"flashDuration":3,"flashScope":1,"frame":6,"se":null}]},
 {"id":60,"animation1Hue":0,"animation1Name":"Fire1","animation2Hue":0,"animation2Name":"","frames":[[[1,0,0,130,0,0,255,1]],[[6,0,-64,150,0,0,255,1]],[[7,0,-72,160,0,0,255,1],[1,-88,0,130,0,0,255,1],[1,88,0,130,0,0,255,1]],[[8,0,-88,180,0,0,255,1],[6,-88,-64,150,0,0,255,1],[6,88,-64,150,0,0,255,1]],[[9,0,-96,185,0,0,255,1],[7,-88,-72,160,0,0,255,1],[7,88,-72,160,0,0,255,1]],[[7,0,-96,190,0,0,255,1],[8,-88,-72,160,0,0,255,1],[8,88,-72,160,0,0,255,1]],[[8,0,-104,195,0,0,255,1],[9,-96,-72,160,0,0,255,1],[6,-96,-56,145,0,0,255,1],[6,96,-56,145,0,0,255,1],[9,88,-72,160,0,0,255,1]],[[9,0,-104,200,0,0,255,1],[7,-104,-72,160,0,0,255,1],[7,-112,-64,150,0,0,255,1],[7,96,-72,160,0,0,255,1],[7,104,-64,150,0,0,255,1]],[[8,104,-72,160,0,0,255,1],[7,0,-104,200,0,0,255,1],[8,-112,-72,160,0,0,255,1],[8,-136,-64,150,0,0,255,1],[8,136,-64,150,0,0,255,1]],[[9,112,-72,160,0,0,255,1],[8,0,-104,200,0,0,255,1],[9,-112,-72,160,0,0,255,1],[7,-152,-64,150,0,0,255,1],[7,152,-64,150,0,0,255,1]],[[9,0,-104,200,0,0,255,1],[7,-112,-72,160,0,0,255,1],[8,-168,-64,150,0,0,255,1],[7,112,-72,160,0,0,255,1],[8,168,-64,150,0,0,255,1]],[[8,112,-72,160,0,0,255,1],[8,-112,-72,160,0,0,255,1],[9,-192,-64,150,0,0,255,1],[7,0,-104,200,0,0,255,1],[9,192,-64,150,0,0,255,1]],[[9,112,-72,160,0,0,255,1],[7,-200,-64,150,0,0,255,1],[9,-112,-72,160,0,0,255,1],[8,0,-104,200,0,0,255,1],[7,200,-64,150,0,0,255,1]],[[9,0,-104,200,0,0,255,1],[8,-208,-64,150,0,0,255,1],[7,-112,-72,160,0,0,255,1],[7,112,-72,160,0,0,255,1],[8,208,-64,150,0,0,255,1]],[[7,0,-104,200,0,0,200,1],[9,-208,-64,150,0,0,200,1],[8,-112,-72,160,0,0,200,1],[8,112,-72,160,0,0,200,1],[9,208,-64,150,0,0,200,1]],[[8,0,-104,200,0,0,100,1],[7,-208,-64,150,0,0,100,1],[9,-112,-72,160,0,0,100,1],[9,112,-72,160,0,0,100,1],[7,208,-64,150,0,0,100,1]]],"name":"炎/全体2","position":3,"timings":[{"flashColor":[255,153,0,187],"flashDuration":10,"flashScope":2,"frame":0,"se":{"name":"Fire8","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,153,0,221],"flashDuration":3,"flashScope":1,"frame":2,"se":null},{"flashColor":[255,136,0,170],"flashDuration":3,"flashScope":1,"frame":5,"se":null},{"flashColor":[255,102,0,170],"flashDuration":3,"flashScope":1,"frame":9,"se":null},{"flashColor":[255,153,0,170],"flashDuration":3,"flashScope":1,"frame":12,"se":null}]},
 {"id":61,"animation1Hue":60,"animation1Name":"Ice1","animation2Hue":0,"animation2Name":"Attack3","frames":[[[-1,0,-88,130,0,0,255,1],[5,-8,-72,80,0,0,150,1]],[[-1,0,-88,130,0,0,255,1],[5,-8,-72,80,0,0,255,1]],[[0,0,-88,130,0,0,255,1],[5,-8,-80,90,0,0,255,1]],[[6,-8,-88,110,0,0,255,1],[1,0,-96,150,0,0,255,1]],[[7,-8,-88,110,0,0,255,1],[2,0,-96,150,0,0,255,1]],[[8,-8,-88,110,0,0,255,0],[3,0,-96,150,0,0,230,1],[105,0,-96,150,0,0,255,1]],[[8,-8,-88,110,0,0,255,0],[4,0,-96,150,0,0,230,1],[106,0,-96,110,0,0,255,1]],[[8,-8,-88,110,0,0,255,0],[4,0,-96,152,0,0,200,1],[107,0,-96,115,0,0,255,1]],[[8,-8,-88,110,0,0,255,0],[4,0,-96,154,0,0,180,1],[106,0,-96,120,0,0,255,1]],[[8,-8,-88,110,0,0,255,0],[4,0,-96,154,0,0,150,1],[107,0,-96,120,0,0,200,1]],[[4,0,-96,154,0,0,100,1],[8,-8,-88,110,0,0,180,0]],[[4,0,-96,154,0,0,70,1],[8,-8,-88,110,0,0,100,0]]],"name":"冰/单体1","position":2,"timings":[{"flashColor":[187,238,255,255],"flashDuration":5,"flashScope":0,"frame":0,"se":{"name":"Ice4","pan":0,"pitch":100,"volume":100}},{"flashColor":[255,255,255,255],"flashDuration":5,"flashScope":0,"frame":0,"se":{"name":"Thunder1","pan":0,"pitch":150,"volume":90}},{"flashColor":[187,238,255,187],"flashDuration":5,"flashScope":1,"frame":3,"se":null}]},

data/CommonEvents.json

@@ -49,5 +49,55 @@ null,
 {"id":47,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":48,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":49,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
-{"id":50,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0}
+{"id":50,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":51,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":52,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":53,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":54,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":55,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":56,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":57,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":58,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":59,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":60,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":61,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":62,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":63,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":64,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":65,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":66,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":67,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":68,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":69,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":70,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":71,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":72,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":73,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":74,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":75,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":76,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":77,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":78,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":79,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":80,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":81,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":82,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":83,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":84,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":85,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"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":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":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":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},
+{"id":96,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":97,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":98,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":99,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
+{"id":100,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0}
 ]

data/Items.json

@@ -89,7 +89,7 @@ null,
 {"id":87,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":88,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":89,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
-{"id":90,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
+{"id":90,"animationId":0,"consumable":false,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"打开查看当前主线任务","effects":[{"code":44,"dataId":90,"value1":1,"value2":0}],"hitType":0,"iconIndex":193,"itypeId":2,"name":"任务","note":"","occasion":2,"price":0,"repeats":1,"scope":0,"speed":0,"successRate":100,"tpGain":0},
 {"id":91,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":92,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":93,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},

data/LargeFace.json

@@ -1 +1 @@
-{"主角团":{"1":{"FileName":"主角团_1","@c":3},"2":{"FileName":"主角团_2","@c":4},"3":{"FileName":"主角团_3","@c":5},"4":{"FileName":"主角团_4","@c":6},"5":{"FileName":"主角团_5","@c":7},"6":{"FileName":"主角团_6","@c":8},"7":{"FileName":"主角团_7","@c":9},"8":{"FileName":"主角团_8","@c":10},"@c":2},"配角团":{"1":{"FileName":"配角团_1","@c":12},"2":{"FileName":"配角团_2","@c":13},"3":{"FileName":"配角团_3","@c":14},"4":{"FileName":"配角团_4","@c":15},"5":{"FileName":"配角团_5","@c":16},"@c":11},"@c":1}
+{"主角团":{"1":{"FileName":"主角团_1","@c":3},"2":{"FileName":"主角团_2","@c":4},"3":{"FileName":"主角团_3","@c":5},"4":{"FileName":"主角团_4","@c":6},"5":{"FileName":"主角团_5","@c":7},"6":{"FileName":"主角团_6","@c":8},"7":{"FileName":"主角团_7","@c":9},"8":{"FileName":"主角团_8","@c":10},"@c":2},"配角团":{"1":{"FileName":"配角团_1","@c":12},"2":{"FileName":"配角团_2","@c":13},"3":{"FileName":"配角团_3","@c":14},"4":{"FileName":"配角团_4","@c":15},"5":{"FileName":"配角团_5","@c":16},"6":{"FileName":"配角团_6","@c":17},"7":{"FileName":"配角团_7","@c":18},"@c":11},"@c":1}

data/Map032Ext.json

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

data/Map033Ext.json

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

data/Map034Ext.json

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

data/MapInfos.json

@@ -1,34 +1,37 @@
 [
 null,
-{"id":1,"expanded":true,"name":"地球","order":1,"parentId":0,"scrollX":691.1111111111111,"scrollY":418.6666666666667},
-{"id":2,"expanded":false,"name":"星港","order":30,"parentId":27,"scrollX":852,"scrollY":1988.4444444444443},
-{"id":3,"expanded":true,"name":"好人家二层","order":19,"parentId":22,"scrollX":772,"scrollY":529},
-{"id":4,"expanded":true,"name":"好人家地下室","order":20,"parentId":22,"scrollX":753.7777777777778,"scrollY":783.1111111111111},
-{"id":5,"expanded":true,"name":"海滩","order":6,"parentId":31,"scrollX":1124,"scrollY":1071},
-{"id":6,"expanded":true,"name":"深海及纳萨托恩外围","order":10,"parentId":10,"scrollX":1560,"scrollY":1931},
-{"id":7,"expanded":true,"name":"纳萨托恩","order":11,"parentId":6,"scrollX":816,"scrollY":1929},
-{"id":8,"expanded":true,"name":"通往皇宫的管道","order":12,"parentId":7,"scrollX":1628,"scrollY":1669},
-{"id":9,"expanded":true,"name":"共鸣腔及水循环通道","order":13,"parentId":8,"scrollX":1628,"scrollY":1448.888888888889},
-{"id":10,"expanded":true,"name":"海底多孔岩工地","order":9,"parentId":24,"scrollX":772,"scrollY":723},
-{"id":11,"expanded":false,"name":"密室","order":14,"parentId":9,"scrollX":772,"scrollY":1201},
-{"id":12,"expanded":true,"name":"大护壁及大漩涡","order":16,"parentId":7,"scrollX":780,"scrollY":479},
-{"id":13,"expanded":true,"name":"渡鸦12345的办公室1F","order":4,"parentId":30,"scrollX":772,"scrollY":721},
-{"id":14,"expanded":true,"name":"梦位面宇宙","order":22,"parentId":0,"scrollX":684,"scrollY":760},
-{"id":15,"expanded":true,"name":"艾欧","order":23,"parentId":14,"scrollX":1842.6666666666667,"scrollY":1952.888888888889},
-{"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":24,"parentId":15,"scrollX":2059,"scrollY":1959},
-{"id":17,"expanded":true,"name":"艾欧同步轨道","order":25,"parentId":15,"scrollX":780,"scrollY":479},
-{"id":18,"expanded":true,"name":"飞船遗迹内部","order":26,"parentId":17,"scrollX":1029,"scrollY":2373},
-{"id":19,"expanded":false,"name":"操作仓","order":27,"parentId":18,"scrollX":772,"scrollY":481},
-{"id":20,"expanded":true,"name":"南郊（有水泵站）","order":17,"parentId":31,"scrollX":1678.2222222222222,"scrollY":1130.6666666666667},
-{"id":21,"expanded":false,"name":"传送阵","order":31,"parentId":14,"scrollX":754.2222222222222,"scrollY":952},
-{"id":22,"expanded":true,"name":"好人家一层","order":18,"parentId":20,"scrollX":832,"scrollY":624},
-{"id":23,"expanded":true,"name":"大海","order":7,"parentId":5,"scrollX":772,"scrollY":483},
-{"id":24,"expanded":true,"name":"迷雾之岛","order":8,"parentId":23,"scrollX":1148,"scrollY":971},
-{"id":25,"expanded":false,"name":"水塔2","order":21,"parentId":20,"scrollX":693.3333333333334,"scrollY":424},
-{"id":26,"expanded":true,"name":"皇宫","order":15,"parentId":9,"scrollX":684,"scrollY":1490.6666666666667},
-{"id":27,"expanded":true,"name":"晶核研究站","order":28,"parentId":14,"scrollX":684,"scrollY":934.2222222222222},
-{"id":28,"expanded":false,"name":"实验室","order":29,"parentId":27,"scrollX":684,"scrollY":518.2222222222222},
-{"id":29,"expanded":false,"name":"渡鸦12345的办公室2F","order":5,"parentId":13,"scrollX":1040,"scrollY":636},
-{"id":30,"expanded":true,"name":"渡鸦12345的办公室","order":3,"parentId":31,"scrollX":1484,"scrollY":1833},
-{"id":31,"expanded":true,"name":"世界地图","order":2,"parentId":1,"scrollX":8293.777777777777,"scrollY":2678.222222222222}
+{"id":1,"expanded":true,"name":"地球","order":12,"parentId":32,"scrollX":848.1818181818182,"scrollY":513.8181818181819},
+{"id":2,"expanded":false,"name":"星港","order":9,"parentId":27,"scrollX":852.5454545454546,"scrollY":1894.909090909091},
+{"id":3,"expanded":true,"name":"好人家二层","order":30,"parentId":22,"scrollX":772,"scrollY":528.8888888888889},
+{"id":4,"expanded":true,"name":"好人家地下室","order":31,"parentId":22,"scrollX":754.2222222222222,"scrollY":623.1111111111111},
+{"id":5,"expanded":true,"name":"海滩","order":17,"parentId":31,"scrollX":1124,"scrollY":1480},
+{"id":6,"expanded":true,"name":"深海及纳萨托恩外围","order":21,"parentId":10,"scrollX":1560.4444444444443,"scrollY":1988.4444444444443},
+{"id":7,"expanded":true,"name":"纳萨托恩","order":22,"parentId":6,"scrollX":816,"scrollY":1929},
+{"id":8,"expanded":true,"name":"通往皇宫的管道","order":23,"parentId":7,"scrollX":1628,"scrollY":1669},
+{"id":9,"expanded":true,"name":"共鸣腔及水循环通道","order":24,"parentId":8,"scrollX":1628,"scrollY":1448.888888888889},
+{"id":10,"expanded":true,"name":"海底多孔岩工地","order":20,"parentId":24,"scrollX":684,"scrollY":781.3333333333334},
+{"id":11,"expanded":false,"name":"密室","order":25,"parentId":9,"scrollX":772,"scrollY":1201},
+{"id":12,"expanded":true,"name":"大护壁及大漩涡","order":27,"parentId":7,"scrollX":691.1111111111111,"scrollY":418.6666666666667},
+{"id":13,"expanded":true,"name":"渡鸦12345的办公室1F","order":15,"parentId":30,"scrollX":772,"scrollY":721},
+{"id":14,"expanded":true,"name":"梦位面宇宙","order":1,"parentId":0,"scrollX":852.5454545454546,"scrollY":934.909090909091},
+{"id":15,"expanded":true,"name":"艾欧","order":2,"parentId":14,"scrollX":1843.111111111111,"scrollY":1952.888888888889},
+{"id":16,"expanded":false,"name":"艾欧深海（各种遗迹以及传送门）","order":3,"parentId":15,"scrollX":2059,"scrollY":1959},
+{"id":17,"expanded":true,"name":"艾欧同步轨道","order":4,"parentId":15,"scrollX":780,"scrollY":479},
+{"id":18,"expanded":true,"name":"飞船遗迹内部","order":5,"parentId":17,"scrollX":1029,"scrollY":2373},
+{"id":19,"expanded":false,"name":"操作仓","order":6,"parentId":18,"scrollX":772,"scrollY":481},
+{"id":20,"expanded":true,"name":"南郊（有水泵站）","order":28,"parentId":31,"scrollX":1656.5454545454545,"scrollY":584.7272727272727},
+{"id":21,"expanded":false,"name":"传送阵","order":10,"parentId":14,"scrollX":839.4545454545455,"scrollY":926.1818181818182},
+{"id":22,"expanded":true,"name":"好人家一层","order":29,"parentId":20,"scrollX":852.5454545454546,"scrollY":694.909090909091},
+{"id":23,"expanded":true,"name":"大海","order":18,"parentId":5,"scrollX":756,"scrollY":548.4444444444445},
+{"id":24,"expanded":true,"name":"迷雾之岛","order":19,"parentId":23,"scrollX":1236,"scrollY":1028.4444444444443},
+{"id":25,"expanded":false,"name":"水塔2","order":32,"parentId":20,"scrollX":848.1818181818182,"scrollY":513.8181818181819},
+{"id":26,"expanded":true,"name":"皇宫","order":26,"parentId":9,"scrollX":816,"scrollY":1484},
+{"id":27,"expanded":true,"name":"晶核研究站","order":7,"parentId":14,"scrollX":839.4545454545455,"scrollY":926.1818181818182},
+{"id":28,"expanded":false,"name":"实验室","order":8,"parentId":27,"scrollX":848.1818181818182,"scrollY":513.8181818181819},
+{"id":29,"expanded":false,"name":"渡鸦12345的办公室2F","order":16,"parentId":13,"scrollX":684,"scrollY":781.3333333333334},
+{"id":30,"expanded":true,"name":"渡鸦12345的办公室","order":14,"parentId":31,"scrollX":2332.5,"scrollY":1413},
+{"id":31,"expanded":true,"name":"世界地图","order":13,"parentId":1,"scrollX":7864.909090909091,"scrollY":2856},
+{"id":32,"expanded":true,"name":"宇宙","order":11,"parentId":0,"scrollX":839.4545454545455,"scrollY":505.0909090909091},
+{"id":33,"expanded":false,"name":"豆豆星系","order":33,"parentId":32,"scrollX":848.1818181818182,"scrollY":513.8181818181819},
+{"id":34,"expanded":false,"name":"豆豆星","order":34,"parentId":33,"scrollX":3403.5,"scrollY":3204}
 ]

data/Test_LargeFace.json

@@ -1 +1 @@
-{"主角团":{"1":{"FileName":"主角团_1","@c":3},"2":{"FileName":"主角团_2","@c":4},"3":{"FileName":"主角团_3","@c":5},"4":{"FileName":"主角团_4","@c":6},"5":{"FileName":"主角团_5","@c":7},"6":{"FileName":"主角团_6","@c":8},"7":{"FileName":"主角团_7","@c":9},"8":{"FileName":"主角团_8","@c":10},"@c":2},"配角团":{"1":{"FileName":"配角团_1","@c":12},"2":{"FileName":"配角团_2","@c":13},"3":{"FileName":"配角团_3","@c":14},"4":{"FileName":"配角团_4","@c":15},"5":{"FileName":"配角团_5","@c":16},"@c":11},"@c":1}
+{"主角团":{"1":{"FileName":"主角团_1","@c":3},"2":{"FileName":"主角团_2","@c":4},"3":{"FileName":"主角团_3","@c":5},"4":{"FileName":"主角团_4","@c":6},"5":{"FileName":"主角团_5","@c":7},"6":{"FileName":"主角团_6","@c":8},"7":{"FileName":"主角团_7","@c":9},"8":{"FileName":"主角团_8","@c":10},"@c":2},"配角团":{"1":{"FileName":"配角团_1","@c":12},"2":{"FileName":"配角团_2","@c":13},"3":{"FileName":"配角团_3","@c":14},"4":{"FileName":"配角团_4","@c":15},"5":{"FileName":"配角团_5","@c":16},"6":{"FileName":"配角团_6","@c":17},"7":{"FileName":"配角团_7","@c":18},"@c":11},"@c":1}