Skip to content

Commit 29566d5

Browse files
committed
删除调试器模块
删除调试器模块,将调试器的功能加入设置模块
1 parent 037eee0 commit 29566d5

File tree

8 files changed

+41
-83
lines changed

8 files changed

+41
-83
lines changed

Assets/Game/Scripts/Base/GameMode.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class GameMode : MonoBehaviour
2525
public static AudioManager Audio;
2626
public static LocalizationManager Localization;
2727
public static SettingManager Setting;
28-
public static DebugManager Debug;
2928

3029
/// <summary>
3130
/// 当前程序集
@@ -73,7 +72,6 @@ IEnumerator Start()
7372
Audio = GameFrameworkMode.GetModule<AudioManager>();
7473
Localization = GameFrameworkMode.GetModule<LocalizationManager>();
7574
Setting = GameFrameworkMode.GetModule<SettingManager>();
76-
Debug = GameFrameworkMode.GetModule<DebugManager>();
7775
#endregion
7876

7977
#region resource
@@ -114,11 +112,11 @@ IEnumerator Start()
114112
State.SetStateStart();
115113
#endregion
116114

117-
#region Debug
115+
#region Setting
118116
GameObject debugHelper = new GameObject("DebugHelper");
119117
debugHelper.transform.SetParent(transform);
120-
Debug.SetDebugHelper(debugHelper.AddComponent<DebugHelper>());
121-
Debug.Enable = DebugEnable;
118+
Setting.SetDebugHelper(debugHelper.AddComponent<DebugHelper>());
119+
Setting.DebugEnable = DebugEnable;
122120
#endregion
123121
}
124122

Assets/Game/Scripts/Editor/GameModeEditor.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class GameModeEditor : Editor
2727
private bool _dataTableModule = true;
2828
private bool _nodeDataModule = true;
2929
private bool _stepModule = true;
30-
private bool _debugModule = true;
30+
private bool _settingModule = true;
3131

3232
////Color.cyan;
3333
private Color _defaultColor;
@@ -221,12 +221,12 @@ public override void OnInspectorGUI()
221221
GUI.color = _defaultColor;
222222
GUILayout.BeginHorizontal();
223223
GUILayout.Space(12);
224-
_debugModule = EditorGUILayout.Foldout(_debugModule, "Debug Module", true);
224+
_settingModule = EditorGUILayout.Foldout(_settingModule, "Setting Module", true);
225225
if (EditorApplication.isPlaying)
226-
_debugModule = !EditorApplication.isPlaying;
226+
_settingModule = !EditorApplication.isPlaying;
227227
GUILayout.EndHorizontal();
228-
if (_debugModule)
229-
DrawDebugGUI();
228+
if (_settingModule)
229+
DrawSettingGUI();
230230
GUILayout.EndVertical();
231231

232232
#endregion
@@ -457,13 +457,13 @@ void DrawStepGUI()
457457
//GUILayout.EndVertical();
458458
}
459459

460-
//绘制调试界面
461-
void DrawDebugGUI()
460+
//绘制设置界面
461+
void DrawSettingGUI()
462462
{
463463
GUILayout.BeginVertical("HelpBox");
464464

465465
GUI.color = _gameMode.DebugEnable ? Color.white : Color.gray;
466-
_gameMode.DebugEnable = GUILayout.Toggle(_gameMode.DebugEnable, "Enable");
466+
_gameMode.DebugEnable = GUILayout.Toggle(_gameMode.DebugEnable, "Debug Enable");
467467
GUI.color = Color.white;
468468

469469
GUILayout.EndVertical();

Assets/GameFramework/Debug.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/GameFramework/Debug/DebugManager.cs

Lines changed: 0 additions & 47 deletions
This file was deleted.

Assets/GameFramework/Debug/DebugManager.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

Assets/GameFramework/Setting/SettingManager.cs

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,36 @@ namespace GameFramework.Taurus
1515
{
1616
public sealed class SettingManager : GameFrameworkModule
1717
{
18-
#region 属性
19-
#endregion
20-
21-
public int GetQuality()
18+
#region 属性
19+
private bool _debugEnable = true;
20+
private DebugHelper _debugHelper;
21+
#endregion
22+
23+
/// <summary>
24+
/// 调试器可见性
25+
/// </summary>
26+
public bool DebugEnable
27+
{
28+
get
29+
{
30+
return _debugEnable;
31+
}
32+
set
33+
{
34+
_debugEnable = value;
35+
_debugHelper.enabled = _debugEnable;
36+
}
37+
}
38+
39+
/// <summary>
40+
/// 设置调试器帮助类
41+
/// </summary>
42+
public void SetDebugHelper(DebugHelper helper)
43+
{
44+
_debugHelper = helper;
45+
}
46+
47+
public int GetQuality()
2248
{
2349
return PlayerPrefs.GetInt("QualitySettings", (int)QualitySettings.GetQualityLevel());
2450
}

0 commit comments

Comments
 (0)