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

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

@@ -8830,7 +8830,7 @@ local passivityList = {
 
         local onRoleTreat=function(target,realTreat,treat)
             local hp=treat- realTreat
-            if hp>0 and realTreat>0 then
+            if hp>0 then
                addHp=addHp+hp*count
             end
         end
@@ -8946,7 +8946,7 @@ local passivityList = {
                return
             end
             
-            if skill.type~= BattleSkillType.Special or skill.type~= BattleSkillType.Extra then
+            if skill.type~= BattleSkillType.Special and skill.type~= BattleSkillType.Extra then
                 return
             end
             local arr=skill:GetDirectTargetsNoExile()

Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua

@@ -106,6 +106,14 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset)
         local sortingOrder
         if self.owner.camp == 0 then
             sortingOrder = self.owner.GameObject:GetComponent("Canvas").sortingOrder
+            --混乱特效因为贴图不显示特殊处理
+            if buffName=="TongYong_Effect_buff_hunluan_1" then
+                sortingOrder=sortingOrder+1
+            end
+        end
+        --混乱特效因为贴图不显示特殊处理
+        if sortingOrder==nil and buffName=="TongYong_Effect_buff_hunluan_1" then
+            sortingOrder=BattleManager.GetBattleSorting()+1
         end
         local node = BattleManager.LoadAsset(buffName, sortingOrder)
         -- node.transform:SetParent(self.RootPanel.transform)

Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua

@@ -92,6 +92,7 @@ function this.GetOneKeyUpHeroList()
         if not upList[v.heroConfig.Id] then
             if #heros < 6 then
                 table.insert(heros, v)
+                upList[v.heroConfig.Id] = 1
             end
         end
     end