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/Player/PlayerGoldRush.py | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
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 1d67bb6..7ae652f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.py
@@ -20,13 +20,14 @@
import NetPackCommon
import IpyGameDataPY
import ItemControler
+import PlayerSuccess
import ChPyNetSendPack
import PlayerActivity
import PlayerControl
import GameFuncComm
import PlayerGubao
import ShareDefine
-import ObjPool
+import PlayerTask
import time
import math
@@ -315,6 +316,9 @@
campInfo = SetCampInfo(curPlayer, campID, refreshCnt, goldID, updWorkerCnt)
GameWorld.DebugLog(" updWorkerCnt=%s,realNeedSeconds=%s,endTime=%s,campInfo=%s"
% (updWorkerCnt, realNeedSeconds, GameWorld.ChangeTimeNumToStr(endTime), campInfo))
+
+ PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_GoldRush, 1)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAGoldRush, 1)
return
def GetWorkerTotal(curPlayer):
@@ -410,6 +414,10 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GoldRushWorkerState, workerState)
GameWorld.DebugLog("解锁淘金监工: workerID=%s,workerState=%s" % (workerID, workerState))
SyncGoldRushInfo(curPlayer)
+
+ PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_GoldRushWorkers)
+ workersTotal = GetWorkerTotal(curPlayer)
+ PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_OSAGoldRushWorkers, workersTotal)
return
#// B0 38 淘金仓库领奖 #tagCSGoldRushWarehouseAward
@@ -429,7 +437,7 @@
getList = []
if isAll:
spaceList = IpyGameDataPY.GetFuncEvalCfg("GoldRush", 1)
- maxSpace = sum(spaceList) if GoldRushAutoCanUse(curPlayer) else spaceList[0]
+ maxSpace = sum(spaceList)
for index in range(maxSpace):
goldID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldRushWarehouse % index)
if not goldID:
@@ -602,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)
@@ -617,7 +625,6 @@
return
def SyncGoldCampInfo(curPlayer, syncCampIDList=None):
- poolMgr = ObjPool.GetPoolMgr()
campList = []
ipyDataMgr = IpyGameDataPY.IPY_Data()
for index in range(ipyDataMgr.GetGoldRushCampCount()):
@@ -626,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
@@ -635,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)
--
Gitblit v1.8.0