From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
index 155d427..db15a00 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
@@ -105,17 +105,16 @@
# @param eventParam 事件参数
# @param curPlayer
# @return None
-def EventReport(eventActionID, eventParam, curPlayer=None):
+def EventReport(eventActionID, eventParam, curPlayer=None, OperatorID=""):
# 组成例子 eventParam 的格式必须是 xx=yy&zz=cc
# "http://192.168.0.249:12000/event_receiver?EventID=3099&OperatorID=test&PlayerCount=102&Time=2018-02-08 18:30:30&ProductID=snxxz&RegionName=s1"
- OperatorID = GameWorld.GetPlatform()
- if not OperatorID:
+ if not curPlayer and not OperatorID:
return
ProductID = ReadChConfig.GetPyMongoConfig("EventReport", "ProductID")
ReportUrl = ReadChConfig.GetPyMongoConfig("EventReport", "ReportUrl")
- RegionName = GameWorld.GetServerSID() # 需考虑合服情况
+
playerInfo = ""
if curPlayer:
@@ -124,6 +123,13 @@
"AccountID": GameWorld.GetPlatformAccID(curPlayer.GetAccID()),
"IP": curPlayer.GetIP(),
"Level": curPlayer.GetLV()})
+
+ OperatorID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
+ RegionName = GameWorld.GetPlayerServerSID(curPlayer)
+
+ else:
+ # 合服情况，玩家取自己服发送，非玩家数据按指定平台配置发，没有则取配置主服
+ RegionName = 's%s'%GameWorld.GetPlayerMainServerID(OperatorID)
if eventParam:
eventParam = "&%s"%eventParam
@@ -572,7 +578,7 @@
def WriteEvent_session(curPlayer):
seconds = 0
if PlayerTJG.GetIsTJG(curPlayer):
- seconds = 0
+ return
else:
logoffTimeStr = curPlayer.GetLogoffTime().strip()
loginTimeStr = curPlayer.GetLoginTime().strip()
--
Gitblit v1.8.0