From bd9dce2d66b5086712596b8dac6d9116be65bafd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 十二月 2025 16:53:47 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（去除常规功能封包对象池使用；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 10 +--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py | 6 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLLMJ.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py | 6 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py | 8 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerChatBox.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBeauty.py | 7 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py | 7 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py | 8 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGubao.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerActivity.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFace.py | 9 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py | 11 +--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyTaofa.py | 10 +--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py | 5 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.py | 9 +-
25 files changed, 59 insertions(+), 90 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 c117e62..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
@@ -407,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
@@ -418,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)
@@ -436,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)
@@ -444,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)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 63d2b59..41a263c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -28,7 +28,6 @@
import FBLogic
import ChConfig
import PlayerGoldInvest
-import ObjPool
import random
import json
@@ -1689,11 +1688,11 @@
return
mapIDList = [mapIDInfo] if type(mapIDInfo) == int else mapIDInfo
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCFBInfoList)
+ clientPack = ChPyNetSendPack.tagSCFBInfoList()
clientPack.FBDataList = []
for mapID in mapIDList:
- fbInfo = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCFBInfo)
+ fbInfo = ChPyNetSendPack.tagSCFBInfo()
fbInfo.MapID = mapID
fbInfo.EnterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbEnterCnt % mapID)
fbInfo.ADAddCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FBADCnt % mapID)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
index ad97def..79adaa7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.py
@@ -35,7 +35,6 @@
import NPCCommon
import BattleObj
import ChEquip
-import ObjPool
import random
@@ -526,11 +525,10 @@
syncItemIDList = GetBootyItemIDList()
else:
syncItemIDList = [itemID]
- poolMgr = ObjPool.GetPoolMgr()
- clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCDropBootyInfo)
+ clientPack = ChPyNetSendPack.tagSCDropBootyInfo()
clientPack.DropBootyList = []
for itemID in syncItemIDList:
- dropBooty = poolMgr.acquire(ChPyNetSendPack.tagSCDropBooty)
+ dropBooty = ChPyNetSendPack.tagSCDropBooty()
dropBooty.ItemID = itemID
dropBooty.TodayDropCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BootyDropToday % itemID)
clientPack.DropBootyList.append(dropBooty)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
index e63e88a..0f63744 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
@@ -30,7 +30,6 @@
import PlayerMail
import DBDataMgr
import TurnSkill
-import ObjPool
def OnDay():
## 结算昨日奖励
@@ -264,7 +263,7 @@
def SyncTianziInfo(curPlayer, lineID=None, bossID=None):
if lineID == None:
lineID, bossID = GetTianziTodayInfo(curPlayer)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTianziKYInfo)
+ clientPack = ChPyNetSendPack.tagSCTianziKYInfo()
clientPack.LineID = lineID
clientPack.HistoryHurt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurt % bossID)
clientPack.HistoryHurtEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurtEx % bossID)
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 74383d5..2030fa7 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
@@ -1264,7 +1263,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 +1272,7 @@
if not itemCountList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCAutoItemCountRefresh)
+ clientPack = ChPyNetSendPack.tagMCAutoItemCountRefresh()
clientPack.Clear()
clientPack.ItemCountList = itemCountList
clientPack.Count = len(clientPack.ItemCountList)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 4f620fd..5850b84 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -133,7 +133,6 @@
import PlayerTravel
import TurnAttack
import PlayerHJG
-import ObjPool
import datetime
import time
@@ -3382,7 +3381,7 @@
adCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ADCnt % adID)
if not adCnt and syncADIDList == None:
continue
- adInfo = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCADInfo)
+ adInfo = ChPyNetSendPack.tagSCADInfo()
adInfo.ADID = adID
adInfo.ADCnt = adCnt
adInfoList.append(adInfo)
@@ -3390,7 +3389,7 @@
if not adInfoList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCADInfoList)
+ clientPack = ChPyNetSendPack.tagSCADInfoList()
clientPack.ADInfoList = adInfoList[:255]
clientPack.Count = len(clientPack.ADInfoList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerActivity.py
index 0cd5c60..9108c9e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerActivity.py
@@ -30,7 +30,6 @@
import ItemCommon
import GameWorld
import ChConfig
-import ObjPool
import math
# 开服冲榜类型对应功能ID
@@ -192,7 +191,7 @@
return
def SyncOSACelebrationInfo(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCOSACelebrationInfo)
+ clientPack = ChPyNetSendPack.tagSCOSACelebrationInfo()
clientPack.PointTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSACelebrationPoint)
clientPack.PointAward = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSACelebrationAward)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index c297ea6..39bf514 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -25,7 +25,6 @@
import IpyGameDataPY
import GameWorld
import DBDataMgr
-import ObjPool
def OnDay(curPlayer):
CheckResetWeekActivity(curPlayer)
@@ -166,7 +165,7 @@
return
def SyncDailyTaskInfo(curPlayer, taskType=0, conds=[], isAll=False):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDailyTaskInfo)
+ clientPack = ChPyNetSendPack.tagSCDailyTaskInfo()
clientPack.ActivityTotal = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ActivityTotal)
clientPack.ActivityAward = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ActivityAward)
clientPack.DailyTaskState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DailyTaskState)
@@ -186,7 +185,7 @@
clientPack.TaskList = []
for taskType, conds in syncTaskCondList:
- task = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDailyTask)
+ task = ChPyNetSendPack.tagSCDailyTask()
task.TaskType = taskType
task.Conds = conds
task.CLen = len(task.Conds)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
index 0120ebe..90ef549 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
@@ -28,7 +28,6 @@
import PyGameData
import GameWorld
import ChConfig
-import ObjPool
import random
# 记录攻击类型
@@ -403,8 +402,7 @@
def __SyncMatchList(curPlayer, matchIDList, viewCacheDict={}):
## 同步匹配列表
- objPool = ObjPool.GetPoolMgr()
- clientPack = objPool.acquire(ChPyNetSendPack.tagSCArenaMatchList)
+ clientPack = ChPyNetSendPack.tagSCArenaMatchList()
clientPack.MatchList = []
for matchID in matchIDList:
if matchID in viewCacheDict:
@@ -413,7 +411,7 @@
viewCache = PlayerViewCache.FindBattleViewCache(matchID)
if not viewCache:
continue
- matchInfo = objPool.acquire(ChPyNetSendPack.tagSCArenaMatchInfo)
+ matchInfo = ChPyNetSendPack.tagSCArenaMatchInfo()
matchInfo.PlayerID = matchID
if viewCache:
matchInfo.PlayerName = viewCache.GetPlayerName()
@@ -432,7 +430,7 @@
return
def Sync_ArenaInfo(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCArenaPlayerInfo)
+ clientPack = ChPyNetSendPack.tagSCArenaPlayerInfo()
clientPack.Score = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ArenaScore)
clientPack.WinCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ArenaWinCnt)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBeauty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBeauty.py
index d1b6242..e31417f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBeauty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBeauty.py
@@ -28,7 +28,6 @@
import PyGameData
import PlayerTask
import FBCommon
-import ObjPool
# 红颜解锁方式
(
@@ -573,7 +572,7 @@
if not state and beautyIDList == None:
continue
lv, exp = GetBeautyLVInfo(curPlayer, beautyID)
- beauty = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBeauty)
+ beauty = ChPyNetSendPack.tagSCBeauty()
beauty.BeautyID = beautyID
beauty.State = state
beauty.LV = lv
@@ -592,7 +591,7 @@
else:
if not skinInfo:
continue
- beautySkin = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBeautySkin)
+ beautySkin = ChPyNetSendPack.tagSCBeautySkin()
beautySkin.SkinID = skinID
beautySkin.State = 1 if IsBeautySkinCanUse(curPlayer, beautyID, skinID, ipyData) else 0
beautySkin.Used = GetBeautySkinUsed(curPlayer, skinID)
@@ -605,7 +604,7 @@
if not beautyList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBeautyInfo)
+ clientPack = ChPyNetSendPack.tagSCBeautyInfo()
clientPack.BeautyList = beautyList
clientPack.Count = len(clientPack.BeautyList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerChatBox.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerChatBox.py
index 92745ec..d77e599 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerChatBox.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerChatBox.py
@@ -24,7 +24,6 @@
import NetPackCommon
import ItemCommon
import ChConfig
-import ObjPool
import time
@@ -249,7 +248,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ChatBoxState, boxID)
if not state and boxIDList == None:
continue
- box = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCChatBox)
+ box = ChPyNetSendPack.tagSCChatBox()
box.BoxID = boxID
box.State = state
box.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBoxEndTime % boxID)
@@ -259,7 +258,7 @@
if not boxList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCChatBoxInfo)
+ clientPack = ChPyNetSendPack.tagSCChatBoxInfo()
clientPack.BoxList = boxList
clientPack.Count = len(clientPack.BoxList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFace.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFace.py
index 96b370e..9f7e597 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFace.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFace.py
@@ -26,7 +26,6 @@
import PlayerHero
import PlayerHJG
import ChConfig
-import ObjPool
import random
import time
@@ -262,7 +261,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_FaceState, faceID)
if not state and faceIDList == None:
continue
- face = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCFace)
+ face = ChPyNetSendPack.tagMCFace()
face.FaceID = faceID
face.State = state
face.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FaceEndTime % faceID)
@@ -272,7 +271,7 @@
if not faceList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCFaceInfo)
+ clientPack = ChPyNetSendPack.tagMCFaceInfo()
clientPack.FaceList = faceList
clientPack.Count = len(clientPack.FaceList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
@@ -462,7 +461,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_FacePicState, facePicID)
if not state and facePicIDList == None:
continue
- facePic = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCFacePic)
+ facePic = ChPyNetSendPack.tagMCFacePic()
facePic.FacePicID = facePicID
facePic.State = state
facePic.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FacePicEndTime % facePicID)
@@ -472,7 +471,7 @@
if not facePicList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCFacePicInfo)
+ clientPack = ChPyNetSendPack.tagMCFacePicInfo()
clientPack.FacePicList = facePicList
clientPack.Count = len(clientPack.FacePicList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
index dceae35..2420dbf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -33,7 +33,6 @@
import PlayerTask
import DBDataMgr
import DirtyList
-import ObjPool
import random
import time
@@ -1527,7 +1526,7 @@
donateCntList.append(donateCnt)
if not donateCntList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDonateCntInfo)
+ clientPack = ChPyNetSendPack.tagSCDonateCntInfo()
clientPack.DonateCntList = donateCntList
clientPack.Count = len(clientPack.DonateCntList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyTaofa.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyTaofa.py
index fb43f53..510f31e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyTaofa.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamilyTaofa.py
@@ -26,7 +26,6 @@
import PlayerFamily
import GameWorld
import DBDataMgr
-import ObjPool
import time
@@ -582,7 +581,7 @@
return
def SyncTaofaInfo(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCFamilyTaofaInfo)
+ clientPack = ChPyNetSendPack.tagSCFamilyTaofaInfo()
clientPack.BuZhenState = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyTaofaBuZhenState)
clientPack.AtkCount = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyTaofaCnt)
clientPack.ItemAddCount = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyTaofaItemAddCnt)
@@ -597,9 +596,8 @@
def SyncTaofaAtkRet(curPlayer, atkType, hurtList, awardItemList):
atkHurtList = []
- objPool = ObjPool.GetPoolMgr()
for totalHurt, isSuper in hurtList:
- atkHurt = objPool.acquire(ChPyNetSendPack.tagSCFamilyTaofaAtkHurt)
+ atkHurt = ChPyNetSendPack.tagSCFamilyTaofaAtkHurt()
atkHurt.IsSuper = isSuper
atkHurt.HurtValue = totalHurt % ChConfig.Def_PerPointValue
atkHurt.HurtValueEx = totalHurt / ChConfig.Def_PerPointValue
@@ -607,12 +605,12 @@
itemList = []
for itemID, itemCount in awardItemList:
- item = objPool.acquire(ChPyNetSendPack.tagSCFamilyTaofaAtkItem)
+ item = ChPyNetSendPack.tagSCFamilyTaofaAtkItem()
item.ItemID = itemID
item.Count = itemCount
itemList.append(item)
- clientPack = objPool.acquire(ChPyNetSendPack.tagSCFamilyTaofaAtkRet)
+ clientPack = ChPyNetSendPack.tagSCFamilyTaofaAtkRet()
clientPack.AtkType = atkType
clientPack.HurtList = atkHurtList
clientPack.HurtCount = len(clientPack.HurtList)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
index 25f00a3..818c651 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
@@ -26,7 +26,6 @@
import IpyGameDataPY
import ShareDefine
import CommFunc
-import ObjPool
import time
@@ -148,7 +147,7 @@
firstChargeList = []
for firstID in syncIDList:
- firstCharge = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCFirstCharge)
+ firstCharge = ChPyNetSendPack.tagSCFirstCharge()
firstCharge.FirstID = firstID
firstCharge.ChargeTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstChargeTime % firstID)
firstCharge.AwardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstChargeRecord % firstID)
@@ -157,7 +156,7 @@
if not firstChargeList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCFirstChargeInfo)
+ clientPack = ChPyNetSendPack.tagSCFirstChargeInfo()
clientPack.FirstChargeList = firstChargeList
clientPack.Count = len(clientPack.FirstChargeList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py
index 57af109..6861b51 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py
@@ -28,7 +28,6 @@
import PlayerGubao
import ShareDefine
import PlayerTask
-import ObjPool
import time
import math
@@ -611,7 +610,7 @@
return
def SyncGoldRushInfo(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCGoldRushInfo)
+ clientPack = ChPyNetSendPack.tagSCGoldRushInfo()
clientPack.CampState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldRushCampState)
clientPack.WorkerState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldRushWorkerState)
clientPack.PanningCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldRushCnt)
@@ -626,7 +625,6 @@
return
def SyncGoldCampInfo(curPlayer, syncCampIDList=None):
- poolMgr = ObjPool.GetPoolMgr()
campList = []
ipyDataMgr = IpyGameDataPY.IPY_Data()
for index in range(ipyDataMgr.GetGoldRushCampCount()):
@@ -635,7 +633,7 @@
if syncCampIDList and campID not in syncCampIDList:
continue
refreshCnt, goldID, workerCnt = GetCampInfo(curPlayer, campID)
- camp = poolMgr.acquire(ChPyNetSendPack.tagSCGoldRushCamp)
+ camp = ChPyNetSendPack.tagSCGoldRushCamp()
camp.CampID = campID
camp.GoldID = goldID
camp.RefreshCnt = refreshCnt
@@ -644,7 +642,7 @@
campList.append(camp)
if not campList:
return
- clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCGoldRushCampInfo)
+ clientPack = ChPyNetSendPack.tagSCGoldRushCampInfo()
clientPack.CampList = campList
clientPack.CampCnt = len(clientPack.CampList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGubao.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGubao.py
index a9c21b0..b35c897 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGubao.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGubao.py
@@ -25,7 +25,6 @@
import ItemControler
import PlayerOnline
import ChConfig
-import ObjPool
GubaoEffType_GoldRush = 1 # 参与淘金
GubaoEffType_Arena = 2 # 参与演武场
@@ -433,7 +432,7 @@
# 没有指定时只同步激活的
continue
lv, star, layer = GetGubaoInfo(curPlayer, gubaoID)
- gubao = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCGubao)
+ gubao = ChPyNetSendPack.tagMCGubao()
gubao.GubaoID = gubaoID
gubao.GubaoLV = lv
gubao.GubaoStar = star
@@ -443,7 +442,7 @@
if not gubaoInfoList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCGubaoInfo)
+ clientPack = ChPyNetSendPack.tagMCGubaoInfo()
clientPack.GubaoInfoList = gubaoInfoList
clientPack.Count = len(clientPack.GubaoInfoList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.py
index 2275cca..7ff73d0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHJG.py
@@ -27,7 +27,6 @@
import PlayerFace
import PlayerHero
import ChConfig
-import ObjPool
import random
import time
@@ -444,7 +443,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_TitleState, titleID)
if not state and titleIDList == None:
continue
- title = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTitle)
+ title = ChPyNetSendPack.tagSCTitle()
title.TitleID = titleID
title.State = state
title.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TitleEndTime % titleID)
@@ -454,7 +453,7 @@
if not titleList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTitleInfo)
+ clientPack = ChPyNetSendPack.tagSCTitleInfo()
clientPack.TitleList = titleList
clientPack.Count = len(clientPack.TitleList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
@@ -666,7 +665,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ModelState, modelID)
if not state and modelIDList == None:
continue
- model = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCModel)
+ model = ChPyNetSendPack.tagSCModel()
model.ModelID = modelID
model.State = state
model.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ModelEndTime % modelID)
@@ -676,7 +675,7 @@
if not modelList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCModelInfo)
+ clientPack = ChPyNetSendPack.tagSCModelInfo()
clientPack.ModelList = modelList
clientPack.Count = len(clientPack.ModelList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index 3b19ad1..93bec80 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -28,7 +28,6 @@
import PlayerOnline
import PlayerTask
import GameWorld
-import ObjPool
import time
@@ -250,7 +249,7 @@
return
def SyncHorseClassInfo(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseClassInfo)
+ clientPack = ChPyNetSendPack.tagSCHorseClassInfo()
clientPack.ClassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
clientPack.HorseLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseLV)
clientPack.Exp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseExp)
@@ -493,7 +492,7 @@
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_HorseSkinState, horseSkinID)
if not state and horseSkinIDList == None:
continue
- horseSkin = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkin)
+ horseSkin = ChPyNetSendPack.tagSCHorseSkin()
horseSkin.HorseSkinID = horseSkinID
horseSkin.State = state
horseSkin.EndTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseSkinEndTime % horseSkinID)
@@ -503,7 +502,7 @@
if not horseSkinList:
return
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCHorseSkinInfo)
+ clientPack = ChPyNetSendPack.tagSCHorseSkinInfo()
clientPack.HorseSkinList = horseSkinList
clientPack.Count = len(clientPack.HorseSkinList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLLMJ.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLLMJ.py
index cec5841..238cd35 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLLMJ.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLLMJ.py
@@ -21,7 +21,6 @@
import ChPyNetSendPack
import PlayerControl
import GameWorld
-import ObjPool
def OnPlayerLogin(curPlayer):
if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_LLMJLVInfo):
@@ -143,7 +142,7 @@
def SyncLLMJInfo(curPlayer):
mjLV, zhanchui = GetMJLVInfo(curPlayer)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCLLMJInfo)
+ clientPack = ChPyNetSendPack.tagSCLLMJInfo()
clientPack.MJLV = mjLV
clientPack.Zhanchui = zhanchui
clientPack.ExpEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_LLMJExp)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py
index 62e891a..08ec981 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.py
@@ -15,7 +15,6 @@
#"""Version = 2025-10-09 16:30"""
#-------------------------------------------------------------------------------
-import ObjPool
import DBDataMgr
import PlayerMail
import ShareDefine
@@ -150,7 +149,7 @@
def Sync_SignDayInfo(curPlayer):
signInMax = GetSignAwardCountMax()
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCDaySignInfo)
+ clientPack = ChPyNetSendPack.tagSCDaySignInfo()
clientPack.SignStateList = []
for bit in range(signInMax):
state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_SignInState, bit, False)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
index da70bce..19ffda5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
@@ -26,7 +26,6 @@
import ItemControler
import IpyGameDataPY
import PyGameData
-import ObjPool
#成就奖励是否已领取
def GetSuccHasGot(curPlayer, succID):
@@ -353,13 +352,12 @@
syncTypeCondList.append(tcList)
successInfoList = []
- objPoolMgr = ObjPool.GetPoolMgr()
for succType, conds in syncTypeCondList:
curValue = GetSuccValue(curPlayer, succType, conds)
# 不发送为0的数据
if not isSendZero and curValue <= 0:
continue
- succInfo = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessInfo)
+ succInfo = ChPyNetSendPack.tagSCSuccessInfo()
succInfo.SuccType = succType
succInfo.Conds = conds
succInfo.CLen = len(succInfo.Conds)
@@ -369,7 +367,7 @@
if not successInfoList:
return
- clientPack = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessInfoList)
+ clientPack = ChPyNetSendPack.tagSCSuccessInfoList()
clientPack.SuccessInfoList = successInfoList
clientPack.Count = len(clientPack.SuccessInfoList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
@@ -391,13 +389,12 @@
maxSuccID = ipyDataMgr.GetSuccessByIndex(succCnt - 1).GetSuccID()
recordIndexList = xrange(maxSuccID / 31 + 1)
- objPoolMgr = ObjPool.GetPoolMgr()
recordList = []
for i in recordIndexList:
awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuccessAward % i)
if not isSyncZero and not awardRecord:
continue
- recordInfo = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessAwardRecord)
+ recordInfo = ChPyNetSendPack.tagSCSuccessAwardRecord()
recordInfo.RecordIndex = i
recordInfo.Record = awardRecord
recordList.append(recordInfo)
@@ -405,7 +402,7 @@
if not recordList:
return
- clientPack = objPoolMgr.acquire(ChPyNetSendPack.tagSCSuccessAwardRecordList)
+ clientPack = ChPyNetSendPack.tagSCSuccessAwardRecordList()
clientPack.RecordList = recordList
clientPack.RecordCnt = len(clientPack.RecordList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.py
index 7474b04..cdd0ca1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.py
@@ -23,7 +23,6 @@
import ItemControler
import PlayerBeauty
import GameWorld
-import ObjPool
import random
import time
@@ -481,7 +480,7 @@
gridList = []
for row, col in syncGridList:
- grid = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTravelGrid)
+ grid = ChPyNetSendPack.tagSCTravelGrid()
grid.Row = row
grid.Col = col
grid.State = GetGridState(curPlayer, row, col)
@@ -490,7 +489,7 @@
gridList.append(grid)
sceneryType, sRow, sCol = __getSceneryInfo(curPlayer)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTravelInfo)
+ clientPack = ChPyNetSendPack.tagSCTravelInfo()
clientPack.Energy = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TravelEnergy)
clientPack.EnergyTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TravelEnergyTime)
clientPack.TravelCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TravelCnt)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
index 4506dce..81a0369 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
@@ -25,7 +25,7 @@
import PlayerGubao
import PlayerCoin
import ChConfig
-import ObjPool
+
import time
# 战令类型
@@ -332,7 +332,7 @@
rewardList = []
for ipyData in ipyDataList:
rewardIndex = ipyData.GetRewardIndex()
- reward = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCZhanling)
+ reward = ChPyNetSendPack.tagMCZhanling()
reward.Clear()
reward.NeedValue = ipyData.GetNeedValue()
reward.FreeRewardState = 1 if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ZhanlingRewardFree, rewardIndex, True, [zhanlingType]) else 0
@@ -340,7 +340,7 @@
reward.ZLRewardStateH = 1 if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_ZhanlingRewardH, rewardIndex, True, [zhanlingType]) else 0
rewardList.append(reward)
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCZhanlingInfo)
+ clientPack = ChPyNetSendPack.tagMCZhanlingInfo()
clientPack.Clear()
clientPack.ZhanlingType = zhanlingType
clientPack.IsActivite = 1 if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhanlingState)&pow(2, zhanlingType) else 0
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.py
index 40c5f19..d8d748e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.py
@@ -26,7 +26,6 @@
import PyMongoMain
import PlayerTask
import DirtyList
-import ObjPool
def OnPlayerLogin(curPlayer):
if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Rename):
@@ -116,7 +115,7 @@
return fullName
def Sync_UpdatePlayerNameCount(curPlayer):
- clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagUpdatePlayerNameCount)
+ clientPack = ChPyNetSendPack.tagUpdatePlayerNameCount()
clientPack.Count = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Rename)
NetPackCommon.SendFakePack(curPlayer, clientPack)
return
--
Gitblit v1.8.0