From 11a8b1213819e3067ef079bffecf7542318b49f8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 十二月 2019 16:09:31 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(添加第一名无归属时原因日志)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
index 92d8712..2459a6c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
@@ -122,20 +122,26 @@
         playerInfo = urllib.urlencode({"RoleID": curPlayer.GetName(),
                           "AccountID": GameWorld.GetPlatformAccID(curPlayer.GetAccID()),
                           "IP": curPlayer.GetIP(),
-                          "Level": curPlayer.GetLV()}) 
+                          "Level": curPlayer.GetLV(),
+                          "DeviceFlag": curPlayer.GetAccountData().GetDeviceFlag()}) 
         
         OperatorID = GameWorld.GetPlayerPlatform(curPlayer)
         RegionName = GameWorld.GetPlayerServerSID(curPlayer)
+        playerInfo = "&%s"%playerInfo
         
     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
 
     if eventParam:
         eventParam = "&%s"%eventParam
     
     
-    getUrl = "%s?ProductID=%s&OperatorID=%s&RegionName=%s&EventID=%s&%s&Time=%s%s"%(\
+    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)
@@ -150,7 +156,7 @@
 #  @return None
 def WriteEvent(eventClass):
     return
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         return
     
     if eventClass.GetScribeEventName() not in ReadChConfig.GetEvalChConfig("EventReportID"):
@@ -570,7 +576,9 @@
 def WriteEvent_login(curPlayer):
     if curPlayer.GetIP() == "127.0.0.1":
         return
-    EventReport(ShareDefine.Def_UserAction_Login, "Job=%s&SessionID=%s"%(curPlayer.GetJob(), GameWorld.GetSessionID(curPlayer)), curPlayer)
+    EventReport(ShareDefine.Def_UserAction_Login, "Job=%s&SessionID=%s&Version=%s"%(
+                                curPlayer.GetJob(), GameWorld.GetSessionID(curPlayer),
+                                curPlayer.GetAccountData().GetClientVersion()), curPlayer)
 
     return
 

--
Gitblit v1.8.0