From 4f7ba73222af001f2665f9a98798776541316f1e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Sat, 14 Jan 2023 14:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_rdtaskcondi.json |  27 +++++++
 bin/json/game_worldtask.json   | 138 +++++++++++++++++++++++++++------
 2 files changed, 140 insertions(+), 25 deletions(-)

diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 3dfbdfc0f..b9c6f0e69 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -908,6 +908,33 @@
     "data4": 0,
     "data5": 0
   },
+  {
+    "id": 301,
+    "type": 61,
+    "data1": 101,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 302,
+    "type": 61,
+    "data1": 104,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 303,
+    "type": 61,
+    "data1": 108,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
   {
     "id": 10001,
     "type": 24,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index d6f8a6d7b..53fdc66c0 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -438,13 +438,13 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-波比-右屏圣树2",
-      "153"
+      "718"
     ],
     "getafter_event": [
       2,
-      422
+      411
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -460,9 +460,9 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-豺狼人-右屏圣树",
-      "153"
+      "718"
     ],
     "getafter_event": [
       2,
@@ -488,9 +488,9 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-豺狼人-右屏圣树",
-      "153"
+      "718"
     ],
     "getafter_event": [
       2,
@@ -510,16 +510,16 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-圣树下的黑洞",
-      "153"
+      "718"
     ],
     "getafter_event": [
       5,
       10008
     ],
     "completetask": 198,
-    "auto_accept": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -532,9 +532,9 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-波比-犀牛守卫",
-      "153"
+      "718"
     ],
     "getafter_event": [
       2,
@@ -554,9 +554,9 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-波比-右屏圣树3",
-      "153"
+      "718"
     ],
     "getafter_event": [
       9,
@@ -576,9 +576,9 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_boundary_01_recordtask",
+      "scenes_kongfupanda_01",
       "新手引导-波比-右屏圣树3",
-      "153"
+      "718"
     ],
     "getafter_event": [
       2,
@@ -600,7 +600,7 @@
     "npc": [
       "scenes_boundary_01_recordtask",
       "0新手引导-杰克-中轴城常驻待机",
-      "153"
+      "150"
     ],
     "getafter_event": [
       2,
@@ -622,14 +622,14 @@
     "npc": [
       "scenes_boundary_01_recordtask",
       "0新手引导-杰克-中轴城常驻待机",
-      "153"
+      "150"
     ],
     "getafter_event": [
       2,
       423
     ],
-    "completetask": 118,
-    "auto_accept": 0,
+    "completetask": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -643,8 +643,8 @@
     "icon": "",
     "npc": [
       "scenes_boundary_01_recordtask",
-      "新手引导-布兰奇-中轴城",
-      "153"
+      "0新手引导-杰克-中轴城常驻待机",
+      "150"
     ],
     "getafter_event": [
       2,
@@ -666,14 +666,14 @@
     "npc": [
       "scenes_boundary_01_recordtask",
       "0新手引导-杰克-中轴城常驻待机",
-      "153"
+      "150"
     ],
     "getafter_event": [
       2,
       426
     ],
     "completetask": 0,
-    "auto_accept": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -681,7 +681,7 @@
     "key": 20190,
     "lock": 1,
     "ontxe": 20180,
-    "id_after": 0,
+    "id_after": 20200,
     "group": 2,
     "des": 2,
     "icon": "",
@@ -698,5 +698,93 @@
     "auto_accept": 0,
     "overtips": 1,
     "reword": []
+  },
+  {
+    "key": 20200,
+    "lock": 1,
+    "ontxe": 20190,
+    "id_after": 20210,
+    "group": 2,
+    "des": 2,
+    "icon": "",
+    "npc": [
+      "scenes_smithy_01",
+      "暴夫纳特铁匠铺",
+      "139"
+    ],
+    "getafter_event": [
+      2,
+      427
+    ],
+    "completetask": 0,
+    "auto_accept": 0,
+    "overtips": 1,
+    "reword": []
+  },
+  {
+    "key": 20210,
+    "lock": 1,
+    "ontxe": 20200,
+    "id_after": 20220,
+    "group": 2,
+    "des": 2,
+    "icon": "",
+    "npc": [
+      "scenes_boundary_01_recordtask",
+      "0新手引导-杰克-中轴城常驻待机",
+      "150"
+    ],
+    "getafter_event": [
+      2,
+      427
+    ],
+    "completetask": 301,
+    "auto_accept": 0,
+    "overtips": 1,
+    "reword": []
+  },
+  {
+    "key": 20220,
+    "lock": 1,
+    "ontxe": 20210,
+    "id_after": 20230,
+    "group": 2,
+    "des": 2,
+    "icon": "",
+    "npc": [
+      "scenes_boundary_01_recordtask",
+      "0新手引导-杰克-中轴城常驻待机",
+      "150"
+    ],
+    "getafter_event": [
+      2,
+      427
+    ],
+    "completetask": 302,
+    "auto_accept": 0,
+    "overtips": 1,
+    "reword": []
+  },
+  {
+    "key": 20230,
+    "lock": 1,
+    "ontxe": 20220,
+    "id_after": 0,
+    "group": 2,
+    "des": 2,
+    "icon": "",
+    "npc": [
+      "scenes_boundary_01_recordtask",
+      "0新手引导-杰克-中轴城常驻待机",
+      "150"
+    ],
+    "getafter_event": [
+      2,
+      427
+    ],
+    "completetask": 303,
+    "auto_accept": 0,
+    "overtips": 1,
+    "reword": []
   }
 ]
\ No newline at end of file