diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 420aa5402..d7882e6e6 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -79,6 +79,19 @@ 1008 ] }, + { + "id": 100200, + "group": 3, + "subgroup": 0, + "type": 2, + "preTid": 100104, + "condition": [ + 0 + ], + "sidequest": [ + 2035 + ] + }, { "id": 100201, "group": 2, diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index b291d37b9..6941bd264 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -328,5 +328,15 @@ 0 ], "nextTid": 100216 + }, + { + "id": 200022, + "num": 1, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": -1 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index fb85e2e2b..ac0e86e66 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -554,8 +554,8 @@ "type": 46, "inited": [], "data1": 1, - "data2": 1, - "data3": 1, + "data2": 6, + "data3": 0, "data4": 0, "data5": 0 }, @@ -828,7 +828,799 @@ "datatype": 2, "type": 70, "inited": [], - "data1": 101, + "data1": 109, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10001, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10002, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10003, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10004, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10005, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10006, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10007, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10008, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10009, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10010, + "datatype": 2, + "type": 24, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10101, + "datatype": 2, + "type": 7, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10201, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10202, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10203, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10204, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10205, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10206, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10207, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10208, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10209, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10210, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10301, + "datatype": 2, + "type": 18, + "inited": [], + "data1": 1, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10302, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 5, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10303, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 10, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10304, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 20, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10305, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 50, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10306, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 100, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10307, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 200, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10308, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 300, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10309, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 500, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10310, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 1000, + "data2": 5, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10401, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 1, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10402, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 5, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10403, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 10, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10404, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 20, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10405, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 50, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10406, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 100, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10407, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 200, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10408, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 300, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10409, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 500, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10410, + "datatype": 2, + "type": 50, + "inited": [], + "data1": 1000, + "data2": 6, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10501, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10502, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10503, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10504, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10505, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10506, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10507, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 70, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10508, + "datatype": 2, + "type": 58, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10601, + "datatype": 2, + "type": 62, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10602, + "datatype": 2, + "type": 62, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10603, + "datatype": 2, + "type": 62, + "inited": [], + "data1": 99, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10701, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10702, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10703, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10704, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10705, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10706, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10707, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10708, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10709, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10710, + "datatype": 2, + "type": 64, + "inited": [], + "data1": 1000, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10801, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 1, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10802, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 5, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10803, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 10, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10804, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 20, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10805, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 50, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10806, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 100, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10807, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 200, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10808, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 300, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10809, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 500, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 10810, + "datatype": 2, + "type": 8, + "inited": [], + "data1": 1000, "data2": 0, "data3": 0, "data4": 0, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index a64d38011..495497af1 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -471,7 +471,7 @@ 20004 ], "endTid": [ - 171 + -1 ], "storyEnd": 0, "reward": [ @@ -569,7 +569,7 @@ "EntityInteractive": [ false ], - "modelaction": "", + "modelaction": "Enter", "rotation": { "x": 0, "y": -90, @@ -693,7 +693,7 @@ 200015 ], "endTid": [ - -1 + 118 ], "storyEnd": 0, "reward": [], @@ -1228,12 +1228,9 @@ "enableAi": false, "boxreplace": "", "timeline": "", - "chooseId": [ - 200021, - 200020 - ], + "chooseId": [], "endTid": [ - 106 + -1 ], "storyEnd": 0, "reward": [], @@ -1293,9 +1290,12 @@ "enableAi": false, "boxreplace": "", "timeline": "", - "chooseId": [], + "chooseId": [ + 200021, + 200020 + ], "endTid": [ - -1 + 106 ], "storyEnd": 329, "reward": [], @@ -1438,7 +1438,7 @@ "EntityChange": [], "EntityStateChange": [], "EntityInteractive": [], - "modelaction": "Enter", + "modelaction": "", "rotation": { "x": 0, "y": -90, @@ -1458,5 +1458,38 @@ "reward": [], "nextTid": 100207, "CD": 0 + }, + { + "id": 2035, + "objType": 1, + "location": "middle", + "point": "model_07", + "storyBegin": 999, + "Entity": [], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [], + "modelaction": "Enter", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "enableAi": false, + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200022 + ], + "endTid": [ + -1 + ], + "storyEnd": 0, + "reward": [], + "nextTid": 0, + "CD": 0 } ] \ No newline at end of file