diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json
index 945b4cbdf..ba42c06bb 100644
--- a/bin/json/game_dispatch_battle.json
+++ b/bin/json/game_dispatch_battle.json
@@ -7,11 +7,11 @@
     "rejectstory": 4002,
     "endstory": 0,
     "battlename": {
-      "key": "story_80",
+      "key": "story_7156",
       "text": "闹事之人"
     },
     "battletxt": {
-      "key": "story_80",
+      "key": "story_7157",
       "text": "有人前来闹事，快去解决掉他"
     },
     "BattleReadyID": 100,
@@ -61,11 +61,11 @@
     "rejectstory": 4002,
     "endstory": 0,
     "battlename": {
-      "key": "story_81",
+      "key": "story_7158",
       "text": "闹事之人"
     },
     "battletxt": {
-      "key": "story_81",
+      "key": "story_7159",
       "text": "有人前来闹事，快去解决掉他"
     },
     "BattleReadyID": 100,
diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json
index 39b240c3c..ed030d9dc 100644
--- a/bin/json/game_dispatch_task.json
+++ b/bin/json/game_dispatch_task.json
@@ -8,16 +8,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 103,
+    "tasktime": 160,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 10
+        "param": 25
       }
     ],
     "reqtxt": [
@@ -56,16 +56,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 98,
+    "tasktime": 176,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 17
+        "param": 9
       }
     ],
     "reqtxt": [
@@ -104,16 +104,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 101,
+    "tasktime": 65,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 27
+        "param": 4
       }
     ],
     "reqtxt": [
@@ -152,16 +152,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 147,
+    "tasktime": 148,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 29
+        "param": 28
       }
     ],
     "reqtxt": [
@@ -200,16 +200,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 74,
+    "tasktime": 109,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 15
+        "param": 12
       }
     ],
     "reqtxt": [
@@ -248,7 +248,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 168,
+    "tasktime": 171,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -257,7 +257,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 22
+        "param": 4
       }
     ],
     "reqtxt": [
@@ -296,16 +296,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 111,
+    "tasktime": 144,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 30
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -344,16 +344,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 137,
+    "tasktime": 96,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 1
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -392,7 +392,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 115,
+    "tasktime": 72,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -401,7 +401,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 14
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -440,7 +440,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 100,
+    "tasktime": 146,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -449,7 +449,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 15
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -488,16 +488,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 132,
+    "tasktime": 154,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 3
+        "param": 7
       }
     ],
     "reqtxt": [
@@ -536,16 +536,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 139,
+    "tasktime": 103,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 21
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -584,16 +584,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 141,
+    "tasktime": 84,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 11
+        "param": 1
       }
     ],
     "reqtxt": [
@@ -632,16 +632,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 169,
+    "tasktime": 141,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 6
+        "param": 1
       }
     ],
     "reqtxt": [
@@ -680,7 +680,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 171,
+    "tasktime": 160,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -689,7 +689,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 12
+        "param": 11
       }
     ],
     "reqtxt": [
@@ -728,16 +728,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 91,
+    "tasktime": 75,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 25
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -776,7 +776,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 149,
+    "tasktime": 107,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -785,7 +785,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 14
+        "param": 30
       }
     ],
     "reqtxt": [
@@ -824,16 +824,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 66,
+    "tasktime": 87,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 6
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -872,16 +872,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 113,
+    "tasktime": 106,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 26
+        "param": 12
       }
     ],
     "reqtxt": [
@@ -920,16 +920,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 97,
+    "tasktime": 166,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 2
+        "param": 8
       }
     ],
     "reqtxt": [
@@ -968,16 +968,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 108,
+    "tasktime": 145,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 1
+        "param": 13
       }
     ],
     "reqtxt": [
@@ -1016,16 +1016,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 104,
+    "tasktime": 142,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 25
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -1064,16 +1064,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 167,
+    "tasktime": 67,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 18
+        "param": 23
       }
     ],
     "reqtxt": [
@@ -1112,16 +1112,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 78,
+    "tasktime": 179,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 29
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -1160,16 +1160,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 140,
+    "tasktime": 64,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 7
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -1208,7 +1208,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 111,
+    "tasktime": 71,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -1217,7 +1217,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 2
+        "param": 8
       }
     ],
     "reqtxt": [
@@ -1256,16 +1256,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 125,
+    "tasktime": 60,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 19
+        "param": 3
       }
     ],
     "reqtxt": [
@@ -1304,16 +1304,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 159,
+    "tasktime": 137,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 21
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -1352,16 +1352,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 139,
+    "tasktime": 122,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 13
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -1400,16 +1400,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 93,
+    "tasktime": 130,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 27
+        "param": 19
       }
     ],
     "reqtxt": [
@@ -1448,7 +1448,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 161,
+    "tasktime": 88,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1457,7 +1457,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 24
+        "param": 25
       }
     ],
     "reqtxt": [
@@ -1496,16 +1496,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 175,
+    "tasktime": 151,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 29
+        "param": 21
       }
     ],
     "reqtxt": [
@@ -1544,16 +1544,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 176,
+    "tasktime": 122,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 7
+        "param": 2
       }
     ],
     "reqtxt": [
@@ -1592,16 +1592,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 109,
+    "tasktime": 117,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 3
+        "param": 12
       }
     ],
     "reqtxt": [
@@ -1640,7 +1640,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 139,
+    "tasktime": 128,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -1649,7 +1649,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 19
+        "param": 4
       }
     ],
     "reqtxt": [
@@ -1688,16 +1688,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 107,
+    "tasktime": 146,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 17
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -1736,16 +1736,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 165,
+    "tasktime": 118,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 23
+        "param": 22
       }
     ],
     "reqtxt": [
@@ -1784,16 +1784,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 140,
+    "tasktime": 164,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 18
+        "param": 23
       }
     ],
     "reqtxt": [
@@ -1832,16 +1832,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 175,
+    "tasktime": 67,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 1
+        "param": 26
       }
     ],
     "reqtxt": [
@@ -1880,7 +1880,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 113,
+    "tasktime": 60,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -1889,7 +1889,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 20
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -1928,16 +1928,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 108,
+    "tasktime": 159,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 11
+        "param": 3
       }
     ],
     "reqtxt": [
@@ -1976,16 +1976,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 95,
+    "tasktime": 61,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 25
+        "param": 11
       }
     ],
     "reqtxt": [
@@ -2024,7 +2024,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 80,
+    "tasktime": 69,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2033,7 +2033,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 12
+        "param": 24
       }
     ],
     "reqtxt": [
@@ -2072,7 +2072,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 140,
+    "tasktime": 61,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2081,7 +2081,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 20
+        "param": 19
       }
     ],
     "reqtxt": [
@@ -2120,16 +2120,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 144,
+    "tasktime": 168,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 11
+        "param": 10
       }
     ],
     "reqtxt": [
@@ -2168,16 +2168,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 133,
+    "tasktime": 158,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 13
+        "param": 27
       }
     ],
     "reqtxt": [
@@ -2216,16 +2216,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 65,
+    "tasktime": 84,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 4
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -2264,7 +2264,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 123,
+    "tasktime": 100,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2273,7 +2273,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 9
+        "param": 27
       }
     ],
     "reqtxt": [
@@ -2312,7 +2312,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 176,
+    "tasktime": 78,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
@@ -2321,7 +2321,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 30
+        "param": 15
       }
     ],
     "reqtxt": [
@@ -2360,7 +2360,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 157,
+    "tasktime": 103,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
@@ -2369,7 +2369,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 1
+        "param": 8
       }
     ],
     "reqtxt": [
@@ -2408,7 +2408,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 169,
+    "tasktime": 144,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -2417,7 +2417,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 7
+        "param": 11
       }
     ],
     "reqtxt": [
@@ -2456,16 +2456,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 98,
+    "tasktime": 151,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 30
+        "param": 16
       }
     ],
     "reqtxt": [
@@ -2504,16 +2504,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 175,
+    "tasktime": 154,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 29
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -2552,16 +2552,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 157,
+    "tasktime": 94,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 13
+        "param": 21
       }
     ],
     "reqtxt": [
@@ -2600,16 +2600,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 179,
+    "tasktime": 82,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 24
+        "param": 4
       }
     ],
     "reqtxt": [
@@ -2648,7 +2648,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 103,
+    "tasktime": 60,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -2657,7 +2657,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 13
+        "param": 6
       }
     ],
     "reqtxt": [
@@ -2696,16 +2696,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 102,
+    "tasktime": 156,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 22
+        "param": 28
       }
     ],
     "reqtxt": [
@@ -2744,16 +2744,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 118,
+    "tasktime": 116,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 1,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 12
+        "param": 13
       }
     ],
     "reqtxt": [
@@ -2792,16 +2792,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 161,
+    "tasktime": 102,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 25
+        "param": 2
       }
     ],
     "reqtxt": [
@@ -2840,16 +2840,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 138,
+    "tasktime": 134,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 29
+        "param": 8
       }
     ],
     "reqtxt": [
@@ -2888,16 +2888,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 91,
+    "tasktime": 103,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 24
+        "param": 18
       }
     ],
     "reqtxt": [
@@ -2936,16 +2936,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 106,
+    "tasktime": 154,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 9
+        "param": 30
       }
     ],
     "reqtxt": [
@@ -2984,16 +2984,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 102,
+    "tasktime": 179,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 2,
     "taskreq": [
       {
         "key": 1,
-        "param": 23
+        "param": 21
       }
     ],
     "reqtxt": [
@@ -3032,16 +3032,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 116,
+    "tasktime": 170,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 4
+        "param": 5
       }
     ],
     "reqtxt": [
@@ -3080,16 +3080,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 152,
+    "tasktime": 118,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 6
+        "param": 8
       }
     ],
     "reqtxt": [
@@ -3128,16 +3128,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 108,
+    "tasktime": 91,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 23
+        "param": 21
       }
     ],
     "reqtxt": [
@@ -3176,7 +3176,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 167,
+    "tasktime": 117,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -3185,7 +3185,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 21
+        "param": 1
       }
     ],
     "reqtxt": [
@@ -3224,7 +3224,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 78,
+    "tasktime": 141,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -3233,7 +3233,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 21
+        "param": 14
       }
     ],
     "reqtxt": [
@@ -3272,16 +3272,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 129,
+    "tasktime": 99,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 3
+        "param": 16
       }
     ],
     "reqtxt": [
@@ -3320,16 +3320,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 130,
+    "tasktime": 171,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 4,
+    "taskneed": 1,
     "taskreq": [
       {
         "key": 1,
-        "param": 23
+        "param": 4
       }
     ],
     "reqtxt": [
@@ -3368,7 +3368,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 80,
+    "tasktime": 107,
     "tasktxt": {
       "key": "Entrustment details of Tiger",
       "text": "这是属于悍娇虎的专属委托"
@@ -3377,7 +3377,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 23
+        "param": 2
       }
     ],
     "reqtxt": [
@@ -3416,7 +3416,7 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 110,
+    "tasktime": 65,
     "tasktxt": {
       "key": "Entrustment details of Shifu",
       "text": "这是属于师父的专属委托"
@@ -3425,7 +3425,7 @@
     "taskreq": [
       {
         "key": 1,
-        "param": 30
+        "param": 25
       }
     ],
     "reqtxt": [
@@ -3464,16 +3464,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 154,
+    "tasktime": 84,
     "tasktxt": {
       "key": "Entrustment details of Po",
       "text": "这是属于阿宝的专属委托"
     },
-    "taskneed": 3,
+    "taskneed": 4,
     "taskreq": [
       {
         "key": 1,
-        "param": 2
+        "param": 9
       }
     ],
     "reqtxt": [
@@ -3512,16 +3512,16 @@
     },
     "icon": "wg_cj1_img01",
     "taskcd": 200,
-    "tasktime": 145,
+    "tasktime": 80,
     "tasktxt": {
       "key": "Entrustment details of Bobi",
       "text": "这是属于波比的专属委托"
     },
-    "taskneed": 2,
+    "taskneed": 3,
     "taskreq": [
       {
         "key": 1,
-        "param": 10
+        "param": 2
       }
     ],
     "reqtxt": [
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 0ad4701b5..565b5a78f 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -4246,5 +4246,17 @@
     "data3": 0,
     "data4": 0,
     "data5": 26
+  },
+  {
+    "id": 20003,
+    "type_sp": 1,
+    "tasktxt": "和暴夫纳特交谈",
+    "type": 20001,
+    "valid": 1,
+    "data1": 1,
+    "data2": 500,
+    "data3": 0,
+    "data4": 0,
+    "data5": 21
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 07d7152bc..dfbefe606 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -55,7 +55,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 2,
+    "deliver_npc": 1,
     "auto_accept": 0,
     "reword": [],
     "module": [
@@ -86,7 +86,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 3,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": [
@@ -117,7 +117,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 4,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -146,7 +146,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 5,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -175,7 +175,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 6,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -204,7 +204,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 7,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -233,7 +233,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 8,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -262,7 +262,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 9,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -291,7 +291,7 @@
     "completetask": [
       174
     ],
-    "deliver_npc": 10,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [
       {
@@ -326,7 +326,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 11,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -355,7 +355,7 @@
     "completetask": [
       198
     ],
-    "deliver_npc": 12,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [
       {
@@ -390,7 +390,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 13,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -419,7 +419,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 14,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -448,7 +448,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 15,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -477,7 +477,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 16,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -506,7 +506,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 17,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -535,7 +535,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 18,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -564,7 +564,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 19,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [
       {
@@ -599,7 +599,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 20,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -628,7 +628,7 @@
     "completetask": [
       0
     ],
-    "deliver_npc": 21,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -657,7 +657,7 @@
     "completetask": [
       301
     ],
-    "deliver_npc": 22,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -686,7 +686,7 @@
     "completetask": [
       302
     ],
-    "deliver_npc": 23,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -715,7 +715,7 @@
     "completetask": [
       303
     ],
-    "deliver_npc": 24,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -744,7 +744,7 @@
     "completetask": [
       114
     ],
-    "deliver_npc": 25,
+    "deliver_npc": 1,
     "auto_accept": 1,
     "reword": [],
     "module": []
@@ -755,7 +755,7 @@
     "ontxe": 20010,
     "id_after": 0,
     "group": 3,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "task_Tname": {
       "key": "story_80",
@@ -771,7 +771,7 @@
     },
     "npc": 29,
     "completetask": [
-      301
+      20003
     ],
     "deliver_npc": 1,
     "auto_accept": 0,