From dd93f9d6743284738018c8005946c20e6d681c3c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 25 九月 2018 11:34:43 +0800
Subject: [PATCH] 1 优化神兽宝箱时间通知

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |   23 ++++++++++++++++++-----
 1 files changed, 18 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 a19da7a..19da755 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -230,11 +230,8 @@
     multiple = 1
     if addValue:
         #__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint, nuwTotalPoint)
-        actRealmPointInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_RealmPoint, {})# 多倍修行点活动
-        if actRealmPointInfo.get(ShareDefine.ActKey_State) \
-            and curPlayer.GetLV() >= actRealmPointInfo.get(ShareDefine.ActKey_LVLimit, 0):
-            multiple = actRealmPointInfo.get(ShareDefine.ActKey_RealmPointMulti, 1)
-            addValue *= multiple
+        multiple = __GetActionAddPer(curPlayer)
+        addValue *= multiple
         
         realmPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint)
         __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, realmPoint+addValue)
@@ -244,6 +241,19 @@
                        % (activityNum, addPbCnt, addValue, multiple), curPlayer.GetPlayerID())
     return
 
+def __GetActionAddPer(curPlayer):
+    multiple = 1
+    actRealmPointInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_RealmPoint, {})# 多倍修行点活动
+    if not actRealmPointInfo:
+        return multiple
+    if not actRealmPointInfo.get(ShareDefine.ActKey_State):
+        return multiple
+    actRealmPointIpyData = IpyGameDataPY.GetIpyGameData("ActRealmPoint", actRealmPointInfo.get(ShareDefine.ActKey_CfgID, 0))
+    if not actRealmPointIpyData:
+        return multiple
+    if curPlayer.GetLV() < actRealmPointIpyData.GetLVLimit():
+        return multiple
+    return actRealmPointIpyData.GetMultiple()
 
 ## 同步活跃度信息
 #  @param curPlayer
@@ -363,6 +373,9 @@
     activityNum = GetActivityNum(RelatedType_1, dailyID)
     dailyQuestData = IpyGameDataPY.GetIpyGameDataNotLog('DailyQuest', activityNum)
     unLimitCnt = dailyQuestData and not dailyQuestData.GetTotalActiveValue()
+    funcID = dailyQuestData.GetUnLockFuncID() if dailyQuestData else 0
+    if funcID and not GameFuncComm.GetFuncCanUse(curPlayer, funcID):
+        return
         
     updDayTimes = 0
     if dayTimesLimit:

--
Gitblit v1.8.0