From 302d2582109d6cdc666306b560f4a842995085de Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 09 十月 2018 19:59:49 +0800
Subject: [PATCH] 3951 【后端】【1.1.0】创角名字长度限制修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index cd11c50..6c738f8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -133,6 +133,7 @@
                         ("list", "HelpBattleSkills", 0),
                         ("DWORD", "FightPowerEx", 0),
                         ("list", "EquipPlaceColorList", 0),
+                        ("list", "HelpBattleNotify", 0),
                         ),
 
                 "DogzEquipPlus":(
@@ -797,6 +798,7 @@
                         ("list", "RandTimeList1", 0),
                         ("list", "RandItemList2", 0),
                         ("list", "RandTimeList2", 0),
+                        ("dict", "RandItemByUseCount", 0),
                         ("list", "JobItemList", 0),
                         ("BYTE", "MoneyType", 0),
                         ("DWORD", "MoneyCount", 0),
@@ -1223,7 +1225,8 @@
         self.BaseAttrValues = []
         self.HelpBattleSkills = []
         self.FightPowerEx = 0
-        self.EquipPlaceColorList = []
+        self.EquipPlaceColorList = []
+        self.HelpBattleNotify = []
         return
         
     def GetDogzID(self): return self.DogzID # 神兽ID
@@ -1231,7 +1234,8 @@
     def GetBaseAttrValues(self): return self.BaseAttrValues # 基础属性值列表
     def GetHelpBattleSkills(self): return self.HelpBattleSkills # 助战技能ID列表
     def GetFightPowerEx(self): return self.FightPowerEx # 助战附加战力
-    def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制
+    def GetEquipPlaceColorList(self): return self.EquipPlaceColorList # 穿戴装备颜色限制
+    def GetHelpBattleNotify(self): return self.HelpBattleNotify # 助战广播 ["广播key",[参数1,参数2,...],广播CD分钟]
 
 # 神兽强化表
 class IPY_DogzEquipPlus():
@@ -2607,6 +2611,7 @@
         self.RandTimeList1 = []
         self.RandItemList2 = []
         self.RandTimeList2 = []
+        self.RandItemByUseCount = {}
         self.JobItemList = []
         self.MoneyType = 0
         self.MoneyCount = 0
@@ -2621,6 +2626,7 @@
     def GetRandTimeList1(self): return self.RandTimeList1 # 随机次数饼图列表1
     def GetRandItemList2(self): return self.RandItemList2 # 随机物品饼图列表2
     def GetRandTimeList2(self): return self.RandTimeList2 # 随机次数饼图列表2
+    def GetRandItemByUseCount(self): return self.RandItemByUseCount # 宝箱开启X次对应特殊产出,与饼图列表2互斥
     def GetJobItemList(self): return self.JobItemList # 职业物品列表
     def GetMoneyType(self): return self.MoneyType # 货币类型
     def GetMoneyCount(self): return self.MoneyCount # 货币数量
@@ -3834,7 +3840,7 @@
     '''查询条件下与对应查询字段参考值相近的数据实例;参考值小于配置表最小值时返回none,大于最大值时返回最大值对应的实例
     @param dtName: 表名,不含tag
     @param keyName: 参考字段名
-    @param keyValue: 参考字段值
+    @param keyValue: 参考字段值,大于等于字段值时返回对应数据
     @param conditionDict: 查询条件,{查询字段名:字段值, ...}
     @return: 找不到数据返回 None , 否则返回对应的 ipyData 数据实例
     '''
@@ -3866,7 +3872,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