From 81b2c992ade83d0d44aa0748d2af6682023f6956 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 14:47:12 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单(删除旧合服相关内容)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py |   47 +++++++++++++++++------------------------------
 1 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
index d922fde..2a06a97 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
@@ -551,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: 卡号
@@ -606,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执行命令操作
@@ -1270,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: 之前是否已报名
@@ -1625,3 +1595,20 @@
     #发送封包
     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