From 29e0c5aba71dd59c435a241317979ce629539652 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 25 Nov 2022 20:09:35 +0800
Subject: [PATCH 1/4] =?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 |  68 +++++++++++++++++-
 bin/json/game_worldtask.json   | 126 ++++++++++++++++-----------------
 2 files changed, 130 insertions(+), 64 deletions(-)

diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 7772c3fdf..a2c3c5c8e 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -994,7 +994,7 @@
     "type": 140,
     "inited": [],
     "data1": 1,
-    "data2": 20001,
+    "data2": 10004,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -1087,6 +1087,72 @@
     "data4": 0,
     "data5": 0
   },
+  {
+    "id": 195,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10005,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 196,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10006,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 197,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10007,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 198,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10008,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 199,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10009,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 200,
+    "datatype": 2,
+    "type": 140,
+    "inited": [],
+    "data1": 1,
+    "data2": 10010,
+    "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 8a668e472..5f0c3ee48 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -10,7 +10,7 @@
     "task_name": "新剧情10100",
     "task_display": "新剧情文本10100",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -45,7 +45,7 @@
     "task_name": "新剧情10101",
     "task_display": "新剧情文本10101",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名入场",
       "150"
     ],
@@ -152,7 +152,7 @@
     "task_name": "新剧情10105",
     "task_display": "新剧情文本10105",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -176,7 +176,7 @@
     "task_name": "新剧情10106",
     "task_display": "新剧情文本10106",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -200,7 +200,7 @@
     "task_name": "新剧情10107",
     "task_display": "新剧情文本10107",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -224,7 +224,7 @@
     "task_name": "新剧情10108",
     "task_display": "新剧情文本10108",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -248,7 +248,7 @@
     "task_name": "新剧情10109",
     "task_display": "新剧情文本10109",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "戈伯组件名",
       "153"
     ],
@@ -296,7 +296,7 @@
     "task_name": "新剧情10111",
     "task_display": "新剧情文本10111",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝铁匠铺出来模型",
       "153"
     ],
@@ -320,7 +320,7 @@
     "task_name": "新剧情10112",
     "task_display": "新剧情文本10112",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥组件名",
       "153"
     ],
@@ -440,7 +440,7 @@
     "task_name": "新剧情10117",
     "task_display": "新剧情文本10117",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -464,7 +464,7 @@
     "task_name": "新剧情10118",
     "task_display": "新剧情文本10118",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -488,7 +488,7 @@
     "task_name": "新剧情10119",
     "task_display": "新剧情文本10119",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -512,7 +512,7 @@
     "task_name": "新剧情10120",
     "task_display": "新剧情文本10120",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -536,7 +536,7 @@
     "task_name": "新剧情10121",
     "task_display": "新剧情文本10121",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -560,7 +560,7 @@
     "task_name": "新剧情10122",
     "task_display": "新剧情文本10122",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -584,7 +584,7 @@
     "task_name": "新剧情10123",
     "task_display": "新剧情文本10123",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -776,7 +776,7 @@
     "task_name": "新剧情10131",
     "task_display": "新剧情文本10131",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥维京区",
       "151"
     ],
@@ -800,7 +800,7 @@
     "task_name": "新剧情10132",
     "task_display": "新剧情文本10132",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -824,7 +824,7 @@
     "task_name": "新剧情10133",
     "task_display": "新剧情文本10133",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -848,7 +848,7 @@
     "task_name": "新剧情10134",
     "task_display": "新剧情文本10134",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -872,7 +872,7 @@
     "task_name": "新剧情10135",
     "task_display": "新剧情文本10135",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -896,7 +896,7 @@
     "task_name": "新剧情10136",
     "task_display": "新剧情文本10136",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -968,7 +968,7 @@
     "task_name": "新剧情10139",
     "task_display": "新剧情文本10139",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -992,7 +992,7 @@
     "task_name": "新剧情10140",
     "task_display": "新剧情文本10140",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1016,7 +1016,7 @@
     "task_name": "新剧情10141",
     "task_display": "新剧情文本10141",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1040,7 +1040,7 @@
     "task_name": "新剧情10142",
     "task_display": "新剧情文本10142",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1064,7 +1064,7 @@
     "task_name": "新剧情10143",
     "task_display": "新剧情文本10143",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1088,7 +1088,7 @@
     "task_name": "新剧情10144",
     "task_display": "新剧情文本10144",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1112,7 +1112,7 @@
     "task_name": "新剧情10145",
     "task_display": "新剧情文本10145",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "瓜哥现代区",
       "152"
     ],
@@ -1136,7 +1136,7 @@
     "task_name": "新剧情10146",
     "task_display": "新剧情文本10146",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1160,7 +1160,7 @@
     "task_name": "新剧情10147",
     "task_display": "新剧情文本10147",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1184,7 +1184,7 @@
     "task_name": "新剧情10148",
     "task_display": "新剧情文本10148",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1208,7 +1208,7 @@
     "task_name": "新剧情10149",
     "task_display": "新剧情文本10149",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1232,7 +1232,7 @@
     "task_name": "新剧情10150",
     "task_display": "新剧情文本10150",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1256,7 +1256,7 @@
     "task_name": "新剧情10151",
     "task_display": "新剧情文本10151",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1280,7 +1280,7 @@
     "task_name": "新剧情10152",
     "task_display": "新剧情文本10152",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "杰克",
       "150"
     ],
@@ -1616,7 +1616,7 @@
     "task_name": "新剧情10100",
     "task_display": "新剧情文本10100",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "600"
     ],
@@ -1651,7 +1651,7 @@
     "task_name": "新剧情10101",
     "task_display": "新剧情文本10101",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名",
       "601"
     ],
@@ -1776,7 +1776,7 @@
     "task_name": "新剧情10105",
     "task_display": "新剧情文本10105",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "605"
     ],
@@ -1806,7 +1806,7 @@
     "task_name": "新剧情10106",
     "task_display": "新剧情文本10106",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "606"
     ],
@@ -1836,7 +1836,7 @@
     "task_name": "新剧情10107",
     "task_display": "新剧情文本10107",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "607"
     ],
@@ -1866,7 +1866,7 @@
     "task_name": "新剧情10108",
     "task_display": "新剧情文本10108",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "608"
     ],
@@ -1896,7 +1896,7 @@
     "task_name": "新剧情10109",
     "task_display": "新剧情文本10109",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "戈伯组件名",
       "609"
     ],
@@ -1926,7 +1926,7 @@
     "task_name": "新剧情10100",
     "task_display": "新剧情文本10100",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "600"
     ],
@@ -1961,7 +1961,7 @@
     "task_name": "新剧情10101",
     "task_display": "新剧情文本10101",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名",
       "601"
     ],
@@ -2086,7 +2086,7 @@
     "task_name": "新剧情10105",
     "task_display": "新剧情文本10105",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "605"
     ],
@@ -2116,7 +2116,7 @@
     "task_name": "新剧情10106",
     "task_display": "新剧情文本10106",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "606"
     ],
@@ -2146,7 +2146,7 @@
     "task_name": "新剧情10107",
     "task_display": "新剧情文本10107",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "607"
     ],
@@ -2176,7 +2176,7 @@
     "task_name": "新剧情10108",
     "task_display": "新剧情文本10108",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "608"
     ],
@@ -2206,7 +2206,7 @@
     "task_name": "新剧情10109",
     "task_display": "新剧情文本10109",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "戈伯组件名",
       "609"
     ],
@@ -2236,7 +2236,7 @@
     "task_name": "新剧情20100",
     "task_display": "新剧情文本20100",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "600"
     ],
@@ -2266,7 +2266,7 @@
     "task_name": "新剧情20101",
     "task_display": "新剧情文本20101",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名",
       "601"
     ],
@@ -2296,7 +2296,7 @@
     "task_name": "新剧情20102",
     "task_display": "新剧情文本20102",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],
@@ -2326,7 +2326,7 @@
     "task_name": "新剧情20103",
     "task_display": "新剧情文本20103",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],
@@ -2356,7 +2356,7 @@
     "task_name": "新剧情20104",
     "task_display": "新剧情文本20104",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],
@@ -2386,7 +2386,7 @@
     "task_name": "新剧情20105",
     "task_display": "新剧情文本20105",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],
@@ -2416,7 +2416,7 @@
     "task_name": "新剧情20106",
     "task_display": "新剧情文本20106",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名",
       "601"
     ],
@@ -2446,7 +2446,7 @@
     "task_name": "新剧情20107",
     "task_display": "新剧情文本20107",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝维京区",
       "619"
     ],
@@ -2476,7 +2476,7 @@
     "task_name": "新剧情20108",
     "task_display": "新剧情文本20108",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝维京区",
       "619"
     ],
@@ -2506,7 +2506,7 @@
     "task_name": "新剧情20109",
     "task_display": "新剧情文本20109",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "邦尼兔组件名",
       "601"
     ],
@@ -2536,7 +2536,7 @@
     "task_name": "新剧情20110",
     "task_display": "新剧情文本20110",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝组件名",
       "600"
     ],
@@ -2566,7 +2566,7 @@
     "task_name": "新剧情20111",
     "task_display": "新剧情文本20111",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],
@@ -2596,7 +2596,7 @@
     "task_name": "新剧情20112",
     "task_display": "新剧情文本20112",
     "npc": [
-      "scenes_ boundary_02",
+      "scenes_ boundary_01",
       "阿宝右屏组件名",
       "611"
     ],

From 9e6125b0b169c3b60fc3dfdfb9168027f90c7545 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 25 Nov 2022 21:00:49 +0800
Subject: [PATCH 2/4] =?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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 482317e06..5f0c3ee48 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -71,7 +71,7 @@
     "npc": [
       "dreamwork_restaurant_01",
       "波比组件名",
-      "140"
+      "701"
     ],
     "getafter_event": [
       2,
@@ -95,7 +95,7 @@
     "npc": [
       "dreamwork_restaurant_01",
       "波比组件名",
-      "140"
+      "701"
     ],
     "getafter_event": [
       2,
@@ -119,7 +119,7 @@
     "npc": [
       "dreamwork_restaurant_01",
       "波比组件名",
-      "140"
+      "701"
     ],
     "getafter_event": [
       2,
@@ -184,7 +184,7 @@
       2,
       100007
     ],
-    "completetask": 174,
+    "completetask": 175,
     "auto_accept": 1,
     "overtips": 1,
     "reword": []

From e7125e528ad54242bd77705da420adcb860364ef Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 25 Nov 2022 22:08:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_combatlevel.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json
index 29eae9ea1..0b56f90a4 100644
--- a/bin/json/game_combatlevel.json
+++ b/bin/json/game_combatlevel.json
@@ -69,7 +69,10 @@
   {
     "id": 10004,
     "scene": "LevelDemo_Fcamer_1_4",
-    "formatList": [],
+    "formatList": [
+      101011,
+      101021
+    ],
     "droplist": [
       10401,
       10402,
@@ -122,8 +125,6 @@
     ],
     "droplist": [],
     "passformatList": [
-      101011,
-      101012,
       101013
     ],
     "passdroplist": [],

From d4c953dc175b9602768bc51b383776849d962dfb Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 25 Nov 2022 22:51:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A9=E6=88=98=E8=8B=B1=E9=9B=84?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/friend/api_cross_assisthero.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/friend/api_cross_assisthero.go b/modules/friend/api_cross_assisthero.go
index 5c339cb75..0f8004e46 100644
--- a/modules/friend/api_cross_assisthero.go
+++ b/modules/friend/api_cross_assisthero.go
@@ -76,6 +76,7 @@ func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssisth
 			},
 		}
 
+		this.moduleFriend.Debug("设置的助战英雄推送给好友", log.Fields{"uid": uid, "friendIds": self.FriendIds, "heroObjId": req.HeroObjId})
 		if err := this.moduleFriend.SendMsgToUsers(string(this.moduleFriend.GetType()), "assistheroupdate", push, self.FriendIds...); err != nil {
 			this.moduleFriend.Error("推送助战英雄列表", log.Fields{"uid": uid, "friends": self.FriendIds, "err": err.Error()})
 		}