From 28cf96828011304cd74254017a1af7a0cc8df0be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 10 九月 2018 10:23:35 +0800
Subject: [PATCH] 3245 【后端】开服限时活动定制; 增加设置开服是星期几的GM命令: SetOpenServerWeekday

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 32ee3d2..58f3f7b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -3480,8 +3480,14 @@
         return
     
     mapID = curPlayer.GetMapID()
+    
+    activityLineID = 0 # 活动线, 默认1线
+    activityMapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 2, {})
+    if mapID in activityMapLineDict:
+        activityLineID = max(0, activityMapLineDict[mapID] - 1)
+        
     mapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 1)
-    if mapID in mapLineDict and changLineID >= mapLineDict[mapID]:
+    if changLineID != activityLineID and mapID in mapLineDict and changLineID >= mapLineDict[mapID]:
         GameWorld.ErrLog("该地图没有开放此线路,无法手动切换!mapID=%s,changLineID=%s,maxLine=%s" 
                          % (mapID, changLineID, mapLineDict[mapID]), curPlayer.GetID())
         return

--
Gitblit v1.8.0