From 2bf6b92988d09bda4bfd0170b052526a446d2fd2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 21 九月 2018 10:25:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FriendSystem/MailAllModel.cs | 7 +++++++
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs | 2 +-
Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
index e891d7d..0bf7a49 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -57,7 +57,7 @@
StatusMgr.Instance.GetBuffIds(vNetData.ObjID, ref _skill.cacheBuffList);
_skill.OnRecv_SkillCast();
- if (BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))
+ if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))
{
// 杩欓噷鎾斁閰嶇疆鐨勬妧鑳界壒鏁�
if (_skill.skillInfo.config.EffectName > 0)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
index c422b92..4aaea9d 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
@@ -41,7 +41,7 @@
}
}
- if (BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))
+ if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))
{
if (_skill.skillInfo.config.EffectName != 0)
{
diff --git a/System/FriendSystem/MailAllModel.cs b/System/FriendSystem/MailAllModel.cs
index 938afba..61414ad 100644
--- a/System/FriendSystem/MailAllModel.cs
+++ b/System/FriendSystem/MailAllModel.cs
@@ -475,8 +475,10 @@
}
StringBuilder todayDailySB = new StringBuilder();
+ List<int> dailyIdlist = new List<int>();
public string GetTodayDailyNotify(DateTime getTime)
{
+ dailyIdlist.Clear();
todayDailySB.Length = 0;
var dayOfWeek = (int)getTime.DayOfWeek;
var quests = dailyModel.GetQuestByWeekTime(dayOfWeek % 7);
@@ -487,6 +489,11 @@
int openTime = openTimelist[i];
for (int j = 0;j < quests[openTime].Count; j++)
{
+ if(dailyIdlist.Contains(quests[openTime][j]))
+ {
+ continue;
+ }
+ dailyIdlist.Add(quests[openTime][j]);
DailyQuestOpenTime dailyQuestOpenTime;
dailyModel.TryGetOpenTime(quests[openTime][j], out dailyQuestOpenTime);
if (dailyQuestOpenTime.IsValidServerOpenTime())
--
Gitblit v1.8.0