From c41b83a2be58b90181fffd2a154809f508da609e Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 11 Nov 2022 18:10:47 +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_worldtask.json    | 26 +++++++++++++-------------
 modules/worldtask/api_finish.go |  3 ---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index ec1120ee4..a42972b36 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -45,7 +45,7 @@
     "task_name": "新剧情10101",
     "task_display": "新剧情文本10101",
     "npc": [
-      "dreamwork_restaurant_01",
+      "scenes_ boundary_02",
       "邦尼兔组件名",
       "601"
     ],
@@ -113,7 +113,7 @@
       2,
       10004
     ],
-    "completetask": 173,
+    "completetask": 0,
     "auto_accept": 1,
     "overtips": 1,
     "reword": [
@@ -315,7 +315,7 @@
     "task_name": "新剧情10110",
     "task_display": "新剧情文本10110",
     "npc": [
-      "scenes_smithy_01",
+      "SmithyScene",
       "戈伯铁匠铺组件名",
       "610"
     ],
@@ -735,7 +735,7 @@
     "task_name": "新剧情10124",
     "task_display": "新剧情文本10124",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "624"
     ],
@@ -765,7 +765,7 @@
     "task_name": "新剧情10125",
     "task_display": "新剧情文本10125",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "625"
     ],
@@ -795,7 +795,7 @@
     "task_name": "新剧情10126",
     "task_display": "新剧情文本10126",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "626"
     ],
@@ -825,7 +825,7 @@
     "task_name": "新剧情10127",
     "task_display": "新剧情文本10127",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "627"
     ],
@@ -855,7 +855,7 @@
     "task_name": "新剧情10128",
     "task_display": "新剧情文本10128",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "628"
     ],
@@ -885,7 +885,7 @@
     "task_name": "新剧情10129",
     "task_display": "新剧情文本10129",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "629"
     ],
@@ -915,7 +915,7 @@
     "task_name": "新剧情10130",
     "task_display": "新剧情文本10130",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "630"
     ],
@@ -1125,7 +1125,7 @@
     "task_name": "新剧情10137",
     "task_display": "新剧情文本10137",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "637"
     ],
@@ -1155,7 +1155,7 @@
     "task_name": "新剧情10138",
     "task_display": "新剧情文本10138",
     "npc": [
-      "scenes_martialarts_01",
+      "WuGuanScene",
       "阿宝组件名",
       "638"
     ],
@@ -1949,7 +1949,7 @@
     "task_name": "新剧情10165",
     "task_display": "新剧情文本10165",
     "npc": [
-      "scenes_ boundary_03",
+      "scenes_ boundary_02",
       "布兰奇组件名"
     ],
     "getafter_event": [
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index 787c64f31..255e09314 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -89,9 +89,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 
 	if curTaskConf.Completetask != 0 {
 		if c := this.module.ModuleRtask.CheckCondi(uid, curTaskConf.Completetask); c == pb.ErrorCode_Success {
-			// code = pb.ErrorCode_WorldtaskNoComplete
-			// this.module.Debugf("任务条件:%v 未完成", curTaskConf.Completetask)
-			// return
 			finishCall()
 		}
 	} else {