From 66d7dbd46a74b8acf30bb297d664b6d98f7f4099 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 07 十二月 2020 20:33:20 +0800
Subject: [PATCH] 8585 【港台】【BT】【长尾】【后端】竞技场(增加通知重置赛季状态)

---
 ServerPython/CoreServerGroup/GameServer/Script/EventReport.py |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py b/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
index 7ff6764..083efde 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
@@ -96,8 +96,8 @@
     
     playerInfo = ""
     if curPlayer:
-        playerInfo = "&AccountID=%s&IP=%s"%(GameWorld.GetPlatformAccID(curPlayer.GetAccID()),
-                                                            curPlayer.GetIP())
+        playerInfo = "&AccountID=%s&IP=%s&DeviceFlag=%s"%(GameWorld.GetPlatformAccID(curPlayer.GetAccID()),
+                                                            curPlayer.GetIP(), curPlayer.GetDeviceFlag())
         #=======================================================================
         # #UTF8 需要转成url编码才可用
         # playerInfo = urllib.urlencode({"RoleID": curPlayer.GetName(),
@@ -109,10 +109,17 @@
         RegionName = GameWorld.GetPlayerServerSID(curPlayer)
         
     else:
-        # 合服情况,玩家取自己服发送,非玩家数据按指定平台配置发,没有则取配置主服
-        RegionName = 's%s'%GameWorld.GetPlayerMainServerID(OperatorID) 
+        # 合服情况,玩家取自己服发送,非玩家数据按指定平台配置发
+        sid = GameWorld.GetPlayerMainServerID(OperatorID)
+        if not sid:
+            GameWorld.ErrLog("GetPlayerMainServerID: %s-%s"%(OperatorID, sid))
+            return
+        RegionName = 's%s'%sid
         
-    getUrl = "%s?ProductID=%s&OperatorID=%s&RegionName=%s&EventID=%s%s&Time=%s&%s"%(\
+    if eventParam:
+        eventParam = "&%s"%eventParam
+        
+    getUrl = "%s?ProductID=%s&OperatorID=%s&RegionName=%s&EventID=%s%s&Time=%s%s"%(\
              ReportUrl, ProductID, OperatorID, RegionName, eventActionID, playerInfo,
              str(datetime.datetime.today()).split('.')[0], eventParam)
     GameWorld.DebugLog("EventReport: %s"%getUrl)

--
Gitblit v1.8.0