Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
4f8b0fbefe
|
@ -478,7 +478,7 @@ function this.ShowStory(nextId,OnFocus)
|
||||||
StoryMapManager.isShowStory = false
|
StoryMapManager.isShowStory = false
|
||||||
local isShowStory = 1
|
local isShowStory = 1
|
||||||
if PlayerPrefs.HasKey("StoryMapPanel1"..PlayerManager.uid) then
|
if PlayerPrefs.HasKey("StoryMapPanel1"..PlayerManager.uid) then
|
||||||
isShowStory = PlayerPrefs.GetInt("StoryMapPanel"..PlayerManager.uid)
|
isShowStory = PlayerPrefs.GetInt("StoryMapPanel1"..PlayerManager.uid)
|
||||||
end
|
end
|
||||||
if isShowStory == 1 then
|
if isShowStory == 1 then
|
||||||
LogGreen("this.gameObject:"..this.gameObject.name)
|
LogGreen("this.gameObject:"..this.gameObject.name)
|
||||||
|
|
|
@ -181,18 +181,34 @@ function SupremeHeroPopup:OnOpen(_fun)
|
||||||
fun = _fun
|
fun = _fun
|
||||||
end
|
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()
|
function SupremeHeroPopup:OnShow()
|
||||||
actIsDone = false
|
actIsDone = false
|
||||||
|
this.ShowStory()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.InitShowPanel()
|
||||||
--初始化静态显示数据
|
--初始化静态显示数据
|
||||||
this.InitShow()
|
this.InitShow()
|
||||||
|
|
||||||
canClose = false
|
canClose = false
|
||||||
this.effectTime = nil
|
this.effectTime = nil
|
||||||
this.effectTime = Timer.New(function ()
|
this.effectTime = Timer.New(function ()
|
||||||
canClose = true
|
canClose = true
|
||||||
end, 1.2)
|
end, 1.2)
|
||||||
this.effectTime:Start()
|
this.effectTime:Start()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.InitShow()
|
function this.InitShow()
|
||||||
|
|
Loading…
Reference in New Issue