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/PlayerZhanling.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

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 3a1d092..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
 
 # 战令类型
@@ -35,10 +35,11 @@
 ZhanlingType_MainLevel, # 主线关卡 3
 ZhanlingType_GubaoCnt, # 古宝数量 4
 ZhanlingType_ArenaCnt, # 演武场次数 5
-) = range(1, 1 + 5)
+ZhanlingType_WeekActivity, # 周活跃 6
+) = range(1, 1 + 6)
 
 # 用Value1记录进度的战令类型
-ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt]
+ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt, ZhanlingType_WeekActivity]
 
 def OnPlayerLogin(curPlayer):
     for zhanlingType in ZhanlingTypeList:
@@ -230,7 +231,7 @@
         lvID = needValue
         curValue = lvID if PlayerControl.IsMainLevelPass(curPlayer, lvID) else 0
     elif zhanlingType == ZhanlingType_GubaoCnt:
-        curValue = PlayerGubao.GetGubaoTotalCnt(curPlayer)
+        curValue = PlayerGubao.GetGubaoTotalCnt(curPlayer, needValue)
     #elif zhanlingType == ZhanlingType_Login:
     #    firstLoginTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhanlingValue1 % zhanlingType)
     #    if not firstLoginTime:
@@ -331,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
@@ -339,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

--
Gitblit v1.8.0