Merge branch 'china/dev-c' into china/dev

dev_chengFeng
gaoxin 2021-04-30 16:36:09 +08:00
commit d574d2ee2a
2 changed files with 14 additions and 4 deletions

View File

@ -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

View File

@ -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