From fbf3fe5655d97c67db3bf07706ab5af232dcc9a5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 九月 2025 19:17:48 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(甘夫人技能;增加连击、追击增伤减伤属性;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.py |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 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 8a608cc..70916dc 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
@@ -19,22 +19,39 @@
 import PlayerControl
 import IpyGameDataPY
 import GameLogic_MainLevel
+import IPY_GameWorld
+import ClearPack
+import ChConfig
 
 def OnExec(curPlayer, gmList):
     
     if not gmList:
         GameWorld.DebugAnswer(curPlayer, "重置主线: MainLevel 0")
         GameWorld.DebugAnswer(curPlayer, "设置主线: MainLevel 章节 关卡 波")
-        GameWorld.DebugAnswer(curPlayer, "测试掉落: MainLevel d 击杀数")
+        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":
-        killCnt = gmList[1] if len(gmList) > 1 else 1
-        GameLogic_MainLevel.GMTestKillDrop(curPlayer, killCnt)
+        unXiantao = gmList[1] if len(gmList) > 1 else 1
+        if unXiantao == 0:
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntExp, 0)
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntEquip, 0)
+            GameLogic_MainLevel.ResetBootyDropToday(curPlayer)
+            clearDropPack = gmList[2] if len(gmList) > 2 else 0
+            if clearDropPack:
+                ClearPack.__DoLogic_Clear_Pack(curPlayer, IPY_GameWorld.rptIdentify)
+            GameWorld.DebugAnswer(curPlayer, "重置未结算战锤掉落OK!")
+            return
         return
     
     if value == "b":
@@ -53,7 +70,7 @@
     
     if value <= 0:
         nowValue = PlayerControl.SetMainLevelNowInfo(curPlayer, 1, 1, 1)
-        passValue = PlayerControl.SetMainLevelPassInfo(curPlayer, 0, 0, 0)
+        passValue = PlayerControl.SetMainLevelPassInfo(curPlayer, 1, 1, 0)
         GameWorld.DebugAnswer(curPlayer, "重置主线:now=%s,pass=%s" % (nowValue, passValue))
         return
     

--
Gitblit v1.8.0