【优化】屏蔽卡牌技能相关代码,解决卡牌技能未配置,战斗服报错

XmdsCommonServer/Plugin/Base/XmdsGlobalData.cs

@@ -23,7 +23,7 @@ namespace XmdsCommonServer.Plugin.Base
 		private static HashMap<int, int> mSkillBreakShieldValue = new HashMap<int, int>();
 
 		//玩家天赋数据，重进游戏保存
-		private static HashMap<string, JSGPlayerCardModule> mPlayerCardModuleMaps = new HashMap<string, JSGPlayerCardModule>();
+		// private static HashMap<string, JSGPlayerCardModule> mPlayerCardModuleMaps = new HashMap<string, JSGPlayerCardModule>();
 
 		public static void PutTalentData(int skillID, XmdsSkillValue data)
 		{
@@ -51,21 +51,21 @@ namespace XmdsCommonServer.Plugin.Base
 			return mSkillBreakShieldValue.Get(skillId);
 		}
 
-		public static JSGPlayerCardModule GetPlayerCardModule(XmdsVirtual player)
-		{
-			if(player == null || string.IsNullOrEmpty(player.mUnit.PlayerUUID))
-			{
-				return null;
-			}
-
-			JSGPlayerCardModule module = mPlayerCardModuleMaps.Get(player.mUnit.PlayerUUID);
-			if(module == null)
-			{
-				module = new JSGPlayerCardModule(player);
-				mPlayerCardModuleMaps.Put(player.mUnit.PlayerUUID, module);
-			}
-
-			return module;
-		}
+		// public static JSGPlayerCardModule GetPlayerCardModule(XmdsVirtual player)
+		// {
+		// 	if(player == null || string.IsNullOrEmpty(player.mUnit.PlayerUUID))
+		// 	{
+		// 		return null;
+		// 	}
+		//
+		// 	JSGPlayerCardModule module = mPlayerCardModuleMaps.Get(player.mUnit.PlayerUUID);
+		// 	if(module == null)
+		// 	{
+		// 		module = new JSGPlayerCardModule(player);
+		// 		mPlayerCardModuleMaps.Put(player.mUnit.PlayerUUID, module);
+		// 	}
+		//
+		// 	return module;
+		// }
 	}
 }

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.Damage.cs

@@ -157,8 +157,8 @@ namespace XmdsCommonServer.Plugin
 			damage = (int)hitter.DispatchHitDamageEvent(damage, attacker, source, ref result, damageType);
 
 			//分发卡牌时间
-			attacker.mCardModule.OnHitOther(hitter, source, damage, damageType);
-			hitter.mCardModule.OnHitDamage(attacker, source, damage, damageType);
+			// attacker.mCardModule.OnHitOther(hitter, source, damage, damageType);
+			// hitter.mCardModule.OnHitDamage(attacker, source, damage, damageType);
 		}
 
         private int CalDamage(XmdsVirtual attacker, XmdsVirtual hitter, AttackSource source, ref AtkResult result)

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.Skills.cs

@@ -80,31 +80,31 @@ namespace XmdsCommonServer.Plugin
 
 		private void CreateCreateCardModule()
 		{
-			if (this.mCardModule == null)
-			{
-				if (this.mUnit.IsPlayer)
-				{
-					this.mCardModule = XmdsGlobalData.GetPlayerCardModule(this);
-				}
-				else if (this.mUnit.IsMonster && this.IsBoss())
-				{
-					this.mCardModule = new JSGMonsterCardModule(this);
-				}
-				else
-				{
-					this.mCardModule = new JSGOtherCardModule();
-				}
-			}
+			// if (this.mCardModule == null)
+			// {
+			// 	if (this.mUnit.IsPlayer)
+			// 	{
+			// 		this.mCardModule = XmdsGlobalData.GetPlayerCardModule(this);
+			// 	}
+			// 	else if (this.mUnit.IsMonster && this.IsBoss())
+			// 	{
+			// 		this.mCardModule = new JSGMonsterCardModule(this);
+			// 	}
+			// 	else
+			// 	{
+			// 		this.mCardModule = new JSGOtherCardModule();
+			// 	}
+			// }
 		}
 
 		public void InitCardModule()
 		{
-			this.mCardModule.Init(this);	
-
-			if(this.mUnit.VisibleInfo != null)
-			{
-				this.mUnit.VisibleInfo.setVisibleCardData(this.mCardModule.GetCardInterface());
-			}			
+			// this.mCardModule.Init(this);	
+			//
+			// if(this.mUnit.VisibleInfo != null)
+			// {
+			// 	this.mUnit.VisibleInfo.setVisibleCardData(this.mCardModule.GetCardInterface());
+			// }			
 		}
 
 		protected void checkSkillData(XmdsUnitData data)
@@ -281,10 +281,10 @@ namespace XmdsCommonServer.Plugin
 						{
 							AbstractSkill skill = this.mSkillHelper.AddActiveSkill(gs, gs.SkillType == XmdsSkillType.normalAtk);
 
-							if (gs.SkillType == XmdsSkillType.cardSkill && this.CardModule != null)
-							{
-								//this.CardModule.InitSkill
-							}
+							// if (gs.SkillType == XmdsSkillType.cardSkill && this.CardModule != null)
+							// {
+							// 	//this.CardModule.InitSkill
+							// }
 						}
 
 						//if (skillCD > 0)

XmdsCommonServer/Plugin/XmdsVirtual/XmdsVirtual.cs

@@ -203,7 +203,7 @@ namespace XmdsCommonServer.Plugin
 					mProp.ServerData.Prop.MoveSpeed = mInfo.MoveSpeedSEC;
 				}
 
-					//当前场景类型.
+				//当前场景类型.
 				InitSceneInfo();
                 //子类初始化.
                 Init(pointLv);
@@ -499,10 +499,10 @@ namespace XmdsCommonServer.Plugin
             event_OnHandleCombatChangeEvent = null;
             mBattlePropChangeEvt = null;
 
-			if(this.mCardModule != null)
-			{
-				this.mCardModule.Dispose();
-			}
+			// if(this.mCardModule != null)
+			// {
+			// 	this.mCardModule.Dispose();
+			// }
 
             ClearRegistEvent();
             mHateSystem.Dispose();
@@ -1576,10 +1576,10 @@ namespace XmdsCommonServer.Plugin
 			//技能刷新.
 			UpdateSkillHelper(intervalMS, slowRefresh);
 
-			if (this.mCardModule != null)
-			{
-				this.mCardModule.Update(intervalMS, slowRefresh);
-			}
+			// if (this.mCardModule != null)
+			// {
+			// 	this.mCardModule.Update(intervalMS, slowRefresh);
+			// }
 		}
 
         public void OnBuffBegin(InstanceUnit.BuffState state, XmdsVirtual sender)

XmdsVSPlugins/XmdsCommonSkill/Plugin/base/JSGPlayerCardSkillBase.cs

@@ -129,7 +129,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 					return;
 				}
 				hitter = hateUnit.Virtual as XmdsVirtual;
-				if (hitter == null)
+				if (hitter == null)                     
 				{
 					log.Error("JSGCardSkillBase unitLaunchSpell launch_null 2: " + spellID + ", CardSkillID: " + this.SkillID);
 					return;