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 2de1c9da1b..05ebf17550 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -54,9 +54,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