From 09e53ea10631c31e091c2947fc05c56ffe954ba6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 02 七月 2019 16:55:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py
index abbe155..2a6869b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEquipDecompose.py
@@ -101,21 +101,21 @@
awardRateList = IpyGameDataPY.GetFuncEvalCfg('EquipDecomposeAward', 2)
resetItemIDList = IpyGameDataPY.GetFuncEvalCfg('EquipDecomposeAward', 3)
giveCnt = updDecomposeCnt/perDecomposeCnt
+ minCnt, minItemID = 0, 0
+ for itemid in resetItemIDList:
+ cnt = ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptItem, itemid)
+ cnt += ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptWarehouse, itemid)
+ if not minCnt or cnt < minCnt:
+ minCnt = cnt
+ minItemID = itemid
+
giveItemIDDict = {}
for _ in xrange(giveCnt):
itmeID = GameWorld.GetResultByRandomList(awardRateList)
if not itmeID:
continue
- if itmeID in resetItemIDList: #给玩家拥有最少的材料
- minCnt, rItemID = 0, 0
- for itemid in resetItemIDList:
- cnt = ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptItem, itemid)
- cnt += ItemControler.FindPlayerItemCountByItemID(curPlayer, IPY_GameWorld.rptWarehouse, itemid)
- if cnt and not minCnt or cnt < minCnt:
- minCnt = cnt
- rItemID = itemid
- if rItemID:
- itmeID = rItemID
+ if itmeID in resetItemIDList and minItemID: #给玩家拥有最少的材料
+ itmeID = minItemID
giveItemIDDict[itmeID] = giveItemIDDict.get(itmeID, 0) + 1
if giveItemIDDict:
--
Gitblit v1.8.0