【优化】日志

XmdsCommonServer/Plugin/CardSkill/Base/JSGCardDataBase.cs

@@ -1,5 +1,6 @@
 using CommonAI.data;
 using CommonAI.Data;
+using CommonLang.Log;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +12,7 @@ namespace XmdsCommonServer.Plugin.Base
 {
 	public abstract class JSGCardDataBase : ICardData
 	{
+		protected static Logger log = LoggerFactory.GetLogger("JSGCardDataBase");
 		public static readonly byte TRIGGER_NUM = 4;
 
 		protected int mCards = 0;
@@ -81,6 +83,13 @@ namespace XmdsCommonServer.Plugin.Base
 				result.type = sameMax <= 1 ? CardType.Max : (CardType)(sameIndex);
 				result.sameNums = cardNum[sameIndex];
 
+				if(result.sameNums  < 1)
+                {
+					log.Warn("AddCard触发卡牌，sameNums异常：" + result.sameNums + ", type: " + result.type);
+					log.Warn("详情:" + cardNum[0] + ", " + cardNum[1] + ", " + cardNum[2] + ", " + cardNum[3]);
+					result.sameNums = 1;
+				}
+
 				//刷一次之前的球信息
 				this.RefreshCardInfo(unit, result.cardData);
 				//刷当前的数据

XmdsCommonServer/Plugin/JSGModule/JSGXmdsHackerModule.cs

@@ -87,12 +87,13 @@ namespace XmdsCommonServer.Plugin.JSGXmdsModule
                         {
                             break;
                         }
-                        
-                        if(attckOriginProp.MaxAttack <= 0)
+
+                        int finalAttack = attacker.MirrorProp.GetFinalAttack(hitter.mUnit.IsMonster);
+                        if (finalAttack <= 0)
                         {
-                            log.Warn("攻击者最大攻击属性异常：" + attacker.mUnit.Parent.GetSceneID() + ", " + attckOriginProp.MaxAttack);
+                            log.Warn("攻击者最大攻击属性异常：" + attacker.mUnit.Parent.GetSceneID() + ", " + finalAttack);
                         }
-                        else if(damage * 1.0f / attckOriginProp.MaxAttack < 2)
+                        else if(damage * 1.0f / finalAttack < 2)
                         {
                             break;
                         }
@@ -101,7 +102,7 @@ namespace XmdsCommonServer.Plugin.JSGXmdsModule
                         XmdsVirtual.FormatLog(LoggerLevel.ERROR, "1. 伤害异常 : {0}, {1}, {2}, 实际伤害值：{3}, 防御信息：{4}, {5}, {6}", attacker.mInfo.Name, hitter.mInfo.Name,
                             FromSkillType, damage, hitter.MirrorProp.Defence, attacker.MirrorProp.IgnoreDefense, attacker.MirrorProp.IgnoreDefensePer);
 
-                        int spellInfo = source.FromSpell == null ? 0 : source.FromSpell.ID;
+                        int spellInfo = (source == null || source.FromSpell == null) ? 0 : source.FromSpell.ID;
                         XmdsVirtual.FormatLog(LoggerLevel.ERROR, "2. 伤害异常 : {0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}",
                             damageBaseValue, DefCoef, damageReduce, addDamage, artifaceMainDamage, spellInfo, attacker.mUnit.PlayerUUID, hitter.mUnit.PlayerUUID);
 

XmdsServerCS/XmdsServerEdgeJS/Zone/ZoneService.cs

@@ -186,7 +186,7 @@ namespace XmdsServerEdgeJS.Zone
 					codec = new BattleCodec(ZoneNodeManager.Templates.Templates);
 
 					//日志定时器
-					logUpdateTimer = new Timer(updateLog, this, 60000, 60000);
+					logUpdateTimer = new Timer(updateLog, this, 120000, 120000);
 				}
 				catch (Exception err)
 				{

XmdsVSPlugins/XmdsCommonSkill/Plugin/Skills/CardSkill/14_XuanWu/CardSkill_1430000.cs

@@ -65,7 +65,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 		{
 			if(buff != null && buff.ID == CARD_XW_IGNORECTRL_HUDUN && !string.IsNullOrEmpty(result) && !BuffState.ENDResult_HuDunBreak.Equals(result))
 			{
-				unit.CardModule.AddCard(s_ValueSet2.GetValue(this.mTriggerLv, this.mTriggerSameNums - 1), true);
+				unit.CardModule.AddCard(s_ValueSet2.GetValue(this.mTriggerLv, Math.Min(0, this.mTriggerSameNums - 1)), true);
 			}
 
 		}

XmdsVSPlugins/XmdsCommonSkill/Plugin/base/JSGPlayerCardSkillBase.cs

@@ -44,6 +44,11 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 			this.mTriggerSameCards = sameNums;
 			player.CardModule.TriggerSkillLoadStrength(skillData, sameNums);
 			this.OnTriggerCardSkill(player, hitter, source, skillData, sameNums);
+
+			if (sameNums < 1)
+			{
+				log.Warn("TriggerCardSkill sames not valid:" + (player == null ? "null" : player.mUnit.PlayerUUID) + ", " + skillData.skillId + ", " + sameNums);
+			}
 		}
 
 		protected override void OnSkillDamagePerEvent(BattleParams param)

test/app.config

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <appSettings>
-    <add key="zoneConfig.assetPath" value="D:\XMDS_TEMP\GameEditors\GameEditor\data" />
-    <add key="logConfig.configFile" value="log4net.config" />
-    <add key="logConfig.serverId" value="csharp-server-11" />
-    <add key="logConfig.outputPath" value="../" />
-    <!-- FINE、DEBUG、TRACE、LOG、INFO、WARNNING、ERROR、FATAL-->
-    <add key="logConfig.level" value="INFO" />
-    <!--add key="iceConfig.host" value="192.168.92.2" /-->
-    <add key="iceConfig.port" value="9910" />
-    <add key="iceConfig.isTraceNetwork" value="true" />
-    <add key="iceConfig.isTraceProtocol" value="true" />
-    <add key="iceConfig.isWarnConnections" value="true" />
-    <add key="fastStreamConfig.port" value="9370" />
-    <add key="game.server.id" value="10004" />
-	<add key="game.bstest" value="true" />
-    <!--add key="gameServer.start.bat" value="E:\work\服务器运行环境\xmds-server\xmds-game.bat" /-->
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
-  </appSettings>
-  <system.web>
-    <membership defaultProvider="ClientAuthenticationMembershipProvider">
-      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
-      </providers>
-    </membership>
-    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
-      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
-      </providers>
-    </roleManager>
-  </system.web>
+	<appSettings>
+		<add key="zoneConfig.assetPath" value="D:\XMDS_TEMP\GameEditors\GameEditor\data" />
+		<add key="logConfig.configFile" value="log4net" />
+		<add key="logConfig.serverId" value="csharp-server-11" />
+		<add key="logConfig.outputPath" value="../log/" />
+		<!-- DEBUG、INFO、WARNNING、ERROR-->
+		<add key="logConfig.level" value="DEBUG" />
+		<!--add key="iceConfig.host" value="192.168.92.2" /-->
+		<add key="iceConfig.port" value="3910" />
+		<add key="iceConfig.isTraceNetwork" value="true" />
+		<add key="iceConfig.isTraceProtocol" value="true" />
+		<add key="iceConfig.isWarnConnections" value="true" />
+		<add key="fastStreamConfig.port" value="3370" />
+		<add key="game.server.id" value="" />
+		<add key="game.bstest" value="true" />
+		<!--add key="gameServer.start.bat" value="E:\work\服务器运行环境\xmds-server\xmds-game.bat" /-->
+		<add key="ClientSettingsProvider.ServiceUri" value="" />
+	</appSettings>
+	<system.web>
+		<membership defaultProvider="ClientAuthenticationMembershipProvider">
+			<providers>
+				<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+			</providers>
+		</membership>
+		<roleManager defaultProvider="ClientRoleProvider" enabled="true">
+			<providers>
+				<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+			</providers>
+		</roleManager>
+	</system.web>
 </configuration>