Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-12-16 10:10:05 +08:00
commit 7c1a3caa5f
4 changed files with 6 additions and 4 deletions

View File

@ -488,6 +488,7 @@ function BattleLogic.Update()
end
if CurRound > MaxRound then
if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛
or BattleLogic.Type == BATTLE_SERVER_TYPE.ArenaFight
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend
or BattleLogic.Type == BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight
or BattleLogic.Type == BATTLE_SERVER_TYPE.LINGMAIMIJING

View File

@ -5,7 +5,7 @@ local onRoleBeHit=nil
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function Shield:SetData(...)
self.shieldType, -- 护盾类型(1 固定减伤盾 2 百分比减伤盾 3 无敌盾)
self.shieldType, -- 护盾类型(1 固定减伤盾 2 百分比减伤盾 3 无敌盾 5.反伤盾 )
self.shieldValue, -- 护盾值(固定减伤盾:减伤值 百分比减伤盾:减伤百分比 无敌盾:吸血率)
self.dmgReboundFactor = ... --伤害反弹系数
self.damageSum = 0 --记录承受的伤害
@ -16,7 +16,8 @@ function Shield:SetData(...)
-- 刷新排序等级
self.sort = 4
immune0=function(buff)
return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or buff.caster.camp~=self.target.camp
return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or (buff.caster.camp~=self.target.camp and buff.type~= BuffName.Exile
)
end
onRoleBeHit=function(atkRole, damage, bCrit, finalDmg, damageType, skill)
--damagetype为3 是 舍身济世分摊伤害

View File

@ -333,7 +333,7 @@ ShieldTypeName = {
NormalReduce = 1, -- 固定值减伤
RateReduce = 2, -- 百分比减伤
AllReduce = 3, -- 无敌护盾
ThornsReduce = 4, --反伤盾
ThornsReduce = 5, --反伤盾
}
--额外释放技能

View File

@ -437,7 +437,7 @@ function this.HeadAdapter(head,data,type)
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality))
icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon))
end
if data.isRealDead and (type==1 or type==2) then
if data.isRealDead and (type==1 or type==2 or type==3) then
Util.SetGray(icon.gameObject ,true)
deadObj:SetActive(true)
else