From 9a4c438bc7d995bd24fdd484f8d6ddd9e66bd4bf Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 20 四月 2019 15:18:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
index 8e5fdd4..286a645 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
@@ -133,7 +133,8 @@
return
zoneID = zoneIpyData.GetZoneID()
- copyMapPlayerMax = 0 # 0为不限制人数，默认不限制
+ dynamicLineMaxPlayerCountDict = IpyGameDataPY.GetFuncEvalCfg("CrossDynamicLineMap", 2)
+ copyMapPlayerMax = dynamicLineMaxPlayerCountDict.get(mapID, 0) # 0为不限制人数，默认不限制
if mapID == ChConfig.Def_FBMapID_CrossDemonKing:
bossID = msgData["BossID"]
if not CrossBoss.GetCrossBossIsAliveOrCanReborn(zoneID, bossID):
@@ -141,7 +142,7 @@
return
elif mapID in [ChConfig.Def_FBMapID_CrossGrasslandLing, ChConfig.Def_FBMapID_CrossGrasslandXian]:
- copyMapPlayerMax = 10
+ pass
else:
return
@@ -163,20 +164,11 @@
playerIDList, dataMapID, mapID, copyMapID, funcLineID = msgData
- dynamicLineMapDict = IpyGameDataPY.GetFuncEvalCfg("CrossDynamicLineMap", 1)
- if dataMapID not in dynamicLineMapDict:
- return
- mapPosInfo = dynamicLineMapDict[dataMapID][0]
- posX, posY = mapPosInfo[:2]
- dist = mapPosInfo[2] if len(mapPosInfo) > 2 else 0
- if dist > 0:
- posX, posY = random.randint(posX - dist, posX + dist), random.randint(posY - dist, posY + dist)
-
for playerID in playerIDList:
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
if not curPlayer:
continue
- CrossRealmPlayer.SendCrossRealmReg(curPlayer, dataMapID, mapID, dataMapID, copyMapID, posX, posY, lineID=funcLineID)
+ CrossRealmPlayer.SendCrossRealmReg(curPlayer, dataMapID, mapID, dataMapID, copyMapID, lineID=funcLineID)
return
@@ -225,9 +217,7 @@
return realMapID, copyMapID, openState
dynamicLineMapDict = IpyGameDataPY.GetFuncEvalCfg("CrossDynamicLineMap", 1)
- if mapID not in dynamicLineMapDict:
- return
- dynamicMapIDList = dynamicLineMapDict[mapID][1]
+ dynamicMapIDList = dynamicLineMapDict.get(mapID, [mapID])
openMapID, openCopyMapID = 0, 0
for realMapID in dynamicMapIDList:
--
Gitblit v1.8.0