From 72e0425552abdbcc2fffbb8e9575e21dbda469a2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 五月 2022 17:03:29 +0800
Subject: [PATCH] 9415 【BT】【后端】古神战场(修复周参与榜结算奖励某些名次多结算神玉奖励bug; 每天过天时增加记录跨服榜单数据流向)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 6aac47a..4d45f72 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -70,6 +70,7 @@
 import CrossRealmPlayer
 import CrossRealmMsg
 import CrossRealmPK
+import CrossBattlefield
 import ChPyNetSendPack
 import NetPackCommon
 import AuctionHouse
@@ -78,6 +79,7 @@
 import GameWorldArena
 import GameWorldItem
 import PlayerAssist
+import PlayerLove
 
 import time
 import datetime
@@ -502,14 +504,15 @@
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
         if not curPlayer:
             return
-        ChPlayer.DoPlayerRealLoginOK(curPlayer, tick)
+        loginMsg = eval(resultName)
+        ChPlayer.DoPlayerRealLoginOK(curPlayer, loginMsg, tick)
         return
     
     if callName == "SendMail":
-        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource = eval(resultName)
+        title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource, crossMail = eval(resultName)
         limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))
         limitTime = limitTime.split(".")[0]
-        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail, moneySource=moneySource)
+        PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail, moneySource=moneySource, crossMail=crossMail)
         return
     
     if callName == "SendMailBatch":
@@ -645,6 +648,11 @@
     #跨服注册结果
     if callName == "CrossRealmReg":
         CrossRealmPlayer.OnCrossRealmRegOK(srcPlayerID, eval(resultName), tick)
+        return
+    
+    # 跨服战场结算
+    if callName =="CrossBattlefieldOver":
+        CrossBattlefield.MapServer_CrossBattlefieldOver(eval(resultName))
         return
     
     #py喇叭聊天
@@ -955,6 +963,16 @@
         ret = GameWorldArena.MapServer_Arena(curPlayer, eval(resultName))
         resultName = '%s' % ret if ret != None else '' # 需要重置间隔,每次都回复
         
+    # 情缘
+    if callName =="Love":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = PlayerLove.MapServer_Love(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
     # 天星塔
     if callName == "SkyTower":
         ret = GameWorldSkyTower.MapServer_SkyTowerInfo(eval(resultName))

--
Gitblit v1.8.0