From ec519cae8e5136fa593918628499f969b2bde334 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 16 四月 2021 10:33:06 +0800
Subject: [PATCH] 8873 【BT2】【主干】【后端】新增在线特惠(同步A109封包 主干)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index a165f35..2189b3c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -61,6 +61,7 @@
 import PyGameData
 import GMShell
 import IPY_PlayerDefine
+import GameWorldArena
 import CrossRealmPK
 import AuctionHouse
 import PlayerAssist
@@ -89,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
 
 #---------------------------------------------------------------------
@@ -183,6 +182,8 @@
         GameWorldActionControl.OnPlayerLogin(curPlayer)
         #玩家等级记录
         PyGameData.g_todayPlayerLVDict[curPlayer.GetID()] = curPlayer.GetLV()
+        #竞技场
+        GameWorldArena.OnPlayerLogin(curPlayer)
         #跨服PK
         CrossRealmPK.OnPlayerLogin(curPlayer)
         #诛仙BOSS
@@ -519,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
@@ -622,6 +621,7 @@
     
     playerStatePack = IPY_GameServer.IPY_GRefreshPlayerProperty()
     packValue = playerStatePack.GetValue()
+    packValueEx = playerStatePack.GetValueEx()
     packType = playerStatePack.GetType()
     
     #---特殊逻辑处理---
@@ -648,7 +648,7 @@
         return
     
     if packType == IPY_GameServer.CDBPlayerRefresh_FightPower:
-        curPlayer.SetFightPower(packValue)
+        curPlayer.SetFightPower(packValue, packValueEx)
         return
 
     if packType == IPY_GameServer.CDBPlayerRefresh_ExAttr2:

--
Gitblit v1.8.0