From cfe15751c03f2c611c7ef5fc1e96712602a5dd92 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 30 Mar 2023 10:42:11 +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_rdtaskcondi.json     | 48 ++++++++++++++++++++++++++++++
 bin/json/game_rdtasknpc.json       |  4 +--
 bin/json/game_worldtask.json       |  8 ++---
 modules/dispatch/model_dispatch.go |  2 +-
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index b99ac8f20..c9a32b082 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -1259,6 +1259,54 @@
     "data4": 0,
     "data5": 0
   },
+  {
+    "id": 304,
+    "type_sp": 1,
+    "tasktxt": "通关维京远征难度1",
+    "type": 73,
+    "valid": 0,
+    "data1": 1,
+    "data2": 1001,
+    "data3": 1,
+    "data4": 0,
+    "data5": 10071
+  },
+  {
+    "id": 305,
+    "type_sp": 1,
+    "tasktxt": "通关主线1-6",
+    "type": 61,
+    "valid": 0,
+    "data1": 1100106,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 102
+  },
+  {
+    "id": 306,
+    "type_sp": 1,
+    "tasktxt": "进行一次10连",
+    "type": 14,
+    "valid": 0,
+    "data1": 10,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 101
+  },
+  {
+    "id": 307,
+    "type_sp": 1,
+    "tasktxt": "打败梦魇！",
+    "type": 70,
+    "valid": 0,
+    "data1": 1,
+    "data2": 102,
+    "data3": 0,
+    "data4": 0,
+    "data5": 10101
+  },
   {
     "id": 10001,
     "type_sp": 0,
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index 35d021717..916a438d0 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -302,7 +302,7 @@
     "id": 10082,
     "datas": [
       "GameMain",
-      "食人鱼",
+      "20080_食人鱼_1",
       "901"
     ],
     "event": [
@@ -354,7 +354,7 @@
     "id": 10101,
     "datas": [
       "GameMain",
-      "梦魇",
+      "20100_梦魇_1",
       "901"
     ],
     "event": [
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index a52cb7446..9ef3f3813 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -231,7 +231,7 @@
     },
     "npc": 10070,
     "completetask": [
-      0
+      304
     ],
     "deliver_npc": 10072,
     "auto_accept": 0,
@@ -266,7 +266,7 @@
     },
     "npc": 10080,
     "completetask": [
-      0
+      305
     ],
     "deliver_npc": 10082,
     "auto_accept": 0,
@@ -301,7 +301,7 @@
     },
     "npc": 10090,
     "completetask": [
-      0
+      306
     ],
     "deliver_npc": 0,
     "auto_accept": 0,
@@ -336,7 +336,7 @@
     },
     "npc": 10100,
     "completetask": [
-      0
+      307
     ],
     "deliver_npc": 10102,
     "auto_accept": 1,
diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go
index bc97a07cb..bf1d392ca 100644
--- a/modules/dispatch/model_dispatch.go
+++ b/modules/dispatch/model_dispatch.go
@@ -96,7 +96,7 @@ func (this *modelDispatch) getTasksWeight(uid string, d *pb.DBDispatch) int32 {
 
 	// 取权重数组下标
 	i := comm.GetRandW(conf.Probability)
-	this.module.Debug("随机下标", log.Field{Key: "idx", Value: i})
+	// this.module.Debug("随机下标", log.Field{Key: "idx", Value: i})
 	confList, err := this.module.configure.getDispatchTaskConfByType(int32(i + 1))
 
 	var tIds []int32