From 6cb04b8056a3873c85df0e44f9bd45b4a74b493f Mon Sep 17 00:00:00 2001
From: lightyears <lightyears1998@hotmail.com>
Date: Sun, 19 Feb 2023 01:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Autoloads/GameSettings.cs                |  7 ++++
 CMSGame.csproj                           |  1 +
 Components/BattleCharacter.cs            |  5 ++-
 Components/PauseMenu.cs                  | 24 +++++++------
 Components/PrebattleMenu.tscn            |  2 +-
 Entities/Character.cs                    | 21 ++++++++++++
 Helpers/TimeHelper.cs                    | 10 ++++++
 Scenes/Battle.cs                         | 40 ----------------------
 Scenes/BattleScene.cs                    | 43 ++++++++++++++++++++++++
 Scenes/{Battle.tscn => BattleScene.tscn} |  4 +--
 Scenes/Main.cs                           |  3 --
 Scenes/MainScene.cs                      | 20 +++++++++++
 Scenes/{Main.tscn => MainScene.tscn}     | 11 +++---
 ScriptTemplates/Node/.gdignore           |  0
 ScriptTemplates/Node/Standard.cs         |  9 +++++
 Scripts/Character.cs                     | 18 ----------
 Scripts/Settings.cs                      |  4 ---
 Scripts/TimeHelper.cs                    |  6 ----
 project.godot                            |  5 +--
 19 files changed, 142 insertions(+), 91 deletions(-)
 create mode 100644 Autoloads/GameSettings.cs
 create mode 100644 Entities/Character.cs
 create mode 100644 Helpers/TimeHelper.cs
 delete mode 100644 Scenes/Battle.cs
 create mode 100644 Scenes/BattleScene.cs
 rename Scenes/{Battle.tscn => BattleScene.tscn} (91%)
 delete mode 100644 Scenes/Main.cs
 create mode 100644 Scenes/MainScene.cs
 rename Scenes/{Main.tscn => MainScene.tscn} (72%)
 create mode 100644 ScriptTemplates/Node/.gdignore
 create mode 100644 ScriptTemplates/Node/Standard.cs
 delete mode 100644 Scripts/Character.cs
 delete mode 100644 Scripts/Settings.cs
 delete mode 100644 Scripts/TimeHelper.cs

diff --git a/Autoloads/GameSettings.cs b/Autoloads/GameSettings.cs
new file mode 100644
index 0000000..822ed2e
--- /dev/null
+++ b/Autoloads/GameSettings.cs
@@ -0,0 +1,7 @@
+namespace CMSGame
+{
+    public partial class GameSettings : Node
+    {
+        public bool PauseBattleWhenCharacterIsSelected = true;
+    }
+}
diff --git a/CMSGame.csproj b/CMSGame.csproj
index d3d9ffb..9db91b5 100644
--- a/CMSGame.csproj
+++ b/CMSGame.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
+    <DefaultItemExcludes>$(DefaultItemExcludes);ScriptTemplates\**\*.cs</DefaultItemExcludes>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
diff --git a/Components/BattleCharacter.cs b/Components/BattleCharacter.cs
index c6b2faa..17d7670 100644
--- a/Components/BattleCharacter.cs
+++ b/Components/BattleCharacter.cs
@@ -1,3 +1,6 @@
-public partial class BattleCharacter : Sprite2D
+namespace CMSGame
 {
+    public partial class BattleCharacter : Sprite2D
+    {
+    }
 }
diff --git a/Components/PauseMenu.cs b/Components/PauseMenu.cs
index d68b39a..6d022af 100644
--- a/Components/PauseMenu.cs
+++ b/Components/PauseMenu.cs
@@ -1,15 +1,19 @@
-public partial class PauseMenu : Control
+namespace CMSGame
 {
-    private GameSettings _settings;
-
-    public override void _Ready()
+    public partial class PauseMenu : Control
     {
-        _settings = GetNode<GameSettings>("/root/GameSettings");
-        GetNode<CheckBox>("%CheckBoxPauseBattleWhenCharacterIsSelected").ToggleMode = _settings.PauseBattleWhenCharacterIsSelected;
-    }
+        private GameSettings _settings;
 
-    public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled()
-    {
-        _settings.PauseBattleWhenCharacterIsSelected = false;
+        public override void _Ready()
+        {
+            _settings = GetNode<GameSettings>("/root/GameSettings");
+            GetNode<CheckBox>("%CheckBoxPauseBattleWhenCharacterIsSelected").ToggleMode = _settings.PauseBattleWhenCharacterIsSelected;
+        }
+
+        public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled()
+        {
+            _settings.PauseBattleWhenCharacterIsSelected = false;
+        }
     }
+
 }
diff --git a/Components/PrebattleMenu.tscn b/Components/PrebattleMenu.tscn
index c471e1d..446f616 100644
--- a/Components/PrebattleMenu.tscn
+++ b/Components/PrebattleMenu.tscn
@@ -1,6 +1,6 @@
 [gd_scene format=3 uid="uid://blobono0y4pqs"]
 
-[node name="PrebattleMenu" type="Control"]
+[node name="PreBattleMenu" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/Entities/Character.cs b/Entities/Character.cs
new file mode 100644
index 0000000..e31ae9e
--- /dev/null
+++ b/Entities/Character.cs
@@ -0,0 +1,21 @@
+namespace CMSGame
+{
+    public partial class Character : Node
+    {
+        private int _hp;
+
+        public int Hp
+        {
+            get => _hp;
+            set => _hp = value;
+        }
+
+        public override void _Ready()
+        {
+        }
+
+        public override void _Process(double delta)
+        {
+        }
+    }
+}
diff --git a/Helpers/TimeHelper.cs b/Helpers/TimeHelper.cs
new file mode 100644
index 0000000..adc90aa
--- /dev/null
+++ b/Helpers/TimeHelper.cs
@@ -0,0 +1,10 @@
+namespace CMSGame
+{
+    static class TimeHelper
+    {
+        public static string FormatTime(double time)
+        {
+            return TimeSpan.FromSeconds(time).ToString("c");
+        }
+    }
+}
diff --git a/Scenes/Battle.cs b/Scenes/Battle.cs
deleted file mode 100644
index 06ce8b4..0000000
--- a/Scenes/Battle.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-public partial class Battle : Control
-{
-    private Label _labelBattleTime;
-
-    public double Time;
-
-    public bool IsPause = false;
-
-    public override void _Ready()
-    {
-        _labelBattleTime = GetNode<Label>("%LabelBattleTime");
-    }
-
-    public override void _Process(double delta)
-    {
-        if (!IsPause)
-        {
-            Time += delta;
-        }
-        UpdateUI();
-    }
-
-    public override void _Input(InputEvent input)
-    {
-        if (Input.IsActionPressed("battle_pause"))
-        {
-            IsPause = !IsPause;
-        }
-    }
-
-    public void UpdateUI()
-    {
-        _labelBattleTime.Text = TimeHelper.FormatTime(Time);
-    }
-
-    public static void On_ButtonBattlePause_Pressed()
-    {
-        Input.ParseInputEvent(new InputEventAction { Action = "battle_pause" });
-    }
-}
diff --git a/Scenes/BattleScene.cs b/Scenes/BattleScene.cs
new file mode 100644
index 0000000..df410e0
--- /dev/null
+++ b/Scenes/BattleScene.cs
@@ -0,0 +1,43 @@
+namespace CMSGame
+{
+    public partial class BattleScene : Control
+    {
+        private Label _labelBattleTime;
+
+        public double Time;
+
+        public bool IsPause = false;
+
+        public override void _Ready()
+        {
+            _labelBattleTime = GetNode<Label>("%LabelBattleTime");
+        }
+
+        public override void _Process(double delta)
+        {
+            if (!IsPause)
+            {
+                Time += delta;
+            }
+            UpdateUI();
+        }
+
+        public override void _Input(InputEvent input)
+        {
+            if (Input.IsActionPressed("battle_pause"))
+            {
+                IsPause = !IsPause;
+            }
+        }
+
+        public void UpdateUI()
+        {
+            _labelBattleTime.Text = TimeHelper.FormatTime(Time);
+        }
+
+        public static void On_ButtonBattlePause_Pressed()
+        {
+            Input.ParseInputEvent(new InputEventAction { Action = "battle_pause" });
+        }
+    }
+}
diff --git a/Scenes/Battle.tscn b/Scenes/BattleScene.tscn
similarity index 91%
rename from Scenes/Battle.tscn
rename to Scenes/BattleScene.tscn
index 02235dc..f065456 100644
--- a/Scenes/Battle.tscn
+++ b/Scenes/BattleScene.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=2 format=3 uid="uid://cx6yq8awwkqv3"]
 
-[ext_resource type="Script" path="res://Scenes/Battle.cs" id="1_n6bn7"]
+[ext_resource type="Script" path="res://Scenes/BattleScene.cs" id="1_n6bn7"]
 
-[node name="Battle" type="Control"]
+[node name="BattleScene" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/Scenes/Main.cs b/Scenes/Main.cs
deleted file mode 100644
index e60c6df..0000000
--- a/Scenes/Main.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-public partial class Main : Control
-{
-}
diff --git a/Scenes/MainScene.cs b/Scenes/MainScene.cs
new file mode 100644
index 0000000..50f4949
--- /dev/null
+++ b/Scenes/MainScene.cs
@@ -0,0 +1,20 @@
+namespace CMSGame
+{
+    public partial class MainScene : Control
+    {
+        public static void On_ButtonBattleDemo_Pressed()
+        {
+
+        }
+
+        public static void On_ButtonSettings_Pressed()
+        {
+
+        }
+
+        public static void On_ButtonExit_Pressed()
+        {
+
+        }
+    }
+}
diff --git a/Scenes/Main.tscn b/Scenes/MainScene.tscn
similarity index 72%
rename from Scenes/Main.tscn
rename to Scenes/MainScene.tscn
index 47c7fba..9234658 100644
--- a/Scenes/Main.tscn
+++ b/Scenes/MainScene.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=2 format=3 uid="uid://dxnmltew81ny0"]
 
-[ext_resource type="Script" path="res://Scenes/Main.cs" id="1_kso8c"]
+[ext_resource type="Script" path="res://Scenes/MainScene.cs" id="1_kso8c"]
 
-[node name="Main" type="Control"]
+[node name="MainScene" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -35,9 +35,12 @@ grow_vertical = 2
 layout_mode = 2
 text = "战斗场景 Demo"
 
+[node name="ButtonSettings" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+text = "游戏设置"
+
 [node name="ButtonExit" type="Button" parent="VBoxContainer"]
 layout_mode = 2
 text = "退出"
 
-[connection signal="pressed" from="VBoxContainer/ButtonBattleDemo" to="." method="_On_button_battle_demo_pressed"]
-[connection signal="button_up" from="VBoxContainer/ButtonExit" to="." method="_on_button_exit_button_up"]
+[connection signal="pressed" from="VBoxContainer/ButtonSettings" to="." method="On_ButtonSettings_Pressed"]
diff --git a/ScriptTemplates/Node/.gdignore b/ScriptTemplates/Node/.gdignore
new file mode 100644
index 0000000..e69de29
diff --git a/ScriptTemplates/Node/Standard.cs b/ScriptTemplates/Node/Standard.cs
new file mode 100644
index 0000000..6a696f9
--- /dev/null
+++ b/ScriptTemplates/Node/Standard.cs
@@ -0,0 +1,9 @@
+namespace CMSGame
+{
+    public partial class _CLASS_ : _BASE_
+    {
+        public override void _Ready()
+        {
+        }
+    }
+}
diff --git a/Scripts/Character.cs b/Scripts/Character.cs
deleted file mode 100644
index 5927b89..0000000
--- a/Scripts/Character.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-public partial class Character : Node
-{
-    private int _hp;
-
-    public int Hp
-    {
-        get => _hp;
-        set => _hp = value;
-    }
-
-    public override void _Ready()
-    {
-    }
-
-    public override void _Process(double delta)
-    {
-    }
-}
diff --git a/Scripts/Settings.cs b/Scripts/Settings.cs
deleted file mode 100644
index 1b6d51e..0000000
--- a/Scripts/Settings.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-public partial class GameSettings : Node
-{
-    public bool PauseBattleWhenCharacterIsSelected = true;
-}
diff --git a/Scripts/TimeHelper.cs b/Scripts/TimeHelper.cs
deleted file mode 100644
index 31a0cda..0000000
--- a/Scripts/TimeHelper.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-static class TimeHelper {
-    public static string FormatTime(double time)
-    {
-        return TimeSpan.FromSeconds(time).ToString("c");
-    }
-}
diff --git a/project.godot b/project.godot
index 4288437..e322a25 100644
--- a/project.godot
+++ b/project.godot
@@ -11,13 +11,13 @@ config_version=5
 [application]
 
 config/name="The Country of Mountains and Seas"
-run/main_scene="res://Scenes/Main.tscn"
+run/main_scene="res://Scenes/MainScene.tscn"
 config/features=PackedStringArray("4.0", "Forward Plus")
 config/icon="res://icon.svg"
 
 [autoload]
 
-Settings="*res://Scripts/Settings.cs"
+GameSettings="*res://Autoloads/GameSettings.cs"
 
 [dotnet]
 
@@ -25,6 +25,7 @@ project/assembly_name="CMSGame"
 
 [editor]
 
+script/templates_search_path="res://ScriptTemplates"
 naming/default_signal_callback_name="On_{NodeName}_{SignalName}"
 naming/default_signal_callback_to_self_name="On_{SignalName}"
 naming/scene_name_casing=1