From 9d37dd506253a8dd42f8e5c71ee9ca3d5c5b2287 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 15:16:33 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置（节日登录奖励）
---
/dev/null | 290 --------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 12 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 56 ------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 56 ------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 3
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 56 ------
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 3
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 56 ------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 1
10 files changed, 0 insertions(+), 536 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index fc320e7..7a27e3e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -12615,62 +12615,6 @@
#------------------------------------------------------
-# AB 07 领取节日登陆奖励 #tagCMGetFestivalLoginAward
-
-class tagCMGetFestivalLoginAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("FestivalType", c_ubyte), # 节日类型
- ("DayIndex", c_ubyte), # 节日天 <从节日活动开始日0天开始>
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- self.FestivalType = 0
- self.DayIndex = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMGetFestivalLoginAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 07 领取节日登陆奖励 //tagCMGetFestivalLoginAward:
- Cmd:%s,
- SubCmd:%s,
- FestivalType:%d,
- DayIndex:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.FestivalType,
- self.DayIndex
- )
- return DumpString
-
-
-m_NAtagCMGetFestivalLoginAward=tagCMGetFestivalLoginAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetFestivalLoginAward.Cmd,m_NAtagCMGetFestivalLoginAward.SubCmd))] = m_NAtagCMGetFestivalLoginAward
-
-
-#------------------------------------------------------
# AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
class tagCMOpenServerCampaignAward(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 59df580..c27ff9e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -25703,62 +25703,6 @@
#------------------------------------------------------
-# AB 07 节日活动奖励状态 #tagMCFestivalLoginAwardState
-
-class tagMCFestivalLoginAwardState(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("FestivalType", c_ubyte), # 节日类型
- ("State", c_int), # 领取状态 <按位取值,0-未领取 1-可领取 2-已领取>
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- self.FestivalType = 0
- self.State = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCFestivalLoginAwardState)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 07 节日活动奖励状态 //tagMCFestivalLoginAwardState:
- Cmd:%s,
- SubCmd:%s,
- FestivalType:%d,
- State:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.FestivalType,
- self.State
- )
- return DumpString
-
-
-m_NAtagMCFestivalLoginAwardState=tagMCFestivalLoginAwardState()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFestivalLoginAwardState.Cmd,m_NAtagMCFestivalLoginAwardState.SubCmd))] = m_NAtagMCFestivalLoginAwardState
-
-
-#------------------------------------------------------
# AB 04 Boss复活活动信息 #tagMCBossRebornInfo
class tagMCBossRebornAwardItem(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index bae4cc3..f205662 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -188,9 +188,6 @@
Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState" #战盟相关活动今日开启状态, 按位存储代表今日是否开启过
-Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s' # 登录领取奖励开始时间，参数为活动类型
-Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s' # 登录领取奖励结束时间，参数为活动类型
-
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 70d6788..6338378 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -700,18 +700,6 @@
PacketSubCMD_1=0x42
PacketCallFunc_1=OnGetSuccessAward
-;节日登陆奖励
-[PlayerFestivalLogin]
-ScriptName = Player\PlayerFestivalLogin.py
-Writer = ljd
-Releaser = ljd
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xAB
-PacketSubCMD_1=0x07
-PacketCallFunc_1=GetFestivalLoginAward
-
;转生
[PlayerReincarnation]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 8894602..b0da649 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3472,7 +3472,6 @@
Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
-Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
Def_PDict_TJGDeadTime = "TJGDeadTime" # 脱机被杀时间
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index fc320e7..7a27e3e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -12615,62 +12615,6 @@
#------------------------------------------------------
-# AB 07 领取节日登陆奖励 #tagCMGetFestivalLoginAward
-
-class tagCMGetFestivalLoginAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("FestivalType", c_ubyte), # 节日类型
- ("DayIndex", c_ubyte), # 节日天 <从节日活动开始日0天开始>
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- self.FestivalType = 0
- self.DayIndex = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMGetFestivalLoginAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 07 领取节日登陆奖励 //tagCMGetFestivalLoginAward:
- Cmd:%s,
- SubCmd:%s,
- FestivalType:%d,
- DayIndex:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.FestivalType,
- self.DayIndex
- )
- return DumpString
-
-
-m_NAtagCMGetFestivalLoginAward=tagCMGetFestivalLoginAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetFestivalLoginAward.Cmd,m_NAtagCMGetFestivalLoginAward.SubCmd))] = m_NAtagCMGetFestivalLoginAward
-
-
-#------------------------------------------------------
# AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
class tagCMOpenServerCampaignAward(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 59df580..c27ff9e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -25703,62 +25703,6 @@
#------------------------------------------------------
-# AB 07 节日活动奖励状态 #tagMCFestivalLoginAwardState
-
-class tagMCFestivalLoginAwardState(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("FestivalType", c_ubyte), # 节日类型
- ("State", c_int), # 领取状态 <按位取值,0-未领取 1-可领取 2-已领取>
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xAB
- self.SubCmd = 0x07
- self.FestivalType = 0
- self.State = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCFestivalLoginAwardState)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 07 节日活动奖励状态 //tagMCFestivalLoginAwardState:
- Cmd:%s,
- SubCmd:%s,
- FestivalType:%d,
- State:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.FestivalType,
- self.State
- )
- return DumpString
-
-
-m_NAtagMCFestivalLoginAwardState=tagMCFestivalLoginAwardState()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFestivalLoginAwardState.Cmd,m_NAtagMCFestivalLoginAwardState.SubCmd))] = m_NAtagMCFestivalLoginAwardState
-
-
-#------------------------------------------------------
# AB 04 Boss复活活动信息 #tagMCBossRebornInfo
class tagMCBossRebornAwardItem(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFestivalLoginAward.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFestivalLoginAward.py
deleted file mode 100644
index c966607..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFestivalLoginAward.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package ClearFestivalLoginAward.py
-#
-# @todo:清除节日奖励
-#
-# @author ljd
-# @date 2014-12-21 21:40
-# @version 1.0
-# @note:
-#
-#
-#------------------------------------------------------------------------------
-#"""Version = 2014-12-21 21:40"""
-#------------------------------------------------------------------------------
-
-import ChConfig
-import PlayerControl
-import PlayerFestivalLogin
-import GameWorld
-#---------------------------------------------------------------------
-
-## 执行逻辑
-# @param curPlayer 当前玩家
-# @param cmdList 参数
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, cmdList):
- for festivalType in PlayerFestivalLogin.GetFestivalTypeList():
- __DoFLCReset(curPlayer, festivalType)
- return
-
-## 节日登陆奖励重置
-# @param curPlayer
-# @param festivalType 重置类型
-# @return None
-def __DoFLCReset(curPlayer, festivalType):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FestivalLoginState%festivalType, 0)
- PlayerFestivalLogin.NotifyAwardState(curPlayer, festivalType)
- GameWorld.DebugAnswer(curPlayer, 'FLCReset %s OK！'%festivalType)
- return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 370ed55..40ac9b2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -626,9 +626,6 @@
#
# 开服活动奖励信息
OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer)
-#
-# # 节日登陆奖励
-# PlayerFestivalLogin.OnLoginFestivalLogin(curPlayer)
# 试炼之塔
GameLogic_TrialTower.OnFBPlayerLogin(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFestivalLogin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFestivalLogin.py
deleted file mode 100644
index a57549d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFestivalLogin.py
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package Player.PlayerFestivalLogin
-#
-# @todo:节日登陆奖励
-# @author ljd
-# @date 2014-12-22 09:50
-# @version 1.2
-#
-# @change: "2015-01-06 17:40" ljd 增加后台控制起始时间的节日类型
-# @change: "2015-01-21 10:50" ljd 改DebugLog输出方式
-#
-# 详细描述: 节日登陆奖励 <元旦、圣诞>
-#
-#---------------------------------------------------------------------
-"""Version = 2015-01-21 10:50"""
-#---------------------------------------------------------------------
-
-import IPY_GameWorld
-import GameWorld
-import ChConfig
-import ReadChConfig
-import ItemCommon
-import PlayerControl
-import ItemControler
-import ChPyNetSendPack
-import NetPackCommon
-import ShareDefine
-
-# 节日信息配置索引
-(
-Festival_StartTime,
-Festival_EndTime,
-Festival_WarnTime,
-Festival_LimitLV,
-Festival_Reward,
-) = range(5)
-
-# 奖励状态
-(
-Reward_State_Not,
-Reward_State_Can,
-Reward_State_Yet,
-) = range(3)
-
-# 定义物品类型
-(
-Item_Type_Common, # 一般物品表
-Item_Type_Appoint, # 特殊定制物品
-) = range(2)
-
-# 奖励信息配置位索引
-(
-Reward_Item_Type,
-Reward_Item_Id,
-Reward_Item_Num,
-Reward_Item_IsBind,
-) = range(4)
-
-
-## OnDay 记录并通知奖励状态
-# @param curPlayer
-# @return None
-def OnDayFestivalLogin(curPlayer):
- __UpdateAwardState(curPlayer)
-
-## OnLogin 记录并通知奖励状态
-# @param curPlayer
-# @return None
-def OnLoginFestivalLogin(curPlayer):
- __UpdateAwardState(curPlayer)
-
-## 更新奖励状态
-# @param curPlayer
-# @return None
-def __UpdateAwardState(curPlayer):
- festivalDict = ReadChConfig.GetEvalChConfig('FestivalLoginAward')
- curTime = GameWorld.GetCurrentTime()
- for festivalType, curFestival in festivalDict.items():
- if curPlayer.GetLV() < curFestival[Festival_LimitLV]:
- GameWorld.DebugLog("__UpdateAwardState() player level(%s) not enough"%curPlayer.GetLV())
- continue
-
- startTime = __GetFestivalTime(curFestival, Festival_StartTime, festivalType)
- endTime = __GetFestivalTime(curFestival, Festival_EndTime, festivalType)
- warnTime = __GetFestivalTime(curFestival, Festival_WarnTime, festivalType)
-
- # 通知奖励时间
- if not GameWorld.IsAtActTime(curTime, [startTime, warnTime]):
- GameWorld.DebugLog("__UpdateAwardState() curTime(%s) startTime(%s) wardTime(%s)"
- %(curTime, startTime, warnTime))
- continue
- # 活动时间
- if GameWorld.IsAtActTime(curTime, [startTime, endTime]):
- __SetCanState(curPlayer, curFestival, festivalType)
-
- NotifyAwardState(curPlayer, festivalType)
-
-## 领取节日登陆奖励 <AB 07封包>
-# @param index
-# @param clientPack <FestivalType-节日类型 DayIndex-节日天>
-# @param tick
-# @return
-def GetFestivalLoginAward(index, clientPack, tick):
- festivalType = clientPack.FestivalType
- dayIndex = clientPack.DayIndex
- GameWorld.DebugLog("==[PlayerFestivalLogin]== In->GetFestivalLoginAward() festival[%s]=%s"
- %(festivalType, dayIndex))
-
- curFestival = __GetFestivalInfo(festivalType)
- if not curFestival:
- return
-
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- loginState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FestivalLoginState%festivalType)
- if curPlayer.GetLV() < curFestival[Festival_LimitLV]:
- GameWorld.DebugLog("GetFestivalLoginAward() player level(%s) not enough"%curPlayer.GetLV())
- return
-
- # 处理当前状态
- curState = GameWorld.GetDataByDigitPlace(loginState, dayIndex)
- if curState != Reward_State_Can:
- GameWorld.DebugLog("GetFestivalLoginAward() loginState(%s)"%loginState)
- return
-
- startTime = __GetFestivalTime(curFestival, Festival_StartTime, festivalType)
- curDayIndex = GameWorld.GetPastHour(startTime) / 24
- if dayIndex > curDayIndex:
- GameWorld.DebugLog("GetFestivalLoginAward() day(%s) curDay(%s)"%(dayIndex, curDayIndex))
- return
-
- itemList = __GetRewardList(curPlayer, curFestival, dayIndex)
- if not __CheckRewardList(curPlayer, itemList):
- return
-
- loginState = GameWorld.ChangeDataByDigitPlace(loginState, dayIndex, Reward_State_Yet)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FestivalLoginState%festivalType, loginState)
-
- __GiveReward(curPlayer, itemList)
-
- GameWorld.DebugLog("==[PlayerFestivalLogin]== Out->GetFestivalLoginAward() state(%s)"%loginState)
- NotifyAwardState(curPlayer, festivalType)
- return
-
-## 通知节日登陆奖励
-# @param curPlayer
-# @return None
-def NotifyAwardState(curPlayer, festivalType):
- sendPack = ChPyNetSendPack.tagMCFestivalLoginAwardState()
- sendPack.Clear()
- sendPack.FestivalType = festivalType
- sendPack.State = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FestivalLoginState%festivalType)
-
- NetPackCommon.SendFakePack(curPlayer, sendPack)
- return
-
-## 获取节日类型列表
-# @param None
-# @return 奖励类型列表
-def GetFestivalTypeList():
- festivalInfo = ReadChConfig.GetEvalChConfig('FestivalLoginAward')
- return festivalInfo.keys()
-
-## 重置节日奖励状态
-# @param curPlayer
-# @param festivalType 节日类型
-# @param isNotify 是否通知奖励变更
-# @return None
-def ResetFestivalAward(curPlayer, festivalType, isNotify=False):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FestivalLoginState%festivalType, 0)
- if isNotify:
- NotifyAwardState(curPlayer, festivalType)
-
-## 更新奖励状态
-# @param curPlayer
-# @param curFestival 当前节日
-# @param festivalType 节日类型
-# @return None
-def __SetCanState(curPlayer, curFestival, festivalType):
- loginState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FestivalLoginState%festivalType)
-
- startTime = __GetFestivalTime(curFestival, Festival_StartTime, festivalType)
- dayIndex = GameWorld.GetPastHour(startTime) / 24
- curState = GameWorld.GetDataByDigitPlace(loginState, dayIndex)
-
- # 检查活动结束时间
- if curState != Reward_State_Not:
- GameWorld.DebugLog("__SetCanState() day(%s) curState(%s)"%(dayIndex, curState))
- return
-
- loginState = GameWorld.ChangeDataByDigitPlace(loginState, dayIndex, Reward_State_Can)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FestivalLoginState%festivalType, loginState)
-
-## 获取当前节日信息
-# @param festivalType 节日类型
-# @return 当前节日信息
-def __GetFestivalInfo(festivalType):
- festivalInfo = ReadChConfig.GetEvalChConfig('FestivalLoginAward')
- curFestival = festivalInfo.get(festivalType)
- if not curFestival:
- GameWorld.DebugLog("__GetFestivalInfo() festival(%s) isn't configuration"%festivalType)
- return
-
- startTime = __GetFestivalTime(curFestival, Festival_StartTime, festivalType)
- warnTime = __GetFestivalTime(curFestival, Festival_WarnTime, festivalType)
-
- curTime = GameWorld.GetCurrentTime()
- if not GameWorld.IsAtActTime(curTime, [startTime, warnTime]):
- GameWorld.DebugLog("__GetFestivalInfo() curTime(%s) startTime(%s) wardTime(%s)"
- %(curTime, startTime, warnTime))
- return
- return curFestival
-
-## 获取节日时间
-# @param curFestival 当前节日
-# @param timeType 时间类型
-# @param festivalType 节日类型
-# @return 时间 <格式:%Y-%m-%d %H:%M:%S>
-def __GetFestivalTime(curFestival, timeType, festivalType):
- festivalTime = curFestival[timeType]
-
- if festivalTime:
- return festivalTime
-
- if timeType == Festival_StartTime:
- tickTimeKey = ShareDefine.Def_Notify_WorldKey_LoginAwardStartDate%festivalType
- else:
- tickTimeKey = ShareDefine.Def_Notify_WorldKey_LoginAwardEndDate%festivalType
- tickTime = GameWorld.GetGameWorld().GetGameWorldDictByKey(tickTimeKey)
-
- return str(GameWorld.ChangeTimeNumToDatetime(tickTime))
-
-## 发放奖励物品
-# @param curPlayer
-# @param itemList 奖励物品列表
-# @return None
-def __GiveReward(curPlayer, itemList):
- for itemInfo in itemList:
- itemType = itemInfo[Reward_Item_Type]
- itemId = itemInfo[Reward_Item_Id]
- itemNum = itemInfo[Reward_Item_Num]
- itemIsBind = itemInfo[Reward_Item_IsBind]
-
- if itemNum <= 0:
- continue
-
- if itemType == Item_Type_Common:
- ItemControler.GivePlayerItem(curPlayer, itemId, itemNum, 0, [IPY_GameWorld.rptItem])
-
- elif itemType == Item_Type_Appoint:
- ItemControler.GivePlayerAppointItem(curPlayer, itemId, False)
-
-## 奖励物品列表
-# @param curPlayer
-# @param itemList 奖励物品列表
-# @return 是否可以发放物品
-def __CheckRewardList(curPlayer, itemList):
- if not itemList:
- GameWorld.DebugLog("__CheckRewardList() Reward item list(%s) Null"%itemList)
- return False
-
- packSpaceNum = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(itemList) > packSpaceNum:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return False
-
- return True
-
-## 获取奖励列表
-# @param curPlayer
-# @param curFestival 当前节日
-# @param stateIndex 奖励状态索引
-# @return 奖励物品列表
-def __GetRewardList(curPlayer, curFestival, stateIndex):
- rewardInfoDict = curFestival[Festival_Reward]
- rewardInfo = rewardInfoDict.get(stateIndex, {})
-
- heroJob = curPlayer.GetJob()
-
- # 按职业取奖励物品列表
- for jobs, items in rewardInfo.items():
- if heroJob in jobs:
- return items[:]
-
- GameWorld.DebugLog("__GetRewardList() Not find job(%s)"%heroJob)
- return rewardInfo.get(())
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index bae4cc3..f205662 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -188,9 +188,6 @@
Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState" #战盟相关活动今日开启状态, 按位存储代表今日是否开启过
-Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s' # 登录领取奖励开始时间，参数为活动类型
-Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s' # 登录领取奖励结束时间，参数为活动类型
-
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志
--
Gitblit v1.8.0