From 04643ea031c7434a7bb019aa1c05aa283ed7372d Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期六, 29 九月 2018 03:19:38 +0800 Subject: [PATCH] 3928 【后端】增加多倍经验活动在活动期间的循环广播 --- ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py index 4ae0037..c96aa40 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py @@ -221,6 +221,7 @@ ("list", "EndTimeList", 0), ("dict", "NotifyInfoStart", 0), ("dict", "NotifyInfoEnd", 0), + ("list", "NotifyInfoLoop", 0), ("WORD", "LVLimit", 0), ("DWORD", "AddExpRate", 0), ), @@ -672,6 +673,7 @@ self.EndTimeList = [] self.NotifyInfoStart = {} self.NotifyInfoEnd = {} + self.NotifyInfoLoop = [] self.LVLimit = 0 self.AddExpRate = 0 return @@ -685,6 +687,7 @@ def GetEndTimeList(self): return self.EndTimeList # 结束时间列表, 支持多个时段 def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间 def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间 + def GetNotifyInfoLoop(self): return self.NotifyInfoLoop # 全服提示信息 - 循环广播[间隔分钟, 广播key, [可选参数1, ...]] def GetLVLimit(self): return self.LVLimit # 限制等级 def GetAddExpRate(self): return self.AddExpRate # 经验倍率加成,万分率 @@ -1287,7 +1290,7 @@ '''查询条件下与对应查询字段参考值相近的数据实例;参考值小于配置表最小值时返回none,大于最大值时返回最大值对应的实例 @param dtName: 表名,不含tag @param keyName: 参考字段名 - @param keyValue: 参考字段值 + @param keyValue: 参考字段值,大于等于字段值时返回对应数据 @param conditionDict: 查询条件,{查询字段名:字段值, ...} @return: 找不到数据返回 None , 否则返回对应的 ipyData 数据实例 ''' @@ -1319,7 +1322,7 @@ for i in xrange(near - 1, low - 1, -1): nearData = dataList[i] nearValue = getattr(nearData, "%s" % keyName) - if nearValue < keyValue: + if nearValue <= keyValue: return nearData elif keyValue > nearValue: -- Gitblit v1.8.0