From f88ead93b8cc2d26ce548d5f9138b5f37737175e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 24 十二月 2018 17:16:39 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发(玩家召唤兽不能对怪上buff)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 4a9bff8..293b4bc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -410,15 +410,14 @@
break
attrDict[effectID] = attrDict.get(effectID, 0) + curEffect.GetEffectValue(0)
- gsParamIpyData = None
+ classLV = GetItemClassLV(curItem)
+ color = curItem.GetItemColor()
+ itemQuality = curItem.GetItemQuality()
+ gsParamIpyData = IpyGameDataPY.GetIpyGameData("EquipGSParam", classLV, color, itemQuality)
# 传奇属性
legendAttrIDCnt = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrID)
legendAttrValueCnt = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrValue)
if legendAttrIDCnt and legendAttrIDCnt == legendAttrValueCnt:
- classLV = GetItemClassLV(curItem)
- color = curItem.GetItemColor()
- itemQuality = curItem.GetItemQuality()
- gsParamIpyData = IpyGameDataPY.GetIpyGameData("EquipGSParam", classLV, color, itemQuality)
for i in xrange(legendAttrIDCnt):
attrID = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetLegendAttrID, i)
attrValue = curItem.GetUserAttrByIndex(ShareDefine.Def_IudetLegendAttrValue, i)
@@ -1338,8 +1337,9 @@
return hasEnough, itemIndexList, findItemIsBind, needCnt
-def GetPackItemBindStateIndexInfo(curPlayer, itemID):
+def GetPackItemBindStateIndexInfo(curPlayer, itemID, needCount=0):
''' 获取背包消耗道具绑定及未绑定索引情况
+ @param needCount: 所需个数, 默认绑定优先，当找到已经足够的个数后不再遍历，减少无用遍历
@return: 可消耗物品列表[[绑定物品索引], [不绑定物品索引]], 绑定个数, 未绑定个数
'''
consumeItemIndexList = [[], []] # 可消耗物品列表[[绑定物品索引], [不绑定物品索引]]
@@ -1360,6 +1360,8 @@
if curItem.GetIsBind():
consumeItemIndexList[0].append(i)
bindCnt += itemCount
+ if needCount > 0 and bindCnt >= needCount:
+ break
else:
consumeItemIndexList[1].append(i)
unBindCnt += itemCount
@@ -1514,7 +1516,18 @@
def GetShopItemPrice(itemID, priceType):
''' 获取商城物品对应价格 '''
- ipyData = IpyGameDataPY.GetIpyGameDataByCondition("Store", {"ItemID":itemID, "MoneyType":priceType}, isLogNone=False)
+ # 系统固定商店类型： 仙玉（2-常用道具，3-成长变强），绑玉（4-绑玉商城）
+ priceTypeShopTypeDict = {IPY_GameWorld.TYPE_Price_Gold_Money:[2, 3],
+ IPY_GameWorld.TYPE_Price_Gold_Paper:[4],
+ }
+ ipyData = None
+ if priceType in priceTypeShopTypeDict:
+ for shopType in priceTypeShopTypeDict[priceType]:
+ ipyData = IpyGameDataPY.GetIpyGameDataByCondition("Store", {"ShopType":shopType, "ItemID":itemID, "MoneyType":priceType}, isLogNone=False)
+ if ipyData:
+ break
+ else:
+ ipyData = IpyGameDataPY.GetIpyGameDataByCondition("Store", {"ItemID":itemID, "MoneyType":priceType}, isLogNone=False)
if not ipyData:
return 0
return ipyData.GetMoneyNum()
@@ -1836,6 +1849,13 @@
itemName = str(itemID) if not curItemData else curItemData.GetName()
itemName = "%s LV%s" % (itemName, plusLV + 1)
isNeedRecord = curItemData and ItemControler.IsRuneItemNeedRecord(curItemData, plusLV)
+ if packIndex == ShareDefine.rptGatherSoul:
+ itemID = ItemControler.GetGatherSoulItemID(itemKeyData)
+ plusLV = ItemControler.GetGatherSoulItemPlusLV(itemKeyData)
+ curItemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
+ itemName = str(itemID) if not curItemData else curItemData.GetName()
+ itemName = "%s LV%s" % (itemName, plusLV + 1)
+ isNeedRecord = curItemData and ItemControler.IsGatherSoulItemNeedRecord(curItemData, plusLV)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_VPackItem % (packIndex, place), 0)
if isNeedRecord:
--
Gitblit v1.8.0