From 7f2015aabab2671946a7f034403d09be45f4d39d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 九月 2018 17:53:22 +0800
Subject: [PATCH] Fix: 修复活动线无法手动切换的bug;

---
 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 c63b2a6..a47da80 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -3479,8 +3479,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