From a1dd4e92306ad37bacf390825efd39ca315e8b5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 八月 2021 15:25:04 +0800
Subject: [PATCH] 8721 【主干】【BT3】【后端】H.活动-合服庆典（转盘活动改为支持配置消耗的货币类型 主干冲突）
---
ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py | 58 +++++++++++++++-------------------------------------------
1 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
index 8a921f3..57cfda4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
@@ -65,6 +65,7 @@
import GameWorld
import datetime
import ShareDefine
+import PlayerControl
import ChConfig
#===============================================================================
##发送事件记录给EventShell
@@ -75,7 +76,9 @@
if curPlayer:
pid = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_PlayerFromPID)
dataDict["pid"] = pid
- dataDict["fightPower"] = curPlayer.GetFightPower()
+ dataDict["fightPower"] = PlayerControl.GetFightPower(curPlayer)
+ dataDict["PlayerLV"] = curPlayer.GetLV()
+ dataDict["IP"] = curPlayer.GetIP()
dataDict["time"] = str(datetime.datetime.today()).split(".")[0]
@@ -116,10 +119,10 @@
# @param familyName: 家族名
# @param familyID: 家族ID
# @return None
-def DR_CreateFamily(accID, playerID, playerNaem, familyName, familyID):
+def DR_CreateFamily(accID, playerID, playerNaem, familyName, familyID, creatFamilyTimes):
dataDict = {'AccID':accID, 'PlayerID':playerID, "PlayerName":playerNaem, 'FamilyName':familyName,
- 'FamilyID':familyID}
+ 'FamilyID':familyID, 'creatFamilyTimes':creatFamilyTimes}
#发送封包
SendEventPack("CreateFamily", dataDict)
@@ -453,12 +456,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
-
#-------------------------------------
#↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓交易所↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
## 添加交易所物品数据到流向记录用字典
@@ -558,6 +555,15 @@
SendEventPack("CompensationPersonal", dataDict)
return
+## 删除个人补偿流向
+# @param curPlayerID, GUID, ItemDictList
+# @return: None
+def DR_DelPersonalCompensation(playerID, GUID, eventName):
+ dataDict = {'PlayerID':playerID, 'GUID':GUID, 'eventName':eventName}
+ #发送封包
+ SendEventPack("CompensationPersonalDel", dataDict)
+ return
+
## 添加全服补偿流向
# @param GUID, ItemDictList
# @return: None
@@ -565,39 +571,5 @@
dataDict = {'GUID':GUID, "eventName":eventName}
dataDict.update(addDict)
SendEventPack("CompensationEntire", dataDict)
- return
-
-## 发送充值排行榜特惠活动奖励邮件记录流向
-# @param curPlayerID: 玩家ID
-# @param GUID:
-# @param actionID: 活动ID
-# @param actionValue: 活动编号
-# @param order: 奖励排名
-# @param rewardItemList: 奖励物品列表
-# @return None
-def DR_SendRechareRankTeHuiRewardMail(curPlayerID, GUID, actionID, actionValue, order, rewardItemList):
-
- dataDict = {'PlayerID':curPlayerID, 'GUID':GUID, 'ActionID':actionID, 'ActionValue':actionValue,
- 'Order':order, 'ItemList':rewardItemList}
-
- #发送封包
- SendEventPack("SendRechareRankTeHuiRewardMail", dataDict)
- return
-
-## 发送消费排行榜特惠活动奖励邮件记录流向
-# @param curPlayerID: 玩家ID
-# @param GUID:
-# @param actionID: 活动ID
-# @param actionValue: 活动编号
-# @param order: 奖励排名
-# @param rewardItemList: 奖励物品列表
-# @return None
-def DR_SendCostRankTeHuiRewardMail(curPlayerID, GUID, actionID, actionValue, order, rewardItemList):
-
- dataDict = {'PlayerID':curPlayerID, 'GUID':GUID, 'ActionID':actionID, 'ActionValue':actionValue,
- 'Order':order, 'ItemList':rewardItemList}
-
- #发送封包
- SendEventPack("SendCostRankTeHuiRewardMail", dataDict)
return
--
Gitblit v1.8.0