From e7ef89771f8c16b9d0d9623c80538c8a6bb82f15 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 01 九月 2018 10:30:56 +0800
Subject: [PATCH] fix:增加复活CD中提示
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 6b3d761..7bd60ad 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -53,6 +53,7 @@
("BYTE", "EliteCnt", 0),
("DWORD", "NeedMoney", 0),
("DWORD", "WeekMissionMoneyMax", 0),
+ ("BYTE", "BossFBCnt", 0),
),
"MarketQuery":(
@@ -226,6 +227,7 @@
("dict", "NotifyInfoStart", 0),
("dict", "NotifyInfoEnd", 0),
("WORD", "LVLimit", 0),
+ ("BYTE", "TemplateID", 0),
),
"ActFairyCeremony":(
@@ -298,7 +300,8 @@
self.DeputyLeaderCnt = 0
self.EliteCnt = 0
self.NeedMoney = 0
- self.WeekMissionMoneyMax = 0
+ self.WeekMissionMoneyMax = 0
+ self.BossFBCnt = 0
return
def GetFamilyLV(self): return self.FamilyLV # 仙盟等级
@@ -306,7 +309,8 @@
def GetDeputyLeaderCnt(self): return self.DeputyLeaderCnt # 副盟主数量
def GetEliteCnt(self): return self.EliteCnt # 精英数量
def GetNeedMoney(self): return self.NeedMoney # 升级需要资金
- def GetWeekMissionMoneyMax(self): return self.WeekMissionMoneyMax # 每周任务最大可获得仙盟资金
+ def GetWeekMissionMoneyMax(self): return self.WeekMissionMoneyMax # 每周任务最大可获得仙盟资金
+ def GetBossFBCnt(self): return self.BossFBCnt # BOSS副本次数
# 集市查询表
class IPY_MarketQuery():
@@ -659,7 +663,8 @@
self.EndDate = ""
self.NotifyInfoStart = {}
self.NotifyInfoEnd = {}
- self.LVLimit = 0
+ self.LVLimit = 0
+ self.TemplateID = 0
return
def GetCfgID(self): return self.CfgID # 配置ID
@@ -669,7 +674,8 @@
def GetEndDate(self): return self.EndDate # 结束日期
def GetNotifyInfoStart(self): return self.NotifyInfoStart # 全服提示信息 - 相对开始时间
def GetNotifyInfoEnd(self): return self.NotifyInfoEnd # 全服提示信息 - 相对结束时间
- def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetTemplateID(self): return self.TemplateID # 模板编号
# 仙界盛典活动时间表
class IPY_ActFairyCeremony():
@@ -893,22 +899,26 @@
for i, strValue in enumerate(rowList):
if i == 0:
continue
- fieldName = fieldList[i][1]
- strValue = strValue.lstrip().rstrip()
- if strValue.isdigit():
- configValue = int(strValue)
- elif (strValue.startswith("{") and strValue.endswith("}")) \
- or (strValue.startswith("[") and strValue.endswith("]")) \
- or (strValue.startswith("(") and strValue.endswith(")")):
- configValue = eval(strValue)
- elif "_" in strValue and type(self.__StrToDict(strValue)) == dict:
- configValue = self.__StrToDict(strValue)
- elif ChConfig.Def_Str_Montant in strValue:
- configValue = eval("(%s,)" % strValue.replace(ChConfig.Def_Str_Montant, ","))
- elif strValue in ["-", ""]:
- configValue = ""
- else:
- configValue = self.__ToFloat(strValue)
+ try:
+ fieldName = fieldList[i][1]
+ strValue = strValue.lstrip().rstrip()
+ if strValue.isdigit():
+ configValue = int(strValue)
+ elif (strValue.startswith("{") and strValue.endswith("}")) \
+ or (strValue.startswith("[") and strValue.endswith("]")) \
+ or (strValue.startswith("(") and strValue.endswith(")")):
+ configValue = eval(strValue)
+ elif "_" in strValue and type(self.__StrToDict(strValue)) == dict:
+ configValue = self.__StrToDict(strValue)
+ elif ChConfig.Def_Str_Montant in strValue:
+ configValue = eval("(%s,)" % strValue.replace(ChConfig.Def_Str_Montant, ","))
+ elif strValue in ["-", ""]:
+ configValue = ""
+ else:
+ configValue = self.__ToFloat(strValue)
+ except BaseException:
+ ErrLog("SetIpyDataError: tableName=%s,key=%s,i=%s,value=%s" % ("FuncConfig", key, i, strValue))
+ raise
setattr(funcConfigObj, fieldName, configValue)
self.ipyFuncConfigDict[key] = funcConfigObj
return
--
Gitblit v1.8.0