diff --git a/Components/PauseMenu.cs b/Components/PauseMenu.cs index ee74f71..cba28f5 100644 --- a/Components/PauseMenu.cs +++ b/Components/PauseMenu.cs @@ -2,7 +2,7 @@ namespace CMSGame { public partial class PauseMenu : Popup { - public void On_ButtonExit_Pressed() + public void On_ExitButton_Pressed() { Hide(); } diff --git a/Components/PauseMenu.tscn b/Components/PauseMenu.tscn index b0bad8c..1590b99 100644 --- a/Components/PauseMenu.tscn +++ b/Components/PauseMenu.tscn @@ -26,8 +26,8 @@ size_flags_vertical = 4 [node name="SettingsMenu" parent="VBoxContainer" instance=ExtResource("2_smral")] layout_mode = 2 -[node name="ButtonExit" type="Button" parent="VBoxContainer"] +[node name="ExitButton" type="Button" parent="VBoxContainer"] layout_mode = 2 text = "确认" -[connection signal="pressed" from="VBoxContainer/ButtonExit" to="." method="On_ButtonExit_Pressed"] +[connection signal="pressed" from="VBoxContainer/ExitButton" to="." method="On_ExitButton_Pressed"] diff --git a/Components/PrebattleMenu.tscn b/Components/PrebattleMenu.tscn index 446f616..667041a 100644 --- a/Components/PrebattleMenu.tscn +++ b/Components/PrebattleMenu.tscn @@ -22,14 +22,14 @@ offset_bottom = 20.0 grow_horizontal = 2 grow_vertical = 2 -[node name="ButtonPrepare" type="Button" parent="VBoxContainer"] +[node name="PrepareForBattleButton" type="Button" parent="VBoxContainer"] layout_mode = 2 text = "战前准备" -[node name="ButtonStart" type="Button" parent="VBoxContainer"] +[node name="BeginBattleButton" type="Button" parent="VBoxContainer"] layout_mode = 2 text = "开始战斗" -[node name="ButtonEscape" type="Button" parent="VBoxContainer"] +[node name="EscapeFromBattleButton" type="Button" parent="VBoxContainer"] layout_mode = 2 text = "逃跑" diff --git a/Components/SettingsMenu.cs b/Components/SettingsMenu.cs index 9e27cbd..42212ff 100644 --- a/Components/SettingsMenu.cs +++ b/Components/SettingsMenu.cs @@ -2,26 +2,26 @@ namespace CMSGame { public partial class SettingsMenu : VBoxContainer { - private GameSettings _settings; + public GameSettings Settings; - private CheckBox _checkBoxPauseBattleWhenCharacterIsSelected; + public CheckBox PauseBattleWhenCharacterIsSelectedCheckBox; public override void _Ready() { InitializeComponents(); - _checkBoxPauseBattleWhenCharacterIsSelected.ButtonPressed = _settings.BattleSettings.PauseBattleWhenCharacterIsSelected; + PauseBattleWhenCharacterIsSelectedCheckBox.ButtonPressed = Settings.BattleSettings.PauseBattleWhenCharacterIsSelected; } private void InitializeComponents() { - _settings = GetNode("/root/GameSettings"); - _checkBoxPauseBattleWhenCharacterIsSelected = GetNode("%CheckBoxPauseBattleWhenCharacterIsSelected"); + Settings = GetNode("/root/GameSettings"); + PauseBattleWhenCharacterIsSelectedCheckBox = GetNode($"%{nameof(PauseBattleWhenCharacterIsSelectedCheckBox)}"); } - public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled(bool pressed) + public void On_PauseBattleWhenCharacterIsSelectedCheckBox_Toggled(bool pressed) { - _settings.BattleSettings.PauseBattleWhenCharacterIsSelected = pressed; + Settings.BattleSettings.PauseBattleWhenCharacterIsSelected = pressed; } } } diff --git a/Components/SettingsMenu.tscn b/Components/SettingsMenu.tscn index 5f26dd1..689b937 100644 --- a/Components/SettingsMenu.tscn +++ b/Components/SettingsMenu.tscn @@ -5,9 +5,9 @@ [node name="VBoxContainer" type="VBoxContainer"] script = ExtResource("1_b12ly") -[node name="CheckBoxPauseBattleWhenCharacterIsSelected" type="CheckBox" parent="."] +[node name="PauseBattleWhenCharacterIsSelectedCheckBox" type="CheckBox" parent="."] unique_name_in_owner = true layout_mode = 2 text = "选中角色时暂停战斗" -[connection signal="toggled" from="CheckBoxPauseBattleWhenCharacterIsSelected" to="." method="On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled"] +[connection signal="toggled" from="PauseBattleWhenCharacterIsSelectedCheckBox" to="." method="On_PauseBattleWhenCharacterIsSelectedCheckBox_Toggled"] diff --git a/Scenes/BattleScene.cs b/Scenes/BattleScene.cs index bd60e21..57eff22 100644 --- a/Scenes/BattleScene.cs +++ b/Scenes/BattleScene.cs @@ -2,7 +2,7 @@ namespace CMSGame { public partial class BattleScene : Node2D { - private Label _labelBattleTime; + public Label BattleTimeLabel; public double Time; @@ -10,7 +10,7 @@ namespace CMSGame public override void _Ready() { - _labelBattleTime = GetNode