From 21a1d815d3e9a8a35588761b3654d3654e80caab Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Fri, 11 Aug 2023 18:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=BB=E5=8A=A1=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_activityshow.json | 34 ++++++++++++++++++++
 bin/json/game_buriedcondi.json  | 38 ++++++++++++++++------
 bin/json/game_hero.json         | 56 ++++++++++++++++-----------------
 bin/json/game_mainstage.json    |  6 ++--
 bin/json/game_opencond.json     |  4 ---
 bin/json/game_stonetalent.json  | 22 ++++++-------
 modules/buried/module.go        | 11 ++++---
 7 files changed, 112 insertions(+), 59 deletions(-)
 create mode 100644 bin/json/game_activityshow.json

diff --git a/bin/json/game_activityshow.json b/bin/json/game_activityshow.json
new file mode 100644
index 000000000..fdd2cbceb
--- /dev/null
+++ b/bin/json/game_activityshow.json
@@ -0,0 +1,34 @@
+[
+  {
+    "key": 1001,
+    "show": {
+      "a": "item",
+      "t": "23000001",
+      "n": 0
+    }
+  },
+  {
+    "key": 1003,
+    "show": {
+      "a": "item",
+      "t": "23000002",
+      "n": 0
+    }
+  },
+  {
+    "key": 1004,
+    "show": {
+      "a": "item",
+      "t": "23000003",
+      "n": 0
+    }
+  },
+  {
+    "key": 1005,
+    "show": {
+      "a": "item",
+      "t": "23000004",
+      "n": 0
+    }
+  }
+]
\ No newline at end of file
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index fae9983d8..3e2db50ac 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -177,7 +177,9 @@
     "id": 107,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_7",
@@ -204,7 +206,9 @@
     "id": 108,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_8",
@@ -231,7 +235,9 @@
     "id": 109,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_9",
@@ -258,7 +264,9 @@
     "id": 110,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_10",
@@ -285,7 +293,9 @@
     "id": 111,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_11",
@@ -312,7 +322,9 @@
     "id": 112,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_12",
@@ -339,7 +351,9 @@
     "id": 113,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_13",
@@ -366,7 +380,9 @@
     "id": 114,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_14",
@@ -393,7 +409,9 @@
     "id": 115,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "smithy"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_15",
@@ -20837,7 +20855,7 @@
     "NPC": -102,
     "value": 5,
     "filter": [
-      44004
+      24004
     ],
     "filter2": [
       "守护者ID",
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 27185dcf2..1026162cb 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -5331,7 +5331,7 @@
     "hid": "51002",
     "name": {
       "key": "hero_main_name_51002",
-      "text": "埃雷特手下1号"
+      "text": "大胡子村民"
     },
     "star": 3,
     "color": 2,
@@ -5405,7 +5405,7 @@
     "hid": "51003",
     "name": {
       "key": "hero_main_name_51003",
-      "text": "埃雷特手下2号"
+      "text": "蓝帽子村民"
     },
     "star": 3,
     "color": 2,
@@ -5627,7 +5627,7 @@
     "hid": "51006",
     "name": {
       "key": "hero_main_name_51006",
-      "text": "羊群"
+      "text": "羊"
     },
     "star": 3,
     "color": 2,
@@ -5849,7 +5849,7 @@
     "hid": "51010",
     "name": {
       "key": "hero_main_name_51010",
-      "text": "警卫1号"
+      "text": "瘦高的警卫"
     },
     "star": 3,
     "color": 2,
@@ -5923,7 +5923,7 @@
     "hid": "51011",
     "name": {
       "key": "hero_main_name_51011",
-      "text": "警卫2号"
+      "text": "强壮的警卫"
     },
     "star": 3,
     "color": 2,
@@ -10439,7 +10439,7 @@
     "hid": "51050",
     "name": {
       "key": "hero_main_name_51050",
-      "text": "小蜘蛛A"
+      "text": "恐惧小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -10587,7 +10587,7 @@
     "hid": "51052",
     "name": {
       "key": "hero_main_name_51052",
-      "text": "小蜘蛛B"
+      "text": "恐怖小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -10883,7 +10883,7 @@
     "hid": "51100",
     "name": {
       "key": "hero_main_name_51100",
-      "text": "埃雷特手下1号"
+      "text": "大胡子村民"
     },
     "star": 3,
     "color": 2,
@@ -10957,7 +10957,7 @@
     "hid": "51101",
     "name": {
       "key": "hero_main_name_51101",
-      "text": "埃雷特手下2号"
+      "text": "蓝帽子村民"
     },
     "star": 3,
     "color": 2,
@@ -11179,7 +11179,7 @@
     "hid": "51104",
     "name": {
       "key": "hero_main_name_51104",
-      "text": "羊群"
+      "text": "羊"
     },
     "star": 3,
     "color": 2,
@@ -11253,7 +11253,7 @@
     "hid": "51105",
     "name": {
       "key": "hero_main_name_51105",
-      "text": "警卫1号"
+      "text": "瘦高的警卫"
     },
     "star": 3,
     "color": 2,
@@ -11327,7 +11327,7 @@
     "hid": "51106",
     "name": {
       "key": "hero_main_name_51106",
-      "text": "警卫2号"
+      "text": "强壮的警卫"
     },
     "star": 3,
     "color": 2,
@@ -11697,7 +11697,7 @@
     "hid": "51111",
     "name": {
       "key": "hero_main_name_51111",
-      "text": "小蜘蛛A"
+      "text": "恐惧小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -11845,7 +11845,7 @@
     "hid": "51113",
     "name": {
       "key": "hero_main_name_51113",
-      "text": "小蜘蛛B"
+      "text": "恐怖小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -11993,7 +11993,7 @@
     "hid": "51300",
     "name": {
       "key": "hero_main_name_51300",
-      "text": "埃雷特手下1号"
+      "text": "大胡子村民"
     },
     "star": 3,
     "color": 2,
@@ -12067,7 +12067,7 @@
     "hid": "51301",
     "name": {
       "key": "hero_main_name_51301",
-      "text": "埃雷特手下2号"
+      "text": "蓝帽子村民"
     },
     "star": 3,
     "color": 2,
@@ -12289,7 +12289,7 @@
     "hid": "51304",
     "name": {
       "key": "hero_main_name_51304",
-      "text": "羊群"
+      "text": "羊"
     },
     "star": 3,
     "color": 2,
@@ -12363,7 +12363,7 @@
     "hid": "51305",
     "name": {
       "key": "hero_main_name_51305",
-      "text": "警卫1号"
+      "text": "瘦高的警卫"
     },
     "star": 3,
     "color": 2,
@@ -12437,7 +12437,7 @@
     "hid": "51306",
     "name": {
       "key": "hero_main_name_51306",
-      "text": "警卫2号"
+      "text": "强壮的警卫"
     },
     "star": 3,
     "color": 2,
@@ -12807,7 +12807,7 @@
     "hid": "51311",
     "name": {
       "key": "hero_main_name_51311",
-      "text": "小蜘蛛A"
+      "text": "恐惧小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -12955,7 +12955,7 @@
     "hid": "51313",
     "name": {
       "key": "hero_main_name_51313",
-      "text": "小蜘蛛B"
+      "text": "恐怖小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -13103,7 +13103,7 @@
     "hid": "51500",
     "name": {
       "key": "hero_main_name_51500",
-      "text": "埃雷特手下1号"
+      "text": "大胡子村民"
     },
     "star": 3,
     "color": 2,
@@ -13177,7 +13177,7 @@
     "hid": "51501",
     "name": {
       "key": "hero_main_name_51501",
-      "text": "埃雷特手下2号"
+      "text": "蓝帽子村民"
     },
     "star": 3,
     "color": 2,
@@ -13399,7 +13399,7 @@
     "hid": "51504",
     "name": {
       "key": "hero_main_name_51504",
-      "text": "羊群"
+      "text": "羊"
     },
     "star": 3,
     "color": 2,
@@ -13473,7 +13473,7 @@
     "hid": "51505",
     "name": {
       "key": "hero_main_name_51505",
-      "text": "警卫1号"
+      "text": "瘦高的警卫"
     },
     "star": 3,
     "color": 2,
@@ -13547,7 +13547,7 @@
     "hid": "51506",
     "name": {
       "key": "hero_main_name_51506",
-      "text": "警卫2号"
+      "text": "强壮的警卫"
     },
     "star": 3,
     "color": 2,
@@ -13917,7 +13917,7 @@
     "hid": "51511",
     "name": {
       "key": "hero_main_name_51511",
-      "text": "小蜘蛛A"
+      "text": "恐惧小蜘蛛"
     },
     "star": 3,
     "color": 2,
@@ -14065,7 +14065,7 @@
     "hid": "51513",
     "name": {
       "key": "hero_main_name_51513",
-      "text": "小蜘蛛B"
+      "text": "恐怖小蜘蛛"
     },
     "star": 3,
     "color": 2,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 0c51e4f56..c535de7fc 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -7013,8 +7013,10 @@
     "openlevel": 1,
     "EditorStage": 0,
     "venturemodel": "",
-    "venturetype": 0,
-    "ventureavatar": [],
+    "venturetype": 1,
+    "ventureavatar": [
+      "Person/14002/14002_q.prefab"
+    ],
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 9472c40d8..64898fecd 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -2040,10 +2040,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100808
       }
     ],
     "wkqbx": 2,
diff --git a/bin/json/game_stonetalent.json b/bin/json/game_stonetalent.json
index 252191a1a..e147de0a9 100644
--- a/bin/json/game_stonetalent.json
+++ b/bin/json/game_stonetalent.json
@@ -2,7 +2,7 @@
   {
     "Id": 1,
     "NodeType": 2,
-    "NodeIcon": "js_icon_sx9",
+    "NodeIcon": "mj_icon_attack",
     "listIndex": 1,
     "Front": [],
     "CostItem": [
@@ -31,7 +31,7 @@
   {
     "Id": 2,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon01",
+    "NodeIcon": "mj_icon_life",
     "listIndex": 1,
     "Front": [
       1
@@ -58,7 +58,7 @@
   {
     "Id": 3,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon03",
+    "NodeIcon": "mj_icon_life",
     "listIndex": 1,
     "Front": [
       1
@@ -140,7 +140,7 @@
   {
     "Id": 6,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon01",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 2,
     "Front": [
       5
@@ -167,7 +167,7 @@
   {
     "Id": 7,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon03",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 2,
     "Front": [
       5
@@ -194,7 +194,7 @@
   {
     "Id": 8,
     "NodeType": 2,
-    "NodeIcon": "Life",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 2,
     "Front": [
       6,
@@ -222,7 +222,7 @@
   {
     "Id": 9,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon05",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 3,
     "Front": [
       8
@@ -249,7 +249,7 @@
   {
     "Id": 10,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon05",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 3,
     "Front": [
       8
@@ -276,7 +276,7 @@
   {
     "Id": 11,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon05",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 3,
     "Front": [
       9
@@ -303,7 +303,7 @@
   {
     "Id": 12,
     "NodeType": 1,
-    "NodeIcon": "js_jx_img_icon05",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 3,
     "Front": [
       10
@@ -330,7 +330,7 @@
   {
     "Id": 13,
     "NodeType": 2,
-    "NodeIcon": "js_icon_sx7",
+    "NodeIcon": "Lifemj_icon_life",
     "listIndex": 3,
     "Front": [
       11,
diff --git a/modules/buried/module.go b/modules/buried/module.go
index 2b127710a..ea410129d 100644
--- a/modules/buried/module.go
+++ b/modules/buried/module.go
@@ -567,6 +567,11 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
 						}
 						notify[mname] = append(notify[mname], cp)
 					}
+				} else {
+					if _, ok = notify[string(comm.ModuleWtask)]; !ok {
+						notify[string(comm.ModuleWtask)] = make([]*pb.ConIProgress, 0)
+					}
+					notify[string(comm.ModuleWtask)] = append(notify[string(comm.ModuleWtask)], cp)
 				}
 			}
 
@@ -593,11 +598,9 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
 			//异步通知指定模块
 			nmodule.BuriedsNotify(session, v)
 		}
-	} else {
-		this.wtask.BuriedsNotify(session, changes)
-		this.smithy.BuriedsNotify(session, changes)
-		// this.sociaty.BuriedsNotify(session, changes)
 	}
+	// this.wtask.BuriedsNotify(session, changes)
+	// this.smithy.BuriedsNotify(session, changes)
 }
 
 // 更新并校验完成