From 542b896965d8b73ce4434de75c7eb232378c0a64 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 23 一月 2019 10:57:47 +0800
Subject: [PATCH] 6001 【后端】【1.5.100】七日巡礼增加条件(封包)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 82 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 1 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 b222ccb..47c70b3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1097,6 +1097,9 @@
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()]
@@ -2413,6 +2416,10 @@
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)
itemQuality = curItem.GetItemQuality()
@@ -2509,6 +2516,76 @@
# 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, ...):[传奇属性类型组1, ...], ...}
+ if itemType in equipTypeRandGroupDict:
+ randGroupList = equipTypeRandGroupDict[itemType]
+ else:
+ randGroupList = []
+ for typeTuple, groupList in equipTypeRandGroupDict.items():
+ if not isinstance(typeTuple, tuple):
+ continue
+ if itemType in typeTuple:
+ randGroupList = groupList
+ break
+
+ if not randGroupList:
+ GameWorld.ErrLog("该物品类型没有传奇属性!itemType=%s" % itemType)
+ return
+
+ randLegendAttrIDLsit = []
+ legendAttrGroupDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 1, {}) # 传奇类型组 {1:[传奇属性类型ID组], ...}
+ for groupType in randGroupList:
+ if groupType not in legendAttrGroupDict:
+ GameWorld.ErrLog("没有配置传奇属性组对应传奇属性类型列表! groupType=%s" % groupType)
+ continue
+ randLegendAttrIDLsit += legendAttrGroupDict[groupType]
+
+ if not randLegendAttrIDLsit:
+ return
+
+ itemClassLV = ItemCommon.GetItemClassLV(curItem)
+ itemQuality = curItem.GetItemQuality()
+ randCountKey = (itemClassLV, itemQuality)
+ randCountDict = IpyGameDataPY.GetFuncEvalCfg("LegendAttrRandRule", 3) # 随机条数: {(阶,星):[随机条数A, 随机条数B]], ...}
+ if randCountKey not in randCountDict:
+ GameWorld.ErrLog("没有配置装备阶星对应随机传奇属性条数: itemClassLV=%s, itemQuality=%s" % (itemClassLV, itemQuality))
+ return
+ randCountList = randCountDict[randCountKey]
+ 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) # 随机数值: {传奇属性类型:[随机数值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 attrID not in randValueListDict:
+ GameWorld.ErrLog("传奇属性没有配置随机数值范围或配置错误: attrID=%s" % (attrID))
+ return
+ randValueList = randValueListDict[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):
@@ -2644,9 +2721,12 @@
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]:
+ 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)
--
Gitblit v1.8.0