Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
9f2a9fe2d3
|
@ -66,12 +66,12 @@ function this.OnLevelChange()
|
|||
-- 首充引导特殊处理到十级开放
|
||||
if PlayerManager.level == 10 then
|
||||
LogError(" 首充加入引导")
|
||||
if CheckListIsContainValue1(_FuncGuideList, 100200) == false then
|
||||
--if CheckListIsContainValue1(_FuncGuideList, 100200) == false then
|
||||
--if PlayerPrefs.GetInt(PlayerManager.uid.."isGMEsp")==0 then
|
||||
--GuideManager.ShowGuide(100200)
|
||||
table.insert(_FuncGuideList, 100200)
|
||||
--table.insert(_FuncGuideList, 100200)
|
||||
--end
|
||||
end
|
||||
--end
|
||||
this.CheckFuncGuide()
|
||||
--解开孙悟空封印的剧情
|
||||
StoryMapManager.isShowStory = 1
|
||||
|
|
|
@ -578,20 +578,23 @@ function this.ShowStory(nextId, OnFocus)
|
|||
local isShowStory = 1
|
||||
if PlayerPrefs.HasKey("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid) then
|
||||
isShowStory = PlayerPrefs.GetInt("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid)
|
||||
--LogWarn("dddddddddddddddddddddddddddd")
|
||||
end
|
||||
if isShowStory == 1 then
|
||||
this.gameObject:SetActive(false)
|
||||
local function onCloseStoryMapPanel()
|
||||
--LogWarn("dddddddddddddddddddddddddddd")
|
||||
this.GameSetActive(nextId, OnFocus)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuaJi.CloseStoryMapPanel, onCloseStoryMapPanel)
|
||||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel, onCloseStoryMapPanel)
|
||||
PlayerPrefs.SetInt("StoryMapPanel" .. StoryMapManager.isShowStory .. PlayerManager.uid, 0)
|
||||
StoryMapManager.InitData(StoryMapManager.isShowStory)
|
||||
--LogWarn("dddddddddddddddddddddddddddd")
|
||||
else
|
||||
this.NextGuide(nextId)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus)
|
||||
--this.NextGuide(nextId)
|
||||
--Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus)
|
||||
--Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus)
|
||||
end
|
||||
else
|
||||
this.NextGuide(nextId)
|
||||
|
@ -602,6 +605,7 @@ end
|
|||
|
||||
function this.GameSetActive(nextId, OnFocus)
|
||||
this.gameObject:SetActive(true)
|
||||
--LogWarn("===================================")
|
||||
this.NextGuide(nextId)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, OnFocus)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnFocus, OnFocus)
|
||||
|
@ -654,6 +658,7 @@ end
|
|||
|
||||
-- 下一个
|
||||
function this.NextGuide(nextId)
|
||||
LogWarn("===================================")
|
||||
if audio then
|
||||
SoundManager.StopSound(audio)
|
||||
end
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue