From 50ceaa59ec07cfeb12e4f5bced4b84a23097a358 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Mon, 26 Sep 2022 16:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_rdtask.json       |  45 ++++++++----
 bin/json/game_rdtaskchoose.json |  22 ++++--
 bin/json/game_rdtaskcondi.json  |   6 +-
 bin/json/game_rdtaskside.json   | 121 ++++++++++++++++++++++++++++----
 4 files changed, 157 insertions(+), 37 deletions(-)

diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json
index d7882e6e6..b1c1ad68e 100644
--- a/bin/json/game_rdtask.json
+++ b/bin/json/game_rdtask.json
@@ -4,7 +4,7 @@
     "group": 1,
     "subgroup": 0,
     "type": 2,
-    "preTid": 0,
+    "preTid": 100104,
     "condition": [
       104
     ],
@@ -225,9 +225,9 @@
       0
     ],
     "sidequest": [
-      2016,
-      2017,
-      2018
+      2036,
+      2037,
+      2038
     ]
   },
   {
@@ -240,7 +240,9 @@
       0
     ],
     "sidequest": [
-      2019
+      2016,
+      2017,
+      2018
     ]
   },
   {
@@ -253,7 +255,7 @@
       0
     ],
     "sidequest": [
-      2020
+      2019
     ]
   },
   {
@@ -266,9 +268,7 @@
       0
     ],
     "sidequest": [
-      2021,
-      2022,
-      2023
+      2020
     ]
   },
   {
@@ -281,9 +281,9 @@
       0
     ],
     "sidequest": [
-      2024,
-      2025,
-      2026
+      2021,
+      2022,
+      2023
     ]
   },
   {
@@ -296,9 +296,9 @@
       0
     ],
     "sidequest": [
-      2027,
-      2028,
-      2029
+      2024,
+      2025,
+      2026
     ]
   },
   {
@@ -310,6 +310,21 @@
     "condition": [
       0
     ],
+    "sidequest": [
+      2027,
+      2028,
+      2029
+    ]
+  },
+  {
+    "id": 100217,
+    "group": 2,
+    "subgroup": 0,
+    "type": 2,
+    "preTid": 100216,
+    "condition": [
+      0
+    ],
     "sidequest": [
       2030,
       2031,
diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json
index 6941bd264..6d7c7a263 100644
--- a/bin/json/game_rdtaskchoose.json
+++ b/bin/json/game_rdtaskchoose.json
@@ -217,7 +217,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100211
+    "nextTid": 100212
   },
   {
     "id": 200011,
@@ -227,7 +227,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100213
+    "nextTid": 100214
   },
   {
     "id": 200012,
@@ -287,7 +287,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100212
+    "nextTid": 100213
   },
   {
     "id": 200018,
@@ -297,7 +297,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100213
+    "nextTid": 100214
   },
   {
     "id": 200019,
@@ -307,7 +307,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100215
+    "nextTid": 100216
   },
   {
     "id": 200020,
@@ -327,7 +327,7 @@
     "needItem": [
       0
     ],
-    "nextTid": 100216
+    "nextTid": 100217
   },
   {
     "id": 200022,
@@ -338,5 +338,15 @@
       0
     ],
     "nextTid": -1
+  },
+  {
+    "id": 200023,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100211
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index ac0e86e66..503ced286 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -37,8 +37,8 @@
     "datatype": 2,
     "type": 4,
     "inited": [],
-    "data1": 25001,
-    "data2": 20,
+    "data1": 25004,
+    "data2": 10,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -718,7 +718,7 @@
     "datatype": 2,
     "type": 61,
     "inited": [],
-    "data1": 101,
+    "data1": 109,
     "data2": 0,
     "data3": 0,
     "data4": 0,
diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json
index 495497af1..22ef65bb4 100644
--- a/bin/json/game_rdtaskside.json
+++ b/bin/json/game_rdtaskside.json
@@ -588,7 +588,7 @@
     "endTid": [
       -1
     ],
-    "storyEnd": 311,
+    "storyEnd": 0,
     "reward": [
       {
         "ChooseId": 20008,
@@ -758,12 +758,11 @@
       200015
     ],
     "endTid": [
-      152,
-      146
+      104
     ],
     "storyEnd": 317,
     "reward": [],
-    "nextTid": 100210,
+    "nextTid": 100211,
     "CD": 0
   },
   {
@@ -863,13 +862,13 @@
         "Reward": [
           {
             "a": "hero",
-            "t": "45921",
-            "n": 1
+            "t": "43901",
+            "n": 5
           }
         ]
       }
     ],
-    "nextTid": 100211,
+    "nextTid": 100212,
     "CD": 0
   },
   {
@@ -962,9 +961,9 @@
     "endTid": [
       158
     ],
-    "storyEnd": 322,
+    "storyEnd": 0,
     "reward": [],
-    "nextTid": 100212,
+    "nextTid": 100213,
     "CD": 0
   },
   {
@@ -997,7 +996,7 @@
     ],
     "storyEnd": 322,
     "reward": [],
-    "nextTid": 100213,
+    "nextTid": 100214,
     "CD": 0
   },
   {
@@ -1045,7 +1044,7 @@
         ]
       }
     ],
-    "nextTid": 100214,
+    "nextTid": 100215,
     "CD": 0
   },
   {
@@ -1141,7 +1140,7 @@
     ],
     "storyEnd": 0,
     "reward": [],
-    "nextTid": 100215,
+    "nextTid": 100216,
     "CD": 0
   },
   {
@@ -1299,7 +1298,7 @@
     ],
     "storyEnd": 329,
     "reward": [],
-    "nextTid": 100216,
+    "nextTid": 100217,
     "CD": 0
   },
   {
@@ -1491,5 +1490,101 @@
     "reward": [],
     "nextTid": 0,
     "CD": 0
+  },
+  {
+    "id": 2036,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 338,
+    "Entity": [],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [
+      200023,
+      200015
+    ],
+    "endTid": [
+      146
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": 0,
+    "CD": 0
+  },
+  {
+    "id": 2037,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 339,
+    "Entity": [],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2038,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 340,
+    "Entity": [],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": 90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
   }
 ]
\ No newline at end of file