Merge branch 'dev_oneDis' into dev_one_discount
commit
47a5749423
|
@ -47,7 +47,7 @@ local _GuildBuildConfig = {
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
[GUILD_MAP_BUILD_TYPE.SKILL] = { --技能
|
[GUILD_MAP_BUILD_TYPE.SKILL] = { --技能
|
||||||
isOpen = false,
|
isOpen = true,
|
||||||
rpType = RedPointType.Guild_Skill,
|
rpType = RedPointType.Guild_Skill,
|
||||||
btnName = "btnSkill",
|
btnName = "btnSkill",
|
||||||
btnFunc = function()
|
btnFunc = function()
|
||||||
|
|
|
@ -138,12 +138,12 @@ function this.SetAllGuildSkillRedPlayers()
|
||||||
end
|
end
|
||||||
--刷新方法
|
--刷新方法
|
||||||
function this.RefreshAllGuildSkillRedPoint()
|
function this.RefreshAllGuildSkillRedPoint()
|
||||||
-- for i = 1, #GuildSkillType do
|
for i = 1, #GuildSkillType do
|
||||||
-- local isShowRedPoint = this.GuildSkillRedPoint(i)
|
local isShowRedPoint = this.GuildSkillRedPoint(i)
|
||||||
-- if isShowRedPoint then
|
if isShowRedPoint then
|
||||||
-- return true
|
return true
|
||||||
-- end
|
end
|
||||||
-- end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
--1 已经查看过不需要显示新红点 0 显示红点
|
--1 已经查看过不需要显示新红点 0 显示红点
|
||||||
|
|
|
@ -125,10 +125,10 @@ function GodsWayTowerPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip("扫荡次数不足")
|
PopupTipPanel.ShowTip("扫荡次数不足")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then
|
-- if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then
|
||||||
PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战")
|
-- PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战")
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
-- if FormationManager.CheckFormationValid(curType + 3000) then
|
-- if FormationManager.CheckFormationValid(curType + 3000) then
|
||||||
-- MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true)
|
-- MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true)
|
||||||
-- else
|
-- else
|
||||||
|
|
|
@ -130,7 +130,7 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk
|
||||||
this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession]
|
this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession]
|
||||||
this.guildProValue.text = allLv
|
this.guildProValue.text = allLv
|
||||||
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
|
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
|
||||||
this.jumpBtn:SetActive(false)
|
this.jumpBtn:SetActive(_guildSkill == nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not this.specialPro then
|
if not this.specialPro then
|
||||||
|
|
|
@ -56,7 +56,7 @@ function GodsWaySingleSingleWave:OnOpen()
|
||||||
--self.bg.sprite = self.spLoader:LoadSprite(GetFourElementBgByType(self.trailData.fourElementType))
|
--self.bg.sprite = self.spLoader:LoadSprite(GetFourElementBgByType(self.trailData.fourElementType))
|
||||||
self:UpdatePrivilage()
|
self:UpdatePrivilage()
|
||||||
if self.data.wave < curFloor then
|
if self.data.wave < curFloor then
|
||||||
self.pass.gameObject:SetActive(true)
|
self.pass.gameObject:SetActive(false)
|
||||||
self.fight.gameObject:SetActive(false)
|
self.fight.gameObject:SetActive(false)
|
||||||
self.reward.gameObject:SetActive(false)
|
self.reward.gameObject:SetActive(false)
|
||||||
else
|
else
|
||||||
|
@ -102,25 +102,27 @@ function GodsWaySingleSingleWave:OnOpen()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
if self.data.wave == curFloor then
|
if self.data.wave == curFloor then
|
||||||
if self.freeTimes <=0 and self.buyTimes <= 0 then
|
-- if self.freeTimes <=0 and self.buyTimes <= 0 then
|
||||||
PopupTipPanel.ShowTip("今日已无扫荡次数!")
|
-- PopupTipPanel.ShowTip("今日已无扫荡次数!")
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
if self.freeTimes <= 0 then
|
-- if self.freeTimes <= 0 then
|
||||||
if BagManager.GetItemCountById(self.itemId) < self.costNum then
|
-- if BagManager.GetItemCountById(self.itemId) < self.costNum then
|
||||||
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
|
-- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType)
|
-- local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType)
|
||||||
MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",self.costNum,itemConfig[self.itemId].Name),function() end,function()
|
-- MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",self.costNum,itemConfig[self.itemId].Name),function() end,function()
|
||||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,self.storeDataId,1,function()
|
-- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,self.storeDataId,1,function()
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1)
|
-- PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1)
|
||||||
x()
|
-- x()
|
||||||
end)
|
-- end)
|
||||||
end,"取消","确定")
|
-- end,"取消","确定")
|
||||||
else
|
-- else
|
||||||
x()
|
-- x()
|
||||||
end
|
--
|
||||||
|
PopupTipPanel.ShowTip("已通关最高层")
|
||||||
|
return
|
||||||
elseif self.data.wave == curFloor + 1 then
|
elseif self.data.wave == curFloor + 1 then
|
||||||
local teamType=0
|
local teamType=0
|
||||||
local myTeams=teamIds[curType]
|
local myTeams=teamIds[curType]
|
||||||
|
@ -273,8 +275,8 @@ function GodsWaySingleSingleWave:SetIcon()
|
||||||
Util.SetGray(self.fight,false)
|
Util.SetGray(self.fight,false)
|
||||||
else
|
else
|
||||||
--self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
|
--self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
|
||||||
self.fightBtnIcon.gameObject:SetActive(true)
|
self.fightBtnIcon.gameObject:SetActive(false)
|
||||||
self.fightBtnNum.gameObject:SetActive(true)
|
self.fightBtnNum.gameObject:SetActive(false)
|
||||||
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
||||||
local color = 0
|
local color = 0
|
||||||
LogError("self.itemId==="..self.itemId)
|
LogError("self.itemId==="..self.itemId)
|
||||||
|
@ -285,10 +287,11 @@ function GodsWaySingleSingleWave:SetIcon()
|
||||||
color = "17232A"
|
color = "17232A"
|
||||||
end
|
end
|
||||||
self.fightBtnNum.text =string.format("<color=#%s>%s</color>",color,self.costNum)
|
self.fightBtnNum.text =string.format("<color=#%s>%s</color>",color,self.costNum)
|
||||||
self.fightBtnText.text = string.format("<color=#%s>%s</color>",color,"扫荡")
|
--.fightBtnText.text = string.format("<color=#%s>%s</color>",color,"扫荡")
|
||||||
if self.buyTimes < 1 then
|
if self.buyTimes < 1 then
|
||||||
Util.SetGray(self.fight,true)
|
Util.SetGray(self.fight,true)
|
||||||
end
|
end
|
||||||
|
self.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","已通关")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
self.rewardData = self.data.firstReward
|
self.rewardData = self.data.firstReward
|
||||||
|
|
Loading…
Reference in New Issue