From cdb001b8065cf4bcfe63b82bf8c03ae48b362e7b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 19 三月 2026 12:02:09 +0800
Subject: [PATCH] 493 【活动内容】武将登场-服务端（招募武将非首次获得不广播设定仅针对常规招募；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py | 61 ++++++------------------------
1 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
index a1f54f3..9dcf009 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
@@ -33,7 +33,6 @@
#---------------------------------------------------------------------
import ChConfig
-import TurnAttack
import PlayerControl
import IpyGameDataPY
import ReadChConfig
@@ -42,7 +41,6 @@
import datetime
import urllib
-import json
## 初始化事件
# @param None
@@ -61,17 +59,18 @@
# @param eventParam 事件参数
# @param curPlayer
# @return None
-def EventReport(eventActionID, eventParam, curPlayer=None, OperatorID=""):
+def EventReport(eventActionID, eventParam, curPlayer=None, OperatorID="", checkNeed=True):
# 组成例子 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"
- reportActionIDList = IpyGameDataPY.GetFuncEvalCfg("EventReport", 3)
- if reportActionIDList and eventActionID not in reportActionIDList:
- #GameWorld.DebugLog("非需要汇报的事件ID! %s" % eventActionID)
- return
- if eventActionID in IpyGameDataPY.GetFuncEvalCfg("EventReport", 1):
- #GameWorld.DebugLog("不需要汇报的事件! %s" % eventActionID)
- return
+ if checkNeed:
+ reportActionIDList = IpyGameDataPY.GetFuncEvalCfg("EventReport", 3)
+ if reportActionIDList and eventActionID not in reportActionIDList:
+ #GameWorld.DebugLog("非需要汇报的事件ID! %s" % eventActionID)
+ return
+ if eventActionID in IpyGameDataPY.GetFuncEvalCfg("EventReport", 1):
+ #GameWorld.DebugLog("不需要汇报的事件! %s" % eventActionID)
+ return
if not curPlayer and not OperatorID:
return
@@ -88,6 +87,7 @@
"IP": curPlayer.GetIP(),
"Level": curPlayer.GetLV(),
"DeviceFlag": curPlayer.GetAccountData().GetDeviceFlag(),
+ "ClientVersion":curPlayer.GetAccountData().GetClientVersion(),
"Job": curPlayer.GetJob(),
"PlayerID": curPlayer.GetPlayerID(),
"CreateRoleTime": curPlayer.GetCreateRoleTime(),
@@ -98,7 +98,6 @@
"FamilyName": curPlayer.GetFamilyName(),
"ReamlLV":curPlayer.GetOfficialRank(),
"TreeLV":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV),
- "LineupHero":GetReportMainLineupInfo(curPlayer),
}
for mapID in ChConfig.ReportCenterMapIDList:
playerInfo["FBPass%s" % mapID] = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FBPassLineID % mapID)
@@ -108,12 +107,8 @@
playerInfo = "&%s" % urllib.urlencode(playerInfo) #UTF8 需要转成url编码才可用
else:
- # 合服情况，玩家取自己服发送，非玩家数据按指定平台配置发
- sid = GameWorld.GetPlayerMainServerID(OperatorID)
- if not sid:
- GameWorld.ErrLog("GetPlayerMainServerID: %s-%s"%(OperatorID, sid))
- return
- RegionName = 's%s'%sid
+ serverID = GameWorld.GetGameWorld().GetServerID()
+ RegionName = 's%s'%serverID
if eventParam:
eventParam = "&%s"%eventParam
@@ -127,38 +122,6 @@
# 第五个参数0代表get发送 1代表post
GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
return
-
-def GetReportMainLineupInfo(curPlayer):
- lineup = TurnAttack.GetPlayerLineup(curPlayer, ShareDefine.Lineup_Main)
- if lineup.IsEmpty():
- return {}
-
- heroDict = {}
- curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptHero)
- for posNum in lineup.GetPosNumList():
- hero = lineup.GetLineupHero(posNum)
- heroID = hero.heroID
- itemIndex = hero.itemIndex
- heroLV = 1
- star = 0
- breakLV = 0
- awakeLV = 0
- if itemIndex >= 0 and itemIndex < curPack.GetCount():
- heroItem = curPack.GetAt(itemIndex)
- if heroItem and not heroItem.IsEmpty():
- heroLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroLV)
- star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)
- breakLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroBreakLV)
- awakeLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroAwakeLV)
- heroDict[str(posNum)] = {
- "HeroID":heroID,
- "SkinID":hero.skinID,
- "LV":heroLV,
- "Star":star,
- "BreakLV":breakLV,
- "AwakeLV":awakeLV,
- }
- return json.dumps(heroDict, ensure_ascii=False).replace(" ", "")
## =================================================================================================
--
Gitblit v1.8.0