From 8ab0e3412c93ed16f9ecbd3f8f6c587ae681cde4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 十二月 2025 11:38:53 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(修复满星生效卡被吞噬后无法生效新卡的bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 79539df..0bef096 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -33,7 +33,6 @@
 import PlayerGubao
 import PyGameData
 import PlayerHero
-import ObjPool
 
 import math
 import time
@@ -484,6 +483,12 @@
     
     itemType = curItem.GetType()
     itemID = curItem.GetItemTypeID()
+    
+    if itemType in IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 4) \
+        or itemID in IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 5):
+        GameWorld.DebugLog("不需要记录的物品类型或ID! itemType=%s,itemID=%s" % (itemType, itemID))
+        return False
+    
     itemTypeMinColorDict = IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 1)
     if itemType in itemTypeMinColorDict:
         minColor = itemTypeMinColorDict[itemType]
@@ -497,11 +502,6 @@
         or itemID in IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 3):
         #GameWorld.DebugLog("需要记录的物品类型或ID! itemType=%s,itemID=%s" % (itemType, itemID))
         return True
-    
-    if itemType in IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 4) \
-        or itemID in IpyGameDataPY.GetFuncEvalCfg("ItemRecordRule", 5):
-        #GameWorld.DebugLog("不需要记录的物品类型或ID! itemType=%s,itemID=%s" % (itemType, itemID))
-        return False
     
     #if itemType == ChConfig.Def_ItemType_Rune:
     #    return IsRuneItemNeedRecord(curItem, curItem.GetUserAttr(ShareDefine.Def_IudetRuneLV))
@@ -1264,7 +1264,7 @@
         itemCount = GetItemCountByID(curPlayer, itemID)
         if not itemCount and not force:
             continue
-        countInfo = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCAutoItemCount)
+        countInfo = ChPyNetSendPack.tagMCAutoItemCount()
         countInfo.Clear()
         countInfo.ItemID = itemID
         countInfo.ItemCount = itemCount
@@ -1273,7 +1273,7 @@
     if not itemCountList:
         return
     
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCAutoItemCountRefresh)
+    clientPack = ChPyNetSendPack.tagMCAutoItemCountRefresh()
     clientPack.Clear()
     clientPack.ItemCountList = itemCountList
     clientPack.Count = len(clientPack.ItemCountList)
@@ -2005,11 +2005,11 @@
         return False
     
     if isAuctionItem:
-        ipyData = None #IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
-        if not ipyData:
-            GameWorld.ErrLog("非拍卖物品,默认转为非拍品! itemID=%s,itemCount=%s,isAuctionItem=%s" 
-                             % (itemID, itemCount, isAuctionItem), curPlayer.GetPlayerID())
-            isAuctionItem = 0
+        #ipyData = None #IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
+        #if not ipyData:
+        #    GameWorld.ErrLog("非拍卖物品,默认转为非拍品! itemID=%s,itemCount=%s,isAuctionItem=%s" 
+        #                     % (itemID, itemCount, isAuctionItem), curPlayer.GetPlayerID())
+        isAuctionItem = 0
     
     defaultPack = IPY_GameWorld.rptItem if not packIndexList else packIndexList[0]
     packIndex = ChConfig.GetItemPackType(curItemData, defaultPack)

--
Gitblit v1.8.0