From b78aa5487fb989a8dd373ce4b320a15087aeedbc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 29 十二月 2018 03:47:49 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(修复非匹配期间无法加日常活跃修行bug)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index 0e8a159..90264dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -369,9 +369,11 @@
 #        return
     
     # 由GameServer决定
-    if not GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % dailyID):
-        GameWorld.DebugLog("日常活动未开启!dailyID=%s" % dailyID)
-        return
+    # 目前跨服PK暂不需要判断,因为跨服PK次数结算在本服,玩家可能上次未结算离线,等非匹配期间上线,也需要加上,所以暂不判断
+    if dailyID not in [ShareDefine.DailyActionID_CrossReamPK]:
+        if not GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % dailyID):
+            GameWorld.DebugLog("日常活动未开启!dailyID=%s" % dailyID)
+            return
     
     dayTimesLimit = GetMaxDayTimes(ipyData)#ipyData.GetDayTimes()
     weekTimesLimit = ipyData.GetWeekTimes()

--
Gitblit v1.8.0