Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
a47268aa88
|
|
@ -124,8 +124,8 @@ function this:SetIcon()
|
|||
this.fightBtnIcon.gameObject:SetActive(false)
|
||||
this.fightBtnNum.gameObject:SetActive(false)
|
||||
this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_002")
|
||||
this.tip.text = "奖励"
|
||||
if waveId == MonsterCampManager.monsterWave - 1 then
|
||||
this.tip.text = "扫荡奖励"
|
||||
if freeTime > 0 then
|
||||
this.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","免费扫荡")
|
||||
else
|
||||
|
|
@ -145,11 +145,9 @@ function this:SetIcon()
|
|||
end
|
||||
end
|
||||
elseif (waveId == MonsterCampManager.monsterWave) then
|
||||
this.tip.text = "战斗奖励"
|
||||
this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_001")
|
||||
this.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","挑 战")
|
||||
else
|
||||
this.tip.text = "战斗奖励"
|
||||
this.fightBtnText.text =string.format("<color=#%s>%s</color>","17232A","确定")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function MonsterCampNewPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.FoueElementPeo,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
Util.AddClick(this.addBtn, function ()
|
||||
if buyTimes < 0 then
|
||||
if buyTimes <= 0 then
|
||||
PopupTipPanel.ShowTip("今日已无购买次数")
|
||||
else
|
||||
if BagManager.GetItemCountById(itemId) < costNum then
|
||||
|
|
@ -92,22 +92,26 @@ function MonsterCampNewPanel:BindEvent()
|
|||
end,2)
|
||||
end)
|
||||
Util.AddClick(this.moppingUpBtn, function ()
|
||||
-- local _storeDataId,_itemId,_costNum,moppingUpNum = MonsterCampManager.MonsterCampGetYJGMCost()
|
||||
-- MsgPanel.ShowTwo(string.format("是否花费%s进行一键扫荡?",_costNum,itemConfig[itemId].Name),function() end,function()
|
||||
-- if BagManager.GetItemCountById(_itemId) < _costNum then
|
||||
-- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name))
|
||||
-- else
|
||||
-- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function()
|
||||
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum)
|
||||
-- NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg)
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function()
|
||||
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() )
|
||||
-- this.UpdatePrivilage()
|
||||
-- end)
|
||||
-- end)
|
||||
-- end)
|
||||
-- end
|
||||
-- end,"取消","确定")
|
||||
if MonsterCampManager.monsterWave - 1 > 0 then
|
||||
local _storeDataId,_itemId,_costNum,moppingUpNum = MonsterCampManager.MonsterCampGetYJGMCost()
|
||||
MsgPanel.ShowTwo(string.format("是否花费%s进行一键扫荡?",_costNum,itemConfig[itemId].Name),function() end,function()
|
||||
if BagManager.GetItemCountById(_itemId) < _costNum then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name))
|
||||
else
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum)
|
||||
NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() )
|
||||
this.UpdatePrivilage()
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end,"取消","确定")
|
||||
else
|
||||
PopupTipPanel.ShowTip("当前不可扫荡!")
|
||||
end
|
||||
end)
|
||||
BindRedPointObject(RedPointType.EpicExplore,Util.GetGameObject(this.btnHelpFight, "redPoint"))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ function MonsterCampSingleWave:SetIcon()
|
|||
self.rewardText.text = "奖励"
|
||||
if self.data.Id < MonsterCampManager.monsterWave - 1 then
|
||||
elseif self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡
|
||||
self.rewardText.text = "扫荡奖励"
|
||||
-- self.rewardText.text = "扫荡奖励"
|
||||
self.fight.gameObject:SetActive(true)
|
||||
if self.freeTimes > 0 then
|
||||
self.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","免费扫荡")
|
||||
|
|
|
|||
Loading…
Reference in New Issue