【优化】内部优化

Common/CommonAI/CommonAI.csproj

@@ -40,7 +40,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\Library\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PATH_NO_SQRT;JSGProfile;JSG_DMG_LOG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;PATH_NO_SQRT;JSG_DMG_LOG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

Common/CommonAI/Zone/EventTrigger/EventAdapter.cs

@@ -386,7 +386,7 @@ namespace CommonAI.Zone.EventTrigger
 			{
 				log.WarnFormat("scene event [{0}] at scene[{1}] -> event[{2}] : stopwatch time {3} > {4}ms",
 					function,
-					(ZoneAPI as EditorScene).Data.ToString(),
+					(ZoneAPI as EditorScene).Data.ToString() + "-" + ZoneAPI.UUID,
 					mData.EventName,
 					stopwatch.ElapsedMilliseconds,
 					EXPECT_TEST_AND_DO_ACTION_TIME_MS);

Common/CommonAI/ZoneServer/JSGModule/JSGModule.cs

@@ -27,7 +27,7 @@ namespace CommonAI.ZoneServer.JSGModule
 			}
 			else
 			{
-				return 12;
+				return 10;
 			}
 		}
 

XmdsCommonServer/Plugin/Scene/XmdsServerScene.cs

@@ -53,8 +53,9 @@ namespace XmdsCommonServer.Plugin.Scene
 		}
 		protected override void InitTerrain(SceneData data, int spaceDiv, out ZoneManhattanMap terrain_data, out AstarManhattan path_finder, out ManhattanMapAreaGenerator area_gen)
         {
-            if ((data.Properties as XmdsSceneProperties).ServerSceneData.UsespaceDiv) { spaceDiv = 11; }
-            else { spaceDiv = 0; }
+            //if ((data.Properties as XmdsSceneProperties).ServerSceneData.UsespaceDiv) { spaceDiv = 11; }
+            //else { spaceDiv = 0; }
+
             base.InitTerrain(data, spaceDiv, out terrain_data, out path_finder, out area_gen);
         }
         //         private static int GetSpaceDiv(SceneData data)

XmdsCommonServer/Plugin/Units/XmdsInstancePlayer.cs

@@ -906,6 +906,8 @@ namespace XmdsCommonServer.Plugin.Units
             base.doGuard(act);
         }
 
+		//private static List<int> s_RobotScenID = new List<int>() { 21202, 11001, 11002, 11004,11006, 21202,11021,11022,11047,11048,11049,
+		//	11050,11052,11053,11056,11061,11064, 11019,11065,11068,11071, 11072,11074,12116,12119, 11012,11015,11019,11024,11029,11045};
         /// <summary>
         /// 解析挂机指令，新增指令头，告知是定点挂机还是全图游走.
         /// 第0位 map/point:
@@ -923,7 +925,7 @@ namespace XmdsCommonServer.Plugin.Units
 # if OPNE_JSG_AI_TOOLS
 			if (this.IsRobot)
 			{
-				this.mGuardSearchRange = 100;
+				this.mGuardSearchRange = 50;
 				reason = CommonAI.XmdsConstConfig.AUTO_GUARD_MODE_MAP;
 			}
 #endif

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.Skills.cs

@@ -1761,14 +1761,6 @@ namespace XmdsCommonServer.Plugin
 			return false;
 		}
 
-		public virtual void Talent_MarkValid(bool isValid)
-		{
-			if (this.mPlayerCache != null)
-			{
-				this.mPlayerCache.MarkValid(isValid);
-			}
-		}
-
 		//---------------------------------------------------------------------
 
 		#region BUFF跨场景.

XmdsServerCS/XmdsServerEdgeJS/XmdsPlayerUtil.cs

@@ -276,14 +276,14 @@ namespace XmdsServerEdgeJS
                 prop.SkillDamageAdd = (input.SkillDamage != null) ? (int)input.SkillDamage : 0;
                 prop.AttackSpeed = (input.AttackSpeed != null) ? (int)input.AttackSpeed : 0;
                 prop.ControlUp = (input.ControlUp != null) ? (int)input.ControlUp : 0;
-				if(prop.AttackSpeed != 0 && (prop.AttackSpeed > 100000 || prop.AttackSpeed < 1000))
-				{
-					log.Warn("玩家/宠物攻速确定是认真的？ ： " + prop.AttackSpeed);
-					//prop.AttackSpeed = 10000;
-				}
-
-                //元素攻击 & 防御
-                prop.ArtifactAttack[(int)ArtifactType.Gold] = (input.GoldAttack != null) ? (int)input.GoldAttack : 0;
+				//if (prop.AttackSpeed != 0 && (prop.AttackSpeed > 100000 || prop.AttackSpeed < 1000))
+				//{
+				//	log.Warn("玩家/宠物攻速确定是认真的？ ： " + prop.AttackSpeed);
+				//	prop.AttackSpeed = 10000;
+				//}
+
+				//元素攻击 & 防御
+				prop.ArtifactAttack[(int)ArtifactType.Gold] = (input.GoldAttack != null) ? (int)input.GoldAttack : 0;
                 prop.ArtifactAttack[(int)ArtifactType.Wood] = (input.WoodAttack != null) ? (int)input.WoodAttack : 0;
                 prop.ArtifactAttack[(int)ArtifactType.Water] = (input.WaterAttack != null) ? (int)input.WaterAttack : 0;
                 prop.ArtifactAttack[(int)ArtifactType.Fire] = (input.FireAttack != null) ? (int)input.FireAttack : 0;

XmdsServerCS/XmdsServerEdgeJS/Zone/XmdsZoneNode.cs

@@ -353,28 +353,37 @@ namespace XmdsServerEdgeJS.Zone
             int aLevel = 0;
             string aName = "";
             string sceneType = "";
-            if (attacker is XmdsInstanceMonster)
-            {
-                MonsterVisibleDataB2C mvd = attacker.GenSyncUnitInfo().VisibleInfo as MonsterVisibleDataB2C;
-                sceneType = (attacker.Virtual as XmdsVirtual).GetCurSceneType();
-
-                aID = attacker.Info.TemplateID;
-                aQColor = (int)mvd.Qcolor;
-                aName = mvd.DisplayName;
-                aLevel = attacker.GenSyncUnitInfo().Level;
-            }
-			else if(attacker.IsPlayerUnit && obj.IsMonster)
+			int attackID = attacker.Info.ID;
+			try
 			{
-				InstanceUnit attackerUnit = attacker.IsPet ? attacker.Virtual.GetMasterUnit() : attacker;
-				if(attackerUnit != null)
+				if (attacker is XmdsInstanceMonster)
 				{
-					attackerUnit.Virtual.DispatchKillOtherEvent(attackerUnit.Virtual, obj.Virtual);
+					MonsterVisibleDataB2C mvd = attacker.GenSyncUnitInfo().VisibleInfo as MonsterVisibleDataB2C;
+					sceneType = (attacker.Virtual as XmdsVirtual).GetCurSceneType();
+
+					aID = attacker.Info.TemplateID;
+					aQColor = (int)mvd.Qcolor;
+					aName = mvd.DisplayName;
+					aLevel = attacker.GenSyncUnitInfo().Level;
 				}
-				else
+				else if (attacker.IsPlayerUnit && obj.IsMonster)
 				{
-					log.Warn("zone_onUnitDead: 找不到人形攻击者：" + attacker.Info.ID + ", " + zone.GetSceneID());
+					InstanceUnit attackerUnit = attacker.IsPet ? attacker.Virtual.GetMasterUnit() : attacker;
+					if (attackerUnit != null)
+					{
+						attackerUnit.Virtual.DispatchKillOtherEvent(attackerUnit.Virtual, obj.Virtual);
+					}
+					else
+					{
+						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/PassiveSkills/Remedy/Remedy_510601.cs

@@ -95,7 +95,7 @@ namespace XmdsCommonSkill.Plugin.PassiveSkills.Remedy
 			if(poisonRate == null)
 			{
 				log.Error("Remedy_510601解析伤害技能异常2：" + attacker.mUnit.PlayerUUID + ", " + prop.SkillTemplateID + 
-					", " + attacker.mUnit.Parent.GetSceneID() + ", " + JSGModule.GetAttackSourceDes(source));
+					", " + attacker.mUnit.Parent.GetSceneID() + ", " + attacker.SkillHelper.GetAllSkills());
 				return damage;
 			}
 

XmdsVSPlugins/XmdsCommonSkill/Plugin/base/PlayerCache/PlayerCache_Remedy.cs

@@ -88,10 +88,10 @@ namespace XmdsCommonSkill.Plugin.Skills
 		{
 			base.MarkValid(isValid);
 
-			if (!isValid)
-			{
-				mPoisonRate.Clear();
-			}
+			//if (!isValid)
+			//{
+			//	mPoisonRate.Clear();
+			//}
 			this.mPoisonValidTime = 0;
 			this.mPoisonBreakDmgAdd = 0;
 			this.mPoisonBreakFullDmgAdd = 0;