From 81b82ea509e3d0b8fe9e3a9d08f04a71cfee99a9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 30 Apr 2021 15:27:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E8=B7=A8=E5=A4=A9=E7=BA=A2=E7=82=B9=E4=B8=8D?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 21d54853f4..1a878df5cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -69,6 +69,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五 PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen,0) + PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen,0) end if var == 1 then From 412a4ec851461f8948bf60b4a1d11df35b486dbf Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 30 Apr 2021 16:13:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E5=89=A7=E6=83=85=E7=BB=A7=E7=BB=AD=E6=89=A7=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Story/StoryMapPanel.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index d1619882cb..e817f2f15c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -460,13 +460,22 @@ function this:ShowDialog() this:StackPop() end else + + local config = chapterEventPointData[this.curEvent.groups[this.eventIndex]] + if not config then + this:CloseDiaLog() + LogGreen("this.curEvent.groups[this.eventIndex]:"..this.curEvent.groups[this.eventIndex].." this.eventIndex:"..this.eventIndex) + if this.go then + this.go:StackPop() + this.go = nil + else + this:StackPop() + end + return + end this.showImg:SetActive(false) this.dialog.gameObject:SetActive(true) this.GoOn.gameObject:SetActive(true) - local config = chapterEventPointData[this.curEvent.groups[this.eventIndex]] - if not config then - --LogGreen("this.curEvent.groups[this.eventIndex]:"..this.curEvent.groups[this.eventIndex].." this.eventIndex:"..this.eventIndex) - end local showValues = GetLanguageStrById(config.ShowValues) local options = config.Option