调整代码风格

master
lightyears 2 years ago
parent 28a6d2c4da
commit de08e993eb
Signed by: lightyears
GPG Key ID: 98D80DDF26D4F2F9

@ -2,7 +2,7 @@ namespace CMSGame
{ {
public partial class PauseMenu : Popup public partial class PauseMenu : Popup
{ {
public void On_ButtonExit_Pressed() public void On_ExitButton_Pressed()
{ {
Hide(); Hide();
} }

@ -26,8 +26,8 @@ size_flags_vertical = 4
[node name="SettingsMenu" parent="VBoxContainer" instance=ExtResource("2_smral")] [node name="SettingsMenu" parent="VBoxContainer" instance=ExtResource("2_smral")]
layout_mode = 2 layout_mode = 2
[node name="ButtonExit" type="Button" parent="VBoxContainer"] [node name="ExitButton" type="Button" parent="VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "确认" text = "确认"
[connection signal="pressed" from="VBoxContainer/ButtonExit" to="." method="On_ButtonExit_Pressed"] [connection signal="pressed" from="VBoxContainer/ExitButton" to="." method="On_ExitButton_Pressed"]

@ -22,14 +22,14 @@ offset_bottom = 20.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="ButtonPrepare" type="Button" parent="VBoxContainer"] [node name="PrepareForBattleButton" type="Button" parent="VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "战前准备" text = "战前准备"
[node name="ButtonStart" type="Button" parent="VBoxContainer"] [node name="BeginBattleButton" type="Button" parent="VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "开始战斗" text = "开始战斗"
[node name="ButtonEscape" type="Button" parent="VBoxContainer"] [node name="EscapeFromBattleButton" type="Button" parent="VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "逃跑" text = "逃跑"

@ -2,26 +2,26 @@ namespace CMSGame
{ {
public partial class SettingsMenu : VBoxContainer public partial class SettingsMenu : VBoxContainer
{ {
private GameSettings _settings; public GameSettings Settings;
private CheckBox _checkBoxPauseBattleWhenCharacterIsSelected; public CheckBox PauseBattleWhenCharacterIsSelectedCheckBox;
public override void _Ready() public override void _Ready()
{ {
InitializeComponents(); InitializeComponents();
_checkBoxPauseBattleWhenCharacterIsSelected.ButtonPressed = _settings.BattleSettings.PauseBattleWhenCharacterIsSelected; PauseBattleWhenCharacterIsSelectedCheckBox.ButtonPressed = Settings.BattleSettings.PauseBattleWhenCharacterIsSelected;
} }
private void InitializeComponents() private void InitializeComponents()
{ {
_settings = GetNode<GameSettings>("/root/GameSettings"); Settings = GetNode<GameSettings>("/root/GameSettings");
_checkBoxPauseBattleWhenCharacterIsSelected = GetNode<CheckBox>("%CheckBoxPauseBattleWhenCharacterIsSelected"); PauseBattleWhenCharacterIsSelectedCheckBox = GetNode<CheckBox>($"%{nameof(PauseBattleWhenCharacterIsSelectedCheckBox)}");
} }
public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled(bool pressed) public void On_PauseBattleWhenCharacterIsSelectedCheckBox_Toggled(bool pressed)
{ {
_settings.BattleSettings.PauseBattleWhenCharacterIsSelected = pressed; Settings.BattleSettings.PauseBattleWhenCharacterIsSelected = pressed;
} }
} }
} }

@ -5,9 +5,9 @@
[node name="VBoxContainer" type="VBoxContainer"] [node name="VBoxContainer" type="VBoxContainer"]
script = ExtResource("1_b12ly") script = ExtResource("1_b12ly")
[node name="CheckBoxPauseBattleWhenCharacterIsSelected" type="CheckBox" parent="."] [node name="PauseBattleWhenCharacterIsSelectedCheckBox" type="CheckBox" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
text = "选中角色时暂停战斗" text = "选中角色时暂停战斗"
[connection signal="toggled" from="CheckBoxPauseBattleWhenCharacterIsSelected" to="." method="On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled"] [connection signal="toggled" from="PauseBattleWhenCharacterIsSelectedCheckBox" to="." method="On_PauseBattleWhenCharacterIsSelectedCheckBox_Toggled"]

@ -2,7 +2,7 @@ namespace CMSGame
{ {
public partial class BattleScene : Node2D public partial class BattleScene : Node2D
{ {
private Label _labelBattleTime; public Label BattleTimeLabel;
public double Time; public double Time;
@ -10,7 +10,7 @@ namespace CMSGame
public override void _Ready() public override void _Ready()
{ {
_labelBattleTime = GetNode<Label>("%LabelBattleTime"); BattleTimeLabel = GetNode<Label>($"%{nameof(BattleTimeLabel)}");
} }
public override void _Process(double delta) public override void _Process(double delta)
@ -26,23 +26,23 @@ namespace CMSGame
{ {
if (Input.IsActionPressed("battle_pause_toggle")) if (Input.IsActionPressed("battle_pause_toggle"))
{ {
ToggleBattlePause(); TogglePauseBattle();
} }
} }
public void UpdateUI() public void UpdateUI()
{ {
_labelBattleTime.Text = TimeHelper.FormatTime(Time); BattleTimeLabel.Text = TimeHelper.FormatTime(Time);
} }
private void ToggleBattlePause() private void TogglePauseBattle()
{ {
IsPause = !IsPause; IsPause = !IsPause;
} }
public void On_ButtonPauseBattle_Pressed() public void On_PauseBattleButton_Pressed()
{ {
ToggleBattlePause(); TogglePauseBattle();
} }
} }
} }

@ -2,17 +2,17 @@ namespace CMSGame
{ {
public partial class MainScene : Control public partial class MainScene : Control
{ {
public void On_ButtonBattleDemo_Pressed() public void On_BattleDemo1Button_Pressed()
{ {
GetTree().ChangeSceneToFile("res://Scenes/BattleScene.tscn"); GetTree().ChangeSceneToFile("res://Scenes/BattleScene.tscn");
} }
public void On_ButtonSettings_Pressed() public void On_SettingsMenuButtons_Pressed()
{ {
GetNode<Popup>("%PauseMenu").PopupCentered(); GetNode<Popup>("%PauseMenu").PopupCentered();
} }
public void On_ButtonExit_Pressed() public void On_QuitButton_Pressed()
{ {
GetTree().Quit(); GetTree().Quit();
} }

Loading…
Cancel
Save