From 28a6d2c4da4e5391a4b5b6ba969a295707a04b8a Mon Sep 17 00:00:00 2001
From: lightyears <lightyears1998@hotmail.com>
Date: Sun, 19 Feb 2023 10:37:28 +0800
Subject: [PATCH] =?UTF-8?q?BattleScene=20=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CSharp 真好用
---
 Components/BattleCharacter.tscn |  4 ++--
 Components/PauseMenu.tscn       |  2 +-
 Scenes/BattleScene.cs           | 17 +++++++++++------
 Scenes/BattleScene.tscn         | 17 ++++++-----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Components/BattleCharacter.tscn b/Components/BattleCharacter.tscn
index f34bc5e..930653f 100644
--- a/Components/BattleCharacter.tscn
+++ b/Components/BattleCharacter.tscn
@@ -1,6 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://be4dnt701hcsv"]
+[gd_scene load_steps=3 format=3]
 
-[ext_resource type="Texture2D" uid="uid://dgl6fv3okxuoc" path="res://Assets/Characters/1.png" id="1_wpp45"]
+[ext_resource type="Texture2D" uid="uid://dgl6fv3okxuoc" path="res://Temp/Characters/1.png" id="1_wpp45"]
 [ext_resource type="Script" path="res://Components/BattleCharacter.cs" id="2_upe33"]
 
 [node name="BattleCharacter" type="Sprite2D"]
diff --git a/Components/PauseMenu.tscn b/Components/PauseMenu.tscn
index 7099cc3..b0bad8c 100644
--- a/Components/PauseMenu.tscn
+++ b/Components/PauseMenu.tscn
@@ -23,7 +23,7 @@ grow_vertical = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 
-[node name="VBoxContainer" parent="VBoxContainer" instance=ExtResource("2_smral")]
+[node name="SettingsMenu" parent="VBoxContainer" instance=ExtResource("2_smral")]
 layout_mode = 2
 
 [node name="ButtonExit" type="Button" parent="VBoxContainer"]
diff --git a/Scenes/BattleScene.cs b/Scenes/BattleScene.cs
index df410e0..bd60e21 100644
--- a/Scenes/BattleScene.cs
+++ b/Scenes/BattleScene.cs
@@ -1,6 +1,6 @@
 namespace CMSGame
 {
-    public partial class BattleScene : Control
+    public partial class BattleScene : Node2D
     {
         private Label _labelBattleTime;
 
@@ -22,11 +22,11 @@ namespace CMSGame
             UpdateUI();
         }
 
-        public override void _Input(InputEvent input)
+        public override void _UnhandledInput(InputEvent input)
         {
-            if (Input.IsActionPressed("battle_pause"))
+            if (Input.IsActionPressed("battle_pause_toggle"))
             {
-                IsPause = !IsPause;
+                ToggleBattlePause();
             }
         }
 
@@ -35,9 +35,14 @@ namespace CMSGame
             _labelBattleTime.Text = TimeHelper.FormatTime(Time);
         }
 
-        public static void On_ButtonBattlePause_Pressed()
+        private void ToggleBattlePause()
         {
-            Input.ParseInputEvent(new InputEventAction { Action = "battle_pause" });
+            IsPause = !IsPause;
+        }
+
+        public void On_ButtonPauseBattle_Pressed()
+        {
+            ToggleBattlePause();
         }
     }
 }
diff --git a/Scenes/BattleScene.tscn b/Scenes/BattleScene.tscn
index f065456..3bee9c1 100644
--- a/Scenes/BattleScene.tscn
+++ b/Scenes/BattleScene.tscn
@@ -2,20 +2,14 @@
 
 [ext_resource type="Script" path="res://Scenes/BattleScene.cs" id="1_n6bn7"]
 
-[node name="BattleScene" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
+[node name="BattleScene" type="Node2D"]
 script = ExtResource("1_n6bn7")
 
 [node name="Camera2D" type="Camera2D" parent="."]
 
-[node name="Characters" type="Node2D" parent="."]
+[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Camera2D"]
 
-[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
+[node name="Characters" type="Node2D" parent="."]
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
@@ -34,7 +28,7 @@ offset_right = 41.0
 offset_bottom = 26.0
 text = "00:00"
 
-[node name="ButtonBattlePause" type="Button" parent="CanvasLayer/HUD"]
+[node name="ButtonPauseBattle" type="Button" parent="CanvasLayer/HUD"]
 layout_mode = 1
 anchors_preset = 7
 anchor_left = 0.5
@@ -46,6 +40,7 @@ offset_top = -23.0
 offset_right = 20.0
 grow_horizontal = 2
 grow_vertical = 0
+focus_mode = 0
 text = "按下 Space 暂停时间"
 
-[connection signal="pressed" from="CanvasLayer/HUD/ButtonBattlePause" to="." method="_On_ButtonBattlePause_Pressed"]
+[connection signal="pressed" from="CanvasLayer/HUD/ButtonPauseBattle" to="." method="On_ButtonPauseBattle_Pressed"]