diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png b/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png index c052bb3..3ee24a1 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_b/chuanlian.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png b/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png index 5c1efe0..c7f687e 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_b/huatan.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png index 0ef9a58..3743732 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _01.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png index e986f8f..8cf4d6c 100644 --- a/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png +++ b/DungeonShooting_Godot/resource/sprite/item/hall_c/item _36.png Binary files differ diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index 7119221..70383b3 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=43 format=3 uid="uid://c2hynqudkykxl"] +[gd_scene load_steps=44 format=3 uid="uid://c2hynqudkykxl"] [ext_resource type="PackedScene" uid="uid://bqf2vks5ggnsp" path="res://scene/Dungeon.tscn" id="1_31od0"] [ext_resource type="Script" path="res://src/game/hall/Hall.cs" id="2_43fdu"] @@ -36,6 +36,7 @@ [ext_resource type="Texture2D" uid="uid://c5aieljuvuhld" path="res://resource/sprite/item/hall_c/item _59.png" id="29_4dx8t"] [ext_resource type="Texture2D" uid="uid://bgrroshvf4iyu" path="res://resource/sprite/item/hall_c/item _23.png" id="30_vfhiv"] [ext_resource type="Texture2D" uid="uid://du12pb6w1c1n3" path="res://resource/sprite/item/hall_c/item _03.png" id="36_knh8x"] +[ext_resource type="Texture2D" uid="uid://b7dxbpdj5hdmd" path="res://resource/sprite/item/hall_c/item _01.png" id="37_5rb67"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ru8u4"] size = Vector2(19, 10) @@ -271,7 +272,7 @@ DefaultLayer = 1 [node name="Item0036" type="Node2D" parent="ItemRoot" index="13"] -position = Vector2(941, 313) +position = Vector2(946, 314) script = ExtResource("5_lowqi") Id = "item_0036" DefaultLayer = 1 @@ -496,3 +497,17 @@ [node name="Item03" type="Sprite2D" parent="." index="23"] position = Vector2(906, 159) texture = ExtResource("36_knh8x") + +[node name="Item01" type="Sprite2D" parent="." index="24"] +position = Vector2(888, 332.5) +scale = Vector2(1.0625, 1.0375) +texture = ExtResource("37_5rb67") + +[node name="Item01" type="Sprite2D" parent="Item01" index="0"] +position = Vector2(888, 332.5) +scale = Vector2(1.0625, 1.0375) +texture = ExtResource("37_5rb67") + +[node name="Item06" type="Sprite2D" parent="." index="25"] +position = Vector2(838, 362) +texture = ExtResource("7_42rdc") diff --git a/DungeonShooting_Godot/src/game/hall/Hall.cs b/DungeonShooting_Godot/src/game/hall/Hall.cs index e8ffde4..6b9bbe0 100644 --- a/DungeonShooting_Godot/src/game/hall/Hall.cs +++ b/DungeonShooting_Godot/src/game/hall/Hall.cs @@ -1,4 +1,4 @@ - + using Godot; /// @@ -6,17 +6,17 @@ /// public partial class Hall : World { - /// - /// 玩家出生标记 - /// - [Export] - public Marker2D BirthMark; + /// + /// 玩家出生标记 + /// + [Export] + public Marker2D BirthMark; - [Export] - public Sprite2D BgSprite; - - /// - /// 房间数据, 该数据时虚拟出来的, 并不是配置文件读取出来的 - /// - public RoomInfo RoomInfo { get; set; } -} \ No newline at end of file + [Export] + public Sprite2D BgSprite; + + /// + /// 房间数据, 该数据时虚拟出来的, 并不是配置文件读取出来的 + /// + public RoomInfo RoomInfo { get; set; } +} diff --git a/DungeonShooting_Godot/src/game/room/SceneManager.cs b/DungeonShooting_Godot/src/game/room/SceneManager.cs index 9ebf743..e8f359c 100644 --- a/DungeonShooting_Godot/src/game/room/SceneManager.cs +++ b/DungeonShooting_Godot/src/game/room/SceneManager.cs @@ -1,4 +1,4 @@ - + using Godot; /// @@ -6,14 +6,14 @@ /// public static class SceneManager { - - /// - /// 加载场景 - /// - /// 场景路径 - public static void LoadScene(string path) - { - //var packedScene = ResourceManager.Load(ResourcePath.scene_Room_tscn).Instantiate(); - //SceneRoot.AddChild(RoomManager); - } -} \ No newline at end of file + + /// + /// 加载场景 + /// + /// 场景路径 + public static void LoadScene(string path) + { + //var packedScene = ResourceManager.Load(ResourcePath.scene_Room_tscn).Instantiate(); + //SceneRoot.AddChild(RoomManager); + } +} diff --git a/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs b/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs index 1878e8a..583d4e1 100644 --- a/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs +++ b/DungeonShooting_Godot/src/test/TestPerfectPixelScene.cs @@ -3,79 +3,79 @@ public partial class TestPerfectPixelScene : Node2D { - public enum HandlerType - { - UnHandler, - NormalHandler, - OffsetHandler - } + public enum HandlerType + { + UnHandler, + NormalHandler, + OffsetHandler + } - [Export] - public CharacterBody2D Player; + [Export] + public CharacterBody2D Player; - [Export] - public Label FpsLabel; - - [Export] - public Camera2D Camera2D; + [Export] + public Label FpsLabel; + + [Export] + public Camera2D Camera2D; - [Export] - public float Speed = 50; + [Export] + public float Speed = 50; - [Export] - public float CameraRecoveryScale = 5; + [Export] + public float CameraRecoveryScale = 5; - [Export] - public SubViewportContainer SubViewportContainer; + [Export] + public SubViewportContainer SubViewportContainer; - [Export] - public HandlerType Type; - - private ShaderMaterial _shaderMaterial; - private Vector2 _cameraPos; + [Export] + public HandlerType Type; + + private ShaderMaterial _shaderMaterial; + private Vector2 _cameraPos; - public override void _Ready() - { - if (SubViewportContainer != null) - { - _shaderMaterial = (ShaderMaterial)SubViewportContainer.Material; - } - } + public override void _Ready() + { + if (SubViewportContainer != null) + { + _shaderMaterial = (ShaderMaterial)SubViewportContainer.Material; + } + } - public override void _Process(double delta) - { - InputManager.Update((float)delta); + public override void _Process(double delta) + { + InputManager.Update((float)delta); - - } + + } - public override void _PhysicsProcess(double delta) - { - FpsLabel.Text = "FPS: " + Engine.GetFramesPerSecond(); - Player.Velocity = InputManager.MoveAxis * Speed; - Player.MoveAndSlide(); + public override void _PhysicsProcess(double delta) + { + FpsLabel.Text = "FPS: " + Engine.GetFramesPerSecond(); + Player.Velocity = InputManager.MoveAxis * Speed; + Player.MoveAndSlide(); - var playerPos = Player.GlobalPosition; - //_cameraPos = playerPos; - _cameraPos = _cameraPos.MoveToward(playerPos, playerPos.DistanceTo(_cameraPos) * (float)delta * CameraRecoveryScale); + var playerPos = Player.GlobalPosition; + //_cameraPos = playerPos; + _cameraPos = _cameraPos.MoveToward(playerPos, playerPos.DistanceTo(_cameraPos) * (float)delta * CameraRecoveryScale); - if (Type == HandlerType.UnHandler) - { - Camera2D.GlobalPosition = _cameraPos; - } - else if (Type == HandlerType.NormalHandler) - { - Camera2D.GlobalPosition = _cameraPos.Round(); - } - else if (Type == HandlerType.OffsetHandler) - { - if (_shaderMaterial != null) - { - var cameraPosition = _cameraPos; - var offset = cameraPosition.Round() - cameraPosition; - _shaderMaterial.SetShaderParameter("offset", offset); - Camera2D.GlobalPosition = cameraPosition.Round(); - } - } - } + if (Type == HandlerType.UnHandler) + { + Camera2D.GlobalPosition = _cameraPos; + } + else if (Type == HandlerType.NormalHandler) + { + Camera2D.GlobalPosition = _cameraPos.Round(); + } + else if (Type == HandlerType.OffsetHandler) + { + if (_shaderMaterial != null) + { + var cameraPosition = _cameraPos; + var offset = cameraPosition.Round() - cameraPosition; + _shaderMaterial.SetShaderParameter("offset", offset); + Camera2D.GlobalPosition = cameraPosition.Round(); + } + } + } }