【优化】优化dispose处理-instanceSpell, XmdsInstanceMonster

Common/CommonAI/Zone/Data.cs

@@ -93,9 +93,11 @@ namespace CommonAI.Zone
         [DescAttribute("NPC每隔多长毫秒检测一次最大警戒距离", "AI")]
         public int AI_NPC_CHECK_IN_GUARD_LIMIT_TIME_MS = 500;
         [DescAttribute("NPC攻击间歇时，有多少几率检测旁边有人，并散开，防止堆积在一个点。（百分比）", "AI")]
-        public float AI_NPC_ATTACK_IDLE_SCATTER_PCT = 25;
+        public float AI_NPC_ATTACK_IDLE_SCATTER_PCT = 300;
+		[DescAttribute("NPC散开检测间隔", "AI")]
+		public int AI_NPC_ATTACK_IDLE_INTERVAL = 3000;
 
-        [DescAttribute("仇恨列表上限", "AI")]
+		[DescAttribute("仇恨列表上限", "AI")]
         public int AI_HATE_SYSTEM_CAPACITY_MS = 50;
     }
 

Common/CommonAI/Zone/EventTrigger/EventAdapter.cs

@@ -333,10 +333,10 @@ namespace CommonAI.Zone.EventTrigger
 			{
 				log.Warn("--调试场景: " + this.ZoneAPI.UUID + ", " + this.ZoneAPI.GetSceneID() + ", 执行动作：" + this.Name);
 			}
-			else
-			{
-				log.Info("--调试场景: " + this.ZoneAPI.UUID + ", " + this.ZoneAPI.GetSceneID() + ", 执行动作：" + this.Name);
-			}
+			//else
+			//{
+			//	log.Info("--调试场景: " + this.ZoneAPI.UUID + ", " + this.ZoneAPI.GetSceneID() + ", 执行动作：" + this.Name);
+			//}
 
 			//if(this.Name.Equals("事件重置列表1") || this.Name.Equals("玉重置"))
 			//{

Common/CommonAI/Zone/Instance/InstanceNpcs.cs

@@ -466,9 +466,11 @@ namespace CommonAI.Zone.Instance
             //只有单位为非碰撞时，才有这个需求//
             if (!this.IntersectObj)
             {
-                if (CUtils.RandomPercent(Parent.RandomN, Templates.CFG.AI_NPC_ATTACK_IDLE_SCATTER_PCT))
+                if (CommonLang.CUtils.localTimeMS > mCheckAttackSpread  && CUtils.RandomPercent(Parent.RandomN, Templates.CFG.AI_NPC_ATTACK_IDLE_SCATTER_PCT))
                 {
-                    InstanceUnit block = null;
+					mCheckAttackSpread = CommonLang.CUtils.localTimeMS + Templates.CFG.AI_NPC_ATTACK_IDLE_INTERVAL;
+
+					InstanceUnit block = null;
                     Parent.ForEachNearObjects(X, Y, (InstanceZoneObject o, ref bool cancel) =>
                     {
                         if ((o != this) && (o is InstanceUnit) && Parent.TouchObject2(this, o))

Common/CommonAI/Zone/Instance/InstanceSpell.cs

@@ -66,7 +66,7 @@ namespace CommonAI.Zone.Instance
 		private readonly int mSpellTotalTime;               //法术的总时长
 
 		// 飞弹各种奇葩数据记录， 法术数量可控
-		private readonly JSGCreateSpellData mCreateSpellData;           //法术创建信息（可变的，由技能数据确定）
+		private JSGCreateSpellData mCreateSpellData;           //法术创建信息（可变的，由技能数据确定）
 		// 飞弹不同的法术id
 		public List<LaunchSpell> mCurveSpellList;
 		//连续飞弹
@@ -403,7 +403,35 @@ namespace CommonAI.Zone.Instance
             setPos(mStartPos.X, mStartPos.Y, this.LaunchHeightZ);
 
         }
-        protected override void onRemoved()
+
+		//public long mDisPosingTime = 0;
+		//public long mDisPosingTime1 = 0;
+		protected override void Disposing()
+		{
+			this.mSeekingCooldownTime = null;
+			this.mKeyFrames = null;
+			//mDisPosingTime = CommonLang.CUtils.localTimeMS;
+			//mDisPosingTime1 = System.DateTime.Now.Ticks;
+
+			if (this.mHittedUnits != null)
+			{
+				this.mHittedUnits.Clear();
+				this.mHittedUnits = null;
+			}
+
+			this.mHitIntervalTicker = null;
+			this.mCreateSpellData = null;
+
+			if(this.mCurveSpellList != null)
+			{
+				this.mCurveSpellList.Clear();
+				this.mCurveSpellList = null;
+			}
+
+			base.Disposing();
+		}
+
+		protected override void onRemoved()
         {
             if (mInfo.StopBindingSkillOnRemoved)
             {
@@ -430,7 +458,11 @@ namespace CommonAI.Zone.Instance
                 }
             }
             
-            updateKeyFrames();
+			if(this.mKeyFrames != null)
+			{
+				updateKeyFrames(slowRefresh);
+			}
+           
             if (mInfo.MType == SpellTemplate.MotionType.Foxfire && mTarget != null)
             {
             }
@@ -940,7 +972,7 @@ namespace CommonAI.Zone.Instance
         }
 
         // 范围伤害，碰撞检测 //
-        private void getShapeAttackable(List<InstanceUnit> ret, AttackReason reason)
+        private void getShapeAttackable(List<InstanceUnit> ret, AttackReason reason, bool slowRefresh)
         {
             AttackRange.Shape = (AttackShape)mInfo.BodyShape;
             AttackRange.BodySize = this.mBaseSize;
@@ -980,7 +1012,7 @@ namespace CommonAI.Zone.Instance
         /// <summary>
         /// 更新范围检测以及关键帧
         /// </summary>
-        private void updateKeyFrames()
+        private void updateKeyFrames(bool slowRefresh)
         {
             switch (Info.MType)
             {
@@ -1020,7 +1052,7 @@ namespace CommonAI.Zone.Instance
 					{
 						using (var enemy_list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
 						{
-							getShapeAttackable(enemy_list, AttackReason.Attack);
+							getShapeAttackable(enemy_list, AttackReason.Attack, slowRefresh);
 							if (enemy_list.Count > 0)
 							{
 								InstanceUnit target = enemy_list[0];
@@ -1041,7 +1073,7 @@ namespace CommonAI.Zone.Instance
                         {
                             using (var list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
                             {
-                                getShapeAttackable(list, AttackReason.Attack);
+                                getShapeAttackable(list, AttackReason.Attack, slowRefresh);
                                 affectToMulti(list, kf, true);
                             }
                         }
@@ -1062,24 +1094,24 @@ namespace CommonAI.Zone.Instance
                     }
                     break;
                 case SpellTemplate.MotionType.Boomerang1:
-                case SpellTemplate.MotionType.Boomerang2:
-                    if (Finish)
-                    {
-                        Parent.RemoveObject(this);
-                    }
+                case SpellTemplate.MotionType.Boomerang2:                  
                     if (Info.SpecialEffect == SpellTemplate.SpecialAdditionalEffect.DragPath && Info.SpecialEffectParam != 0f)
                     {
-                        updateDragPathKeyFramesRanged();
+                        updateDragPathKeyFramesRanged(slowRefresh);
                     }
                     else if (Info.SpecialEffect == SpellTemplate.SpecialAdditionalEffect.DarkHole && Info.SpecialEffectParam != 0f)
                     {
-                        updateDarkHoleKeyFramesRanged();
+                        updateDarkHoleKeyFramesRanged(slowRefresh);
                     }
                     else
                     {
-                        updateKeyFramesRanged();
+                        updateKeyFramesRanged(slowRefresh);
                     }
-                    break;
+					if (Finish)
+					{
+						Parent.RemoveObject(this);
+					}
+					break;
                 case SpellTemplate.MotionType.Foxfire:
                     if (mTarget != null && CMath.includeRoundPoint(mTarget.X, mTarget.Y, mTarget.BodyHitSize, this.X, this.Y))
                     {
@@ -1106,15 +1138,15 @@ namespace CommonAI.Zone.Instance
                     {
                         if (Info.SpecialEffect == SpellTemplate.SpecialAdditionalEffect.DragPath && Info.SpecialEffectParam != 0f)
                         {
-                            updateDragPathKeyFramesRanged();
+                            updateDragPathKeyFramesRanged(slowRefresh);
                         }
                         else if (Info.SpecialEffect == SpellTemplate.SpecialAdditionalEffect.DarkHole && Info.SpecialEffectParam != 0f)
                         {
-                            updateDarkHoleKeyFramesRanged();
+                            updateDarkHoleKeyFramesRanged(slowRefresh);
                         }
                         else
                         {
-                            updateKeyFramesRanged();
+                            updateKeyFramesRanged(slowRefresh);
                         }
                     }
                     break;
@@ -1167,10 +1199,15 @@ namespace CommonAI.Zone.Instance
         }
 
 
-        private void updateKeyFramesRanged()
+        private void updateKeyFramesRanged(bool slowRefresh)
         {
             using (var kfs = ListObjectPool<SpellTemplate.KeyFrame>.AllocAutoRelease())
             {
+				//if(mKeyFrames == null)
+				//{
+				//	long ltime1 = CommonLang.CUtils.localTimeMS - mDisPosingTime;
+				//	long ltime2 = System.DateTime.Now.Ticks - mDisPosingTime1;
+				//}
                 int kfs_count = mKeyFrames.PopKeyFrames(PassTimeMS, kfs);
                 bool is_interval_test = mHitIntervalTicker.Update(Parent.UpdateIntervalMS);
                 //此处修正 加入触发次数上限检测
@@ -1184,7 +1221,7 @@ namespace CommonAI.Zone.Instance
 
 					using (var enemy_list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
                     {
-                        getShapeAttackable(enemy_list, AttackReason.Attack);
+                        getShapeAttackable(enemy_list, AttackReason.Attack, slowRefresh);
                         if (kfs_count > 0)
                         {
 							// 单Frame情况下，如果是Attack。进行唯一敌人判定（X型拼接法术， 需要伤害只生效一次）
@@ -1239,13 +1276,13 @@ namespace CommonAI.Zone.Instance
         }
 
 
-        private void updateDarkHoleKeyFramesRanged()
+        private void updateDarkHoleKeyFramesRanged(bool slowRefresh)
         {
             using (var kfs = ListObjectPool<SpellTemplate.KeyFrame>.AllocAutoRelease())
             {
                 using (var enemy_list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
                 {
-                    getShapeAttackable(enemy_list, AttackReason.Attack);
+                    getShapeAttackable(enemy_list, AttackReason.Attack, slowRefresh);
 
                     for (int i = enemy_list.Count - 1; i >= 0; --i)
                     {
@@ -1354,13 +1391,13 @@ namespace CommonAI.Zone.Instance
         public const float PiOver36 = (float)(Math.PI / 36.0);
         public const float TwoPi = (float)(Math.PI * 2.0);
 
-        private void updateDragPathKeyFramesRanged()
+        private void updateDragPathKeyFramesRanged(bool slowRefresh)
         {
             using (var kfs = ListObjectPool<SpellTemplate.KeyFrame>.AllocAutoRelease())
             {
                 using (var enemy_list = ListObjectPool<InstanceUnit>.AllocAutoRelease())
                 {
-                    getShapeAttackable(enemy_list, AttackReason.Attack);
+                    getShapeAttackable(enemy_list, AttackReason.Attack, slowRefresh);
 
                     float _a, _b, _angle, offset, dx, dy , dis;
 

Common/CommonAI/Zone/Instance/InstanceUnit.Status.cs

@@ -68,7 +68,7 @@ namespace CommonAI.Zone.Instance
 		}
 
 		//--------------------------------------------------------------------------------------------------------------
-		private readonly List<MultiTimeLine> mMultiTimeLineGroup = new List<MultiTimeLine>();
+		private List<MultiTimeLine> mMultiTimeLineGroup = new List<MultiTimeLine>();
         private UnitSyncMultiTimeLine mMultiTimeLineSync;
 
         /// <summary>
@@ -201,7 +201,7 @@ namespace CommonAI.Zone.Instance
         }
         private void UpdateTimeLines(int intervalMS)
         {
-			if(!mNeedUpdate)
+			if(mMultiTimeLineGroup == null || !mNeedUpdate)
 			{
 				return;
 			}

Common/CommonAI/Zone/Instance/InstanceUnit.cs

@@ -98,6 +98,8 @@ namespace CommonAI.Zone.Instance
 		//主人id
 		private long mRemoveSelfTime;
 		private InstanceUnit mBindMaster;
+		//检测散开间隔
+		protected long mCheckAttackSpread = 0;
 
 		/// <summary>
 		/// 自动恢复计数器 
@@ -149,7 +151,7 @@ namespace CommonAI.Zone.Instance
 			//		this.IsMonster + ", " + mProcessDeadTime);
 			//}
 
-            if (mUnitVirtual != null)
+			if (mUnitVirtual != null)
             {
                 mUnitVirtual.OnDispose(this);
             }
@@ -159,7 +161,23 @@ namespace CommonAI.Zone.Instance
             this.clearBuffs();
             this.clearItemSlots();
             this.clearTriggers();
-        }
+
+			//this.mNoneBlockTimeMS.Clear();
+			//this.mStunTimeMS.Clear();
+			//this.mInvisibleTimeMS.Clear();
+			//this.mInvincibleTimeMS.Clear();
+			//this.mSilentTimeMS.Clear();
+			//this.mCannotMoveTimeMS.Clear();
+			//this.mIgnoreControl.Clear();
+
+			foreach (MultiTimeLine timeLine in mMultiTimeLineGroup)
+			{
+				timeLine.Disposing();
+			}
+			this.mMultiTimeLineGroup.Clear();
+			this.mMultiTimeLineGroup = null;
+			this.mMultiTimeLineSync = null;
+		}
 
         protected override void onAdded(bool pointLv)
         {

Common/CommonAI/Zone/Instance/InstanceZone.cs

@@ -173,7 +173,7 @@ namespace CommonAI.Zone.Instance
             this.mFlags.Clear();
 
 			this.m_UnitsPos.Clear();
-			this.m_UnitsPos.Clear();
+			this.m_UnitsStates.Clear();
 
 			InstanceZone.s_active_zone_count--;
         }
@@ -250,14 +250,25 @@ namespace CommonAI.Zone.Instance
         {
             mTasks.Enqueue(task);
         }
-        /// <summary>
-        /// 【线程安全】增加时间任务
-        /// </summary>
-        /// <param name="intervalMS"></param>
-        /// <param name="delayMS"></param>
-        /// <param name="repeat"></param>
-        /// <param name="handler"></param>
-        public TimeTaskMS AddTimeTask(int intervalMS, int delayMS, int repeat, TickHandler handler)
+
+		public string GetInfo()
+		{
+			if(this.mObjects == null)
+			{
+				return "对象：-1";
+			}
+			
+			return "对象：" + AllObjectsCount + ", 单位：" + AllUnitsCount + ", 法术：" + AllSpellsCount + ", 道具：" + AllItemsCount + ", 玩家：" + AllPlayersCount;
+		}
+
+		/// <summary>
+		/// 【线程安全】增加时间任务
+		/// </summary>
+		/// <param name="intervalMS"></param>
+		/// <param name="delayMS"></param>
+		/// <param name="repeat"></param>
+		/// <param name="handler"></param>
+		public TimeTaskMS AddTimeTask(int intervalMS, int delayMS, int repeat, TickHandler handler)
         {
             return mTimeTasks.AddTimeTask(intervalMS, delayMS, repeat, handler);
         }

Common/CommonAI/Zone/Instance/InstanceZoneObject.cs

@@ -47,7 +47,7 @@ namespace CommonAI.Zone.Instance
         readonly public bool IsStaticBlockable;
 
         private Vector2 mPos = new Vector2();
-        readonly private Vector2 mPosPrevFrame = new Vector2();
+        private Vector2 mPosPrevFrame = new Vector2();
         private float mPosZPrevFrame = 0;
         private bool mNeedGenSyncPos = true;
         private ObjectForceSyncPosEvent mForceSync = new ObjectForceSyncPosEvent();

Common/CommonAI/data/Interface.cs

@@ -26,7 +26,7 @@ namespace CommonAI.data
 
 		protected virtual void LogError(string text = null)
 		{
-			string error = string.Format("特殊事件错误:未找到事件脚本【{0}】", text) + new System.Diagnostics.StackTrace().ToString();
+			string error = string.Format("特殊事件错误:未找到事件脚本【{0}】", text);// + new System.Diagnostics.StackTrace().ToString();
 			log.Error(error);
 		}
 

Common/CommonAIServer/Node/BaseZoneNode.cs

@@ -35,7 +35,7 @@ namespace CommonAIServer.Node
         private readonly ZoneNodeConfig mConfig;
         private readonly int mUpdateInterval;
         private readonly int mUpdateIntervalLimit;
-        private readonly TimeInterval<ServerStatusB2C> mSyncServerStatus;
+        //private readonly TimeInterval<ServerStatusB2C> mSyncServerStatus;
 
         protected SceneData mSceneData;
         private EditorScene mZone;
@@ -66,7 +66,7 @@ namespace CommonAIServer.Node
             this.mConfig = cfg.Clone();
             this.mUpdateInterval = mConfig.GAME_UPDATE_INTERVAL_MS;
             this.mUpdateIntervalLimit = mUpdateInterval * 2;
-            this.mSyncServerStatus = new TimeInterval<ServerStatusB2C>(new ServerStatusB2C(), cfg.TEST_POST_SERVER_INFO_INTERVAL_MS);
+            //this.mSyncServerStatus = new TimeInterval<ServerStatusB2C>(new ServerStatusB2C(), cfg.TEST_POST_SERVER_INFO_INTERVAL_MS);
             this.EnableTimer = true;
         }
 
@@ -171,14 +171,14 @@ namespace CommonAIServer.Node
         protected virtual void OnStarted() { }
         protected virtual void OnStopped() { }
         protected virtual void OnZoneUpdate(bool slowRefresh) { }
-        protected virtual void OnTestUpdate(int intervalMS)
-        {
-            if (mSyncServerStatus.Update(intervalMS))
-            {
-                mSyncServerStatus.Tag.Update(Process.GetCurrentProcess());
-                mPostZoneEvents.Enqueue(mSyncServerStatus.Tag);
-            }
-        }
+        //protected virtual void OnTestUpdate(int intervalMS)
+        //{
+        //    if (mSyncServerStatus.Update(intervalMS))
+        //    {
+        //        mSyncServerStatus.Tag.Update(Process.GetCurrentProcess());
+        //        mPostZoneEvents.Enqueue(mSyncServerStatus.Tag);
+        //    }
+        //}
         protected virtual void OnBeginUpdate() { }
         protected virtual void OnEndUpdate() { }
         protected virtual void OnError(Exception err)
@@ -250,8 +250,8 @@ namespace CommonAIServer.Node
                     stopwatch.Stop();
                     if (mIsRunning && stopwatch.ElapsedMilliseconds > mUpdateIntervalLimit)
                     {
-                        log.WarnFormat("update overload at scene[{0}] : stopwatch time {1} units = {2} spells = {3} items = {4}, UUID = {5}",
-                            mSceneData, stopwatch.ElapsedMilliseconds, mZone.AllUnitsCount, mZone.AllSpellsCount, mZone.AllItemsCount, mZone.UUID);
+                        log.WarnFormat("update overload at scene[{0}] : stopwatch time {1} units = {2} spells = {3} items = {4}, UUID = {5}, {6}",
+                            mSceneData, stopwatch.ElapsedMilliseconds, mZone.AllUnitsCount, mZone.AllSpellsCount, mZone.AllItemsCount, mZone.UUID, mZone.GetInfo());
                     }
 					//else if(mZone != null && slowUpdate & this.mProfileItemsTime < CommonLang.CUtils.localTimeMS && (mZone.AllUnitsCount > 200 || mZone.AllSpellsCount > 200 || mZone.AllItemsCount > 200))
 					//{
@@ -267,7 +267,7 @@ namespace CommonAIServer.Node
         /// <param name="intervalMS"></param>
         public virtual bool ZoneUpdate(int intervalMS)
         {
-			bool slowUpdate = true;
+			bool slowUpdate = false;
 			//从效率出发，Unit位置更新，及时推送到客户端，AOI进出则不需要每帧检测
 			lock (locker)
             {
@@ -281,9 +281,12 @@ namespace CommonAIServer.Node
                     {						
                         try
                         {
-							mTotalUpdateTimes = (mTotalUpdateTimes + 1) % GlobalData.ZONE_UPDATE_SLOW;
-							slowUpdate = (mTotalUpdateTimes == 0);
-							
+							mTotalUpdateTimes++;
+							if(mTotalUpdateTimes > GlobalData.ZONE_UPDATE_SLOW)
+							{
+								mTotalUpdateTimes = 0;
+								slowUpdate = true;
+							}							
 							mZone.Update(intervalMS, slowUpdate);
                         }
                         catch (Exception err)
@@ -296,10 +299,10 @@ namespace CommonAIServer.Node
                             this.OnZoneUpdate(slowUpdate);
                         }
                     }
-                    if (mConfig.TEST)
-                    {
-                        OnTestUpdate(intervalMS);
-                    }
+                    //if (mConfig.TEST)
+                    //{
+                    //    OnTestUpdate(intervalMS);
+                    //}
                     OnEndUpdate();
                     if (mShutDown)
                     {

Common/CommonAIServer/Node/ZoneNode.cs

@@ -319,7 +319,7 @@ namespace CommonAIServer.Node
 		protected void RecordDropItem()
 		{
 			////场景掉落物最大存活时间，用来降低检测频率
-			this.mCheckDropEndTime = CommonLang.CUtils.localTimeMS + 300000;
+			this.mCheckDropEndTime = CommonLang.CUtils.localTimeMS + 120000;
 		}
 
 		public override bool CheckDropItem()

Common/CommonLang/Timing.cs

@@ -424,15 +424,15 @@ namespace CommonLang
 	/// </summary>
 	public class MultiTimeLine
     {
-        private readonly List<TimeExpire<int>> Times = new List<TimeExpire<int>>();
-		private readonly MultiTimeLineRefresh mRefeshNotify;
+        private List<TimeExpire<int>> Times = new List<TimeExpire<int>>();
+		private MultiTimeLineRefresh mRefeshNotify;
 		public MultiTimeLine(MultiTimeLineRefresh notify)
 		{
 			this.mRefeshNotify = notify;
 		}
 
 		public TimeExpire<int> Add(int timeMS)
-        {
+        {			
             TimeExpire<int> ret = new TimeExpire<int>(timeMS);
             Times.Add(ret);			
 			if(this.mRefeshNotify != null)
@@ -459,9 +459,17 @@ namespace CommonLang
                 TimeExpire<int> task = Times[i];
                 task.End();
             }
-            Times.Clear();
+
+			Times.Clear();
         }
-        public bool Update(int intervalMS)
+
+		public void Disposing()
+		{
+			this.Clear();
+			this.mRefeshNotify = null;
+		}
+
+		public bool Update(int intervalMS)
         {
 			for (int i = Times.Count - 1; i >= 0; --i)
 			{
@@ -519,18 +527,18 @@ namespace CommonLang
         }
     }
 
-	public class SystemMultiTimeLine : MultiTimeLine
-	{
-		private long lastUpdateTime = CUtils.CurrentTimeMS;
-		public SystemMultiTimeLine() : base(null) { }
-		public void Update()
-		{
-			long curTime = CUtils.CurrentTimeMS;
-			int interval = (int)(curTime - lastUpdateTime);
-			lastUpdateTime = curTime;
-			base.Update(interval);
-		}
-	}
+	//public class SystemMultiTimeLine : MultiTimeLine
+	//{
+	//	private long lastUpdateTime = CUtils.CurrentTimeMS;
+	//	public SystemMultiTimeLine() : base(null) { }
+	//	public void Update()
+	//	{
+	//		long curTime = CUtils.CurrentTimeMS;
+	//		int interval = (int)(curTime - lastUpdateTime);
+	//		lastUpdateTime = curTime;
+	//		base.Update(interval);
+	//	}
+	//}
 
 	#endregion
 	//--------------------------------------------------------------------------------------------

XmdsCommonServer/Plugin/Units/XmdsInstancePet.cs

@@ -536,9 +536,10 @@ namespace XmdsCommonServer.Plugin.Units
             //只有单位为非碰撞时，才有这个需求//
             if (!this.IntersectObj)
             {
-                if (CUtils.RandomPercent(Parent.RandomN, Templates.CFG.AI_NPC_ATTACK_IDLE_SCATTER_PCT))
+                if (CommonLang.CUtils.localTimeMS > mCheckAttackSpread && CUtils.RandomPercent(Parent.RandomN, Templates.CFG.AI_NPC_ATTACK_IDLE_SCATTER_PCT))
                 {
-                    InstanceUnit block = null;
+					mCheckAttackSpread = CommonLang.CUtils.localTimeMS + Templates.CFG.AI_NPC_ATTACK_IDLE_INTERVAL;
+					InstanceUnit block = null;
                     Parent.ForEachNearObjects(X, Y, (InstanceZoneObject o, ref bool cancel) =>
                     {
                         if ((o != this) && (o is InstanceUnit) && Parent.TouchObject2(this, o))

XmdsServerCS/XmdsServerEdgeJS/Zone/XmdsZoneNode.cs

@@ -353,8 +353,7 @@ namespace XmdsServerEdgeJS.Zone
             int aLevel = 0;
             string aName = "";
             string sceneType = "";
-			int attackID = attacker.Info.ID;
-			try
+			if(attacker != null)
 			{
 				if (attacker is XmdsInstanceMonster)
 				{
@@ -378,12 +377,7 @@ namespace XmdsServerEdgeJS.Zone
 						log.Warn("zone_onUnitDead: 找不到人形攻击者：" + attacker.Info.ID + ", " + zone.GetSceneID());
 					}
 				}
-			}
-			catch(Exception e)
-			{
-				log.Error("zone_onUnitDead catch: " + e);
-				return;
-			}            
+			}         
 			
 			//连斩数计算
 			if(zone is EditorScene)

XmdsVSPlugins/XmdsCommonSkill/Plugin/Skills/Warrior/Warrior_110500.cs

@@ -98,17 +98,17 @@ namespace XmdsCommonSkill.Plugin.Skills.Warrior
 		private float OnHandleHitOther(float damage, XmdsVirtual hitted, XmdsVirtual attacker, AttackSource source,
 			ref XmdsVirtual.AtkResult result, DamageType damageType, GameSkill skill, ref bool isEndDispatch)
 		{
-			//int timeIndex = Math.Min((int)((CommonLang.CUtils.localTimeMS - damageStartTime) / 1000), mIsHit.Length);
-			int timeIndex = (int)((CommonLang.CUtils.localTimeMS - damageStartTime) / 1000);
-			if (timeIndex < 0 || timeIndex >= mIsHit.Length)
-			{
-				if(timeIndex > 7)
-				{
-					log.Error("Warrior_110500获取时间索引异常：" + attacker.mUnit.PlayerUUID + ", " + timeIndex + ", " + attacker.mUnit.Parent.GetSceneID());
-				}
+			int timeIndex = Math.Min((int)((CommonLang.CUtils.localTimeMS - damageStartTime) / 1000), mIsHit.Length-1);
+			//int timeIndex = (int)((CommonLang.CUtils.localTimeMS - damageStartTime) / 1000);
+			//if (timeIndex < 0 || timeIndex >= mIsHit.Length)
+			//{
+			//	if(timeIndex > 7)
+			//	{
+			//		log.Error("Warrior_110500获取时间索引异常：" + attacker.mUnit.PlayerUUID + ", " + timeIndex + ", " + attacker.mUnit.Parent.GetSceneID());
+			//	}
 									
-				return damage;
-			}
+			//	return damage;
+			//}
 
 			if(!mIsHit[timeIndex])
 			{