From c280ced8be799a899efc78b21cc807d435ab6609 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 19:34:03 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(退出公会时间根据当前是否互通取对应的本服或跨服时间;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Dingjunge.py |   16 +++++++++++-----
 1 files changed, 11 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 41143e0..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
@@ -26,7 +26,7 @@
     
     if not paramList:
         GameWorld.DebugAnswer(curPlayer, "定军阁进度: Dingjunge 今日关卡ID 历史关卡ID")
-        GameWorld.DebugAnswer(curPlayer, "增加效果数: Dingjunge e 增加效果次数")
+        GameWorld.DebugAnswer(curPlayer, "增加效果数: Dingjunge e 加效果数 [自动选择]")
         GameWorld.DebugAnswer(curPlayer, "待选择效果: Dingjunge s 效果ID [效果ID ...]")
         return
     mapID = ChConfig.Def_FBMapID_Dingjunge
@@ -34,6 +34,9 @@
     
     if value1 == "e":
         addEffCnt = paramList[1] if len(paramList) > 1 else 1
+        autoSelect = paramList[2] if len(paramList) > 2 else 0
+        if autoSelect and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_DJGEffAuto):
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DJGEffAuto, 1)
         GameLogic_Dingjunge.GivePassLayerEff(curPlayer, addEffCnt)
     elif value1 == "s":
         setEffIDList = paramList[1:]
@@ -49,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:

--
Gitblit v1.8.0