From 28bb89eb2ee8558b1529df973347803088cef88e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 19 四月 2019 15:10:27 +0800
Subject: [PATCH] 6374 境界提示增加参数

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py |   83 ++++++++++++++++++++++++++++++-----------
 1 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 2ae44ba..c29a919 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,7 +28,6 @@
 import NetPackCommon
 import IpyGameDataPY
 import PyGameData
-
 # 获取玩家跨服服务器上的名字
 #===============================================================================
 # def GetCrossPlayerName(curPlayer):
@@ -46,7 +45,7 @@
 # 获取玩家跨服服务器上的名字
 def GetCrossPlayerName(curPlayer):
     # 通过游戏账号中的平台标志获取名称,目前为spid
-    playerName = curPlayer.GetPlayerName()
+    playerName = curPlayer.GetName()
     
     opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer), 
                                            GameWorld.GetPlayerServerSID(curPlayer)))
@@ -56,36 +55,70 @@
     
     return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
 
-def GetServerCrossZoneIpyData(mapID, serverGroupID=0):
-    ## 获取本服对应跨服玩法分区地图信息
-    if mapID not in ChConfig.Def_CrossZoneTableName:
+def GetCrossZoneIpyDataByZoneID(mapID, zoneID):
+    ## 获取跨服分区
+    zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+    crossZoneName = GameWorld.GetCrossZoneName()
+    return IpyGameDataPY.GetIpyGameData(zoneTypeName, crossZoneName, zoneID)
+
+def GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID):
+    ## 获取跨服分区
+    zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+    crossZoneName = GameWorld.GetCrossZoneName()
+    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+    if not ipyDataList:
         return
-    if not serverGroupID:
-        serverGroupID = GameWorld.GetServerGroupID()
-        
-    tableName = ChConfig.Def_CrossZoneTableName[mapID]
-    ipyDataMgr = IpyGameDataPY.IPY_Data()
-    if not hasattr(ipyDataMgr, "Get%sCount" % tableName):
-        return
-    
-    for i in xrange(getattr(ipyDataMgr, "Get%sCount" % tableName)()):
-        ipyData = getattr(ipyDataMgr, "Get%sByIndex" % tableName)(i)
+    for ipyData in ipyDataList:
         serverGroupIDList = ipyData.GetServerGroupIDList()
         for serverGroupIDInfo in serverGroupIDList:
             if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \
                 or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID):
                 return ipyData
+    GameWorld.ErrLog("没有找到跨服玩法对应分区! mapID=%s, serverGroupID=%s, zoneTypeName=%s" % (mapID, serverGroupID, zoneTypeName))
     return
+
+def GetCrossZoneIpyDataListByServerGroupID(mapID, serverGroupID):
+    ## 获取跨服常规分区列表
+    if serverGroupID:
+        ipyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)
+        if not ipyData:
+            return
+        ipyDataList = [ipyData]
+    else:
+        crossZoneName = GameWorld.GetCrossZoneName()
+        zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+        ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+    return ipyDataList
+
+def GetServerCrossZoneMapIpyData(mapID, serverGroupID=0):
+    ## 获取本服对应跨服玩法分区地图信息
+    if mapID not in ChConfig.Def_CrossZoneMapTableName:
+        return
+    tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
+    if not serverGroupID:
+        if GameWorld.IsCrossServer():
+            return
+        serverGroupID = GameWorld.GetServerGroupID()
+    zoneIpyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)
+    if not zoneIpyData:
+        return
+    zoneID = zoneIpyData.GetZoneID()
+    return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":zoneID})
 
 def IsCrossServerOpen():
     ## 跨服服务器是否开放中
     return GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
 
-def ClientServerMsg_ServerInitOK(serverGroupID):
-    ## 子服连接成功
+def Sync_CrossCommInitDataToClientServer(serverGroupID=0):
+    ''' 同步跨服常规通用数据到子服务器
+    @param serverGroupID: 为0时同步所有子服
+    '''
+    
     isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
-    GameWorld.Log("子服连接成功,通知当前跨服服务器状态: isOpen=%s" % isOpen)
-    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen}, [serverGroupID])
+    crossZoneName = GameWorld.GetCrossZoneName()
+    GameWorld.Log("通知当前跨服服务器状态: isOpen=%s,crossZoneName=%s,syncServerGroupID=%s" % (isOpen, crossZoneName, serverGroupID))
+    serverGroupIDList = [serverGroupID] if serverGroupID else []
+    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen, "crossZoneName":crossZoneName}, serverGroupIDList)
     return
 
 def DoChangeCrossServerState(isOpen):
@@ -110,6 +143,10 @@
 
 def CrossServerMsg_CrossServerState(msgData):
     ## 子服收到跨服服务器状态变更,子服不存DB,默认跨服维护中,连接跨服成功后由跨服同步状态直接更新到字典即可,没连上就默认维护中
+    if "crossZoneName" in msgData:
+        PyGameData.g_crossZoneName = msgData["crossZoneName"]
+        GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossZoneName, PyGameData.g_crossZoneName)
+        
     isOpen = msgData["isOpen"]
     isOpen = 1 if isOpen else 0
     GameWorld.Log("收到跨服服务器状态变更: 是否正常开放中=%s" % isOpen)
@@ -123,6 +160,7 @@
                 continue
             PlayerControl.SetCrossMapID(curPlayer, 0)
             
+    GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen)
     # 通知地图
     GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
     return
@@ -155,12 +193,12 @@
     PlayerControl.SetCrossMapID(curPlayer, 0)
     return
 
-def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0, lineID=0):
     # 发送跨服账号注册上传数据
     
     # 设置上传数据的活动类型
     curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
-    sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY])
+    sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY, lineID])
     curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))            
     GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s" 
                   % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
@@ -316,7 +354,6 @@
     sendPack.ItemDataSize = len(sendPack.ItemData)
     sendPack.PlusData = PlusData
     sendPack.PlusDataSize = len(sendPack.PlusData)
-    sendPack.CrossPlayer = 1
     NetPackCommon.SendFakePack(curPlayer, sendPack)
     return
 
@@ -336,7 +373,7 @@
     # 离线的话直接发邮件
     GameWorld.Log("收到跨服获得物品,玩家不在线,直接发邮件! itemInfo=%s" % str(itemInfo), playerID)
     itemID, itemCount, isBind, itemUserData = itemData
-    addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":isBind, "UserData":itemUserData}]
+    addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":isBind, "UserData":itemUserData}]
     PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event})
     return
 

--
Gitblit v1.8.0