From 2969817f1ce64b763c4b3ddc22e4bc87866cef19 Mon Sep 17 00:00:00 2001
From: liutao <821580467@qq.com>
Date: Tue, 11 Feb 2025 12:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90debugger=E3=80=91=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/Gameplay/Debug/SROptions.Fight.cs | 35 +++++++++++++++++--
 .../Scripts/Gameplay/Debug/SROptions.GM.cs    | 30 ----------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Fight.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Fight.cs
index f46d559caca..819e5a26213 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Fight.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Fight.cs
@@ -5,8 +5,37 @@ using Gameplay.Common;
 using Gameplay.Unit;
 public partial class SROptions
 {
+    
+    [Category("战斗"), DisplayName("己方血量无敌")]
+    public bool SelfUnbeatable
+    {
+        get { return CodeDefine.Fight.HP_NOCOST; }
+        set { CodeDefine.Fight.HP_NOCOST = value; }
+    }
 
-    [Category("战斗"), DisplayName("强制显示地图格子")]
+
+    [Category("战斗"), DisplayName("敌方血量无敌")]
+    public bool EnemyUnbeatable
+    {
+        get { return CodeDefine.Fight.HP_NOCOST_ENEMY; }
+        set { CodeDefine.Fight.HP_NOCOST_ENEMY = value; }
+    }
+
+    [Category("战斗"), DisplayName("己方士气无敌")]
+    public bool SelfMoraleUnbeatable
+    {
+        get { return CodeDefine.Fight.MORALE_NOCOST; }
+        set { CodeDefine.Fight.MORALE_NOCOST = value; }
+    }
+    
+    [Category("战斗"), DisplayName("敌方士气无敌")]
+    public bool EnemyMoraleUnbeatable
+    {
+        get { return CodeDefine.Fight.MORALE_NOCOST_ENEMY; }
+        set { CodeDefine.Fight.MORALE_NOCOST_ENEMY = value; }
+    }
+
+    // [Category("战斗"), DisplayName("强制显示地图格子")]
     public bool ForceShowMapCell
     {
         get
@@ -19,7 +48,7 @@ public partial class SROptions
         }
     }
     
-    [Category("战斗"), DisplayName("跳过可移动单位占位等级检查")]
+    // [Category("战斗"), DisplayName("跳过可移动单位占位等级检查")]
     public bool SkipMoveUnitStandLevelCheck
     {
         get
@@ -70,7 +99,7 @@ public partial class SROptions
         ClearSideMorale(ETroopsId.Enemy);
     }
 
-    [Category("战斗"), DisplayName("使用玩家技能")]
+    // [Category("战斗"), DisplayName("使用玩家技能")]
     public void FakeUsePlayerSkill()
     {
         var fakeEventData = new EDReadyPlayerSkill()
diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.GM.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.GM.cs
index 7ebd0ff06b5..93648fd667d 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.GM.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.GM.cs
@@ -15,37 +15,7 @@ using YooAsset;
 public partial class SROptions
 {
 
-    private bool _useFullCharacters;
-    private bool _useTestTeam;
-
-    [Category("GM"), DisplayName("己方血量无敌")]
-    public bool SelfUnbeatable
-    {
-        get { return CodeDefine.Fight.HP_NOCOST; }
-        set { CodeDefine.Fight.HP_NOCOST = value; }
-    }
-
-
-    [Category("GM"), DisplayName("敌方血量无敌")]
-    public bool EnemyUnbeatable
-    {
-        get { return CodeDefine.Fight.HP_NOCOST_ENEMY; }
-        set { CodeDefine.Fight.HP_NOCOST_ENEMY = value; }
-    }
-
-    [Category("GM"), DisplayName("己方士气无敌")]
-    public bool SelfMoraleUnbeatable
-    {
-        get { return CodeDefine.Fight.MORALE_NOCOST; }
-        set { CodeDefine.Fight.MORALE_NOCOST = value; }
-    }
     
-    [Category("GM"), DisplayName("敌方士气无敌")]
-    public bool EnemyMoraleUnbeatable
-    {
-        get { return CodeDefine.Fight.MORALE_NOCOST_ENEMY; }
-        set { CodeDefine.Fight.MORALE_NOCOST_ENEMY = value; }
-    }
 
     [Category("GM"), DisplayName("机器人数据初始化")]
     public void SendRobotTestInit()