Merge branch 'master_xma_local' into master_develop

# Conflicts:
gaoxin 2020-11-16 20:16:17 +08:00
commit 9c158f1f99
4 changed files with 38 additions and 32 deletions

View File

@ -916,6 +916,7 @@ end
-- 获取技能表现id
function this.GetCombatIdBySkin(skillId, skinId)
skillId = tonumber(skillId)
local effectIds = SkillLogicConfig[skillId].SkillDisplay
local eid=0
local skin = skinId or 0

View File

@ -385,7 +385,7 @@ if effectData then
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false)
BattleLogManager.Log(
"Add Skill",
"Insert Extra Skill",
"camp", self.camp,
"pos", self.position,
"type", skillType,

View File

@ -75,7 +75,7 @@ function this.CheckTurnRound()
return
end
-- 检测一次灵兽技能
this.CheckMonsterSkill(this.MonsterCheckFunc)
-- this.CheckMonsterSkill(this.MonsterCheckFunc)
--
if this.DeadSkillList and #this.DeadSkillList > 0 then
@ -128,12 +128,16 @@ function this.Update()
skill:Cast(function()
-- 检测一下轮转
this.IsSkilling = false
this.CheckTurnRound()
-- this.CheckTurnRound()
-- 检测一次灵兽技能
this.CheckMonsterSkill(this.MonsterCheckFunc)
end)
else
-- 检测一下轮转
this.IsSkilling = false
this.CheckTurnRound()
-- this.CheckTurnRound()
-- 检测一次灵兽技能
this.CheckMonsterSkill(this.MonsterCheckFunc)
end
return
end

View File

@ -39,14 +39,15 @@ function this.SetBasicValues(giftGoodsList)
end
for _, giftGoodsInfo in ipairs(giftGoodsList) do
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID".. giftGoodsInfo.goodsId .." 已购:"
..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
..giftGoodsInfo.endTime .. " 可购(没卵用)" .. giftGoodsInfo.dynamicBuyTimes)
if giftGoodsInfo.endTime ~= 0 and giftGoodsInfo.startTime ~= 0 then
if giftGoodsInfoList[rechargeConfig.Type] then
table.insert(giftGoodsInfoList[rechargeConfig.Type], giftGoodsInfo)
-- LogGreen("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID".. giftGoodsInfo.goodsId .." 已购:"
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
-- ..giftGoodsInfo.endTime .. " 可购(没卵用)" .. giftGoodsInfo.dynamicBuyTimes)
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
else
if giftGoodsInfoList[rechargeConfigLocal.Type] then
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
end
end
end