From 26958aff1b844a743a805b4f9075bee800b72a46 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 04 十一月 2025 14:35:37 +0800
Subject: [PATCH] 332 【主界面】座骑系统-服务端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py
index 62016fd..e3f9fc9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py
@@ -27,14 +27,19 @@
     
     if not gmList:
         GameWorld.DebugAnswer(curPlayer, "重置主线: MainLevel 0")
-        GameWorld.DebugAnswer(curPlayer, "设置主线: MainLevel 章节 关卡 波")
-        GameWorld.DebugAnswer(curPlayer, "测试掉落: MainLevel d 战锤数")
+        GameWorld.DebugAnswer(curPlayer, "设置主线: MainLevel 章节 关卡 波 [是否同波]")
+        GameWorld.DebugAnswer(curPlayer, "测试击杀: MainLevel k 消耗战锤数")
         GameWorld.DebugAnswer(curPlayer, "重置掉落: MainLevel d 0 [是否清掉落背包]")
         GameWorld.DebugAnswer(curPlayer, "重置战利: MainLevel b 0")
         GameWorld.DebugAnswer(curPlayer, "设置战利: MainLevel b 战利品ID 已掉落个数")
         return
     
     value = gmList[0]
+    
+    if value == "k":
+        useXiantao = gmList[1] if len(gmList) > 1 else 1
+        GameLogic_MainLevel.GMTestKill(curPlayer, useXiantao)
+        return
     
     if value == "d":
         unXiantao = gmList[1] if len(gmList) > 1 else 1
@@ -47,8 +52,6 @@
                 ClearPack.__DoLogic_Clear_Pack(curPlayer, IPY_GameWorld.rptIdentify)
             GameWorld.DebugAnswer(curPlayer, "重置未结算战锤掉落OK!")
             return
-        
-        GameLogic_MainLevel.GMTestKillDrop(curPlayer, unXiantao)
         return
     
     if value == "b":
@@ -74,6 +77,7 @@
     chapterID = value
     levelNum = gmList[1] if len(gmList) > 1 else 1
     wave = gmList[2] if len(gmList) > 2 else 1
+    isSameWave = gmList[3] if len(gmList) > 3 else 0
     
     levelIpyData = IpyGameDataPY.GetIpyGameData("MainLevel", chapterID, levelNum)
     if not levelIpyData:
@@ -88,6 +92,6 @@
         wave = waveMax
         
     nowValue = PlayerControl.SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)
-    passValue = PlayerControl.SetMainLevelPassInfo(curPlayer, chapterID, levelNum, wave)
+    passValue = PlayerControl.SetMainLevelPassInfo(curPlayer, chapterID, levelNum, wave if isSameWave else max(0, wave - 1))
     GameWorld.DebugAnswer(curPlayer, "设置主线:章关=%s-%s,波=%s,%s,%s" % (chapterID, levelNum, wave, nowValue, passValue))
     return

--
Gitblit v1.8.0