From 80b0b1c317268f946c2bfa8f442cff6c5df20e76 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 九月 2018 23:24:00 +0800
Subject: [PATCH] 3428 子 【开发】神兽技能 / 【后端】神兽技能 --- 修复属性
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 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 18205d2..69947bd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1009,7 +1009,7 @@
# 小心, 小心, 小心, 小心, 小心
# eggxp
#===============================================================================
- def __PutItemInVPack(self, packIndex, tagItem, event):
+ def PutItemInVPack(self, packIndex, tagItem, event=["", False, {}]):
# 虚拟背包, 默认不做叠加
curPlayer = self.__Player
canPutInCnt = 1
@@ -1017,7 +1017,8 @@
eventName, isForceEvent, addDict = event
isNeedRecord = isForceEvent or ItemNeedRecord(tagItem)
if packIndex == ShareDefine.rptRune:
- setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV))
+ runeSource = tagItem.GetUserAttr(ShareDefine.Def_IudetRuneSource) or 1
+ setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV), source=runeSource)
refreshPlaceList = []
for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
@@ -1044,11 +1045,11 @@
Sync_VPackItem_Refresh(curPlayer, packIndex, refreshPlaceList)
if tagItem and not tagItem.IsEmpty():
- tagItem.Clear()
+ #tagItem.Clear()
return False
return True
- def __DoTransformItem(self, curPlayer, tagItem):
+ def DoTransformItem(self, curPlayer, tagItem):
## 将特殊物品转化为对应数值
itemID = tagItem.GetItemTypeID()
if itemID not in ChConfig.Def_TransformItemIDList:
@@ -1070,6 +1071,8 @@
elif itemID == ChConfig.Def_ItemID_BossReborn:
msgStr = str(itemCount)
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'AddBossRebornPoint', msgStr, len(msgStr))
+ elif itemID == ChConfig.Def_ItemID_Ysog:
+ PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, itemCount)
return True
@@ -1082,8 +1085,8 @@
def PutInItem(self, packIndex, tagItem, defaultPile=True, event=["", False, {}]):
curPlayer = self.__Player
- if self.__DoTransformItem(curPlayer, tagItem):
- tagItem.Clear() # 需清除，不然会导致内存泄露
+ if packIndex != ShareDefine.rptTreasure and self.DoTransformItem(curPlayer, tagItem):
+ tagItem.Clear() # 需清除，不然会导致内存泄露 寻宝仓库可暂存直接转化数值的物品
return True
isEquip = ItemCommon.CheckItemIsEquip(tagItem)
@@ -1103,7 +1106,7 @@
# 虚拟背包, 默认不做叠加
if packIndex in ShareDefine.Def_VPack_TypeList:
- return self.__PutItemInVPack(packIndex, tagItem, event)
+ return self.PutItemInVPack(packIndex, tagItem, event)
eventName, isForceEvent, addDict = event
@@ -1295,13 +1298,14 @@
return True, itemIndex
#==============================================================================
-# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第10位为是否锁定
-def GetRuneItemKeyData(itemID, RuneLV, lockState=0):
+# 符印物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级, 第9位为来源（老号0,默认1，合成2）,第10位为是否锁定
+def GetRuneItemKeyData(itemID, RuneLV, lockState=0, source=1):
lockState = 1 if lockState > 0 else 0
- return lockState * 1000000000 + min(RuneLV, 999) * 100000 + itemID
+ return lockState * 1000000000 + source * 100000000 + min(RuneLV, 999) * 100000 + itemID
def GetRuneItemID(keyData): return keyData % 100000
def GetRuneItemPlusLV(keyData): return keyData % 100000000 / 100000
def GetRuneItemIsLock(keyData): return keyData / 1000000000
+def GetRuneItemSource(keyData): return keyData % 1000000000 / 100000000
def IsRuneItemNeedRecord(curItem, plusLV):
return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange
@@ -1360,7 +1364,7 @@
DropItemToOtherPack(curPlayer, clientData.SrcBackpack, clientData.DesBackPack, clientData.SrcIndex, clientData.IsAll)
return
-def DropItemToOtherPack(curPlayer, fromPackIndex, toPackIndex, index, isAll=False):
+def DropItemToOtherPack(curPlayer, fromPackIndex, desPackIndex, index, isAll=False):
'''拖动某个背包物品到玩家物品背包
'''
movePack = curPlayer.GetItemManager().GetPack(fromPackIndex)
@@ -1371,26 +1375,46 @@
#整个背包转移
if isAll:
+ fullPackList = []
for itemIndex in xrange(movePack.GetCount()):
curItem = movePack.GetAt(itemIndex)
if not curItem or curItem.IsEmpty():
continue
+ toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), desPackIndex)
+ if toPackIndex in fullPackList:
+ continue
if not __DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, itemIndex, curItem):
- return
+ if toPackIndex not in fullPackList:
+ fullPackList.append(toPackIndex)
+
+ for fullPackIndex in fullPackList:
+ PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [fullPackIndex])
#单个物品转移
else:
curItem = movePack.GetAt(index)
if not curItem or curItem.IsEmpty():
return
+ toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), desPackIndex)
__DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, index, curItem)
return
def __DoDropItemToOtherPack(curPlayer, itemControl, fromPackIndex, toPackIndex, itemIndex, curItem):
+ if itemControl.DoTransformItem(curPlayer, curItem):
+ curItem.Clear()
+ return True
curItemTypeID = curItem.GetItemTypeID()
#curItemGUID = curItem.GetGUID()
curItemCount = curItem.GetCount()
curItemIsBind = curItem.GetIsBind()
+ #toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), toPackIndex)
+
+ # 常规物品转移到虚拟符印背包
+ if toPackIndex == ShareDefine.rptRune:
+ if not ItemCommon.CheckPackHasSpace(curPlayer, toPackIndex, True):
+ return False
+ return itemControl.PutItemInVPack(toPackIndex, curItem)
+
checkRet, putIndex = itemControl.CanPutInItemEx(toPackIndex, curItemTypeID, curItemCount, curItemIsBind)
if not checkRet:
return False
@@ -1571,6 +1595,8 @@
itemList = [] # 非装备普通物品
equipGSGreaterList = [] # 属于本职业的高评分装备
equipGSLesserList = [] # 低评分装备和非本职业
+ runeItemList = [] # 符印
+
#EquipGSTypeForSort
equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
#组合列表
@@ -1591,7 +1617,9 @@
equipGS = 1
cmpEquipGS = 2
- if equipGS == 0:
+ if tmpItem.GetType() in [ChConfig.Def_ItemType_Rune, ChConfig.Def_ItemType_RuneExp]:
+ runeItemList.append(tmpItem)
+ elif equipGS == 0:
itemList.append(tmpItem)
elif equipGS > cmpEquipGS:
equipGSGreaterList.append(tmpItem)
@@ -1601,7 +1629,8 @@
equipGSGreaterList.sort(__CmpRolePack)
itemList.sort(__CmpRolePack)
equipGSLesserList.sort(__CmpRolePack)
-
+ runeItemList.sort(__CmpRolePack)
+
#===========================================================================
# GameWorld.DebugLog("equipGSGreaterList")
# for item in equipGSGreaterList:
@@ -1636,6 +1665,11 @@
for item in equipGSLesserList:
curPack.GetAt(putPlace).AssignItem(item, False)
putPlace += 1
+
+ for item in runeItemList:
+ curPack.GetAt(putPlace).AssignItem(item, False)
+ putPlace += 1
+
return
@@ -2204,8 +2238,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
@@ -2234,7 +2273,13 @@
curLegAttrIDList = []
curLegAttrValueList = []
# {属性ID:{颜色:数值, ...}, ...}
- legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor")
+ if isDogzEquip:
+ # 神兽装备数值不一样
+ legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2", 1, {})
+ legAttrValueClassLVColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor2", 2, {})
+ else:
+ legAttrValueColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor", 1, {})
+ legAttrValueClassLVColorDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByColor", 2, {})
legAttrValueClassLVDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrValueByClassLV")
for attrID in randAttrIDList:
if attrID in legAttrValueColorDict:
@@ -2243,6 +2288,24 @@
GameWorld.ErrLog("没有配置传奇属性ID装备颜色对应的数值, attrID=%s,itemColor=%s" % (attrID, itemColor))
continue
attrValue = colorValueDict[itemColor]
+ # {属性ID:{阶:{颜色:数值, ...}, ...}, ...}
+ elif attrID in legAttrValueClassLVColorDict:
+ classLVColorValueDict = legAttrValueClassLVColorDict[attrID]
+ if itemClassLV in classLVColorValueDict:
+ colorValueDict = classLVColorValueDict[itemClassLV]
+ else:
+ minClassLV, maxClassLV = min(classLVColorValueDict), max(classLVColorValueDict)
+ if itemClassLV <= minClassLV:
+ colorValueDict = classLVColorValueDict[minClassLV]
+ elif itemClassLV >= maxClassLV:
+ colorValueDict = classLVColorValueDict[maxClassLV]
+ else:
+ GameWorld.ErrLog("没有配置传奇属性ID装备阶级颜色对应的数值, attrID=%s,itemClassLV=%s" % (attrID, itemClassLV))
+ continue
+ if itemColor not in colorValueDict:
+ GameWorld.ErrLog("没有配置传奇属性ID装备阶级颜色对应的数值, attrID=%s,itemClassLV=%s,itemColor=%s" % (attrID, itemClassLV, itemColor))
+ continue
+ attrValue = colorValueDict[itemColor]
elif attrID in legAttrValueClassLVDict:
classLVValueDict = legAttrValueClassLVDict[attrID]
if itemClassLV in classLVValueDict:
--
Gitblit v1.8.0