Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
1622dcff32
|
@ -91,6 +91,18 @@ local type = {
|
|||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = RedPointType.People_Mirror
|
||||
},
|
||||
[3] = {
|
||||
id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽
|
||||
bg = "r_Dungeon_rendi_04",
|
||||
name = "r_Dungeon_xuanyuanbaojing",
|
||||
live = "r_Dungeon_XuanYuan_huli",
|
||||
livePos = Vector2(149, -6.33),
|
||||
liveSize = Vector2(740, 393),
|
||||
tipBg = "r_Dungeon_wujingdian",
|
||||
resetTime = string.format("<color=#DB9A9A>%s</color>",specialConfig[75].Value),
|
||||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = -1
|
||||
},
|
||||
default = {id = -1,bg = "r_Dungeon_rendi_01"}
|
||||
}
|
||||
}
|
||||
|
@ -376,6 +388,9 @@ function this.BtnClick(id)
|
|||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -51,7 +51,7 @@ function EndLessCarbonPanel:BindEvent()
|
|||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||
PlayerManager.carbonType = 1
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
|
||||
--检测到上一个面板打开之后,关闭自己
|
||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||
|
@ -62,7 +62,6 @@ function EndLessCarbonPanel:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.btnFight, function ()
|
||||
LogGreen("开放的地图ID"..EndLessMapManager.openMapId)
|
||||
this.EnterMap()
|
||||
end)
|
||||
|
||||
|
|
|
@ -196,6 +196,7 @@ function this:InitComponent()
|
|||
|
||||
-- 无尽
|
||||
this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
|
||||
this.btnEndLess:SetActive(false)
|
||||
|
||||
-- 设置
|
||||
--this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting")
|
||||
|
@ -230,7 +231,7 @@ function this:InitComponent()
|
|||
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
|
||||
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715),
|
||||
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
|
||||
[FUNCTION_OPEN_TYPE.TRIAL] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110),
|
||||
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110),
|
||||
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),
|
||||
|
@ -655,11 +656,11 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA)
|
||||
end)
|
||||
Util.AddClick(this.btnColorfulWorld, function()
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
|
||||
PlayerManager.carbonType = 2
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
else
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
end)
|
||||
|
@ -705,10 +706,10 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ALLRANKING)
|
||||
end)
|
||||
|
||||
Util.AddClick(this.btnEndLess, function()
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end)
|
||||
-- Util.AddClick(this.btnEndLess, function()
|
||||
-- MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
-- UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnGuanxing, function()
|
||||
-- JumpManager.GoJump(1024)
|
||||
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ASPECT_STAR)
|
||||
|
|
Loading…
Reference in New Issue