From c060aabfb4621e897f7b69d6e537fc3ccf59d860 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 28 一月 2019 20:44:25 +0800
Subject: [PATCH] 2969 【BUG】【1.5.200】限时抢购，重新开服全服抢购次数会重置
---
ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
index a3a4f26..42ad582 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
@@ -58,7 +58,6 @@
# @change: "2015-02-03 14:30" xmnathan 添加补偿时增加流向
# @change: "2015-06-17 14:30" hxp 排行榜流向增加比较值信息
# @change: "2015-07-13 14:00" hxp 增加pid信息
-# @change: "2015-10-25 17:00" hxp 增加DR_SendMergePKRewardMail
# @change: "2015-11-05 12:00" hxp 增加恢复跨服连胜流向
#------------------------------------------------------------------------------
"""Version = 2016-09-12 16:00"""
@@ -76,6 +75,7 @@
if curPlayer:
pid = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_PlayerFromPID)
dataDict["pid"] = pid
+ dataDict["fightPower"] = curPlayer.GetFightPower()
dataDict["time"] = str(datetime.datetime.today()).split(".")[0]
@@ -317,13 +317,13 @@
# @param tagFamilyLV: 被踢者职位
# @return:
def DR_PlayerLeaveFamily(curPlayer, familyID, familyName, familyCnt, familyLV,
- tagPlayerID, tagPlayerName, tagFamilyLV):
-
+ tagPlayerID, tagPlayerName, tagFamilyLV, leaveFamilyTime=0):
dataDict = {'PlayerID':curPlayer.GetPlayerID(), 'AccID':curPlayer.GetAccID(),
"PlayerName":curPlayer.GetName(),
"FamilyID":familyID, "FamilyName":familyName, "Count":familyCnt, "FamilyJob":familyLV,
"tagPlayerID":tagPlayerID, "tagPlayerName":tagPlayerName, "tagFamilyJob":tagFamilyLV}
-
+ if leaveFamilyTime:
+ dataDict['leaveFamilyTime'] = leaveFamilyTime
#发送封包
SendEventPack("PlayerLeaveFamily", dataDict, curPlayer)
return
@@ -451,12 +451,6 @@
#发送封包
SendEventPack("UpdatePlayerName", dataDict, curPlayer)
- return
-
-def DR_MergePlayerEvent(playerID, eventType, eventTime, eventData, opType):
- # 跨服玩家记录事件流向
- dataDict = {'PlayerID':playerID, "EventType":eventType, "EventTime":eventTime, 'EventData':eventData}
- SendEventPack("MergePlayerEvent_%s" % opType, dataDict)
return
#-------------------------------------
@@ -599,29 +593,5 @@
#发送封包
SendEventPack("SendCostRankTeHuiRewardMail", dataDict)
- return
-
-## 发送跨服PK奖励邮件记录流向
-# @param playerIdList 玩家ID列表
-# @param GUID 邮件标识
-# @param actionKey 活动Key
-# @param order 奖励排名
-# @param rewardItemList 奖励物品列表
-# @param addDataDict 附加属性
-# @return None
-def DR_SendMergePKRewardMail(playerIdList, guid, actionKey, rewardItemList, addDataDict={}):
- dataDict = {'PlayerIDList':playerIdList, 'GUID':guid, 'ItemList':rewardItemList}
-
- dataDict.update(addDataDict)
-
- #发送封包
- SendEventPack("SendMergePKRewardMail_%s" % actionKey, dataDict)
- return
-
-## 恢复跨服PK连胜次数
-def DR_RecoverMergePKWin(accID, cWin, maxCWin):
- dataDict = {'AccID':accID, 'cWin':cWin, 'maxCWin':maxCWin}
- #发送封包
- SendEventPack("RecoverMergePKWin", dataDict)
return
--
Gitblit v1.8.0