diff --git a/DungeonShooting_Godot/prefab/ui/Debugger.tscn b/DungeonShooting_Godot/prefab/ui/Debugger.tscn index 688eb64..cf76f5b 100644 --- a/DungeonShooting_Godot/prefab/ui/Debugger.tscn +++ b/DungeonShooting_Godot/prefab/ui/Debugger.tscn @@ -8,6 +8,8 @@ anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 script = ExtResource("1_awck4") Layer = 3 diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs index e399944..822e63e 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs @@ -202,7 +202,7 @@ World = GameApplication.Instance.CreateNewWorld(); yield return 0; //生成地牢房间 - var random = new SeedRandom(204343260); + var random = new SeedRandom(); _dungeonGenerator = new DungeonGenerator(CurrConfig, random); _dungeonGenerator.Generate(); yield return 0; diff --git a/DungeonShooting_Godot/src/game/ui/debugger/DebuggerPanel.cs b/DungeonShooting_Godot/src/game/ui/debugger/DebuggerPanel.cs index 62af94a..68d13f4 100644 --- a/DungeonShooting_Godot/src/game/ui/debugger/DebuggerPanel.cs +++ b/DungeonShooting_Godot/src/game/ui/debugger/DebuggerPanel.cs @@ -6,11 +6,19 @@ { private bool _showPanel = false; private int _len = 0; + private bool _isDown = false; + private Vector2 _offset; + private Vector2 _prevPos; + private bool _moveFlag; public override void OnCreateUi() { S_Bg.Instance.Visible = false; + S_HoverButton.Instance.Pressed += OnClickHoverButton; + S_HoverButton.Instance.ButtonDown += OnMouseDown; + S_HoverButton.Instance.ButtonUp += OnMouseUp; + S_Clear.Instance.Pressed += OnClear; S_Close.Instance.Pressed += OnClose; } @@ -30,10 +38,40 @@ _len = Debug.AllLogMessage.Length; } } + else + { + if (_isDown) + { + var temp = GetGlobalMousePosition() - _offset; + if (temp != _prevPos) + { + _moveFlag = true; + _prevPos = temp; + S_HoverButton.Instance.GlobalPosition = temp; + } + } + } } + private void OnMouseDown() + { + _isDown = true; + _moveFlag = false; + _prevPos = S_HoverButton.Instance.GlobalPosition; + _offset = GetGlobalMousePosition() - _prevPos; + } + + private void OnMouseUp() + { + _isDown = false; + } + private void OnClickHoverButton() { + if (_moveFlag) + { + return; + } _showPanel = true; S_Bg.Instance.Visible = _showPanel; S_HoverButton.Instance.Visible = false;