MMO-19722: 1. 怪物攻击宠物，转换到宠物的主人，2. 宠物不判定攻击自己敌人

Common/CommonAI/Zone/Instance/InstanceNpcs.cs

@@ -572,6 +572,20 @@ namespace CommonAI.Zone.Instance
             {
                 return;
             }
+
+			if(attacker.IsPet)
+			{
+				InstanceUnit master = attacker.Virtual.GetMasterUnit();
+				if(master == null)
+				{
+					log.Warn("onDamaged: 找不到宠物主人：" + attacker.Info.ID + ", " + attacker.Parent.GetSceneID());
+				}
+				else
+				{
+					attacker = master;
+				}
+			}
+
             // 被攻击转火
             mHateSystem.OnHitted(attacker, attack, reduceHP);
             onAddEnemy(attacker, true, AttackReason.Damaged);

Common/CommonAI/Zone/Instance/InstanceZone.cs

@@ -1572,6 +1572,11 @@ namespace CommonAI.Zone.Instance
         /// <returns></returns>
         public virtual bool IsAttackable(InstanceUnit src, InstanceUnit target, SkillTemplate.CastTarget expectTarget, AttackReason reason, ITemplateData weapon)
         {
+			if(src == null || target == null)
+			{
+				return false;
+			}
+
             if (!IsVisibleAOI(src, target))
             {
                 return false;

XmdsCommonServer/Plugin/Units/XmdsInstancePet.cs

@@ -18,7 +18,7 @@ namespace XmdsCommonServer.Plugin.Units
 {
     public class XmdsInstancePet : InstancePet
     {
-        private XmdsCommon.Plugin.XmdsPetConifg.XmdsPetFollowMode mCurFollowMode = XmdsCommon.Plugin.XmdsPetConifg.XmdsPetFollowMode.ActiveAtk;
+		private XmdsCommon.Plugin.XmdsPetConifg.XmdsPetFollowMode mCurFollowMode = XmdsCommon.Plugin.XmdsPetConifg.XmdsPetFollowMode.ActiveAtk;
 
         //主人当前战斗状态.
         private BattleStatus mMasterCombatStatus;
@@ -100,8 +100,8 @@ namespace XmdsCommonServer.Plugin.Units
 
 				//主人脱战了,并且没有伤害，宠物强行脱战
 				//2020.9.22修改，宠物可以和怪物撕逼
-                if (CurrentState is StateIdle/* || (this.Master.mLastHitOtherTime + XmdsVirtual.Coefficient_OutOfCombatTime < CommonLang.CUtils.localTimeMS
-					&& this.Master.mLastDamageTime + XmdsVirtual.Coefficient_OutOfCombatTime < CommonLang.CUtils.localTimeMS)*/)
+                if (CurrentState is StateIdle || (this.Master.mLastHitOtherTime + XmdsConfig.Instance.OUTOF_BATTLE_PLAYER < CommonLang.CUtils.localTimeMS
+					&& this.Master.mLastDamageTime + XmdsConfig.Instance.OUTOF_BATTLE_PLAYER < CommonLang.CUtils.localTimeMS))
                 {
                     mCurAtkUnit = null;
 
@@ -394,49 +394,49 @@ namespace XmdsCommonServer.Plugin.Units
         {
             bool ret = false;
 
-            using (var list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
-            {
-                //找到离自己最近的单位攻击.
-                Parent.getObjectsRoundRange<InstanceUnit>(Collider.Object_BlockBody_TouchRound, X, Y, Info.GuardRange, list , AoiStatus);
-                DoAndRemoveCollection.UpdateAndRemove<InstanceUnit>(list, (InstanceUnit u) =>
-                {
-                    return !u.IsActive;
-                });
-
-                if (list != null && list.Count > 0)
-                {
-                    list.Sort((a, b) =>
-                    {
-                        //选距离最近的单位.
-                        float da = CMath.getDistanceSquare(a.X, a.Y, this.X, this.Y);
-                        float db = CMath.getDistanceSquare(b.X, b.Y, this.X, this.Y);
-                        return (int)(da - db);
-                    });
-
-                    foreach (SkillState skill in SkillStatus)
-                    {
-                        if (skill.LaunchSkill.AutoLaunch && skill.TryLaunch())
-                        {
-                            foreach (InstanceUnit u in list)
-                            {
-                                if (this.IsCanAttack(u) && Parent.IsAttackable(this, u, skill.Data.ExpectTarget, AttackReason.Attack, skill.Data))
-                                {
-                                    //是否在守卫范围内.
-                                    if (CheckInAtkRange(u, this.Info.GuardRange + skill.Data.AttackRange))
-                                    {
-                                        //检测是否有可释放技能//
-                                        if (tryAutoLaunch(skill, u))
-                                        {
-                                            return true;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                }
-            }
+            //using (var list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
+            //{
+            //    //找到离自己最近的单位攻击.
+            //    Parent.getObjectsRoundRange<InstanceUnit>(Collider.Object_BlockBody_TouchRound, X, Y, Info.GuardRange, list , AoiStatus);
+            //    DoAndRemoveCollection.UpdateAndRemove<InstanceUnit>(list, (InstanceUnit u) =>
+            //    {
+            //        return !u.IsActive;
+            //    });
+
+            //    if (list != null && list.Count > 0)
+            //    {
+            //        list.Sort((a, b) =>
+            //        {
+            //            //选距离最近的单位.
+            //            float da = CMath.getDistanceSquare(a.X, a.Y, this.X, this.Y);
+            //            float db = CMath.getDistanceSquare(b.X, b.Y, this.X, this.Y);
+            //            return (int)(da - db);
+            //        });
+
+            //        foreach (SkillState skill in SkillStatus)
+            //        {
+            //            if (skill.LaunchSkill.AutoLaunch && skill.TryLaunch())
+            //            {
+            //                foreach (InstanceUnit u in list)
+            //                {
+            //                    if (this.IsCanAttack(u) && Parent.IsAttackable(this, u, skill.Data.ExpectTarget, AttackReason.Attack, skill.Data))
+            //                    {
+            //                        //是否在守卫范围内.
+            //                        if (CheckInAtkRange(u, this.Info.GuardRange + skill.Data.AttackRange))
+            //                        {
+            //                            //检测是否有可释放技能//
+            //                            if (tryAutoLaunch(skill, u))
+            //                            {
+            //                                return true;
+            //                            }
+            //                        }
+            //                    }
+            //                }
+            //            }
+            //        }
+
+            //    }
+            //}
             return ret;
         }
 

XmdsVSPlugins/XmdsCommonSkill/Plugin/PassiveSkills/Boss/Boss_91001.cs

@@ -83,6 +83,11 @@ namespace XmdsCommonSkill.Plugin.PassiveSkills.Remedy
 				mTriggerHelp = false;
 				return;
 			}
+			else if (mNextWeakTime == 0)
+			{
+				//起手进入战斗状态，默认进一次cd
+				this.mNextWeakTime = this.mWeakInterval + CommonLang.CUtils.localTimeMS;
+			}
 
 			int kingID = this.mOwner.mUnit.Parent.GetZoneKingID();
 			if (kingID > 0 && mNextWeakTime < CommonLang.CUtils.localTimeMS && !JSGMountainKingModule.IsKingAlive(this.mOwner.mUnit.Parent, kingID)