【BUG】MMO-19841: 释放技能范围检测同步改为自动战斗技能范围检测

Common/CommonAI/Zone/EventTrigger/EventAdapter.cs

@@ -328,6 +328,7 @@ namespace CommonAI.Zone.EventTrigger
 		{
 #if JSGProfile
 			int startTick = System.Environment.TickCount;
+#endif
 			if (GlobalData.GAME_BS_TEST)
 			{
 				log.Warn("--调试场景：" + this.ZoneAPI.UUID + ", " + this.ZoneAPI.GetSceneID() + ", 执行动作：" + this.Name);
@@ -336,8 +337,6 @@ namespace CommonAI.Zone.EventTrigger
 			{
 				log.Info("--调试场景：" + this.ZoneAPI.UUID + ", " + this.ZoneAPI.GetSceneID() + ", 执行动作：" + this.Name);
 			}
-#endif
-
 
 			//if(this.Name.Equals("事件重置列表1") || this.Name.Equals("玉重置"))
 			//{

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

@@ -1121,7 +1121,7 @@ namespace CommonAI.Zone.Instance
 				{
 					if (targetUnit != null)
 					{
-						float rg = Owner.GetSkillAttackRange(this.Data);
+						float rg = Owner.GetSkillAttackRange(this.Data, targetUnit);
 						if (Collider.Object_HitBody_TouchRound(targetUnit, Owner.X, Owner.Y, rg))
 						{
 							return true;

Common/CommonAI/Zone/Instance/InstanceUnit.cs

@@ -1319,11 +1319,18 @@ namespace CommonAI.Zone.Instance
         //-----------------------------------------------------------------------------------------------------------------
         #region _SKILL_
         //-----------------------------------------------------------------------------------------------------------------
-        public float GetSkillAttackRange(SkillTemplate skill)
+        public float GetSkillAttackRange(SkillTemplate skill, InstanceUnit targetUnit)
         {
-            return mIsAttackRangeIncludeBodySize ? BodyBlockSize + skill.AttackRange : skill.AttackRange;
-        }
-        public float GetSkillAttackRange(float range)
+            return mIsAttackRangeIncludeBodySize ? (BodyBlockSize + skill.AttackRange + targetUnit.BodyBlockSize) : skill.AttackRange;
+			//return mIsAttackRangeIncludeBodySize ? (BodyBlockSize + skill.AttackRange) : skill.AttackRange;
+		}
+
+		public float GetSkillAttackRange(SkillTemplate skill)
+		{
+			return mIsAttackRangeIncludeBodySize ? (BodyBlockSize + skill.AttackRange) : skill.AttackRange;
+		}
+
+		public float GetSkillAttackRange(float range)
         {
             return (mIsAttackRangeIncludeBodySize ? BodyBlockSize + range : range);
         }

XmdsVSPlugins/XmdsCommonSkill/Plugin/PassiveSkills/Remedy/Remedy_510601.cs

@@ -80,7 +80,7 @@ namespace XmdsCommonSkill.Plugin.PassiveSkills.Remedy
 
 			if(source.Attack == null || source.Attack.Properties == null)
 			{
-				log.Error("Remedy_510601解析伤害技能异常1："+ attacker.mUnit.PlayerUUID);
+				log.Error("Remedy_510601解析伤害技能异常1："+ attacker.mUnit.PlayerUUID + ", " + attacker.mUnit.Parent.GetSceneID());
 				return damage;
 			}
 
@@ -94,7 +94,8 @@ namespace XmdsCommonSkill.Plugin.PassiveSkills.Remedy
 			IntIntData poisonRate = mPlayerCache.GePoisonRateInfo(prop.SkillTemplateID);
 			if(poisonRate == null)
 			{
-				log.Error("Remedy_510601解析伤害技能异常2：" + attacker.mUnit.PlayerUUID + ", " + prop.SkillTemplateID + JSGModule.GetAttackSourceDes(source));
+				log.Error("Remedy_510601解析伤害技能异常2：" + attacker.mUnit.PlayerUUID + ", " + prop.SkillTemplateID + 
+					", " + attacker.mUnit.Parent.GetSceneID() + ", " + JSGModule.GetAttackSourceDes(source));
 				return damage;
 			}
 

test/Program.cs

@@ -44,7 +44,7 @@ namespace test
                 logConfig.serverId = GetConfigAsString("game.server.id");
                 logConfig.outputPath = GetConfigAsString("logConfig.outputPath");
                 logConfig.level = GetConfigLoglevel("logConfig.level");
-				GlobalData.GAME_BS_TEST = GetConfigAsBool("game.bstest");
+				GlobalData.GAME_BS_TEST = GetConfigAsBool("game.bstest") || logConfig.serverId.Equals("10004");
 
 				string socketPort = "socket_" + GetConfigAsString("fastStreamConfig.port");