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

Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua

@@ -2405,7 +2405,8 @@ local effectList = {
     [128] = function(caster, target, args, interval, skill)
         local pro = args[1]
         local round = args[2]
-        BattleLogic.WaitForTrigger(interval, function ()          
+        BattleLogic.WaitForTrigger(interval, function () 
+            --LogError("teamdamage=="..caster.teamDamage.."    pro=="..pro.."     round=="..round)         
                 local damage=floor(caster.teamDamage*pro)+round
                 BattleUtil.FinalDamageCountShield(nil,caster, target,damage)
         end)

Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua

@@ -37,10 +37,10 @@ function HOT:OnTrigger()
                     value=0
                 end
                 if self.healValue-value>0 then
-                    if target.bloodShield then
-                       target.bloodShield:AddValue(self.healValue-value)
+                    if self.target.bloodShield then
+                       self.target.bloodShield:AddValue(self.healValue-value)
                     else
-                       target:AddBuff(Buff.Create(self.caster,BuffName.Blood,0,self.healValue-value))
+                       self.target:AddBuff(Buff.Create(self.caster,BuffName.Blood,0,self.healValue-value))
                     end
                 end
         else

Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua

@@ -174,6 +174,7 @@ BattleEventName = {
     HitRoleInBurn = indexAdd(), --击中在燃烧状态得敌人
     ActionOperateAngerBefore =indexAdd(),--角色行动操作怒气前
     BloodValueChange = indexAdd(),  --御甲只发发生改变
+    CheckLiZhanZhiQu = indexAdd(),--检测历战之躯
 }
 
 BattleMaxFrame = 1000000
@@ -207,7 +208,7 @@ RoleDataName = {
     DarkDamageReduceFactor = indexAdd(), --暗系伤害减免系数（%）
     ElementDamageBocusFactor = indexAdd(), --属性伤害加成系数（%）
     InitRage = indexAdd(), --初始怒气值
-    CheckLiZhanZhiQu = indexAdd(),--检测历战之躯
+    
 }
 
 BuffName = {

Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua

@@ -750,6 +750,13 @@ function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageTy
        realDamage=math.abs(defRole.bloodShield:CountBloodValue(damage))
        -- damage=realDamage
     end
+    --检测历战之躯
+    -- 造成的最终伤害
+    local damagingFunc = function(dmgDeduction) 
+        realDamage = realDamage - dmgDeduction 
+        damage=realDamage
+    end
+    defRole.Event:DispatchEvent(BattleEventName.CheckLiZhanZhiQu, damagingFunc, atkRole, realDamage, skill, dotType, bCrit, damageType,isDirect)
     --御甲过滤后的伤害只会处理扣血  by:  wangzhenxing  shihongyi  2021/09/27 
     local finalDmg = defRole.data:SubValue(RoleDataName.Hp,realDamage)
     if finalDmg >= 0 then

Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua

@@ -246,6 +246,8 @@ end
 function this.CheckJumpServerhightLadderMainCityRedPoint()
     CheckRedPointStatus(RedPointType.JumpServer_HightLadder_Worship)
     CheckRedPointStatus(RedPointType.JumpServer_HightLadder_HaveMianFeiPanel)
+    -- 检测七界试炼红点
+    CheckRedPointStatus(RedPointType.QiJieShiLian)
 end 
 --剩余免费挑战次数红点
 function this.JumpServerHightLadderMianFeiNumRedPoint()