From 597f6350370aeea090967ac02f81e85d0385db22 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 01 九月 2018 18:12:14 +0800
Subject: [PATCH] 3192 合服数据后台发送
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 8 +++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py | 7 ++++++-
ServerPython/CoreServerGroup/GameServer/Script/EventReport.py | 8 ++++++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py b/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
index 2f9e7f2..fcb35c6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
@@ -93,7 +93,6 @@
ProductID = ReadChConfig.GetPyMongoConfig("EventReport", "ProductID")
ReportUrl = ReadChConfig.GetPyMongoConfig("EventReport", "ReportUrl")
- RegionName = GameWorld.GetServerSID() # 需考虑合服情况
playerInfo = ""
if curPlayer:
@@ -107,7 +106,12 @@
# "Level": curPlayer.GetLV()})
#=======================================================================
OperatorID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
-
+ RegionName = GameWorld.GetPlayerServerSID(curPlayer)
+
+ else:
+ # 合服情况，玩家取自己服发送，非玩家数据按指定平台配置发，没有则取配置主服
+ RegionName = 's%s'%GameWorld.GetPlayerMainServerID(OperatorID)
+
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)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 2dbdcdb..23b3ac8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -477,11 +477,9 @@
def GetPlayerMainServerID(accIDPlatform):
# 玩家合服后所属主服ID
# @param accIDPlatform: 玩家账号所属的平台
- #===========================================================================
- # mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
- # if mainServerID != None:
- # return mainServerID
- #===========================================================================
+ mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
+ if mainServerID != None:
+ return mainServerID
return GetServerID()
##获取玩家所属平台
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
index 79b326c..db15a00 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
@@ -114,7 +114,7 @@
ProductID = ReadChConfig.GetPyMongoConfig("EventReport", "ProductID")
ReportUrl = ReadChConfig.GetPyMongoConfig("EventReport", "ReportUrl")
- RegionName = GameWorld.GetServerSID() # 需考虑合服情况
+
playerInfo = ""
if curPlayer:
@@ -125,6 +125,11 @@
"Level": curPlayer.GetLV()})
OperatorID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
+ RegionName = GameWorld.GetPlayerServerSID(curPlayer)
+
+ else:
+ # 合服情况，玩家取自己服发送，非玩家数据按指定平台配置发，没有则取配置主服
+ RegionName = 's%s'%GameWorld.GetPlayerMainServerID(OperatorID)
if eventParam:
eventParam = "&%s"%eventParam
--
Gitblit v1.8.0