From 0901d837bead952c7eea47bd7eb6187c697d4e5a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 4 Nov 2020 00:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=8F=AC=E5=94=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index b9f429196d..7e373efb95 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -78,7 +78,7 @@ local activityType = { [4306] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero2",id=10089,hero="s_yongwangzhiqian_shenjiang1"}, ----燃灯 + [1]={name="Bg2/hero1",id=10089,hero="s_yongwangzhiqian_shenjiang1"}, ----燃灯 [2]={name="Bg2/hero3",id=10015,hero="s_yongwangzhiqian_shenjiang3"}, --伏虎罗汉 [3]={name="Bg2/hero2",id=10026,hero="s_yongwangzhiqian_shenjiang2"}, ----东华帝君 }, diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index b7eafc4933..a3cadfc427 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -56,9 +56,11 @@ end --判断商品是否可购买(成长礼) function this.IsGrowthGiftGoodsAvailable(goodsType) for _, v in ipairs(giftGoodsInfo)do - local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.goodsId) - if(rechargeConfig.Type == goodsType and v.dynamicBuyTimes == 1 and v.buyTimes ~= v.dynamicBuyTimes)then - return v + if v and v.goodsId and v.goodsId ~= 0 then + local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.goodsId) + if(rechargeConfig.Type == goodsType and v.dynamicBuyTimes == 1 and v.buyTimes ~= v.dynamicBuyTimes)then + return v + end end end return nil