From babddd65bd1fa02b4e4ba7ca399e05fe476abcef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 六月 2024 16:15:52 +0800
Subject: [PATCH] 10185 【越南】【港台】【主干】BOSS凭证修改(优化凭证榜单奖励结算;优化榜单备份;)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |  176 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 161 insertions(+), 15 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 450a64d..27568d5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -34,6 +34,7 @@
 import ChConfig
 import GMCommon
 import DirtyList
+import CrossBillboard
 import PlayerBillboard
 import PlayerExam
 import PlayerControl
@@ -50,6 +51,7 @@
 import GameWorldBoss
 import GameWorldFamilyWar
 #import PlayerFamilyTech
+import PlayerFamilyZhenfa
 import PlayerFamilyRedPacket
 import PlayerFBHelpBattle
 import PlayerHorsePetBoss
@@ -66,15 +68,26 @@
 import PyGameData
 import PlayerTalk
 import PlayerStore
+import CrossYaomoBoss
 import CrossRealmPlayer
 import CrossRealmMsg
 import CrossRealmPK
+import CrossChampionship
+import CrossBattlefield
+import CrossActAllRecharge
+import PlayerActBossTrial
+import PlayerActFamilyCTGAssist
 import ChPyNetSendPack
 import NetPackCommon
 import AuctionHouse
 import PlayerFairyDomain
+import GameWorldSkyTower
+import GameWorldMineArea
+import PlayerTurnFight
+import GameWorldArena
 import GameWorldItem
 import PlayerAssist
+import PlayerLove
 
 import time
 import datetime
@@ -495,15 +508,28 @@
     callName = pack.GetCallName()
     resultName = pack.GetResultName()                       #[queryid, 人气值, 物品ID]
     
+    if callName == "PlayerRealLoginOK":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        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":
         PlayerCompensation.SendPersonalItemMailBatch(eval(resultName))
+        return
+    
+    if callName == "SendEntireMail":
+        mailTypeKey, getDays, limitLV, limitLVType, addItemList, paramList, gold, goldPaper, silver, detail, moneySource = eval(resultName)
+        PlayerCompensation.SendEntireMail(mailTypeKey, getDays, limitLV, limitLVType, addItemList, paramList, gold, goldPaper, silver, detail, moneySource)
         return
     
     if callName == "SendMsgToCrossServer":
@@ -542,6 +568,10 @@
     if callName == "UpdateBillboard":     #地图服务器更新排行榜
         PlayerBillboard.MapServer_UpdateBillboard(eval(resultName), tick)
         return
+
+    if callName == "UpdateCrossBillboard":     #地图服务器更新跨服排行榜
+        CrossBillboard.MapServer_UpdateCrossBillboard(eval(resultName))
+        return
     
     if callName == 'PyAddFamilyInfoValue':     #地图服务器增加战盟信息值
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -556,6 +586,13 @@
     
     if callName == 'ExitExam': #地图服务器玩家退出答题
         PlayerExam.MapServer_ExitAction(srcPlayerID)
+        return
+    
+    if callName == 'FuncOpen':
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        PlayerControl.DoFuncOpenLogic(curPlayer, eval(resultName))
         return
     
     if  callName == 'TeamNotify':
@@ -597,6 +634,11 @@
         GameDataRecord.ChangeCoinCnt(eval(resultName))
         return
     
+    #跨服排位PK战斗结算
+    if callName == "CrossChampionshipPKOver":
+        CrossChampionship.MapServer_CrossChampionshipPKOver(eval(resultName), tick)
+        return
+    
     #跨服匹配PK战斗结算
     if callName == "CrossPKOver":
         CrossRealmPK.MapServer_CrossPKOver(eval(resultName), tick)
@@ -626,6 +668,32 @@
     #跨服注册结果
     if callName == "CrossRealmReg":
         CrossRealmPlayer.OnCrossRealmRegOK(srcPlayerID, eval(resultName), tick)
+        return
+    
+    # 跨服战场结算
+    if callName =="CrossBattlefieldOver":
+        CrossBattlefield.MapServer_CrossBattlefieldOver(eval(resultName))
+        return
+    
+    # 跨服妖魔boss伤害结算
+    if callName =="CrossYaomoBossHurtInfo":
+        CrossYaomoBoss.MapServer_CrossYaomoBossHurtInfo(eval(resultName))
+        return
+    
+    # 跨服全民充值
+    if callName == "CrossActAllRecharge":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        CrossActAllRecharge.MapServer_CrossActAllRecharge(curPlayer, eval(resultName))
+        return
+    
+    # Boss历练
+    if callName == "BossTrial":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        PlayerActBossTrial.MapServer_BossTrial(curPlayer, eval(resultName))
         return
     
     #py喇叭聊天
@@ -672,12 +740,6 @@
                 
         return
     
-    # 战盟副本boss开始、被击杀
-    if callName =="FamilyBossFBState":
-        PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)
-        return
-    
-
     # 击杀boss掉落好物品
     if callName =="BossDropGoodItem":
         GameWorldBoss.OnKillBossDropGoodItem(eval(resultName), tick)
@@ -794,11 +856,11 @@
         PlayerTeam.MapServer_TeamMemFuncData(srcPlayerID, eval(resultName))
         return
     
-    #封魔坛结束
-    if callName == "SealDemonOver":
-        playerID, lineID, rank = eval(resultName)
-        PyDataManager.GetSealDemonRecordManager().UpdateSealDemonRecord(playerID,lineID,rank)
-        return
+#    #封魔坛结束
+#    if callName == "SealDemonOver":
+#        playerID, lineID, rank = eval(resultName)
+#        PyDataManager.GetSealDemonRecordManager().UpdateSealDemonRecord(playerID,lineID,rank)
+#        return
     
     #查询副本功能线路人数
     if callName == "FBLinePlayerCnt":
@@ -853,6 +915,22 @@
     #多仙盟BOSS结束
     if callName =="AllFamilyBossOver":
         PlayerFamilyBoss.AllFamilyBossKilled()
+        return
+    #仙盟阵法
+    if callName =="FamilyZhenfa":
+        curPlayer = None
+        if srcPlayerID:
+            curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+            if not curPlayer:
+                return
+        PlayerFamilyZhenfa.MapServer_FamilyZhenfa(curPlayer, eval(resultName))
+        return
+    #仙盟传功
+    if callName =="FamilyChuangong":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        PlayerFamily.MapServer_FamilyChuangong(curPlayer, eval(resultName))
         return
     #骑宠BOSS结束
     if callName =="HorsePetBossOver":
@@ -919,11 +997,76 @@
     
     
     # 副本助战
-    if callName =="FBHelpBattle":
+    if callName == "FBHelpBattle":
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
         if not curPlayer:
             return
         ret = PlayerFBHelpBattle.MapServer_FBHelpBattle(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+    
+    # 竞技场
+    if callName == "Arena":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = GameWorldArena.MapServer_Arena(curPlayer, eval(resultName))
+        resultName = '%s' % ret if ret != None else '' # 需要重置间隔,每次都回复
+        
+    # 仙盟充值互助
+    if callName == "FamilyCTGAssist":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = PlayerActFamilyCTGAssist.MapServer_FamilyCTGAssist(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
+    # 仙盟boss
+    if callName == "FamilyBoss":
+        ret = PlayerFamilyBoss.MapServer_FamilyBoss(eval(resultName), tick)
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
+    # 情缘
+    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 == "TurnFight":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = PlayerTurnFight.MapServer_TurnFight(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
+    # 福地
+    if callName == "MineArea":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = GameWorldMineArea.MapServer_MineArea(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
+    # 天星塔
+    if callName == "SkyTower":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = GameWorldSkyTower.MapServer_SkyTowerInfo(curPlayer, eval(resultName))
         if ret == None:
             return
         resultName = '%s' % ret
@@ -934,7 +1077,10 @@
 #        if not curPlayer:
 #            return
 #        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
-        
+    
+    if not srcPlayerID:
+        return
+    
     srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
     
     if not srcPlayer:

--
Gitblit v1.8.0