Merge branch 'dev_oneDis' into dev_one_discount

dev_one_discount hotfix/you_gu/cdn_66_and/1.1.36
DESKTOP-RH64908\Administrator 2023-09-06 17:09:14 +08:00
commit 47a5749423
5 changed files with 38 additions and 35 deletions

View File

@ -47,7 +47,7 @@ local _GuildBuildConfig = {
end,
},
[GUILD_MAP_BUILD_TYPE.SKILL] = { --技能
isOpen = false,
isOpen = true,
rpType = RedPointType.Guild_Skill,
btnName = "btnSkill",
btnFunc = function()

View File

@ -138,12 +138,12 @@ function this.SetAllGuildSkillRedPlayers()
end
--刷新方法
function this.RefreshAllGuildSkillRedPoint()
-- for i = 1, #GuildSkillType do
-- local isShowRedPoint = this.GuildSkillRedPoint(i)
-- if isShowRedPoint then
-- return true
-- end
-- end
for i = 1, #GuildSkillType do
local isShowRedPoint = this.GuildSkillRedPoint(i)
if isShowRedPoint then
return true
end
end
return false
end
--1 已经查看过不需要显示新红点 0 显示红点

View File

@ -125,10 +125,10 @@ function GodsWayTowerPanel:BindEvent()
PopupTipPanel.ShowTip("扫荡次数不足")
return
end
if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then
PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战")
return
end
-- if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then
-- PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战")
-- return
-- end
-- if FormationManager.CheckFormationValid(curType + 3000) then
-- MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true)
-- else

View File

@ -130,7 +130,7 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk
this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession]
this.guildProValue.text = allLv
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
this.jumpBtn:SetActive(false)
this.jumpBtn:SetActive(_guildSkill == nil)
end
if not this.specialPro then

View File

@ -56,7 +56,7 @@ function GodsWaySingleSingleWave:OnOpen()
--self.bg.sprite = self.spLoader:LoadSprite(GetFourElementBgByType(self.trailData.fourElementType))
self:UpdatePrivilage()
if self.data.wave < curFloor then
self.pass.gameObject:SetActive(true)
self.pass.gameObject:SetActive(false)
self.fight.gameObject:SetActive(false)
self.reward.gameObject:SetActive(false)
else
@ -102,25 +102,27 @@ function GodsWaySingleSingleWave:OnOpen()
end)
end
if self.data.wave == curFloor then
if self.freeTimes <=0 and self.buyTimes <= 0 then
PopupTipPanel.ShowTip("今日已无扫荡次数!")
return
end
if self.freeTimes <= 0 then
if BagManager.GetItemCountById(self.itemId) < self.costNum then
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
return
end
local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType)
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()
PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1)
x()
end)
end,"取消","确定")
else
x()
end
-- if self.freeTimes <=0 and self.buyTimes <= 0 then
-- PopupTipPanel.ShowTip("今日已无扫荡次数!")
-- return
-- end
-- if self.freeTimes <= 0 then
-- if BagManager.GetItemCountById(self.itemId) < self.costNum then
-- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
-- return
-- end
-- local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType)
-- 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()
-- PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1)
-- x()
-- end)
-- end,"取消","确定")
-- else
-- x()
--
PopupTipPanel.ShowTip("已通关最高层")
return
elseif self.data.wave == curFloor + 1 then
local teamType=0
local myTeams=teamIds[curType]
@ -273,8 +275,8 @@ function GodsWaySingleSingleWave:SetIcon()
Util.SetGray(self.fight,false)
else
--self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
self.fightBtnIcon.gameObject:SetActive(true)
self.fightBtnNum.gameObject:SetActive(true)
self.fightBtnIcon.gameObject:SetActive(false)
self.fightBtnNum.gameObject:SetActive(false)
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
local color = 0
LogError("self.itemId==="..self.itemId)
@ -285,10 +287,11 @@ function GodsWaySingleSingleWave:SetIcon()
color = "17232A"
end
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
Util.SetGray(self.fight,true)
end
self.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","已通关")
end
else
self.rewardData = self.data.firstReward