From b30b110fc4e5901fde2cd4e4e6444bbd32980d86 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 29 一月 2026 14:25:04 +0800
Subject: [PATCH] 423 【内政】命格系统-服务端(命格装备增加A814回包,类型27;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 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..bc622a5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py
@@ -15,6 +15,7 @@
 #"""Version = 2023-12-05 15:30"""
 #-------------------------------------------------------------------------------
 
+import FBCommon
 import GameWorld
 import NetPackCommon
 import IpyGameDataPY
@@ -25,7 +26,7 @@
 import PlayerGubao
 import PlayerCoin
 import ChConfig
-import ObjPool
+
 import time
 
 # 战令类型
@@ -35,10 +36,13 @@
 ZhanlingType_MainLevel, # 主线关卡 3
 ZhanlingType_GubaoCnt, # 古宝数量 4
 ZhanlingType_ArenaCnt, # 演武场次数 5
-) = range(1, 1 + 5)
+ZhanlingType_WeekActivity, # 周活跃 6
+ZhanlingType_MainLevelPlus, # 主线关卡 7
+ZhanlingType_DingjungeLVID, # 定军阁关卡ID 8
+) = range(1, 1 + 8)
 
 # 用Value1记录进度的战令类型
-ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt]
+ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt, ZhanlingType_WeekActivity]
 
 def OnPlayerLogin(curPlayer):
     for zhanlingType in ZhanlingTypeList:
@@ -226,11 +230,14 @@
         curValue = curPlayer.GetLV()
     elif zhanlingType == ZhanlingType_TreeLV:
         curValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV)
-    elif zhanlingType == ZhanlingType_MainLevel:
+    elif zhanlingType in [ZhanlingType_MainLevel, ZhanlingType_MainLevelPlus]:
         lvID = needValue
         curValue = lvID if PlayerControl.IsMainLevelPass(curPlayer, lvID) else 0
+    elif zhanlingType == ZhanlingType_DingjungeLVID:
+        lineID = needValue
+        curValue = lineID if FBCommon.IsFBPass(curPlayer, ChConfig.Def_FBMapID_Dingjunge, lineID) 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 +338,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 +346,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