diff --git a/DungeonShooting_Godot/prefab/role/Player.tscn b/DungeonShooting_Godot/prefab/role/Player.tscn index 016c4b5..2edb8ee 100644 --- a/DungeonShooting_Godot/prefab/role/Player.tscn +++ b/DungeonShooting_Godot/prefab/role/Player.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=20 format=3] +[gd_scene load_steps=20 format=3 uid="uid://cp2uhtlb6h7k2"] -[ext_resource type="PackedScene" uid="uid://b515ti0qinck8" path="res://prefab/role/Role.tscn" id="1"] +[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/Role.tscn" id="1"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_nvo1u"] [ext_resource type="Texture2D" uid="uid://bhwhhg2dfsr26" path="res://resource/sprite/role/role2.png" id="3_55mk2"] diff --git a/DungeonShooting_Godot/prefab/role/Role.tscn b/DungeonShooting_Godot/prefab/role/Role.tscn index 8f99845..0da34c4 100644 --- a/DungeonShooting_Godot/prefab/role/Role.tscn +++ b/DungeonShooting_Godot/prefab/role/Role.tscn @@ -33,7 +33,7 @@ material = SubResource("ShaderMaterial_v2kfw") [node name="BackMountPoint" type="Marker2D" parent="."] -position = Vector2(0, -10) +position = Vector2(0, -12) [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_yif6x") @@ -63,5 +63,5 @@ shape = SubResource("RectangleShape2D_n68nu") [node name="MountPoint" type="Marker2D" parent="."] -position = Vector2(4, -4) +position = Vector2(1, -7) script = ExtResource("4") diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot index 8c7b083..4a33b1d 100644 --- a/DungeonShooting_Godot/project.godot +++ b/DungeonShooting_Godot/project.godot @@ -182,7 +182,7 @@ 2d_physics/layer_5="enemy" 2d_physics/layer_6="affiliation" 2d_physics/layer_7="onHead" -2d_physics/layer_8="inHand" +2d_physics/layer_8="In hand" [mono] diff --git a/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png b/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png new file mode 100644 index 0000000..b041c5a --- /dev/null +++ b/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png Binary files differ diff --git a/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png.import b/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png.import new file mode 100644 index 0000000..a8051d0 --- /dev/null +++ b/DungeonShooting_Godot/resource/0x72_16x16DungeonTileset.v5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8821g3i2vsac" +path="res://.godot/imported/0x72_16x16DungeonTileset.v5.png-14a23d5d550e755fd151304f57805c62.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/0x72_16x16DungeonTileset.v5.png" +dest_files=["res://.godot/imported/0x72_16x16DungeonTileset.v5.png-14a23d5d550e755fd151304f57805c62.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/DungeonShooting_Godot/resource/sprite/gun/gun2.png b/DungeonShooting_Godot/resource/sprite/gun/gun2.png index 8889f01..4e0b9e6 100644 --- a/DungeonShooting_Godot/resource/sprite/gun/gun2.png +++ b/DungeonShooting_Godot/resource/sprite/gun/gun2.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/gun/gun3.png b/DungeonShooting_Godot/resource/sprite/gun/gun3.png index ebccd94..4f5aff6 100644 --- a/DungeonShooting_Godot/resource/sprite/gun/gun3.png +++ b/DungeonShooting_Godot/resource/sprite/gun/gun3.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/gun/gun4.png b/DungeonShooting_Godot/resource/sprite/gun/gun4.png index d3643d2..c6b4b23 100644 --- a/DungeonShooting_Godot/resource/sprite/gun/gun4.png +++ b/DungeonShooting_Godot/resource/sprite/gun/gun4.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role10.png b/DungeonShooting_Godot/resource/sprite/role/role10.png index 6268724..a77808d 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role10.png +++ b/DungeonShooting_Godot/resource/sprite/role/role10.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role2.png b/DungeonShooting_Godot/resource/sprite/role/role2.png index 60cd623..2694cbf 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role2.png +++ b/DungeonShooting_Godot/resource/sprite/role/role2.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role3.png b/DungeonShooting_Godot/resource/sprite/role/role3.png index 802b0bf..3e5e98f 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role3.png +++ b/DungeonShooting_Godot/resource/sprite/role/role3.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role4.png b/DungeonShooting_Godot/resource/sprite/role/role4.png index 72031be..853ef1e 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role4.png +++ b/DungeonShooting_Godot/resource/sprite/role/role4.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role5.png b/DungeonShooting_Godot/resource/sprite/role/role5.png index a21325b..b0aa65d 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role5.png +++ b/DungeonShooting_Godot/resource/sprite/role/role5.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role6.png b/DungeonShooting_Godot/resource/sprite/role/role6.png index 0b5d02d..2e3924a 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role6.png +++ b/DungeonShooting_Godot/resource/sprite/role/role6.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role7.png b/DungeonShooting_Godot/resource/sprite/role/role7.png index a7846a4..23961ef 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role7.png +++ b/DungeonShooting_Godot/resource/sprite/role/role7.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role8.png b/DungeonShooting_Godot/resource/sprite/role/role8.png index 6dc6f6b..bbfe8db 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role8.png +++ b/DungeonShooting_Godot/resource/sprite/role/role8.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/role/role9.png b/DungeonShooting_Godot/resource/sprite/role/role9.png index 111f8c3..0c88e8e 100644 --- a/DungeonShooting_Godot/resource/sprite/role/role9.png +++ b/DungeonShooting_Godot/resource/sprite/role/role9.png Binary files differ