From 4ead2a8d46cb51b2bdf0fe3702b52c9bde5f5651 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 21 一月 2026 17:49:22 +0800
Subject: [PATCH] 412 【挑战】定军阁-服务端(增加定军阁基金8;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.py |    7 ++++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py |   11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py
index c01e5c1..cb08d07 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py
@@ -52,14 +52,17 @@
     else:
         todayLineID = value1
         highestLineID = paramList[1] if len(paramList) > 1 else None
+        if not todayLineID:
+            todayLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DJGLineID)
         if not highestLineID:
             highestLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FBPassLineID % mapID)
             
         layerNum, levelNum = todayLineID / 100, todayLineID % 100
-        ipyData = IpyGameDataPY.GetIpyGameDataNotLog("FBDJGLevel", layerNum, levelNum)
-        if not ipyData:
-            GameWorld.DebugAnswer(curPlayer, "不存在该层关卡:%s-%s" % (layerNum, levelNum))
-            return
+        if todayLineID:
+            ipyData = IpyGameDataPY.GetIpyGameDataNotLog("FBDJGLevel", layerNum, levelNum)
+            if not ipyData:
+                GameWorld.DebugAnswer(curPlayer, "不存在该层关卡:%s-%s" % (layerNum, levelNum))
+                return
         
         if highestLineID:
             if todayLineID > highestLineID:
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 26f5dff..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
@@ -37,7 +38,8 @@
 ZhanlingType_ArenaCnt, # 演武场次数 5
 ZhanlingType_WeekActivity, # 周活跃 6
 ZhanlingType_MainLevelPlus, # 主线关卡 7
-) = range(1, 1 + 7)
+ZhanlingType_DingjungeLVID, # 定军阁关卡ID 8
+) = range(1, 1 + 8)
 
 # 用Value1记录进度的战令类型
 ZhanlingValue1TypeList = [ZhanlingType_ArenaCnt, ZhanlingType_WeekActivity]
@@ -231,6 +233,9 @@
     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, needValue)
     #elif zhanlingType == ZhanlingType_Login:

--
Gitblit v1.8.0