From 328648da94a07437fc46024f3e9b7e48c2e2ae38 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 29 十月 2024 17:15:29 +0800
Subject: [PATCH] 10275 【越南】【英语】【砍树】【tqxbqy】仙盟珍宝阁-后端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index db0b2f9..fe37d50 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -1456,6 +1456,29 @@
     curPlayer.SetTickByType(funcKey, tick)
     return True
 #---------------------------------------------------------------------
+def MergeItemList(itemList):
+    ## 合并物品列表,将相同物品数量合并
+    itemDict = {}
+    for itemInfo in itemList:
+        if len(itemInfo) == 3:
+            itemID, itemCount, isAuctionItem = itemInfo
+        elif len(itemInfo) == 2:
+            itemID, itemCount = itemInfo
+            isAuctionItem = None
+        else:
+            continue
+        key = (itemID, isAuctionItem)
+        itemDict[key] = itemDict.get(key, 0) + itemCount
+        
+    mItemList = []
+    for key, itemCount in itemDict.items():
+        itemID, isAuctionItem = key
+        if isAuctionItem == None:
+            mItemList.append([itemID, itemCount])
+        else:
+            mItemList.append([itemID, itemCount, isAuctionItem])
+    return mItemList
+
 ## 从列表中产生物品列表<不重复>
 #  @param riseList 随机列表
 #  @param randomNum 随机次数

--
Gitblit v1.8.0