From fa8e10ed9c6fed1a4af27657801cb11ff4f634b5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 16:58:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E8=B5=9B=E5=AD=A3=E9=87=8D=E7=BD=AE=E6=98=AF?= =?UTF-8?q?=E5=9C=A3=E7=89=A9=E6=96=B0=E5=AD=97=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 3fea243946..9838068ad9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -843,6 +843,7 @@ function this.ExpeditionResetIndication(buffer) PlayerPrefs.SetInt(PlayerManager.uid.."Expedition", 0) ExpeditionManager.SetExpeditionState(3) ExpeditionManager.expeditionLeve = 1 + ExpeditionManager.allSHoly = {} ExpeditionManager.InitExpeditionData(msg) ExpeditionManager.RefreshPanelShowByState() end From 7784e3a9d1ca21671b3b571983495bfe603dbafc Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 8 Apr 2021 17:03:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d9c500fb36ab18b39b6d0b707bd435ebb3aca2f6) --- .../Modules/DynamicActivity/DynamicTaskPage.lua | 4 ++-- .../Modules/DynamicActivity/TimeLimitedCall.lua | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index af002e4bb5..d233eb4b5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -35,8 +35,8 @@ local bannerType = { [27] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner2_zh"}, [28] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner_zh"}, [29] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"}, - [30] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner_zh"}, - [31] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"}, + [30] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"}, + [31] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"}, [32] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"}, [33] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"}, [34] = {compent = "bg1",titilebg1 = "t_tongqiangtiebi_banner_zh"}, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index a7737fce3f..ac8c468be1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -353,22 +353,22 @@ local activityType = { [4330] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10008,hero="b_bowenduoshi_shenjiang1"}, ----精卫 - [2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ---哪吒 - [3]={name="Bg2/hero3",id=10013,hero="y_yishandaohai_shenjiang2"}, --吕洞宾 + [1]={name="Bg2/hero1",id=10092,hero="s_shibukedang_shenjiang11"}, ----精卫 + [2]={name="Bg2/hero2",id=10033,hero="b_bianhuanmoce_shenjiang2"}, ---哪吒 + [3]={name="Bg2/hero3",id=10090,hero="x_xianglongfuhu_shenjiang22"}, --吕洞宾 }, - title = "b_bowenduoshi_zi_zh", + title = "s_suoxiangpimi_zi_zh", helptype = HELP_TYPE.TimeLimitedCall }, -- 天相吉人 [4331] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10087,hero="t_tianxiangjiren_shenjiang1"}, ----娥皇 - [2]={name="Bg2/hero2",id=10043,hero="t_tianxiangjiren_shenjiang2"}, ---太阴星君 - [3]={name="Bg2/hero3",id=10033,hero="t_tianxiangjiren_shenjiang3"}, --净光天女 + [1]={name="Bg2/hero1",id=10024,hero="d_danxinbixue_shenjiang3"}, ----娥皇 + [2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, ---太阴星君 + [3]={name="Bg2/hero3",id=10041,hero="x_xianshizaohuan_ttjz"}, --净光天女 }, - title = "t_tianxiangjiren_zi_zh", + title = "x_xialuxiangfeng_zi_zh", helptype = HELP_TYPE.TimeLimitedCall }, --博文多识 限时召唤