From 93994a71de117a14aa07bf11553b6eae252a6402 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 24 Nov 2022 23:30:54 +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_combatmanster.json              | 145 ++++++++++++++++++
 bin/json/game_rdtaskcondi.json                |  11 ++
 bin/json/game_worldtask.json                  | 112 +++++++-------
 sys/configure/structs/Game.CombatLevelData.go |   2 +
 .../structs/Game.CombatMansterData.go         |  21 +++
 5 files changed, 235 insertions(+), 56 deletions(-)

diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json
index 1cda05891..c078de435 100644
--- a/bin/json/game_combatmanster.json
+++ b/bin/json/game_combatmanster.json
@@ -1,6 +1,53 @@
 [
   {
     "id": 101011,
+    "type": 1,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 0,
+    "formatList": [
+      101011
+    ],
+    "award": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1650
+      }
+    ]
+  },
+  {
+    "id": 101012,
+    "type": 1,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 0,
+    "formatList": [
+      101011
+    ],
+    "award": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1650
+      }
+    ]
+  },
+  {
+    "id": 101013,
+    "type": 1,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 0,
     "formatList": [
       101011
     ],
@@ -14,6 +61,13 @@
   },
   {
     "id": 101021,
+    "type": 1,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 0,
     "formatList": [
       101021
     ],
@@ -27,6 +81,13 @@
   },
   {
     "id": 110213,
+    "type": 1,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -40,6 +101,10 @@
   },
   {
     "id": 110214,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -53,6 +118,10 @@
   },
   {
     "id": 110215,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -66,6 +135,10 @@
   },
   {
     "id": 110216,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -79,6 +152,10 @@
   },
   {
     "id": 120031,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -92,6 +169,10 @@
   },
   {
     "id": 120032,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -105,6 +186,10 @@
   },
   {
     "id": 120033,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -118,6 +203,10 @@
   },
   {
     "id": 120034,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -131,6 +220,10 @@
   },
   {
     "id": 120035,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -144,6 +237,10 @@
   },
   {
     "id": 120036,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -157,6 +254,10 @@
   },
   {
     "id": 130011,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -170,6 +271,10 @@
   },
   {
     "id": 130012,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -183,6 +288,10 @@
   },
   {
     "id": 130013,
+    "type": 1,
+    "sencenstory": [],
+    "time": 0,
+    "clickstory": 0,
     "formatList": [
       101072
     ],
@@ -193,5 +302,41 @@
         "n": 1650
       }
     ]
+  },
+  {
+    "id": 200001,
+    "type": 2,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 100002,
+    "formatList": [],
+    "award": []
+  },
+  {
+    "id": 200002,
+    "type": 2,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 100002,
+    "formatList": [],
+    "award": []
+  },
+  {
+    "id": 200003,
+    "type": 2,
+    "sencenstory": [
+      3000011,
+      3000012
+    ],
+    "time": 3,
+    "clickstory": 100002,
+    "formatList": [],
+    "award": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 724974408..7772c3fdf 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -1076,6 +1076,17 @@
     "data4": 4,
     "data5": 4
   },
+  {
+    "id": 194,
+    "datatype": 2,
+    "type": 138,
+    "inited": [],
+    "data1": 30,
+    "data2": 0,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
   {
     "id": 10001,
     "datatype": 2,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index f3913f79a..54ab8239e 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -11,7 +11,7 @@
     "task_display": "新剧情文本10100",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝起身入场",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -94,7 +94,7 @@
     "task_display": "新剧情文本10103",
     "npc": [
       "dreamwork_restaurant_01",
-      "阿宝组件名",
+      "波比组件名",
       "140"
     ],
     "getafter_event": [
@@ -153,7 +153,7 @@
     "task_display": "新剧情文本10105",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -177,7 +177,7 @@
     "task_display": "新剧情文本10106",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -201,7 +201,7 @@
     "task_display": "新剧情文本10107",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -225,7 +225,7 @@
     "task_display": "新剧情文本10108",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -304,7 +304,7 @@
       2,
       100012
     ],
-    "completetask": 175,
+    "completetask": 184,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -352,7 +352,7 @@
       2,
       100014
     ],
-    "completetask": 0,
+    "completetask": 185,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -393,7 +393,7 @@
     "task_display": "新剧情文本10115",
     "npc": [
       "scenes_boundary_02night",
-      "阿宝夜晚组件名",
+      "瓜哥夜晚组件名",
       "153"
     ],
     "getafter_event": [
@@ -417,7 +417,7 @@
     "task_display": "新剧情文本10116",
     "npc": [
       "scenes_boundary_02night",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -441,7 +441,7 @@
     "task_display": "新剧情文本10117",
     "npc": [
       "scenes_ boundary_02",
-      "瓜哥主城组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -465,7 +465,7 @@
     "task_display": "新剧情文本10118",
     "npc": [
       "scenes_ boundary_02",
-      "瓜哥主城组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -489,7 +489,7 @@
     "task_display": "新剧情文本10119",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝维京区",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
@@ -513,7 +513,7 @@
     "task_display": "新剧情文本10120",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝维京区",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
@@ -537,14 +537,14 @@
     "task_display": "新剧情文本10121",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝维京区",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
       2,
       100022
     ],
-    "completetask": 0,
+    "completetask": 186,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -561,7 +561,7 @@
     "task_display": "新剧情文本10122",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝维京区",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
@@ -585,7 +585,7 @@
     "task_display": "新剧情文本10123",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝维京区",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
@@ -616,7 +616,7 @@
       2,
       100025
     ],
-    "completetask": 176,
+    "completetask": 195,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -664,7 +664,7 @@
       2,
       100027
     ],
-    "completetask": 177,
+    "completetask": 196,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -688,7 +688,7 @@
       2,
       100028
     ],
-    "completetask": 178,
+    "completetask": 197,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -760,7 +760,7 @@
       2,
       100031
     ],
-    "completetask": 158,
+    "completetask": 198,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -777,7 +777,7 @@
     "task_display": "新剧情文本10131",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "瓜哥维京区",
       "151"
     ],
     "getafter_event": [
@@ -801,7 +801,7 @@
     "task_display": "新剧情文本10132",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -825,7 +825,7 @@
     "task_display": "新剧情文本10133",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -849,7 +849,7 @@
     "task_display": "新剧情文本10134",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -873,7 +873,7 @@
     "task_display": "新剧情文本10135",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -897,7 +897,7 @@
     "task_display": "新剧情文本10136",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -969,7 +969,7 @@
     "task_display": "新剧情文本10139",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -993,7 +993,7 @@
     "task_display": "新剧情文本10140",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -1017,14 +1017,14 @@
     "task_display": "新剧情文本10141",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
       2,
       100043
     ],
-    "completetask": 180,
+    "completetask": 199,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []
@@ -1041,7 +1041,7 @@
     "task_display": "新剧情文本10142",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -1065,7 +1065,7 @@
     "task_display": "新剧情文本10143",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -1089,7 +1089,7 @@
     "task_display": "新剧情文本10144",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -1113,7 +1113,7 @@
     "task_display": "新剧情文本10145",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝现代区",
+      "瓜哥现代区",
       "152"
     ],
     "getafter_event": [
@@ -1137,7 +1137,7 @@
     "task_display": "新剧情文本10146",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1161,7 +1161,7 @@
     "task_display": "新剧情文本10147",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1185,7 +1185,7 @@
     "task_display": "新剧情文本10148",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1209,7 +1209,7 @@
     "task_display": "新剧情文本10149",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1233,7 +1233,7 @@
     "task_display": "新剧情文本10150",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1257,7 +1257,7 @@
     "task_display": "新剧情文本10151",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1281,7 +1281,7 @@
     "task_display": "新剧情文本10152",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "杰克",
       "150"
     ],
     "getafter_event": [
@@ -1305,7 +1305,7 @@
     "task_display": "新剧情文本10153",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1329,7 +1329,7 @@
     "task_display": "新剧情文本10154",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1353,7 +1353,7 @@
     "task_display": "新剧情文本10155",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1377,7 +1377,7 @@
     "task_display": "新剧情文本10156",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1401,7 +1401,7 @@
     "task_display": "新剧情文本10157",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1425,7 +1425,7 @@
     "task_display": "新剧情文本10158",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1449,7 +1449,7 @@
     "task_display": "新剧情文本10159",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1473,7 +1473,7 @@
     "task_display": "新剧情文本10160",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1497,7 +1497,7 @@
     "task_display": "新剧情文本10161",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1521,7 +1521,7 @@
     "task_display": "新剧情文本10162",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1545,7 +1545,7 @@
     "task_display": "新剧情文本10163",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1569,7 +1569,7 @@
     "task_display": "新剧情文本10164",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
@@ -1593,7 +1593,7 @@
     "task_display": "新剧情文本10165",
     "npc": [
       "scenes_martialarts_01",
-      "武馆熊貓",
+      "武馆杰克 ",
       "137"
     ],
     "getafter_event": [
diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go
index 532ddd9fd..944fa2a35 100644
--- a/sys/configure/structs/Game.CombatLevelData.go
+++ b/sys/configure/structs/Game.CombatLevelData.go
@@ -12,6 +12,7 @@ import "errors"
 
 type GameCombatLevelData struct {
     Id int32
+    Scene string
     FormatList []int32
     Droplist []int32
     PassformatList []int32
@@ -27,6 +28,7 @@ func (*GameCombatLevelData) GetTypeId() int32 {
 
 func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err error) {
     { 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; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
diff --git a/sys/configure/structs/Game.CombatMansterData.go b/sys/configure/structs/Game.CombatMansterData.go
index f059cb9c5..acf8c9548 100644
--- a/sys/configure/structs/Game.CombatMansterData.go
+++ b/sys/configure/structs/Game.CombatMansterData.go
@@ -12,6 +12,10 @@ import "errors"
 
 type GameCombatMansterData struct {
     Id int32
+    Type int32
+    Sencenstory []int32
+    Time int32
+    Clickstory int32
     FormatList []int32
     Award []*Gameatn
 }
@@ -24,6 +28,23 @@ func (*GameCombatMansterData) GetTypeId() int32 {
 
 func (_v *GameCombatMansterData)Deserialize(_buf map[string]interface{}) (err error) {
     { 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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["sencenstory"].([]interface{}); !_ok_ { err = errors.New("sencenstory error"); return }
+
+                _v.Sencenstory = 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.Sencenstory = append(_v.Sencenstory, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clickstory"].(float64); !_ok_ { err = errors.New("clickstory error"); return }; _v.Clickstory = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool