Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
987ad6a325
Binary file not shown.
|
|
@ -590,6 +590,8 @@ RedPointType = {
|
|||
HeroExplore = 116, --日常副本
|
||||
EpicExplore = 117, --心魔副本
|
||||
LegendExplore = 118, --车迟斗法副本
|
||||
EndLess = 119,--无尽副本
|
||||
Trial = 121,--森罗幻境
|
||||
-- 充值
|
||||
Recharge = 120,
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,8 @@ GameEvent = {
|
|||
-- 刷新英雄血量
|
||||
RefreshHeroHp="Map.RefreshHeroHp",
|
||||
StopWalk="Map.StopWalk",
|
||||
MaskState = "Map.MaskState"
|
||||
MaskState = "Map.MaskState",
|
||||
EnergyFull = "Map.EnergyFull",
|
||||
},
|
||||
Event = {
|
||||
PointTrigger = "Event.PointTrigger",
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ local type = {
|
|||
tipBg = "r_Dungeon_wujingdian",
|
||||
resetTime = string.format("<color=#DB9A9A>%s</color>",specialConfig[83].Value),
|
||||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[84].Value),
|
||||
redPointType = -1
|
||||
redPointType = RedPointType.EndLess
|
||||
},
|
||||
[2] = {
|
||||
id = FUNCTION_OPEN_TYPE.TRIAL, --森罗
|
||||
|
|
@ -89,7 +89,7 @@ local type = {
|
|||
tipBg = "r_Dungeon_juqingdian",
|
||||
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[66].Value),
|
||||
tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[67].Value),
|
||||
redPointType = -1
|
||||
redPointType = RedPointType.Trial
|
||||
},
|
||||
[3] = {
|
||||
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
|
||||
|
|
|
|||
|
|
@ -445,5 +445,14 @@ function this.IsThisMapOpen(mapId)
|
|||
return isOpen
|
||||
end
|
||||
|
||||
--红点检测
|
||||
function this.EndlessRedCheck()
|
||||
if this.GetLeftMapEnergy() == 100 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS)then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -513,6 +513,8 @@ end
|
|||
-- ========================= 死出图的各种方法 ==========================
|
||||
-- 序章回到主界面
|
||||
function this.BackHome()
|
||||
EndLessMapManager.EndlessRedCheck()
|
||||
MapTrialManager.TrialRedCheck()
|
||||
local triggerCallBack
|
||||
triggerCallBack = function (panelType, panel)
|
||||
if panelType == UIName.MapPanel then
|
||||
|
|
|
|||
|
|
@ -284,4 +284,20 @@ function this.SetHeroHp(data,did,func)
|
|||
if func then func() end
|
||||
end
|
||||
|
||||
function this.TrialRedCheck()
|
||||
local var
|
||||
|
||||
if PlayerPrefs.HasKey(PlayerManager.uid.."TrialIsOpen") then
|
||||
var = PlayerPrefs.GetInt(PlayerManager.uid.."TrialIsOpen")
|
||||
else
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",0)
|
||||
end
|
||||
|
||||
if var == 1 then
|
||||
return false
|
||||
elseif var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -151,6 +151,7 @@ function TrialMapPanel:OnOpen()
|
|||
|
||||
-- 检测引导
|
||||
GuideManager.CheckCarbonGuild(CARBON_TYPE.TRIAL)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)
|
||||
end
|
||||
|
||||
function TrialMapPanel:OnShow()
|
||||
|
|
|
|||
|
|
@ -118,12 +118,14 @@ function this.AddListener()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Map.OnAddNotePoint, this.SetNoteShow)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.OnRemoveNotePoint, this.SetNoteShow)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.GetBagEnergy)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.EnergyFull, EndLessMapManager.EndlessRedCheck)
|
||||
end
|
||||
|
||||
function this.RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.OnAddNotePoint, this.SetNoteShow)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.OnRemoveNotePoint, this.SetNoteShow)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.GetBagEnergy)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.EnergyFull, EndLessMapManager.EndlessRedCheck)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -180,6 +180,8 @@ function this.RefreshUpdateIndication(buffer)
|
|||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0)
|
||||
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
|
||||
end
|
||||
|
||||
--服务器推送红点信息
|
||||
|
|
|
|||
|
|
@ -106,6 +106,8 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.LegendExplore, RedPointType.ExploreMain)
|
||||
|
||||
RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane)
|
||||
RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)
|
||||
RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane)
|
||||
|
||||
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
|
||||
-- 充值
|
||||
|
|
@ -399,6 +401,8 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.EndLess, EndLessMapManager.EndlessRedCheck)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot)
|
||||
|
|
@ -418,6 +422,9 @@ end
|
|||
function this.ClearObject(rpType, rpObj)
|
||||
if rpObj then
|
||||
local indexToKill = nil
|
||||
if not BindObjs or not BindObjs[rpType] then
|
||||
return
|
||||
end
|
||||
for index, obj in pairs(BindObjs[rpType]) do
|
||||
if rpObj == obj then
|
||||
indexToKill = index
|
||||
|
|
|
|||
Loading…
Reference in New Issue