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

dev_chengFeng
ZhangBiao 2021-12-21 16:33:19 +08:00
commit 51d281c1ee
2 changed files with 15 additions and 4 deletions

View File

@ -857,7 +857,7 @@ end
-- 是否解锁跳过功能
function this.IsUnlockBattlePass()
-- return false
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过"
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值6元后解锁跳过"
end
-- 战斗暂停控制

View File

@ -262,11 +262,12 @@ end
function this.CheckNextGuideListen(nextId)
if GuideConfig[nextId] then
local type = GuideConfig[nextId].Type
if openDic[type] then
-- 主线引导保存下一步id
if type == GuideType.Force and openDic[type] then
openDic[type] = nextId
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) )
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
end
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) )
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
end
end
@ -795,6 +796,16 @@ function this.RefreshTriggerListen(id, openType, openArgs)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
-- 十连结果界面触发
elseif openType == 37 then
local trigger
trigger = function(panelType)
if panelType == UIName.TenRecruitPanel then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger)
this.ShowGuide(id)
end
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
end
end