【优化】日志

Common/CommonAI/Zone/Instance/InstanceZone.cs

@@ -318,10 +318,19 @@ namespace CommonAI.Zone.Instance
         {
 			if(mSendingEvents == null)
 			{
-				log.Warn("queueObjectEvent exception： " + this.GetSceneID() + ", Players: " + this.AllPlayersCount + ", Items: "
+				if(mObjects == null)
+				{
+					log.Warn("queueObjectEvent exception1： " + this.GetSceneID() + ", mObjects null, " + this.UUID + ", " + evt.MessageID);
+				}
+				else
+				{
+					log.Warn("queueObjectEvent exception2： " + this.GetSceneID() + ", Players: " + this.AllPlayersCount + ", Items: "
 					+ this.AllItemsCount + ", Units: " + this.AllUnitsCount + ", " + this.UUID + ", " + evt.MessageID);
+				}
+				
 				return;
 			}
+
             if (obj.ID == 0)
                 return;
             if (!force && !obj.IsInZone)

XmdsCommonServer/Plugin/CardSkill/PlayerCardSkill/JSGCardInterface.cs

@@ -203,7 +203,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 		public CardType type;
 		public int skillId;
 		public short skilLv;
-		public short weight;
+		public int weight;
 		public DamageType dmgType = DamageType.None;			//技能是否有伤害
 
 		public CardSkillData(int skillId, CardType type)

XmdsCommonServer/Plugin/CardSkill/PlayerCardSkill/JSGCardRateModule.cs

@@ -89,14 +89,14 @@ namespace CommonAI.ZoneServer.JSGModule
 				}
 				else
 				{
-					short finalWeightChg = GetWeightFinalValue(playerCardSkill, data.cardType, data);
+					int finalWeightChg = GetWeightFinalValue(playerCardSkill, data.cardType, data);
 					if (data.chgType == CardRateChgType.Add)
 					{
 						mCardWeightExt.AddWeight(data.cardType, finalWeightChg);
 					}
 					else if (data.chgType == CardRateChgType.Del)
 					{
-						mCardWeightExt.AddWeight(data.cardType, (short)-finalWeightChg);
+						mCardWeightExt.AddWeight(data.cardType, -finalWeightChg);
 					}
 					else if (data.chgType == CardRateChgType.Set)
 					{
@@ -124,11 +124,11 @@ namespace CommonAI.ZoneServer.JSGModule
 		}
 
 		/** 获取牌珠实际权重变更值 */
-		private short GetWeightFinalValue(CardSkillData[] playerCardSkill, CardType cardType, CardRateChgData data)
+		private int GetWeightFinalValue(CardSkillData[] playerCardSkill, CardType cardType, CardRateChgData data)
 		{
 			if (data.isPrecent)
 			{
-				return (short)(CUtils.CastInt(data.value * XmdsUnitProp.PER * playerCardSkill[(int)cardType].weight));
+				return CUtils.CastInt(data.value * XmdsUnitProp.PER * playerCardSkill[(int)cardType].weight);
 			}
 
 			return data.value;
@@ -140,7 +140,7 @@ namespace CommonAI.ZoneServer.JSGModule
 	{
 		protected static Logger log = LoggerFactory.GetLogger("CardWeigthExt");
 
-		protected short[] cardWeight = new short[(int)CardType.Max+1];
+		protected int[] cardWeight = new int[(int)CardType.Max+1];
 		private bool[] weightFlag = new bool[(int)CardType.Max+1];			// 是否设置概率
 		private int [] doubleRate = new int[(int)CardType.Max+1];			// 双球概率
 
@@ -164,7 +164,7 @@ namespace CommonAI.ZoneServer.JSGModule
 			return weightFlag[(int)type];
 		}
 
-		public void AddWeight(CardType type, short value)
+		public void AddWeight(CardType type, int value)
 		{
 			this.cardWeight[(int)type] += value;
 		}
@@ -174,7 +174,7 @@ namespace CommonAI.ZoneServer.JSGModule
 		//	return this.cardWeight[(int)type];
 		//}
 
-		public void SetWeight(CardType type, short value)
+		public void SetWeight(CardType type, int value)
 		{
 			this.cardWeight[(int)type] = value;
 			this.weightFlag[(int)type] = true;

XmdsCommonServer/Plugin/CardSkill/PlayerCardSkill/JSGPlayerCardModule.cs

@@ -121,7 +121,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 			}
 
 			cardSkillData.skilLv = (short)gs.SkillLevel;
-			cardSkillData.weight = (short)gs.TalentSkillLevel1;
+			cardSkillData.weight = gs.TalentSkillLevel1;
 			return true;
 		}
 
@@ -226,7 +226,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 				if(data != null && data.skillId == info.SkillID)
 				{
 					data.skilLv = (short)info.SkillLevel;
-					data.weight = (short)info.TalentSkillLevel1;
+					data.weight = info.TalentSkillLevel1;
 					break;
 				}
 			}

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.Event.cs

@@ -1183,7 +1183,8 @@ namespace XmdsCommonServer.Plugin
 					{
 						int buffID = source.FromBuff == null ? 0 : source.FromBuff.ID;
 						int spellID = source.FromSpell == null ? 0 : source.FromSpell.ID;
-						log.Warn("DispatchHitDamageEvent监听改变: " + i + ", " + mOnHitDamageLt.Count + ", BuffID: " + buffID + ", spellID: " + spellID);
+						log.Warn("DispatchHitDamageEvent监听改变: " + i + ", " + mOnHitDamageLt.Count + ", BuffID: " + buffID + ", spellID: " + spellID + ", "
+							+ this.mUnit.PlayerUUID);
 						break;
 					}
 

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.Skills.cs

@@ -1218,7 +1218,7 @@ namespace XmdsCommonServer.Plugin
 					ret = XmdsBattleSkill.GetPassiveSkill(gs.SkillID);
 					if (ret == null)
 					{
-						throw new Exception("技能脚本未找到：" + this.mOwner.mUnit.PlayerUUID);
+						throw new Exception("被动技能脚本未找到：" + this.mOwner.mUnit.PlayerUUID);
 					}
 					else
 					{

XmdsCommonServer/XLS/XLSSkillCfgLoader.cs

@@ -174,6 +174,7 @@ namespace XmdsCommonServer.XLS
         {
 
             XmdsSkillData result = null;
+			int randIndex = 0;
             try
             {
                 if (this.bossComPassiveSkill.Length <= 0)
@@ -184,8 +185,8 @@ namespace XmdsCommonServer.XLS
                 int ntestTimes = 10;
                 while(--ntestTimes >= 0)
                 {
-                    int index = random.Next(this.bossComPassiveSkill.Length);
-                    result = this.bossComPassiveSkill[index];
+					randIndex = random.Next(this.bossComPassiveSkill.Length);
+                    result = this.bossComPassiveSkill[randIndex];
 
                     foreach(XmdsSkillData temp in hasList)
                     {
@@ -207,7 +208,8 @@ namespace XmdsCommonServer.XLS
             }
             catch (Exception e)
             {
-                log.Error("GetBossRandomPassiveSkill catch - " +  (hasList == null ? "null" : ("序列：" + hasList.Length)) + ", e: " + e);
+                log.Error("GetBossRandomPassiveSkill catch - " +  (hasList == null ? "null" : ("序列：" + hasList.Length)) + ", 技能数：" +
+					this.bossComPassiveSkill.Length + ", 随机index: " + randIndex +  ", e: " + e);
                 result = null;
             }