Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-04-28 00:15:15 +08:00
commit 4f8b0fbefe
2 changed files with 26 additions and 10 deletions

View File

@ -478,7 +478,7 @@ function this.ShowStory(nextId,OnFocus)
StoryMapManager.isShowStory = false
local isShowStory = 1
if PlayerPrefs.HasKey("StoryMapPanel1"..PlayerManager.uid) then
isShowStory = PlayerPrefs.GetInt("StoryMapPanel"..PlayerManager.uid)
isShowStory = PlayerPrefs.GetInt("StoryMapPanel1"..PlayerManager.uid)
end
if isShowStory == 1 then
LogGreen("this.gameObject:"..this.gameObject.name)

View File

@ -181,18 +181,34 @@ function SupremeHeroPopup:OnOpen(_fun)
fun = _fun
end
function this.ShowStory()
local isShowStory = 1
if PlayerPrefs.HasKey("StoryMapPanel2"..PlayerManager.uid) then
isShowStory = PlayerPrefs.GetInt("StoryMapPanel2"..PlayerManager.uid)
end
if isShowStory == 1 then
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.InitShowPanel)
PlayerPrefs.SetInt("StoryMapPanel2"..PlayerManager.uid,0)
StoryMapManager.InitData(1)
else
this.InitShowPanel()
end
end
function SupremeHeroPopup:OnShow()
actIsDone = false
--初始化静态显示数据
this.InitShow()
canClose = false
this.effectTime = nil
this.effectTime = Timer.New(function ()
canClose = true
end, 1.2)
this.effectTime:Start()
this.ShowStory()
end
function this.InitShowPanel()
--初始化静态显示数据
this.InitShow()
canClose = false
this.effectTime = nil
this.effectTime = Timer.New(function ()
canClose = true
end, 1.2)
this.effectTime:Start()
end
function this.InitShow()