From e1a7147dc7b7e8f9ba72cfa0065695a8d7c3bac6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 28 八月 2018 11:52:05 +0800
Subject: [PATCH] fix:2989 【后端】开服特惠由创角开启改为开服时开启
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index 9544906..0a59194 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1094,13 +1094,8 @@
if not curItemData:
return False
- vPackItemDict = ChConfig.Def_VPackItem_Dict
+ packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
- for pack, itemTypeList in vPackItemDict.items():
- if curItemData.GetType() in itemTypeList:
- packIndex = pack
- break
-
if not self.CanPutInItem(packIndex, tagItem.GetItemTypeID(), tagItem.GetCount(), tagItem.GetIsBind(), defaultPile):
GameWorld.DebugLog("背包满，不能放入物品 count = %d"%tagItem.GetCount())
tagItem.Clear()
@@ -1882,11 +1877,10 @@
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetSpecialItem, 1, [itemID])
return True
- vPackItemDict = ChConfig.Def_VPackItem_Dict
- for pack, itemTypeList in vPackItemDict.items():
- if curItemData.GetType() in itemTypeList:
- packIndexList = [pack]
- break
+ defaultPack = IPY_GameWorld.rptItem if not packIndexList else packIndexList[0]
+ packIndex = ChConfig.GetItemPackType(curItemData.GetType(), defaultPack)
+ if packIndex != defaultPack or not packIndexList:
+ packIndexList = [packIndex]
if not __Check_CanPutItemInPack(curPlayer, itemID, itemCount, itemIsBind, packIndexList, defaultPile):
#不可放入
@@ -2210,8 +2204,13 @@
itemClassLV = ItemCommon.GetItemClassLV(curItem)
itemQuality = curItem.GetItemQuality()
key = (itemColor, itemQuality)
+ isDogzEquip = ItemCommon.GetIsDogzEquip(curItem)
# {(颜色,星级):[一般属性条数, 追求属性条数, 固定属性条数], ...}
- legAttrCntDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrCount")
+ if isDogzEquip:
+ #神兽装备条数不一样
+ legAttrCntDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrCount", 2)
+ else:
+ legAttrCntDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrCount")
if key not in legAttrCntDict:
#GameWorld.DebugLog("该装备品质没有传奇属性: itemColor=%s,itemQuality=%s" % (itemColor, itemQuality))
return
@@ -2240,7 +2239,11 @@
curLegAttrIDList = []
curLegAttrValueList = []
# {属性ID:{颜色:数值, ...}, ...}
- legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor")
+ if isDogzEquip:
+ # 神兽装备数值不一样
+ legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2")
+ else:
+ legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor")
legAttrValueClassLVDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByClassLV")
for attrID in randAttrIDList:
if attrID in legAttrValueColorDict:
--
Gitblit v1.8.0