From a5c0631b7b7d7b1757833751cf56da7737fc1bf6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 三月 2021 14:08:22 +0800
Subject: [PATCH] 8858 【主干】【后端】将BT2的充值返利逻辑移植到主干（充值赠送原优先活动赠送改为累加上活动赠送）

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 0d71834..7c76f53 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -44,7 +44,7 @@
 #import PlayerFamilyStore
 import PlayerSocial
 import PlayerFamilyParty
-import PlayerSealDemon
+#import PlayerSealDemon
 import PlayerBillboard
 import PlayerLVAward
 import PlayerDuJie
@@ -56,12 +56,15 @@
 import GameWorldActionControl
 import GameWorldFamilyWar
 import PlayerFBHelpBattle
+import GameWorldSkyTower
 import GMT_CTG
 import PyGameData
 import GMShell
 import IPY_PlayerDefine
+import GameWorldArena
 import CrossRealmPK
 import AuctionHouse
+import PlayerAssist
 import PlayerFB
 #---------------------------------------------------------------------
 
@@ -87,9 +90,7 @@
     except:
         curPlayer.Kick(IPY_PlayerDefine.disWaitForPlayerLoinError)
         import traceback
-        GameWorld.ErrLog("玩家上线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
-        if GameWorld.GetGameWorld().GetDebugLevel():
-            raise Exception("玩家上线逻辑错误~~~~\r\n%s" % traceback.format_exc())
+        GameWorld.RaiseException("玩家上线逻辑错误\r\n%s" % traceback.format_exc())
     return
 
 #---------------------------------------------------------------------
@@ -159,7 +160,7 @@
         #仙盟宴会
         PlayerFamilyParty.OnPlayerLogin(curPlayer)
         #封魔坛
-        PlayerSealDemon.OnPlayerLogin(curPlayer)
+        #PlayerSealDemon.OnPlayerLogin(curPlayer)
         #仙魔之争
         PlayerXMZZ.OnXMZZOnLogin(curPlayer)
         #等级奖励
@@ -176,20 +177,29 @@
         PlayerFamilySWRH.OnLogin(curPlayer)
         PlayerTalk.LoginChatMi(curPlayer)
         PlayerTalk.NotifyTalkCache(curPlayer)
-        PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())
+        #PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())
         #活动
         GameWorldActionControl.OnPlayerLogin(curPlayer)
         #玩家等级记录
         PyGameData.g_todayPlayerLVDict[curPlayer.GetID()] = curPlayer.GetLV()
-        #副本助战
-        PlayerFBHelpBattle.OnHelpPlayerLogin(curPlayer)
+        #竞技场
+        GameWorldArena.OnPlayerLogin(curPlayer)
         #跨服PK
         CrossRealmPK.OnPlayerLogin(curPlayer)
         #诛仙BOSS
         PlayerZhuXianBoss.OnPlayerLogin(curPlayer)
         #骑宠boss状态通知
         PlayerHorsePetBoss.OnLogin(curPlayer)
+        #协助
+        PlayerAssist.OnPlayerLogin(curPlayer, False)
+        #天星塔
+        GameWorldSkyTower.OnPlayerLogin(curPlayer)
         GMT_CTG.OnPlayerLogin(curPlayer)
+        
+    else:
+        #协助
+        PlayerAssist.OnPlayerLogin(curPlayer, True)
+        
     return
 
 def __UpdOnedayJobPlayerLoginoffTime(curPlayer):
@@ -510,9 +520,7 @@
         __Func_PlayerDisconnect(curPlayer, tick)
     except:
         import traceback
-        GameWorld.ErrLog("玩家下线逻辑错误~~~~~\r\n%s" % traceback.format_exc())
-        if GameWorld.GetGameWorld().GetDebugLevel():
-            raise Exception("玩家下线逻辑错误~~~~\r\n%s" % traceback.format_exc())
+        GameWorld.RaiseException("玩家下线逻辑错误\r\n%s" % traceback.format_exc())
     #调用底层下线
     curPlayer.DoDisconnect()
     return
@@ -537,11 +545,13 @@
     PlayerFriend.OnPlayerDisconnect(curPlayer, tick)
     
     __UpdOnedayJobPlayerLoginoffTime(curPlayer)
-    PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)
+    #PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)
     # 设置家族成员离线时间
     SetPlayerOfflineTime(curPlayer)
     #拍卖行
     AuctionHouse.OnPlayerLeaveServer(curPlayer)
+    #协助
+    PlayerAssist.OnLeaveServer(curPlayer)
     #------------镖车逻辑
     #TruckPlayerDisconnectProcess(curPlayer, tick)
     
@@ -556,8 +566,8 @@
 #  @return None
 #  @remarks 函数详细说明.
 def SetPlayerOfflineTime(curPlayer):
-    if PlayerControl.GetIsTJG(curPlayer):
-        return
+    #if PlayerControl.GetIsTJG(curPlayer):
+    #    return
     
     curPlayerID = curPlayer.GetPlayerID()
     curFamily = curPlayer.GetFamily()
@@ -618,6 +628,10 @@
         PlayerControl.SetGMForbidenTalk(curPlayer, packValue)
         return
     
+    if packType == ShareDefine.CDBPlayerRefresh_ExAttr17:
+        PlayerControl.SetPlayerAccState(curPlayer, packValue)
+        return
+
     if packType == IPY_GameServer.CDBPlayerRefresh_State:
         # 脱机在线
         PlayerControl.SetIsTJG(curPlayer, packValue)
@@ -639,6 +653,14 @@
     if packType == IPY_GameServer.CDBPlayerRefresh_ExAttr2:
         #队伍相关相关审核开关状态
         PlayerTeam.SetTeamCheckState(curPlayer, packValue)
+        return
+    
+    #if packType == IPY_GameServer.CDBPlayerRefresh_ExAttr1:
+    #    PlayerControl.SetAssistTagPlayerID(curPlayer, packValue)
+    #    return
+    
+    if packType == IPY_GameServer.CDBPlayerRefresh_ExAttr3:
+        PlayerControl.SetFBFuncLineID(curPlayer, packValue)
         return
     
     #---常规逻辑处理---
@@ -683,9 +705,6 @@
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr10:
         PlayerControl.SetChatBubbleBox(curPlayer, packValue)
-        
-    elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr11:
-        PlayerControl.SetTodayXianyuanCoin(curPlayer, packValue)
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr13:
         PlayerControl.SetPlayerServerGroupID(curPlayer, packValue)

--
Gitblit v1.8.0