From 905bad6a43c7ed07a436781600c8fe7ad41dd887 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 二月 2019 15:14:51 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（封包）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 229 insertions(+), 11 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 a4bcf8a..1f0a059 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1029,6 +1029,8 @@
if packIndex == ShareDefine.rptRune:
runeSource = tagItem.GetUserAttr(ShareDefine.Def_IudetRuneSource) or 1
setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV), source=runeSource)
+ elif packIndex == ShareDefine.rptGatherSoul:
+ setItemKeyData = GetGatherSoulItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetGatherSoulLV))
refreshPlaceList = []
for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
@@ -1083,8 +1085,27 @@
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)
-
+ elif itemID == ChConfig.Def_ItemID_SoulDust:
+ PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulDust, itemCount)
+ elif itemID == ChConfig.Def_ItemID_SoulSplinters:
+ PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulSplinters, itemCount)
+ elif itemID == ChConfig.Def_ItemID_SoulCore:
+ PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulCore, itemCount)
+ elif itemID == ChConfig.Def_ItemID_Honor:
+ PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Honor, itemCount)
return True
+
+ def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):
+ ## 跨服获得物品
+ if packIndex not in [IPY_GameWorld.rptItem, ShareDefine.rptDogzItem, ShareDefine.rptZhuXianItem]:
+ #GameWorld.DebugLog("跨服获得物品不同步, packIndex=%s" % (packIndex))
+ return
+ curPlayer = self.__Player
+ serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)
+ itemData = [tagItem.GetItemTypeID(), tagItem.GetCount(), tagItem.GetIsBind(), tagItem.GetUserData()]
+ itemMsg = {"PlayerID":curPlayer.GetPlayerID(), "ItemData":itemData, "PackIndex":packIndex, "Event":event}
+ GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_PutInItem, itemMsg, [serverGroupID])
+ return
## 放入物品
# @param packIndex 背包索引
@@ -1103,6 +1124,13 @@
if not curItemData:
return False
+ if GameWorld.IsCrossServer():
+ self.__CrossServerPutInItem(packIndex, tagItem, event)
+ tagItem.Clear()
+ return True
+ if CheckChangeOldItem(curPlayer, tagItem):
+ tagItem.Clear()
+ return True
packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
if not self.CanPutInItem(packIndex, tagItem.GetItemTypeID(), GetItemCount(tagItem), tagItem.GetIsBind(), defaultPile):
@@ -1111,6 +1139,10 @@
return False
itemID = tagItem.GetItemTypeID()
+ #激活成就的道具
+ if tagItem.GetType() == ChConfig.Def_ItemType_SuccessItem:
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetSpecialItem, 1, [tagItem.GetEffectByIndex(0).GetEffectValue(0)])
+ return True
if itemID in ChConfig.Def_TransformItemIDList:
# 直接转化为对应货币的物品仅在放入背包时直接转化，否则还是以真实物品的形式存在，但堆叠上限需要做特殊处理
if packIndex == IPY_GameWorld.rptItem:
@@ -1138,7 +1170,7 @@
isBind = tagItem.GetIsBind()
isNeedRecord = False
# 目前暂只记录放入背包的
- if packIndex in [IPY_GameWorld.rptItem, ShareDefine.rptTreasure, ShareDefine.rptRune]:
+ if packIndex in [IPY_GameWorld.rptItem, ShareDefine.rptTreasure, ShareDefine.rptRune, ShareDefine.rptGatherSoul]:
isNeedRecord = ItemNeedRecord(tagItem) or isForceEvent
putResult = False
@@ -1260,10 +1292,32 @@
return
def CheckRolePackEquipAttr(self):
+ ''' 玩家上线修复装备属性bug
+ 版本1：邮件给装备没有传奇属性，检查无传奇属性装备
+ 版本2：绝版属性数值调整，已获得的装备重新刷下
+ '''
curPlayer = self.__Player
+ checkVersion = 20190103
key = "LoginCheckEquipAttr"
- if curPlayer.NomalDictGetProperty(key):
+ curVersion = curPlayer.NomalDictGetProperty(key)
+ if curVersion == checkVersion:
return
+ playerID = curPlayer.GetPlayerID()
+ GameWorld.Log("玩家上线处理装备属性! curVersion=%s,checkVersion=%s" % (curVersion, checkVersion), playerID)
+
+ outOfPrintAttrItemDict = {} # 有绝版属性的定制物品属性信息 {itemID:[绝版属性ID列表, 绝版属性数值列表], ...}
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for i in xrange(ipyDataMgr.GetAppointItemCount()):
+ ipyData = ipyDataMgr.GetAppointItemByIndex(i)
+ outOfPrintAttrList = ipyData.GetOutOfPrintAttr()
+ outOfPrintAttrValueList = ipyData.GetOutOfPrintAttrValue()
+ if not outOfPrintAttrList or len(outOfPrintAttrList) != len(outOfPrintAttrValueList):
+ continue
+ itemID = GetAppointItemRealID(ipyData.GetID())
+ if not itemID:
+ continue
+ outOfPrintAttrItemDict[itemID] = [outOfPrintAttrList, outOfPrintAttrValueList]
+
checkPackList = [IPY_GameWorld.rptEquip, IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse]
for packType in checkPackList:
curPack = curPlayer.GetItemManager().GetPack(packType)
@@ -1275,8 +1329,21 @@
isEquip = ItemCommon.CheckItemIsEquip(curItem)
if not isEquip:
continue
+ itemID = curItem.GetItemTypeID()
self.CheckEquipAttr(packType, curItem)
- PlayerControl.NomalDictSetProperty(curPlayer, key, 1)
+
+ # 重刷绝版属性
+ if itemID in outOfPrintAttrItemDict:
+ outOfPrintAttrList, outOfPrintAttrValueList = outOfPrintAttrItemDict[itemID]
+ curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID)
+ curItem.ClearUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue)
+ for outOfPrintAttrIndex in xrange(len(outOfPrintAttrList)):
+ curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrID, outOfPrintAttrList[outOfPrintAttrIndex])
+ curItem.AddUserAttr(ShareDefine.Def_IudetOutOfPrintAttrValue, outOfPrintAttrValueList[outOfPrintAttrIndex])
+ GameWorld.Log(" 玩家登录重刷装备绝版属性: packType=%s,i=%s,itemID=%s,outOfPrintAttrList=%s,outOfPrintAttrValueList=%s"
+ % (packType, i, itemID, outOfPrintAttrList, outOfPrintAttrValueList), playerID)
+
+ PlayerControl.NomalDictSetProperty(curPlayer, key, checkVersion)
return
## 是否能放入物品
@@ -1288,6 +1355,8 @@
# @return True or False
# @remarks 函数详细说明.
def CanPutInItem(self, packIndex, curItemID, curItemCount, isBind, defaultPile=True):
+ if GameWorld.IsCrossServer():
+ return True
checkRet, putIndex = self.CanPutInItemEx(packIndex, curItemID, curItemCount, isBind, defaultPile)
return checkRet
@@ -1376,6 +1445,14 @@
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
+
+# 聚魂物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级
+def GetGatherSoulItemKeyData(itemID, GatherSoulLV):
+ return min(GatherSoulLV, 999) * 100000 + itemID
+def GetGatherSoulItemID(keyData): return keyData % 100000
+def GetGatherSoulItemPlusLV(keyData): return keyData % 100000000 / 100000
+def IsGatherSoulItemNeedRecord(curItem, plusLV):
return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange
def SetVPackItemKeyData(curPlayer, packIndex, place, keyData, isSync=True):
@@ -2002,11 +2079,6 @@
if not curItemData:
return False
- #激活成就的道具
- if curItemData.GetType() == ChConfig.Def_ItemType_SuccessItem:
- PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetSpecialItem, 1, [itemID])
- return True
-
defaultPack = IPY_GameWorld.rptItem if not packIndexList else packIndexList[0]
packIndex = ChConfig.GetItemPackType(curItemData.GetType(), defaultPack)
if packIndex != defaultPack or not packIndexList:
@@ -2306,10 +2378,10 @@
#---无空位置，替换---
return placeList[0]
-def GetOutPutItemObj(itemID, itemCount=1, isBind=0):
+def GetOutPutItemObj(itemID, itemCount=1, isBind=0, expireTime=0):
''' 获取功能产出的物品实例
'''
- curItem = ItemCommon.CreateSingleItem(itemID, itemCount, isBind)
+ curItem = ItemCommon.CreateSingleItem(itemID, itemCount, isBind, expireTime)
if not curItem:
GameWorld.ErrLog("产出物品异常,无法创建物品 = %s" % (itemID))
return
@@ -2343,6 +2415,10 @@
itemType = curItem.GetType()
if itemType == ChConfig.Def_ItemType_retWing:
return __GetAddWingLegendAttr(curItem)
+
+ isZhuXianEquip = ItemCommon.GetIsZhuXianEquip(curItem)
+ if isZhuXianEquip:
+ return __GetRandLegendAttr(curItem)
itemColor = curItem.GetItemColor()
itemClassLV = ItemCommon.GetItemClassLV(curItem)
@@ -2440,6 +2516,71 @@
# GameWorld.DebugLog("commAttrList=%s, goodAttrList=%s, specAttrList=%s" % (commAttrList, goodAttrList, specAttrList))
# GameWorld.DebugLog("randAttrIDList=%s,curLegAttrIDList=%s, curLegAttrValueList=%s"
# % (randAttrIDList, curLegAttrIDList, curLegAttrValueList))
+ return [curLegAttrIDList, curLegAttrValueList]
+
+def __GetRandLegendAttr(curItem):
+ # 纯随机类型及数值的规则
+
+ itemType = curItem.GetType()
+ equipTypeRandGroupDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 2, {}) # 随机传奇属性类型组配置: {"装备类型":[传奇类型组1, 组2, ...], ...}
+ if str(itemType) not in equipTypeRandGroupDict:
+ return
+ randGroupList = equipTypeRandGroupDict[str(itemType)]
+ if not randGroupList:
+ GameWorld.ErrLog("该物品类型没有传奇属性!itemType=%s" % itemType)
+ return
+
+ randLegendAttrIDLsit = []
+ legendAttrGroupDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 1, {}) # 传奇类型组 {"组ID":[属性ID1, 属性ID2], ...}
+ for groupType in randGroupList:
+ if str(groupType) not in legendAttrGroupDict:
+ GameWorld.ErrLog("没有配置传奇属性组对应传奇属性类型列表! groupType=%s" % groupType)
+ continue
+ randLegendAttrIDLsit += legendAttrGroupDict[str(groupType)]
+
+ if not randLegendAttrIDLsit:
+ return
+
+ itemClassLV = ItemCommon.GetItemClassLV(curItem)
+ itemQuality = curItem.GetItemQuality()
+ randCountDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 3) # 随机条数: {"阶":{"星":[条数A, 条数B], ...}, ...}
+ if str(itemClassLV) not in randCountDict:
+ GameWorld.ErrLog("没有配置装备阶对应随机传奇属性条数: itemClassLV=%s" % (itemClassLV))
+ return
+ qualityCountDict = randCountDict[str(itemClassLV)]
+ if str(itemQuality) not in qualityCountDict:
+ GameWorld.ErrLog("没有配置装备阶星对应随机传奇属性条数: itemClassLV=%s, itemQuality=%s" % (itemClassLV, itemQuality))
+ return
+ randCountList = qualityCountDict[str(itemQuality)]
+ if not randCountList or len(randCountList) != 2:
+ return
+ legAttrCnt = random.randint(randCountList[0], randCountList[1])
+ legAttrCnt = min(len(randLegendAttrIDLsit), legAttrCnt)
+ curLegAttrIDList = random.sample(randLegendAttrIDLsit, legAttrCnt)
+ curLegAttrValueList = []
+
+ randValueListDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 4) # 随机数值: {"传奇属性ID":[随机数值1, 数值2, ...], ...}
+ maxValueMinCountDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 5) # 保底最大数值条数: {(阶,星):条数, ...], ...} 没配置的默认0
+ maxValueMinCount = maxValueMinCountDict.get((itemClassLV, itemQuality), 0)
+ if legAttrCnt < maxValueMinCount:
+ GameWorld.ErrLog("传奇属性条数少于保底最大数值条数: itemClassLV=%s, itemQuality=%s, legAttrCnt=%s, maxValueMinCount=%s"
+ % (itemClassLV, itemQuality, legAttrCnt, maxValueMinCount))
+ return
+
+ for i, attrID in enumerate(curLegAttrIDList):
+ if str(attrID) not in randValueListDict:
+ GameWorld.ErrLog("传奇属性没有配置随机数值范围或配置错误: attrID=%s" % (attrID))
+ return
+ randValueList = randValueListDict[str(attrID)]
+ if i < maxValueMinCount:
+ randValue = max(randValueList)
+ else:
+ randValue = random.choice(randValueList)
+ curLegAttrValueList.append(randValue)
+
+# GameWorld.DebugLog("itemType=%s,itemClassLV=%s,itemQuality=%s,randLegendAttrIDLsit=%s" % (itemType, itemClassLV, itemQuality, randLegendAttrIDLsit))
+# GameWorld.DebugLog("legAttrCnt=%s,maxValueMinCount=%s" % (legAttrCnt, maxValueMinCount))
+# GameWorld.DebugLog("curLegAttrIDList=%s,curLegAttrValueList=%s" % (curLegAttrIDList, curLegAttrValueList))
return [curLegAttrIDList, curLegAttrValueList]
def __GetAddWingLegendAttr(curItem):
@@ -2560,3 +2701,80 @@
return
+def CheckChangeOldItem(curPlayer, tagItem):
+ ##替换旧物品
+ itemID = tagItem.GetItemTypeID()
+ changeOldItemDict = IpyGameDataPY.GetFuncEvalCfg('ChangeOldItem', 1, {})
+ if itemID not in changeOldItemDict:
+ return
+ itemCnt = GetItemCount(tagItem)
+ isBind = tagItem.GetIsBind()
+ toItemID, toCnt, mailKey = changeOldItemDict[itemID]
+ giveCnt = itemCnt * toCnt
+ PlayerControl.SendMailByKey(mailKey, [curPlayer.GetPlayerID()], [[toItemID, giveCnt, isBind]])
+ return True
+
+def LoginCheckChangeOldItem(curPlayer):
+ ##登录检查替换旧物品
+ if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_GodWeaponItem):
+ return
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_GodWeaponItem, 1)
+ giveItemDict = {}
+ mailDict = {}
+ for packIndex in [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]:
+ curPack = curPlayer.GetItemManager().GetPack(packIndex)
+ for i in xrange(curPack.GetCount()):
+ curItem = curPack.GetAt(i)
+ if not curItem:
+ continue
+ itemID = curItem.GetItemTypeID()
+ changeOldItemDict = IpyGameDataPY.GetFuncEvalCfg('ChangeOldItem', 1, {})
+ if itemID not in changeOldItemDict:
+ continue
+ isBind = curItem.GetIsBind()
+ itemCount = curItem.GetCount()
+ toItemID, toCnt, mailKey = changeOldItemDict[itemID]
+ giveCnt = itemCount * toCnt
+ keyStr = '%s_%s'%(toItemID, isBind)
+ giveItemDict[keyStr] = giveItemDict.get(keyStr, 0) + giveCnt
+ ItemCommon.DelItem(curPlayer, curItem, itemCount, False, "ChangeOldItem")
+ if mailKey not in mailDict:
+ mailDict[mailKey] = [keyStr]
+ if keyStr not in mailDict[mailKey]:
+ mailDict[mailKey].append(keyStr)
+ for mailKey, keyStrList in mailDict.items():
+ itemList = []
+ for keyStr in keyStrList:
+ if keyStr not in giveItemDict:
+ continue
+ giveCnt = giveItemDict[keyStr]
+ itemID, isBind = keyStr.split('_')
+ itemList.append([int(itemID), giveCnt, int(isBind)])
+ PlayerControl.SendMailByKey(mailKey, [curPlayer.GetID()], itemList)
+ return
+
+def GivePlayerItemOrMail(curPlayer, itemList, mailKey=None, event=["", False, {}]):
+ ##给物品，背包满则发邮件
+ needPackSpaceDict = {}
+ for itemID, itemCnt, isBind in itemList:
+ curItem = GameWorld.GetGameData().GetItemByTypeID(itemID)
+ if not curItem:
+ GameWorld.ErrLog('GivePlayerItemOrMail 物品ID不存在 itemID=%s'%itemID, curPlayer.GetID())
+ return
+ packType = ChConfig.GetItemPackType(curItem.GetType())
+ needSpace = GetItemNeedPackCount(packType, curItem, itemCnt)
+ needPackSpaceDict[packType] = needPackSpaceDict.get(packType, 0) + needSpace
+ isSendMail = False
+ for packType, needSpace in needPackSpaceDict.items():
+ if needSpace > ItemCommon.GetItemPackSpace(curPlayer, packType, needSpace):
+ isSendMail = True
+ break
+
+ if isSendMail:
+ PlayerControl.SendMailByKey(mailKey, [curPlayer.GetPlayerID()], itemList)
+ GameWorld.DebugLog("GivePlayerItemOrMail背包空间不够，发送邮件: mailItemList=%s" % str(itemList), curPlayer.GetPlayerID())
+ else:
+ for itemID, itemCnt, isBind in itemList:
+ GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],
+ event=event)
+ return
\ No newline at end of file
--
Gitblit v1.8.0