From 3118adeb72c93f559944ee7425409e0a125b23dd Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 10 一月 2019 11:59:01 +0800
Subject: [PATCH] 860312 修复在线数据同一分钟发送两次问题;客户端和服务端tick不对应再次同步一次

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py
index 037a68c..5c22c1b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.py
@@ -296,14 +296,21 @@
         playerInfoList = []
         for playerID in [playerIDA, playerIDB]:
             player = copyMapPlayerManager.FindPlayerByID(playerID)
+            # 还是离线时间的,走掉线逻辑,越晚掉线的赢;需要加这个逻辑主要是因为当玩家没有触发完整登录流程导致玩家在线但是没有触发DoEnter
+            playerLeaveTick = gameFB.GetGameFBDictByKey(GameFBDict_PlayerLeaveTick % playerID)
+            if playerLeaveTick:
+                pvpDamage, sortTick, curHP, curMaxHP = 0, 0, 0, 0
+                playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerLeaveTick, playerID, player])
+                GameWorld.Log("PK超时: playerLeaveTick=%s" % (playerLeaveTick), playerID)
+                continue
             pvpDamage = gameFB.GetPlayerGameFBDictByKey(playerID, FBPDict_PVPDamage)
             pvpDamTick = gameFB.GetPlayerGameFBDictByKey(playerID, FBPDict_PVPDamUpdTick)
             sortTick = tick - pvpDamTick
             curHP = 0 if not player else player.GetHP()
             curMaxHP = 0 if not player else player.GetMaxHP()
-            playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerID, player])
-            GameWorld.Log("PK超时: pvpDamge=%s,pvpDamTick=%s,tick=%s,sortTick=%s,HP=%s/%s" 
-                          % (pvpDamage, pvpDamTick, tick, sortTick, curHP, curMaxHP), playerID)
+            playerInfoList.append([pvpDamage, sortTick, curHP, curMaxHP, playerLeaveTick, playerID, player])
+            GameWorld.Log("PK超时: pvpDamge=%s,pvpDamTick=%s,tick=%s,sortTick=%s,HP=%s/%s,playerLeaveTick=%s" 
+                          % (pvpDamage, pvpDamTick, tick, sortTick, curHP, curMaxHP, playerLeaveTick), playerID)
             
         playerInfoList.sort(reverse=True)
         GameWorld.Log("PK超时, 进入结算!playerInfoList=%s" % str(playerInfoList))

--
Gitblit v1.8.0