From 3caca95a705f26b0d40a8ae88093c8e2c8ca4f6f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 19 一月 2019 11:55:46 +0800
Subject: [PATCH] 2908 【1.5.0】【1.5.100】组队进入跨服boss打boss异常情况
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 33bb1cc..90264dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -79,6 +79,8 @@
__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint, 0)
# 重置领奖记录
__SetPDictValue(curPlayer, ChConfig.Def_PDict_ActivityAwardRecord, 0)
+ #重置额外获得修行点数
+ __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_ExtraRealmPoint, 0)
#重新计算奖励阶段
__CalcAwardStage(curPlayer)
#重置可领取修行点，未领取的发邮件
@@ -242,8 +244,8 @@
__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, realmPoint+addValue)
SyncDailyActivityInfo(curPlayer)
- GameWorld.DebugLog("增加活跃度任务次数，activityNum=%s,addPbCnt=%s,addValue=%s, multiple=%s, addExtraPoint=%s,curExtraPoint=%s"
- % (activityNum, addPbCnt, addValue, multiple, addExtraPoint, curExtraPoint), curPlayer.GetPlayerID())
+ GameWorld.DebugLog("增加活跃度任务次数，activityNum=%s,addPbCnt=%s,addValue=%s, multiple=%s, addExtraPoint=%s,curExtraPoint=%s"
+ % (activityNum, addPbCnt, addValue, multiple, addExtraPoint, curExtraPoint), curPlayer.GetPlayerID())
return
def __GetActionAddPer(curPlayer):
@@ -367,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