From ec68dabc97521a7706344e7d038e9f08462f4fe8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 10:26:34 +0800
Subject: [PATCH] 16 卡牌服务端(删除多余备档报错防范;)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
index c19100c..80d38e8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
@@ -55,7 +55,6 @@
import PlayerControl
import IpyGameDataPY
import ItemCommon
-import ObjPool
# 重置类型
ResetType_Day = 1
@@ -244,7 +243,9 @@
totalItemList = []
if itemID:
totalItemList.append([itemID, itemCount * clientBuyCount, isBind])
- for itemIDEx, itemCountEx, isBindEx in itemListEx:
+ for itemEx in itemListEx:
+ itemIDEx, itemCountEx = itemEx[:2]
+ isBindEx = itemEx[2] if len(itemEx) > 2 else 0
totalItemList.append([itemIDEx, itemCountEx * clientBuyCount, isBindEx])
if not totalItemList:
GameWorld.ErrLog("Store shop item error! shopType=%s,shopID=%s" % (shopType, shopID), curPlayer.GetPlayerID())
@@ -405,7 +406,7 @@
syncIDList.append(shopID)
if not syncIDList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCShopRefreshItemInfo)
+ clientPack = ChPyNetSendPack.tagSCShopRefreshItemInfo()
clientPack.ShopType = shopType
clientPack.RefreshCnt = min(curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopRefreshCnt % shopType), 250)
clientPack.ShopIDList = syncIDList
@@ -416,11 +417,10 @@
def SyncShopItemBuyCntInfo(curPlayer, syncIDList=[]):
##同步商品购买次数
- objPool = ObjPool.GetPoolMgr()
buyCntList = []
if syncIDList:
for shopID in syncIDList:
- buyInfo = objPool.acquire(ChPyNetSendPack.tagSCShopItemBuyCnt)
+ buyInfo = ChPyNetSendPack.tagSCShopItemBuyCnt()
buyInfo.ShopID = shopID
buyInfo.BuyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopBuyCnt % shopID)
buyCntList.append(buyInfo)
@@ -434,7 +434,7 @@
buyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopBuyCnt % shopID)
if buyCnt <= 0:
continue
- buyInfo = objPool.acquire(ChPyNetSendPack.tagSCShopItemBuyCnt)
+ buyInfo = ChPyNetSendPack.tagSCShopItemBuyCnt()
buyInfo.ShopID = shopID
buyInfo.BuyCnt = buyCnt
buyCntList.append(buyInfo)
@@ -442,7 +442,7 @@
if not buyCntList:
return
- clientPack = objPool.acquire(ChPyNetSendPack.tagSCShopItemBuyCntInfo)
+ clientPack = ChPyNetSendPack.tagSCShopItemBuyCntInfo()
clientPack.BuyCntList = buyCntList
clientPack.Count = len(clientPack.BuyCntList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
--
Gitblit v1.8.0