From 3b45b8cfa4cb24ad084c4fadf5d31430d0de5d21 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 22 三月 2019 16:54:07 +0800
Subject: [PATCH] 6341 【后端】【2.0】境界改版开发单(修为池通知)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py |  112 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
index 72fa8a1..1d0a975 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
@@ -113,6 +113,7 @@
 import ChConfig
 import ShareDefine
 import PlayerControl
+import PyGameData
 #===============================================================================
 ##发送事件记录给EventShell
 # @param eventTypeStr: 事件类型标识
@@ -123,6 +124,7 @@
     if curPlayer:
         pid = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_PlayerFromPID)
         dataDict["pid"] = pid
+        dataDict["fightPower"] = curPlayer.GetFightPower()
     dataDict["time"] = str(datetime.datetime.today()).split(".")[0]
     
     dataStr = str(dataDict)
@@ -153,7 +155,7 @@
     name = curPlayer.GetName()
     
     dataDict = {'Type':'login', 'IP':str(ip), 'AccID':accID,
-                'Name':name, 'LoginTime':str(loginTime), 'LogoutTime':''}
+                'Name':name, 'LoginTime':str(loginTime), 'LogoutTime':'', 'MFPFightPower':GetMFPFightPowerInfo(curPlayer)}
     
     #发送封包
     SendEventPack("LogInOut", dataDict, curPlayer)
@@ -175,11 +177,18 @@
     goldPaper = curPlayer.GetGoldPaper()
     dataDict = {'Type':'logout', 'IP':ip, 'AccID':accID, 'LV':lv, 'VipLV':vipLV,
                   'Name':name, 'LoginTime':str(loginTime), 'Gold':gold, 'GoldPaper':goldPaper,
-                  'LogoutTime':str(logoutTime)}
+                  'LogoutTime':str(logoutTime), 'MFPFightPower':GetMFPFightPowerInfo(curPlayer)}
     #发送封包
     SendEventPack("LogInOut", dataDict, curPlayer)
     return
 
+def GetMFPFightPowerInfo(curPlayer):
+    #记录模块战力
+    dataDict = {}
+    for mfpType in ShareDefine.ModuleFightPowerTypeList:
+        fightPower = PlayerControl.GetMFPFightPower(curPlayer, mfpType)
+        dataDict[mfpType] = fightPower
+    return dataDict
     
 ## 新增有效登陆
 #  @param accID: 账号ID
@@ -542,18 +551,6 @@
     SendEventPack("LVAward", dataDict, curPlayer)
     return
 
-##合服登陆奖励
-def DR_MixLoginDayAward(curPlayer, getState):
-    dataDict = {'PlayerID':curPlayer.GetPlayerID(), 
-                'PlayerName':curPlayer.GetPlayerName(), 
-                'AccID':curPlayer.GetAccID(),
-                "rewardState":getState
-                }
-    
-    SendEventPack("MixLoginDayAward", dataDict, curPlayer)
-    return
-
-
 ## 使用新手媒体卡
 #  @param curPlayer: 玩家实例
 #  @param cardStr: 卡号
@@ -597,18 +594,6 @@
     dataDict["PlayerName"] = curPlayer.GetPlayerName()
     
     SendEventPack("OpenServerAward", dataDict, curPlayer)
-    return
-
-## 合服活动奖励领取情况
-#  @param curPlayer: 玩家实例
-#  @param dataDict: 记录信息字典
-#  @return: None
-def DR_MixServerAward(curPlayer, dataDict):
-    dataDict["PlayerID"] = curPlayer.GetPlayerID()
-    dataDict["AccID"] = curPlayer.GetAccID()
-    dataDict["PlayerName"] = curPlayer.GetPlayerName()
-    
-    SendEventPack("MixServerAward", dataDict, curPlayer)
     return
 
 ## GM执行命令操作
@@ -929,8 +914,8 @@
     dataDict = {"PlayerID":curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
                 "AccID":curPlayer.GetAccID()}
     dataDict.update(addDict)
-    
     SendEventPack("StoneChange_%s"%eventName, dataDict, curPlayer)
+    Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_StoneChange, addDict)
     return
 
 def DR_VIPChange(curPlayer, eventName, addDict={}):
@@ -1261,12 +1246,6 @@
     SendEventPack("PlayerGetReward", 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
-
 ## 申请加入贵宾俱乐部
 #  @param curPlayer
 #  @param hasRegister: 之前是否已报名
@@ -1435,26 +1414,6 @@
     SendEventPack("CollectNPCOK", dataDict, curPlayer)
     return
 
-## 玩家领取充值特惠活动奖励
-#  @param curPlayer: 玩家实例
-#  @param actionID: 活动id
-#  @param actionNum: 活动编号
-#  @param itemID: 物品id
-#  @param itemCnt: 物品数量
-#  @param isPutIn: 是否放入
-#  @param prizeIndex: 奖励中的第x种奖励
-#  @return            
-def DR_PlayerTeHuiRechargePrize(curPlayer, actionID, actionNum, itemID, itemCnt, isPutIn, prizeIndex):
-    #MySql不识别 True False,改成1和0
-    isPutIn = 1 if isPutIn else 0
-    
-    dataDict = {'PlayerID':curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
-                'AccID':curPlayer.GetAccID(), 'ActionID':actionID, 'ActionNum':actionNum, 
-                'IsPutIn':isPutIn, "ItemID":itemID, "ItemCount":itemCnt, 'PrizeIndex':prizeIndex}
-    
-    SendEventPack("TeHuiRechargePrize", dataDict, curPlayer)
-    return
-
 
 ## 领取投资回报
 #  @param curPlayer: 玩家实例
@@ -1582,11 +1541,54 @@
 
 ## 玩家境界升级
 #  @return
-def DR_RealmLVUp(curPlayer, realmlv, realmPoint, needRealmPoint):
+def DR_RealmLVUp(curPlayer, realmlv):
     dataDict = {'PlayerID':curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), 
-                'AccID':curPlayer.GetAccID(), 'realmlv':realmlv, 'curRealmPoint':realmPoint, 'costRealmPoint':needRealmPoint,
+                'AccID':curPlayer.GetAccID(), 'realmlv':realmlv,
                 'playerlv':curPlayer.GetLV(), 'power':curPlayer.GetFightPower()}
     
     #发送封包
     SendEventPack("RealmLVUp", dataDict, curPlayer)
+    return
+
+def Cache_FightPowerChangeInfo(curPlayer, dotype, dataDict):
+    ##暂存可能导致战力降低的行为信息
+    dataDict['dotime'] = str(datetime.datetime.today()).split(".")[0]
+    eventName = ChConfig.FightPowerDownRecordDict.get(dotype, 'Unknown')
+    if eventName in PyGameData.g_fightpowerChangeDataRecordDict:
+        PyGameData.g_fightpowerChangeDataRecordDict[eventName].append(dataDict)
+    else:
+        PyGameData.g_fightpowerChangeDataRecordDict[eventName] = [dataDict]
+    return
+
+def DR_FightPowerChangeInfo(curPlayer, beforePower):
+    ##记录战力降低的行为信息
+    dataDict = {'beforePower':beforePower, 'PlayerID':curPlayer.GetPlayerID(), 'AccID':curPlayer.GetAccID()}
+    for dotype, dateList in PyGameData.g_fightpowerChangeDataRecordDict.items():
+        rList = []
+        for dateInfo in dateList:
+            dateTimeStr = dateInfo['dotime']
+            if GameWorld.GetPastSeconds(dateTimeStr) >10:
+                continue
+            rList.append(dateInfo)
+        dataDict[dotype] = rList
+    PyGameData.g_fightpowerChangeDataRecordDict = {}
+    #发送封包
+    SendEventPack("FightPowerChangeInfo", dataDict, curPlayer)
+    return
+
+## 玩家周狂欢(七天巡礼)
+#  @return
+def DR_WeekPartyPoint(curPlayer, dayIndex, point):
+    dataDict = {'PlayerID':curPlayer.GetPlayerID(), 
+                'AccID':curPlayer.GetAccID(), 'dayIndex':dayIndex, 'point':point}
+    
+    #发送封包
+    SendEventPack("WeekPartyPoint", dataDict, curPlayer)
+    return
+def DR_FeastWeekPartyPoint(curPlayer, dayIndex, point):
+    ##节日巡礼
+    dataDict = {'PlayerID':curPlayer.GetPlayerID(), 
+                'AccID':curPlayer.GetAccID(), 'dayIndex':dayIndex, 'point':point}
+    #发送封包
+    SendEventPack("FeastWeekPartyPoint", dataDict, curPlayer)
     return
\ No newline at end of file

--
Gitblit v1.8.0