diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemNewManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemNewManager.lua index 79e7a227ff..f7f9a70940 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemNewManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemNewManager.lua @@ -10,6 +10,7 @@ function this.Initialize() this.typeGemList = {} this.timer=nil this.oldPower=0 + this.gemLottery = {0,0} --抽卡次数记录 local value=ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value this.drawLimit = string.split(value,"#") end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 1064029ef4..d38287be8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -241,7 +241,10 @@ function this.PlayerInfoRequest(func) -- 服务器开启时间 PlayerManager.SetServerOpenTime(msg.serverOpenTime) TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos) - GemNewManager.gemLottery=msg.gemLotteryCountByDay + if msg.gemLotteryCountByDay then + GemNewManager.gemLottery=msg.gemLotteryCountByDay + end + --GemManager.GetWearedGem(msg.lifeGridInfos) --数字游戏初始化 RatioNumberLevelManager.ChapterHandle() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index e0cb14c999..cd5b5d1b9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -513,7 +513,8 @@ function this.ShowHeroEquip() heroConfig.MaxRank >= tonumber(stars[2]) then isCanUpEquipTreasure = true - this.equipTreasureBtn.gameObject:SetActive(true) + --屏蔽宝物共鸣 + this.equipTreasureBtn.gameObject:SetActive(false) this.treasure1.gameObject:SetActive(true) this.treasure2.gameObject:SetActive(true) this.treasurePage1.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index a3304801b4..fb1a8cdf24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -412,23 +412,27 @@ function this.SortItemList(shopType) --LogError("a.id=="..a.id.." b.id=="..b.id) local aId = a.id % _StoreItemIdFilter local bId = b.id % _StoreItemIdFilter - local aInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, aId) - local bInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, bId) - - -- 公会商店排序未解锁的往后排 - if v.id == SHOP_TYPE.GUILD_SHOP and PlayerManager.familyId ~= 0 and MyGuildManager.GetMyGuildInfo() then - local aIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(aInfo.Sort) - local bIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(bInfo.Sort) - if aIsUnLock and not bIsUnLock then return true end - if not aIsUnLock and bIsUnLock then return false end + local aInfo = ConfigManager.TryGetConfigData(ConfigName.StoreConfig, aId) + 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 + local aIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(aInfo.Sort) + local bIsUnLock = MyGuildManager.GetGuildShopSortIsUnLock(bInfo.Sort) + if aIsUnLock and not bIsUnLock then return true 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 - -- 免费的往前排 - 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) else--是试炼商店 table.sort(v.storeItem, function(a, b)