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

@ -221,10 +221,10 @@ end
-- 是否为指定id指定星级的英雄 by:王振兴 2020/07/29
function RoleLogic:IsAssignHeroAndHeroStar(id,star)
if self.roleId==id and self.star==star then
return true
end
return false
if self.roleId==id and self.star==star then
return true
end
return false
end
@ -375,25 +375,25 @@ end
--加入额外技能,用于额外释放技能 by:王振兴
function RoleLogic:InsertExtraSkill(id,type)
local effectData=BattleUtil.GetExtraSkillbyId(id)
if effectData then
local skillType=BattleSkillType.Extra
--如果type为1则按绝技处理,不为1的话按额外技能处理额外技能因为被动判断会判断是否是绝技类型所以不会触发
if type==1 then
skillType=BattleSkillType.Special
local effectData=BattleUtil.GetExtraSkillbyId(id)
if effectData then
local skillType=BattleSkillType.Extra
--如果type为1则按绝技处理,不为1的话按额外技能处理额外技能因为被动判断会判断是否是绝技类型所以不会触发
if type==1 then
skillType=BattleSkillType.Special
end
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false)
BattleLogManager.Log(
"Insert Extra Skill",
"camp", self.camp,
"pos", self.position,
"type", skillType,
"isRage", tostring(false),
"isAdd", tostring(true),
"targets", targets and #targets or "0"
)
end
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false)
BattleLogManager.Log(
"Add Skill",
"camp", self.camp,
"pos", self.position,
"type", skillType,
"isRage", tostring(false),
"isAdd", tostring(true),
"targets", targets and #targets or "0"
)
end
end

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