装备共鸣屏蔽

onepiece_demo_arena
wangzhenxing 2023-10-30 10:30:39 +08:00
parent 325bdc2b2d
commit 2ca32992da
4 changed files with 27 additions and 18 deletions

View File

@ -10,6 +10,7 @@ function this.Initialize()
this.typeGemList = {} this.typeGemList = {}
this.timer=nil this.timer=nil
this.oldPower=0 this.oldPower=0
this.gemLottery = {0,0} --抽卡次数记录
local value=ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value local value=ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value
this.drawLimit = string.split(value,"#") this.drawLimit = string.split(value,"#")
end end

View File

@ -241,7 +241,10 @@ function this.PlayerInfoRequest(func)
-- 服务器开启时间 -- 服务器开启时间
PlayerManager.SetServerOpenTime(msg.serverOpenTime) PlayerManager.SetServerOpenTime(msg.serverOpenTime)
TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos) TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos)
GemNewManager.gemLottery=msg.gemLotteryCountByDay if msg.gemLotteryCountByDay then
GemNewManager.gemLottery=msg.gemLotteryCountByDay
end
--GemManager.GetWearedGem(msg.lifeGridInfos) --GemManager.GetWearedGem(msg.lifeGridInfos)
--数字游戏初始化 --数字游戏初始化
RatioNumberLevelManager.ChapterHandle() RatioNumberLevelManager.ChapterHandle()

View File

@ -513,7 +513,8 @@ function this.ShowHeroEquip()
heroConfig.MaxRank >= tonumber(stars[2]) heroConfig.MaxRank >= tonumber(stars[2])
then then
isCanUpEquipTreasure = true isCanUpEquipTreasure = true
this.equipTreasureBtn.gameObject:SetActive(true) --屏蔽宝物共鸣
this.equipTreasureBtn.gameObject:SetActive(false)
this.treasure1.gameObject:SetActive(true) this.treasure1.gameObject:SetActive(true)
this.treasure2.gameObject:SetActive(true) this.treasure2.gameObject:SetActive(true)
this.treasurePage1.gameObject:SetActive(true) this.treasurePage1.gameObject:SetActive(true)

View File

@ -412,23 +412,27 @@ function this.SortItemList(shopType)
--LogError("a.id=="..a.id.." b.id=="..b.id) --LogError("a.id=="..a.id.." b.id=="..b.id)
local aId = a.id % _StoreItemIdFilter local aId = a.id % _StoreItemIdFilter
local bId = b.id % _StoreItemIdFilter local bId = b.id % _StoreItemIdFilter
local aInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, aId) local aInfo = ConfigManager.TryGetConfigData(ConfigName.StoreConfig, aId)
local bInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, bId) local bInfo = ConfigManager.TryGetConfigData(ConfigName.StoreConfig, bId)
if aInfo and bInfo then
-- 公会商店排序未解锁的往后排 -- 公会商店排序未解锁的往后排
if v.id == SHOP_TYPE.GUILD_SHOP and PlayerManager.familyId ~= 0 and MyGuildManager.GetMyGuildInfo() then if v.id == SHOP_TYPE.GUILD_SHOP and PlayerManager.familyId ~= 0 and MyGuildManager.GetMyGuildInfo() then
local aIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(aInfo.Sort) local aIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(aInfo.Sort)
local bIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(bInfo.Sort) local bIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(bInfo.Sort)
if aIsUnLock and not bIsUnLock then return true end if aIsUnLock and not bIsUnLock then return true end
if not aIsUnLock and bIsUnLock then return false end if not aIsUnLock and bIsUnLock then return false end
end
-- 免费的往前排
local _, a_price = this.calculateBuyCost(storeInfo.StoreType, aId, 1)
local _, b_price = this.calculateBuyCost(storeInfo.StoreType, bId, 1)
if a_price == 0 and b_price ~= 0 then return true end
if a_price ~= 0 and b_price == 0 then return false end
-- 按sort排序
return aInfo.Sort < bInfo.Sort
else
return false
end end
-- 免费的往前排
local _, a_price = this.calculateBuyCost(storeInfo.StoreType, aId, 1)
local _, b_price = this.calculateBuyCost(storeInfo.StoreType, bId, 1)
if a_price == 0 and b_price ~= 0 then return true end
if a_price ~= 0 and b_price == 0 then return false end
-- 按sort排序
return aInfo.Sort < bInfo.Sort
end) end)
else--是试炼商店 else--是试炼商店
table.sort(v.storeItem, function(a, b) table.sort(v.storeItem, function(a, b)