From ccdb6b538549bf7f9c6d0186686914b495739458 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 15 一月 2019 19:56:11 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发(删除异兽之地副本脚本逻辑,宝箱刷新改为配置到 RandomRefreshNPC 中)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index a0941be..5590d72 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -81,11 +81,13 @@
 import PlayerRefineStove
 import PlayerFamilyTech
 import PlayerCostRebate
+import GY_Query_CrossRealmReg
 import PlayerFairyCeremony
 import PlayerCrossRealmPK
 import FunctionNPCCommon
 import CrossRealmPlayer
 import ChNetSendPack
+import PlayerCoat
 import PlayerState
 import QuestCommon
 import PlayerDogz
@@ -116,6 +118,7 @@
     Def_Max_Move_Tick = 5000
  
     if abs(gameWorldTick - clientWorldTick) >= Def_Max_Move_Tick:
+        curPlayer.Sync_ClientTick()
         #时间相差过大,可能因网络引起,拉回
         GameWorld.DebugLog("PlayerMoveCheckClientWorldTick -- 服务器tick %s-客户端%s时间相差过大,可能因网络引起,拉回" % (
                             gameWorldTick, clientWorldTick), curPlayer.GetID())
@@ -1565,6 +1568,30 @@
 
 #---------------------------------------------------------------------
 
+def PlayerEnterCrossServer(curPlayer, mapID):
+    playerID = curPlayer.GetPlayerID()
+    GameWorld.Log("玩家请求进入跨服地图: mapID=%s" % (mapID), playerID)
+    if GameWorld.IsCrossServer():
+        GameWorld.DebugLog("跨服服务器不允许该操作!")
+        return
+    
+    if GetCrossMapID(curPlayer):
+        GameWorld.ErrLog("玩家当前为跨服状态,不允许再次请求进入跨服!", curPlayer.GetPlayerID())
+        return
+    
+    if not CrossRealmPlayer.IsCrossServerOpen():
+        NotifyCode(curPlayer, "CrossMatching18")
+        return
+    
+    if curPlayer.GetHP() <= 0:
+        return
+    
+    if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer):
+        return
+    
+    GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID)
+    return
+
 ##玩家进入副本
 # @param curPlayer 玩家实例
 # @param mapID 地图ID
@@ -1944,16 +1971,18 @@
     sendPack.FuncLineID = funcLineID
     
     NetPackCommon.SendFakePack(curPlayer, sendPack)
+    GameWorld.Log("准备切换地图", curPlayer.GetID())
     return
 
 # 通知开始切换地图
 def NotifyStartChangeMap(curPlayer):
-    GameWorld.DebugLog("通知开始切换地图, NotifyStartChangeMap")
     sendPack = ChPyNetSendPack.tagMCStartChangeMap()
     sendPack.Clear()
     sendPack.MapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ChangeMapID)
     sendPack.FuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
     NetPackCommon.SendFakePack(curPlayer, sendPack)
+    
+    GameWorld.Log("通知开始切换地图", curPlayer.GetID())
     return
 
 #---------------------------------------------------------------------
@@ -2053,7 +2082,8 @@
     if PlayerTJG.GetIsTJG(curPlayer):
         GameWorld.DebugLog("脱机的玩家不处理分流!", curPlayer.GetPlayerID())
         return tagLineID
-    
+    if GameWorld.IsCrossServer():
+        return tagLineID
     # 非常规地图之间的切换不处理
     if curMapID not in PyGameData.g_commMapLinePlayerCountDict or tagMapID not in PyGameData.g_commMapLinePlayerCountDict:
         return tagLineID
@@ -2989,6 +3019,12 @@
     if value < 0:
         GameWorld.Log('玩家获得金钱异常 , value = %s , priceType = %s ,' % (value, priceType))
         return
+    
+    if GameWorld.IsCrossServer():
+        serverGroupID = GetPlayerServerGroupID(curPlayer)
+        msgInfo = {"PlayerID":curPlayer.GetPlayerID(), "MoneyType":priceType, "Value":value, "GiveType":giveType, "AddDataDict":addDataDict}
+        GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_GiveMoney, msgInfo, [serverGroupID])
+        return True
     
     if priceType == IPY_GameWorld.TYPE_Price_Gold_Money:
         if curPlayer.GetGold() + value > ChConfig.Def_PlayerTotalMoney_Gold:
@@ -4062,6 +4098,7 @@
         PlayerEquipDecompose.RefreshEDAttr(curPlayer)
         PlayerDogz.RefreshDogzAttr(curPlayer)
         PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)
+        PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)
         self.RefreshAllState(isForce=True)
         GameWorld.DebugLog("End ReCalcAllState!!!")
         return
@@ -5680,9 +5717,11 @@
 def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False)
 def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()
 
-## 跨服状态: 0-非跨服状态,1-跨服状态
-def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()
-def SetCrossRealmState(curPlayer, value): curPlayer.SetExAttr5(value, False, True)
+## 跨服状态所在地图ID: 0-非跨服状态,非0-跨服状态对应的地图ID
+def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()
+def SetCrossMapID(curPlayer, value):
+    curPlayer.SetExAttr5(value, False, True)
+    return
 
 ## 铜钱点, 支持铜钱超20亿
 def GetSilver(curPlayer): return curPlayer.GetExAttr6() * ChConfig.Def_PerPointValue + curPlayer.GetSilver()

--
Gitblit v1.8.0