From f27986d2eb32e3d2598d15b91c88479797ce5c72 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 13 三月 2019 17:48:37 +0800
Subject: [PATCH] 6328 【后端】优化代码eval - 二进制流 不能直接输出
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 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 76cc7d8..cb736bb 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
@@ -334,12 +334,11 @@
GameWorld.DebugLog("物品过期时间" + timeStr)
return GameWorld.ChangeTimeStrToNum(timeStr)
-
-## 创建物品
-# @param itemID 物品ID
-# @return curSingleItem
-# @remarks 函数详细说明.
-def CreateSingleItem(itemID, itemCount=1, isBind=1, expireTime=0):
+def CreateSingleItem(itemID, itemCount=1, isAuctionItem=False, expireTime=0):
+ ''' 创建物品
+ @param isAuctionItem: 是否拍品，默认非拍品
+ @param expireTime: 有效时间，时间单位由时效类型决定
+ '''
if itemCount < 1:
GameWorld.ErrLog("创建物品个数不能少于1! itemID=%s,itemCount=%s" % (itemID, itemCount))
return
@@ -375,7 +374,8 @@
return
curSingleItem.SetRemainHour(outTimeServerDay)
- if isBind:
+ if isAuctionItem:
+ curSingleItem.SetUserAttr(ShareDefine.Def_IudetAuctionItemCreateTime, int(time.time()))
curSingleItem.SetIsBind(1)
ItemControler.SetItemCount(curSingleItem, itemCount)
@@ -824,8 +824,7 @@
userData = curItem.GetUserData()
notifyList[4] = userData if (userData and userData != "{}") else ""
notifyList[5] = place
- suiteInfo = PlayerViewCacheTube.__GetEquipPartSuiteInfo(curPlayer)
- notifyList[6] = "" if not suiteInfo else json.dumps(suiteInfo, ensure_ascii=False)
+ notifyList[6] = ""
notifyList[7] = ChEquip.GetEquipPartPlusLV(curPlayer, IPY_GameWorld.rptEquip, place)
# 单部位洗练信息
@@ -1925,29 +1924,45 @@
## 获取物品最高强化等级
# @param itemType: 物品类型
# @return 最大星级，0为不可强化
-def GetItemMaxPlusLV(curItem):
+def GetItemMaxPlusLV(curPlayer, equipPackindex, curItem):
+ findType = ChEquip.GetEquipPlusType(curItem)
+ if not findType:
+ return 0
+ equipStar = ChEquip.GetEquipPartStarByRank(curPlayer, equipPackindex, curItem)
+ ipyData = IpyGameDataPY.GetIpyGameDataNotLog("ItemPlusMax", findType, equipStar)
+ if ipyData:
+ return ipyData.GetLevelMax()
+
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('ItemPlusMax', {'Type':findType}, True, False)
+ if not ipyDataList:
+ return 0
+ maxStar = ipyDataList[-1].GetStar()
+ if equipStar > maxStar:
+ return ipyDataList[-1].GetLevelMax()
+ findMax = 0
+ for ipyData in ipyDataList:
+ if equipStar >= ipyData.GetStar():
+ findMax = ipyData.GetLevelMax()
+ return findMax
+
+
+## 获取物品最高强化进化等级
+# @param itemType: 物品类型
+# @return 最大星级，0为不可强化
+def GetItemMaxPlusEvolveLV(curPlayer, equipPackindex, curItem):
+ packType = IPY_GameWorld.rptEquip
+ curPlusLV = ChEquip.GetEquipPartPlusLVByRank(curPlayer, packType, equipPackindex, curItem)
equipPlace = curItem.GetEquipPlace()
- plusMaxTypeDict = IpyGameDataPY.GetFuncEvalCfg("StrengthenLevelLimit", 1)
- if not plusMaxTypeDict:
- GameWorld.ErrLog("GetItemMaxPlusLV没有强化类型映射表")
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('EquipPlusEvolve', {'EquipPlace':equipPlace}, True)
+ if not ipyDataList:
return 0
-
- if equipPlace not in plusMaxTypeDict:
- return 0
- findType = plusMaxTypeDict[equipPlace]
- #仙器特殊取固定值
- if equipPlace in [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]:
- rank = 0
- itemColor = 0
- else:
- rank = GetItemClassLV(curItem)
- itemColor = curItem.GetItemColor()
- ipyData = IpyGameDataPY.GetIpyGameData("ItemPlusMax", findType, rank, itemColor)
- if not ipyData:
- GameWorld.ErrLog("找不到装备强化等级上限表数据配置！ rank = %s, %s" % (rank , curItem.GetItemQuality()))
- return
-
- return ipyData.GetLevelMax()
+ maxEvolvelv = 0
+ for ipyData in ipyDataList:
+ if curPlusLV >= ipyData.GetNeedPlusLV():
+ maxEvolvelv = ipyData.GetEvolveLV()
+ else:
+ break
+ return maxEvolvelv
## 获取物品最高星数
# @param itemType: 物品类型
@@ -1999,7 +2014,8 @@
addItemDict = {}
addItemDict['ItemID'] = curItem.GetItemTypeID()
addItemDict['Count'] = curItem.GetCount()
- addItemDict['IsBind'] = int(curItem.GetIsBind())
+ addItemDict['IsAuctionItem'] = curItem.GetIsBind()
+ #addItemDict['IsBind'] = int(curItem.GetIsBind())
#addItemDict['EquipGS'] = GetEquipGearScore(curItem)
#addItemDict['ItemStarLV'] = curItem.GetItemStarLV()
#addItemDict['CurDurg'] = GameWorld.GetIntUpper(curItem.GetCurDurg(), ChConfig.Def_EndureRepairParameter)
@@ -2023,7 +2039,7 @@
#addItemDict['EquipMaxAtkValue'] = curItem.GetEquipMaxAtkValue()
#addItemDict['FitLV'] = curItem.GetFitLV()
#addItemDict['Proficiency'] = curItem.GetProficiency()
- addItemDict['IsSuite'] = int(curItem.GetIsSuite())
+ #addItemDict['IsSuite'] = int(curItem.GetIsSuite())
#addItemDict['BaseHP'] = curItem.GetBaseHP()
#addItemDict['BaseMagicDef'] = curItem.GetBaseMagicDef()
#addItemDict['MaxAddSkillCnt'] = curItem.GetMaxAddSkillCnt()
--
Gitblit v1.8.0