From 7d7da6a8246577a11c38219eaedb451178769ec8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 14 九月 2018 17:15:52 +0800
Subject: [PATCH] 3494 【后端】开服前14天运营活动定制 3443 【后端】Boss复活活动,时间段支持日期跨天或日期支持重置时间点设置(如0点或5点) 1972 【后端】运营活动支持循环广播

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 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 b10c7de..37d3df5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -246,24 +246,14 @@
     actRealmPointInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_RealmPoint, {})# 多倍修行点活动
     if not actRealmPointInfo:
         return multiple
-    if actRealmPointInfo.get(ShareDefine.ActKey_State) \
-            and curPlayer.GetLV() >= actRealmPointInfo.get(ShareDefine.ActKey_LVLimit, 0):
-        #从开始天的5点到结束天的5点
-        startData = GameWorld.GetDateTimeByStr(actRealmPointInfo[ShareDefine.ActKey_StartDate], ChConfig.TYPE_Time_Format_Day)
-        endData = GameWorld.GetDateTimeByStr(actRealmPointInfo[ShareDefine.ActKey_EndDate], ChConfig.TYPE_Time_Format_Day)
-        curTime = GameWorld.GetCurrentTime()
-        
-        curHour = GameWorld.GetCurrentTime().hour
-        if curTime.year == startData.year and curTime.month == startData.month and curTime.day == startData.day:
-            if 0<=curHour<5:
-                #GameWorld.DebugLog('多倍修行点开始天的0-5点不生效')
-                return multiple
-        if curTime.year == endData.year and curTime.month == endData.month and curTime.day == endData.day:
-            if curHour >=5:
-                #GameWorld.DebugLog('多倍修行点结束天的5点之后不生效')
-                return multiple
-        multiple = actRealmPointInfo.get(ShareDefine.ActKey_RealmPointMulti, 1)
-    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

--
Gitblit v1.8.0