【优化】MMO-20316：山海残卷增加珠排除无伤害技能，治疗技能

XmdsCommonServer/Plugin/Base/JSGXmdsComInterface.cs

@@ -18,8 +18,8 @@ namespace XmdsCommon.JSGModule.Interface
 	{
 		void Init(XmdsVirtual owner);
 		void Update(int interval, bool slowRefresh);
-		void OnHitOther(XmdsVirtual hitter, AttackSource source);					// 攻击其他人
-		void OnHitDamage(XmdsVirtual attacker, AttackSource source);                 // 收到攻击
+		void OnHitOther(XmdsVirtual hitter, AttackSource source, int damage, DamageType damageType);					// 攻击其他人
+		void OnHitDamage(XmdsVirtual attacker, AttackSource source, int damage, DamageType damageType);                 // 收到攻击
 		void Dispose();
 
 		//技能数据变更

XmdsCommonServer/Plugin/CardSkill/Base/JSGCardModuleBase.cs

@@ -65,8 +65,8 @@ namespace XmdsCommonServer.Plugin.CardSkill
 			this.mIsInitOK = this.OnInit(owner, notifyClient);			
 		}
 
-		public virtual void OnHitDamage(XmdsVirtual attacker, AttackSource source) { }
-		public virtual void OnHitOther(XmdsVirtual hitter, AttackSource source) { }
+		public virtual void OnHitDamage(XmdsVirtual attacker, AttackSource source, int damage, DamageType damageType) { }
+		public virtual void OnHitOther(XmdsVirtual hitter, AttackSource source, int damage, DamageType damageType) { }
 		public virtual void OnSkillDataChange(GameSkill info) { }
 		public virtual void OnInitOver(GameSkill info, IJSGCardSkill cardSkill) { }
 		public virtual void TriggerSkillLoadStrength(CardSkillData skillData, int sameNums) { }

XmdsCommonServer/Plugin/CardSkill/Def/JSGOtherCardModule.cs

@@ -67,12 +67,12 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 			//throw new NotImplementedException();
 		}
 
-		void IJSCardSkillModule.OnHitDamage(XmdsVirtual attacker, AttackSource source)
+		void IJSCardSkillModule.OnHitDamage(XmdsVirtual attacker, AttackSource source, int damage, DamageType damageType)
 		{
 			//throw new NotImplementedException();
 		}
 
-		void IJSCardSkillModule.OnHitOther(XmdsVirtual hitter, AttackSource source)
+		void IJSCardSkillModule.OnHitOther(XmdsVirtual hitter, AttackSource source, int damage, DamageType damageType)
 		{
 			//throw new NotImplementedException();
 		}

XmdsCommonServer/Plugin/CardSkill/MonsterCardSkill/JSGMonsterCardModule.cs

@@ -64,7 +64,7 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 			}			
 		}
 
-		public override void OnHitDamage(XmdsVirtual attacker, AttackSource source)
+		public override void OnHitDamage(XmdsVirtual attacker, AttackSource source, int damage, DamageType damageType)
 		{
 			if(mTriggerSkill == null || attacker == null || this.mOwner == null || !attacker.IsPlayerUnit()  || source.FromSkillType != XmdsSkillType.cardSkill
 				|| mNextGetCardTime > CommonLang.CUtils.localTimeMS || !JSGModule.RandomPrecent(this.mCardCfg.rate))

XmdsCommonServer/Plugin/CardSkill/PlayerCardSkill/JSGPlayerCardModule.cs

@@ -160,9 +160,9 @@ namespace XmdsCommonSkill.Plugin.CardSkill
 		}
 
 		//击中某一单位
-		public override void OnHitOther(XmdsVirtual hitter, AttackSource source)
+		public override void OnHitOther(XmdsVirtual hitter, AttackSource source, int damage, DamageType damageType)
 		{
-			if (!this.mIsFuncOpen)
+			if (!this.mIsFuncOpen || (damage <= 0))
 			{
 				return;
 			}

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);
-			hitter.mCardModule.OnHitDamage(attacker, source);
+			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)