diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json
index 566790c03..7f1a6b5f2 100644
--- a/bin/json/game_rdtask.json
+++ b/bin/json/game_rdtask.json
@@ -159,8 +159,7 @@
     ],
     "sidequest": [
       2009,
-      2010,
-      2011
+      2010
     ]
   },
   {
@@ -172,6 +171,7 @@
       101
     ],
     "sidequest": [
+      2011,
       2012
     ]
   },
@@ -184,7 +184,9 @@
       101
     ],
     "sidequest": [
-      2013
+      2013,
+      2014,
+      2015
     ]
   },
   {
@@ -196,7 +198,9 @@
       101
     ],
     "sidequest": [
-      2014
+      2016,
+      2017,
+      2018
     ]
   },
   {
@@ -208,7 +212,7 @@
       101
     ],
     "sidequest": [
-      2015
+      2019
     ]
   },
   {
@@ -220,7 +224,7 @@
       101
     ],
     "sidequest": [
-      2016
+      2020
     ]
   },
   {
@@ -232,7 +236,9 @@
       101
     ],
     "sidequest": [
-      2017
+      2021,
+      2022,
+      2023
     ]
   },
   {
@@ -244,7 +250,9 @@
       101
     ],
     "sidequest": [
-      2018
+      2024,
+      2025,
+      2026
     ]
   },
   {
@@ -256,7 +264,9 @@
       101
     ],
     "sidequest": [
-      2019
+      2027,
+      2028,
+      2029
     ]
   },
   {
@@ -268,19 +278,9 @@
       101
     ],
     "sidequest": [
-      2020
-    ]
-  },
-  {
-    "id": 100217,
-    "group": 2,
-    "type": 2,
-    "preTid": 100216,
-    "condition": [
-      101
-    ],
-    "sidequest": [
-      2021
+      2030,
+      2031,
+      2032
     ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json
index e2f313556..26bf21b66 100644
--- a/bin/json/game_rdtaskchoose.json
+++ b/bin/json/game_rdtaskchoose.json
@@ -3,10 +3,6 @@
     "id": 10001,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -17,10 +13,6 @@
     "id": 10002,
     "num": 2,
     "preTid": 104,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -31,10 +23,6 @@
     "id": 10003,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -45,10 +33,6 @@
     "id": 10004,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -59,10 +43,6 @@
     "id": 10005,
     "num": 2,
     "preTid": 105,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -73,10 +53,6 @@
     "id": 10006,
     "num": 1,
     "preTid": 105,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -87,10 +63,6 @@
     "id": 10007,
     "num": 2,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -101,10 +73,6 @@
     "id": 10008,
     "num": 3,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -115,14 +83,6 @@
     "id": 10009,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -133,14 +93,6 @@
     "id": 100010,
     "num": 2,
     "preTid": 105,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -151,14 +103,6 @@
     "id": 100011,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 101,
     "needItem": [
       0
@@ -169,14 +113,6 @@
     "id": 100012,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -186,13 +122,7 @@
   {
     "id": 20001,
     "num": 1,
-    "preTid": 104,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
+    "preTid": 0,
     "gotoLevel": 0,
     "needItem": [
       0
@@ -203,12 +133,6 @@
     "id": 20002,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -219,12 +143,6 @@
     "id": 20003,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -235,12 +153,6 @@
     "id": 20004,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -251,12 +163,6 @@
     "id": 20005,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -267,12 +173,6 @@
     "id": 20006,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -283,12 +183,6 @@
     "id": 20007,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -299,12 +193,6 @@
     "id": 20008,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -315,12 +203,6 @@
     "id": 20009,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -331,28 +213,16 @@
     "id": 200010,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
     ],
-    "nextTid": 100212
+    "nextTid": 100211
   },
   {
     "id": 200011,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -363,12 +233,6 @@
     "id": 200012,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -379,12 +243,6 @@
     "id": 200013,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -395,12 +253,6 @@
     "id": 200014,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -411,12 +263,6 @@
     "id": 200015,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -427,16 +273,60 @@
     "id": 200016,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
     ],
     "nextTid": 100217
+  },
+  {
+    "id": 200017,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100212
+  },
+  {
+    "id": 200018,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100213
+  },
+  {
+    "id": 200019,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100215
+  },
+  {
+    "id": 200020,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 0
+  },
+  {
+    "id": 200021,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100216
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index d970e03a8..1b8c3f0d0 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -53,7 +53,7 @@
     "id": 106,
     "datatype": 2,
     "type": 6,
-    "data1": 45003,
+    "data1": 25004,
     "data2": 4,
     "data3": 0,
     "data4": 0,
diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json
index a6d2421a9..7b7764235 100644
--- a/bin/json/game_rdtaskside.json
+++ b/bin/json/game_rdtaskside.json
@@ -25,7 +25,9 @@
       10001,
       10002
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [
       {
@@ -85,7 +87,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": -1,
@@ -117,7 +121,9 @@
       10003,
       10004
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": 100103,
@@ -150,7 +156,9 @@
       10006,
       10007
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": 100101,
@@ -179,7 +187,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": -1,
@@ -211,7 +221,9 @@
       10008,
       10009
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": 100104,
@@ -244,7 +256,9 @@
       100011,
       100012
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": 100105,
@@ -273,7 +287,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 1,
     "reward": [],
     "nextTid": 0,
@@ -309,7 +325,9 @@
       20001,
       20002
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [
       {
@@ -365,7 +383,9 @@
     "chooseId": [
       20003
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": 100204,
@@ -398,7 +418,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": -1,
@@ -431,7 +453,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": -1,
@@ -466,7 +490,9 @@
     "chooseId": [
       20004
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [
       {
@@ -512,7 +538,9 @@
     "chooseId": [
       20007
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": 100206,
@@ -545,7 +573,9 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
     "nextTid": -1,
@@ -581,9 +611,22 @@
       20008,
       20009
     ],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
-    "reward": [],
+    "reward": [
+      {
+        "ChooseId": 20008,
+        "Reward": [
+          {
+            "a": "item",
+            "t": "30001",
+            "n": 1
+          }
+        ]
+      }
+    ],
     "nextTid": 100207,
     "CD": 0
   },
@@ -591,74 +634,8 @@
     "id": 2009,
     "objType": 1,
     "location": "middle",
-    "point": "model_07",
-    "storyBegin": 219,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
-    "modelaction": "",
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "modelstate": 0,
-    "popup": "",
-    "special": "",
-    "enableAi": false,
-    "boxreplace": "",
-    "timeline": "",
-    "chooseId": [],
-    "endTid": -1,
-    "storyEnd": 227,
-    "reward": [],
-    "nextTid": 100208,
-    "CD": 0
-  },
-  {
-    "id": 2010,
-    "objType": 1,
-    "location": "middle",
-    "point": "model_03",
-    "storyBegin": 220,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
-    "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": 2011,
-    "objType": 1,
-    "location": "middle",
     "point": "model_02",
-    "storyBegin": 221,
+    "storyBegin": 311,
     "Entity": [
       "Earth"
     ],
@@ -680,18 +657,20 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
-    "nextTid": -1,
+    "nextTid": 100208,
     "CD": 0
   },
   {
-    "id": 2012,
+    "id": 2010,
     "objType": 1,
     "location": "middle",
-    "point": "model_02",
-    "storyBegin": 212,
+    "point": "model_03",
+    "storyBegin": 217,
     "Entity": [
       "Earth"
     ],
@@ -703,7 +682,42 @@
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": 90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2011,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 312,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
       "z": 0
     },
     "modelstate": 0,
@@ -716,18 +730,20 @@
       200012,
       200015
     ],
-    "endTid": 118,
-    "storyEnd": 209,
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
     "reward": [],
     "nextTid": 100209,
     "CD": 0
   },
   {
-    "id": 2013,
+    "id": 2012,
     "objType": 1,
     "location": "middle",
-    "point": "model_02",
-    "storyBegin": 213,
+    "point": "model_03",
+    "storyBegin": 313,
     "Entity": [
       "Earth"
     ],
@@ -737,6 +753,41 @@
       false
     ],
     "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": 2013,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 314,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "Enter",
     "rotation": {
       "x": 0,
       "y": -180,
@@ -752,8 +803,11 @@
       200013,
       200015
     ],
-    "endTid": 152,
-    "storyEnd": 210,
+    "endTid": [
+      152,
+      146
+    ],
+    "storyEnd": 317,
     "reward": [],
     "nextTid": 100210,
     "CD": 0
@@ -763,43 +817,7 @@
     "objType": 1,
     "location": "middle",
     "point": "model_02",
-    "storyBegin": 214,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      true
-    ],
-    "modelaction": "",
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "modelstate": 0,
-    "popup": "",
-    "special": "",
-    "enableAi": false,
-    "boxreplace": "",
-    "timeline": "",
-    "chooseId": [
-      200014,
-      200015
-    ],
-    "endTid": 146,
-    "storyEnd": 211,
-    "reward": [],
-    "nextTid": 100211,
-    "CD": 0
-  },
-  {
-    "id": 2015,
-    "objType": 1,
-    "location": "middle",
-    "point": "model_02",
-    "storyBegin": 222,
+    "storyBegin": 315,
     "Entity": [
       "Earth"
     ],
@@ -811,7 +829,77 @@
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": -90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2015,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 316,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "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": 2016,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 318,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
       "z": 0
     },
     "modelstate": 0,
@@ -823,53 +911,31 @@
     "chooseId": [
       200010
     ],
-    "endTid": -1,
+    "endTid": [
+      158
+    ],
     "storyEnd": 0,
-    "reward": [],
-    "nextTid": 100212,
-    "CD": 0
-  },
-  {
-    "id": 2016,
-    "objType": 2,
-    "location": "left",
-    "point": "icon_01",
-    "storyBegin": 223,
-    "Entity": [
-      "Earth"
+    "reward": [
+      {
+        "ChooseId": 0,
+        "Reward": [
+          {
+            "a": "hero",
+            "t": "45921",
+            "n": 1
+          }
+        ]
+      }
     ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
-    "modelaction": "",
-    "rotation": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "modelstate": 0,
-    "popup": "",
-    "special": "",
-    "enableAi": false,
-    "boxreplace": "",
-    "timeline": "",
-    "chooseId": [
-      200011
-    ],
-    "endTid": 158,
-    "storyEnd": 0,
-    "reward": [],
-    "nextTid": 100213,
+    "nextTid": 100211,
     "CD": 0
   },
   {
     "id": 2017,
-    "objType": 2,
-    "location": "left",
-    "point": "icon_01",
-    "storyBegin": 224,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 320,
     "Entity": [
       "Earth"
     ],
@@ -881,7 +947,7 @@
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": 0,
+      "y": 90,
       "z": 0
     },
     "modelstate": 0,
@@ -891,27 +957,27 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
-    "nextTid": 100214,
+    "nextTid": -1,
     "CD": 0
   },
   {
     "id": 2018,
     "objType": 1,
     "location": "middle",
-    "point": "model_02",
-    "storyBegin": 225,
+    "point": "model_07",
+    "storyBegin": 319,
     "Entity": [
       "Earth"
     ],
-    "EntityChange": [
-      "globe"
-    ],
+    "EntityChange": [],
     "EntityStateChange": [],
     "EntityInteractive": [
-      true
+      false
     ],
     "modelaction": "",
     "rotation": {
@@ -926,32 +992,32 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": -1,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
     "reward": [],
-    "nextTid": 100215,
+    "nextTid": -1,
     "CD": 0
   },
   {
     "id": 2019,
     "objType": 1,
-    "location": "middle",
-    "point": "model_02",
-    "storyBegin": 215,
+    "location": "left",
+    "point": "icon_01",
+    "storyBegin": 321,
     "Entity": [
       "Earth"
     ],
-    "EntityChange": [
-      "globe"
-    ],
+    "EntityChange": [],
     "EntityStateChange": [],
     "EntityInteractive": [
-      true
+      false
     ],
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": 0,
       "z": 0
     },
     "modelstate": 0,
@@ -961,35 +1027,34 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [
-      200012,
-      200015
+      200017
     ],
-    "endTid": 118,
-    "storyEnd": 0,
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 322,
     "reward": [],
-    "nextTid": 100215,
+    "nextTid": 100212,
     "CD": 0
   },
   {
     "id": 2020,
     "objType": 1,
-    "location": "middle",
-    "point": "model_02",
-    "storyBegin": 216,
+    "location": "left",
+    "point": "icon_01",
+    "storyBegin": 323,
     "Entity": [
       "Earth"
     ],
-    "EntityChange": [
-      "globe"
-    ],
+    "EntityChange": [],
     "EntityStateChange": [],
     "EntityInteractive": [
-      true
+      false
     ],
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": 0,
       "z": 0
     },
     "modelstate": 0,
@@ -999,13 +1064,14 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [
-      200016,
-      200015
+      200018
     ],
-    "endTid": 106,
-    "storyEnd": 0,
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 322,
     "reward": [],
-    "nextTid": 100215,
+    "nextTid": 100212,
     "CD": 0
   },
   {
@@ -1013,7 +1079,7 @@
     "objType": 1,
     "location": "middle",
     "point": "model_02",
-    "storyBegin": 226,
+    "storyBegin": 324,
     "Entity": [
       "Earth"
     ],
@@ -1022,12 +1088,12 @@
     ],
     "EntityStateChange": [],
     "EntityInteractive": [
-      true
+      false
     ],
     "modelaction": "",
     "rotation": {
       "x": 0,
-      "y": -180,
+      "y": -90,
       "z": 0
     },
     "modelstate": 0,
@@ -1037,22 +1103,74 @@
     "boxreplace": "",
     "timeline": "",
     "chooseId": [],
-    "endTid": 161,
+    "endTid": [
+      -1
+    ],
     "storyEnd": 0,
-    "reward": [],
-    "nextTid": 100215,
+    "reward": [
+      {
+        "ChooseId": 0,
+        "Reward": [
+          {
+            "a": "item",
+            "t": "30001",
+            "n": 10
+          }
+        ]
+      }
+    ],
+    "nextTid": 100214,
     "CD": 0
   },
   {
     "id": 2022,
     "objType": 1,
     "location": "middle",
-    "point": "model_02",
-    "storyBegin": 304,
+    "point": "model_03",
+    "storyBegin": 326,
     "Entity": [
       "Earth"
     ],
-    "EntityChange": [],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "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": 2023,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 325,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
     "EntityStateChange": [],
     "EntityInteractive": [
       false
@@ -1069,13 +1187,352 @@
     "enableAi": false,
     "boxreplace": "",
     "timeline": "",
-    "chooseId": [
-      20003
+    "chooseId": [],
+    "endTid": [
+      -1
     ],
-    "endTid": -1,
     "storyEnd": 0,
     "reward": [],
-    "nextTid": 100204,
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2024,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 327,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [
+      200019,
+      200020
+    ],
+    "endTid": [
+      118
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": 100215,
+    "CD": 0
+  },
+  {
+    "id": 2025,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 331,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "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": 2026,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 334,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2027,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 335,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [
+      200021,
+      200020
+    ],
+    "endTid": [
+      106
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": -1,
+    "CD": 0
+  },
+  {
+    "id": 2028,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 332,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "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": 2029,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 328,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 329,
+    "reward": [],
+    "nextTid": 100216,
+    "CD": 0
+  },
+  {
+    "id": 2030,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_02",
+    "storyBegin": 330,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -90,
+      "z": 0
+    },
+    "modelstate": 0,
+    "popup": "",
+    "special": "",
+    "enableAi": false,
+    "boxreplace": "",
+    "timeline": "",
+    "chooseId": [],
+    "endTid": [
+      -1
+    ],
+    "storyEnd": 0,
+    "reward": [],
+    "nextTid": 0,
+    "CD": 0
+  },
+  {
+    "id": 2031,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_03",
+    "storyBegin": 333,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "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": 2032,
+    "objType": 1,
+    "location": "middle",
+    "point": "model_07",
+    "storyBegin": 336,
+    "Entity": [
+      "Earth"
+    ],
+    "EntityChange": [
+      "globe"
+    ],
+    "EntityStateChange": [],
+    "EntityInteractive": [
+      false
+    ],
+    "modelaction": "",
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "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
diff --git a/cmd/v2/lib/common/utils.go b/cmd/v2/lib/common/utils.go
index c1047c1c8..ce9545385 100644
--- a/cmd/v2/lib/common/utils.go
+++ b/cmd/v2/lib/common/utils.go
@@ -88,6 +88,10 @@ func Copy(srcFile, destFile string) (int, error) {
 	return len(input), nil
 }
 
+func DeleteFile(filePath string) error {
+	return os.Remove(filePath)
+}
+
 func RemoveContents(dir string) error {
 	d, err := os.Open(dir)
 	if err != nil {
diff --git a/cmd/v2/ui/tool_gen.go b/cmd/v2/ui/tool_gen.go
index 104f4c030..0d80a7f6c 100644
--- a/cmd/v2/ui/tool_gen.go
+++ b/cmd/v2/ui/tool_gen.go
@@ -190,7 +190,14 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 				filepath.Join(projectDir.Text, outputCodeDir.Text, v))
 			if err != nil {
 				logrus.Error(err)
+				return
 			}
+
+			if err := common.DeleteFile(filepath.Join(tmpDir.Text, "go", v)); err != nil {
+				logrus.Error(err)
+				return
+			}
+
 			this.goList.deleteItem(v)
 		}
 	}
@@ -241,7 +248,6 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 		json_overrideBtn.Disable()
 		defer func() {
 			json_overrideBtn.Enable()
-			// _ = common.RemoveContents(filepath.Join(tmpDir.Text, "json"))
 		}()
 		for _, v := range this.jsonList.selItemIds {
 			// logrus.WithField("path1", filepath.Join(tmpDir.Text, "json", v)).Debug("copy json")
@@ -250,7 +256,14 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 				filepath.Join(projectDir.Text, outputJsonDir.Text, v))
 			if err != nil {
 				logrus.Error(err)
+				return
 			}
+
+			if err := common.DeleteFile(filepath.Join(tmpDir.Text, "json", v)); err != nil {
+				logrus.Error(err)
+				return
+			}
+
 			this.jsonList.deleteItem(v)
 		}
 	}
@@ -292,6 +305,10 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 		genBtn.Disable()
 		defer func() {
 			genBtn.Enable()
+			go_allCancelBtn.Show()
+			go_allSelBtn.Hide()
+			json_allCancelBtn.Show()
+			json_allSelBtn.Hide()
 		}()
 		if runtime.GOOS != "windows" {
 			dialog.ShowError(errors.New("no support "+runtime.GOOS), toolWin.w)
diff --git a/modules/rtask/api_dotask.go b/modules/rtask/api_dotask.go
index 31b9c7427..c9444fbaa 100644
--- a/modules/rtask/api_dotask.go
+++ b/modules/rtask/api_dotask.go
@@ -67,7 +67,12 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 		}
 
 		// 没有设置选项，表示任务完成
-		if sideConf.EndTid == -1 {
+		if len(sideConf.EndTid) == 0 {
+			code = pb.ErrorCode_ConfigurationException
+			return
+		}
+		
+		if sideConf.EndTid[0] == -1 {
 			frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
 			if rtask.FrtaskIds == nil {
 				rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
@@ -84,10 +89,12 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 
 		} else {
 			// 校验完成条件
-			if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), sideConf.EndTid); !ok {
-				this.moduleRtask.Error(err.Error())
-				code = pb.ErrorCode_RtaskCondiNoReach
-				return
+			for _, v := range sideConf.EndTid {
+				if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), v); !ok {
+					this.moduleRtask.Error(err.Error())
+					code = pb.ErrorCode_RtaskCondiNoReach
+					return
+				}
 			}
 		}
 	}
diff --git a/sys/configure/structs/Game.RdtaskSideData.go b/sys/configure/structs/Game.RdtaskSideData.go
index 4f289dab3..35d56b52e 100644
--- a/sys/configure/structs/Game.RdtaskSideData.go
+++ b/sys/configure/structs/Game.RdtaskSideData.go
@@ -26,10 +26,11 @@ type GameRdtaskSideData struct {
     Modelstate int32
     Popup string
     Special string
+    EnableAi bool
     Boxreplace string
     Timeline string
     ChooseId []int32
-    EndTid int32
+    EndTid []int32
     StoryEnd int32
     Reward []*GameChooseReward
     NextTid int32
@@ -116,6 +117,7 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) }
     { var _ok_ bool; if _v.Popup, _ok_ = _buf["popup"].(string); !_ok_ { err = errors.New("popup error"); return } }
     { var _ok_ bool; if _v.Special, _ok_ = _buf["special"].(string); !_ok_ { err = errors.New("special error"); return } }
+    { var _ok_ bool; if _v.EnableAi, _ok_ = _buf["enableAi"].(bool); !_ok_ { err = errors.New("enableAi error"); return } }
     { var _ok_ bool; if _v.Boxreplace, _ok_ = _buf["boxreplace"].(string); !_ok_ { err = errors.New("boxreplace error"); return } }
     { var _ok_ bool; if _v.Timeline, _ok_ = _buf["timeline"].(string); !_ok_ { err = errors.New("timeline error"); return } }
      {
@@ -132,7 +134,20 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error
                 }
             }
 
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endTid"].(float64); !_ok_ { err = errors.New("endTid error"); return }; _v.EndTid = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["endTid"].([]interface{}); !_ok_ { err = errors.New("endTid error"); return }
+
+                _v.EndTid = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.EndTid = append(_v.EndTid, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyEnd"].(float64); !_ok_ { err = errors.New("storyEnd error"); return }; _v.StoryEnd = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go
index ed2a5f17e..5293bb071 100644
--- a/sys/configure/structs/game.rdtaskChooseData.go
+++ b/sys/configure/structs/game.rdtaskChooseData.go
@@ -14,6 +14,7 @@ type GameRdtaskChooseData struct {
     Id int32
     Num int32
     PreTid int32
+    GotoLevel int32
     NeedItem []int32
     NextTid int32
 }
@@ -28,6 +29,7 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gotoLevel"].(float64); !_ok_ { err = errors.New("gotoLevel error"); return }; _v.GotoLevel = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool