Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
249dd957de
|
@ -471,6 +471,7 @@ GameEvent = {
|
||||||
--心魔试炼
|
--心魔试炼
|
||||||
MonsterCamp={
|
MonsterCamp={
|
||||||
UpdatePri = "MonsterCamp.UpdatePri",
|
UpdatePri = "MonsterCamp.UpdatePri",
|
||||||
|
UpdatePanel = "MonsterCamp.UpdatePanel",
|
||||||
},
|
},
|
||||||
--修行引导
|
--修行引导
|
||||||
Practice={
|
Practice={
|
||||||
|
|
|
@ -68,6 +68,7 @@ function this:BindEvent()
|
||||||
-- end)
|
-- end)
|
||||||
Util.AddClick(this.backBtn, function()
|
Util.AddClick(this.backBtn, function()
|
||||||
parent:ClosePanel()
|
parent:ClosePanel()
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.MonsterCamp.UpdatePanel)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
function this:BtnClickEvent()
|
function this:BtnClickEvent()
|
||||||
|
|
|
@ -134,13 +134,13 @@ end
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
function MonsterCampNewPanel:AddListener()
|
function MonsterCampNewPanel:AddListener()
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
||||||
-- Game.GlobalEvent:AddEvent(GameEvent.FourEle.RefreshView, self.OnShow,self)
|
Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function MonsterCampNewPanel:RemoveListener()
|
function MonsterCampNewPanel:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
||||||
-- Game.GlobalEvent:RemoveEvent(GameEvent.FourEle.RefreshView, self.OnShow,self)
|
Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
|
@ -150,6 +150,9 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function MonsterCampNewPanel:OnShow()
|
function MonsterCampNewPanel:OnShow()
|
||||||
|
this.OnShowPanel()
|
||||||
|
end
|
||||||
|
function this.OnShowPanel()
|
||||||
CheckRedPointStatus(RedPointType.EpicExplore_LevleReward)
|
CheckRedPointStatus(RedPointType.EpicExplore_LevleReward)
|
||||||
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
|
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
|
||||||
storeDataId,itemId,costNum = MonsterCampManager.MonsterCampGetCost()
|
storeDataId,itemId,costNum = MonsterCampManager.MonsterCampGetCost()
|
||||||
|
@ -159,24 +162,8 @@ function MonsterCampNewPanel:OnShow()
|
||||||
this.freeMoppingTimes.text = "免费扫荡:" ..freeTimes
|
this.freeMoppingTimes.text = "免费扫荡:" ..freeTimes
|
||||||
this.buyMoppingTimes.text= "购买次数:" ..buyTimes
|
this.buyMoppingTimes.text= "购买次数:" ..buyTimes
|
||||||
this.InitMonsterShow()
|
this.InitMonsterShow()
|
||||||
|
PatFaceManager.RefreshPatface()
|
||||||
-- local waves = MonsterCampManager.GetFourElementTotalWave()
|
|
||||||
-- if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then
|
|
||||||
-- PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1)
|
|
||||||
-- end
|
|
||||||
-- if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then
|
|
||||||
-- PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves)
|
|
||||||
-- local propertyId = SacredTreeManager.GetUnLockNewProperty(waves)
|
|
||||||
-- if propertyId > 0 then
|
|
||||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId)
|
|
||||||
-- local power = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
|
||||||
-- if power - MonsterCampManager.oldpower > 0 then
|
|
||||||
-- UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = MonsterCampManager.oldpower,newValue = power})
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
-- end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.SingleDataShow(go, data)
|
function this.SingleDataShow(go, data)
|
||||||
local singledata = MonsterCampSingleWave:New(go)
|
local singledata = MonsterCampSingleWave:New(go)
|
||||||
singledata:InitComponent(go,data)
|
singledata:InitComponent(go,data)
|
||||||
|
@ -190,7 +177,7 @@ function this.InitMonsterShow()
|
||||||
this.scrollView:SetData(monsterInfo, function (index, go)
|
this.scrollView:SetData(monsterInfo, function (index, go)
|
||||||
local tempData = this.SingleDataShow(go, monsterInfo[index])
|
local tempData = this.SingleDataShow(go, monsterInfo[index])
|
||||||
this.singledataList[monsterInfo[index].Id] = tempData
|
this.singledataList[monsterInfo[index].Id] = tempData
|
||||||
end)
|
end,true,true)
|
||||||
this.scrollView:SetIndex(#monsterInfo - MonsterCampManager.monsterWave - 1)
|
this.scrollView:SetIndex(#monsterInfo - MonsterCampManager.monsterWave - 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -483,6 +483,22 @@ local jumpDic = {
|
||||||
[JumpType.Compound] = function(data)--锻造炉
|
[JumpType.Compound] = function(data)--锻造炉
|
||||||
local index = 1
|
local index = 1
|
||||||
if data then index = data[2] end
|
if data then index = data[2] end
|
||||||
|
local ConfigData = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||||
|
if index == 2 then
|
||||||
|
local string = ConfigData[40].Value
|
||||||
|
local num = string.split(string.split(string,"|")[1],"#")[2]
|
||||||
|
if PlayerManager.level < tonumber(num) then
|
||||||
|
PopupTipPanel.ShowTip(string.format(Language[10770],num))
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if index == 3 then
|
||||||
|
local string = ConfigData[89].Value
|
||||||
|
if PlayerManager.level < tonumber(string) then
|
||||||
|
PopupTipPanel.ShowTip(string.format(Language[10770],string))
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
UIManager.OpenPanel(UIName.CompoundPanel,index)
|
UIManager.OpenPanel(UIName.CompoundPanel,index)
|
||||||
end,
|
end,
|
||||||
[JumpType.DailyCarbon_Gold] = function(data)--每日金币副本
|
[JumpType.DailyCarbon_Gold] = function(data)--每日金币副本
|
||||||
|
|
Loading…
Reference in New Issue