diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn index 7f97af2..5d86ce4 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn @@ -47,19 +47,14 @@ material = SubResource("ShaderMaterial_t4ayq") position = Vector2(9, -10) sprite_frames = ExtResource("3_pjvd8") -animation = &"openDoor" autoplay = "default" -frame = 4 -frame_progress = 1.0 [node name="AnimatedSpriteDown" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") position = Vector2(9, -10) sprite_frames = ExtResource("4_ln8k4") -animation = &"openDoor" +animation = &"closeDoor" autoplay = "default" -frame = 4 -frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] position = Vector2(0, 4) diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn index 0c6565e..5499eb3 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn @@ -14,6 +14,7 @@ shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true @@ -25,6 +26,7 @@ shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_opsb6"] resource_local_to_scene = true @@ -42,11 +44,8 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(0, -8) sprite_frames = ExtResource("3_apluc") -animation = &"closeDoor" autoplay = "default" -frame = 4 frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn index a2996d7..4ad042d 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_f3qbq"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_6vvcd"] -[ext_resource type="SpriteFrames" uid="uid://ciqijjxup5356" path="res://resource/spriteFrames/other/RoomDoor_S.tres" id="3_hhmd5"] +[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/other/RoomDoor_N.tres" id="3_vbbxp"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true @@ -14,6 +14,7 @@ shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t4ayq"] resource_local_to_scene = true @@ -25,6 +26,7 @@ shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 [sub_resource type="RectangleShape2D" id="RectangleShape2D_opsb6"] resource_local_to_scene = true @@ -42,12 +44,8 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(0, -8) -sprite_frames = ExtResource("3_hhmd5") -animation = &"openDoor" +sprite_frames = ExtResource("3_vbbxp") autoplay = "default" -frame = 4 -frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] position = Vector2(0, -3.5) diff --git a/DungeonShooting_Godot/resource/sprite/map/door_close.png b/DungeonShooting_Godot/resource/sprite/map/door_close.png new file mode 100644 index 0000000..46fc591 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/door_close.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/door_close.png.import b/DungeonShooting_Godot/resource/sprite/map/door_close.png.import new file mode 100644 index 0000000..017050f --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/door_close.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dem4b762asjry" +path="res://.godot/imported/door_close.png-1ecc9b3d8e11bebd90ca6a7c4e421947.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/map/door_close.png" +dest_files=["res://.godot/imported/door_close.png-1ecc9b3d8e11bebd90ca6a7c4e421947.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/map/door_open.png b/DungeonShooting_Godot/resource/sprite/map/door_open.png new file mode 100644 index 0000000..4f602b7 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/door_open.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/door_open.png.import b/DungeonShooting_Godot/resource/sprite/map/door_open.png.import new file mode 100644 index 0000000..a51bb11 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/map/door_open.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dv63neggj3xtl" +path="res://.godot/imported/door_open.png-c046225698fe76d75f5eca3b5c10f1b6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/map/door_open.png" +dest_files=["res://.godot/imported/door_open.png-c046225698fe76d75f5eca3b5c10f1b6.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/spriteFrames/other/RoomDoor_N.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres index 1d7086c..0d55e81 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres @@ -1,76 +1,177 @@ -[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://xs72aopsgpg6"] +[gd_resource type="SpriteFrames" load_steps=30 format=3 uid="uid://xs72aopsgpg6"] -[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="1_6mlq3"] +[ext_resource type="Texture2D" uid="uid://dem4b762asjry" path="res://resource/sprite/map/door_close.png" id="1_ei0vs"] +[ext_resource type="Texture2D" uid="uid://dv63neggj3xtl" path="res://resource/sprite/map/door_open.png" id="2_jmlqx"] -[sub_resource type="AtlasTexture" id="AtlasTexture_jiqrp"] -atlas = ExtResource("1_6mlq3") -region = Rect2(288, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_xxmx2"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_id4d1"] -atlas = ExtResource("1_6mlq3") -region = Rect2(256, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_gvitc"] +atlas = ExtResource("1_ei0vs") +region = Rect2(128, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_dun04"] -atlas = ExtResource("1_6mlq3") -region = Rect2(224, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_pu8no"] +atlas = ExtResource("1_ei0vs") +region = Rect2(256, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_1rfr2"] -atlas = ExtResource("1_6mlq3") -region = Rect2(192, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_odchw"] +atlas = ExtResource("1_ei0vs") +region = Rect2(384, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_c8ka5"] -atlas = ExtResource("1_6mlq3") -region = Rect2(160, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_kcny1"] +atlas = ExtResource("1_ei0vs") +region = Rect2(512, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_3jbbr"] -atlas = ExtResource("1_6mlq3") -region = Rect2(288, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_uvf4v"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_xuwj8"] -atlas = ExtResource("1_6mlq3") -region = Rect2(160, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_gdaup"] +atlas = ExtResource("1_ei0vs") +region = Rect2(128, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_xx0rn"] -atlas = ExtResource("1_6mlq3") -region = Rect2(192, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_pvmn2"] +atlas = ExtResource("1_ei0vs") +region = Rect2(256, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_5h1on"] -atlas = ExtResource("1_6mlq3") -region = Rect2(224, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_5cqxt"] +atlas = ExtResource("1_ei0vs") +region = Rect2(384, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_rwd5l"] -atlas = ExtResource("1_6mlq3") -region = Rect2(256, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_6plqf"] +atlas = ExtResource("1_ei0vs") +region = Rect2(512, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_wov8g"] -atlas = ExtResource("1_6mlq3") -region = Rect2(288, 0, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_eljnj"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_km3b8"] +atlas = ExtResource("1_ei0vs") +region = Rect2(128, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_l6mb4"] +atlas = ExtResource("1_ei0vs") +region = Rect2(256, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_flrvv"] +atlas = ExtResource("1_ei0vs") +region = Rect2(384, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_873cg"] +atlas = ExtResource("1_ei0vs") +region = Rect2(512, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6qen8"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qmv44"] +atlas = ExtResource("1_ei0vs") +region = Rect2(128, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_x3d11"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y1j0t"] +atlas = ExtResource("2_jmlqx") +region = Rect2(0, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0lg71"] +atlas = ExtResource("2_jmlqx") +region = Rect2(128, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_al4vf"] +atlas = ExtResource("2_jmlqx") +region = Rect2(256, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_odhj1"] +atlas = ExtResource("2_jmlqx") +region = Rect2(0, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ammds"] +atlas = ExtResource("2_jmlqx") +region = Rect2(128, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_rt3bg"] +atlas = ExtResource("2_jmlqx") +region = Rect2(256, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3qiys"] +atlas = ExtResource("2_jmlqx") +region = Rect2(0, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_smh0c"] +atlas = ExtResource("2_jmlqx") +region = Rect2(128, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ewvdi"] +atlas = ExtResource("2_jmlqx") +region = Rect2(256, 160, 64, 80) [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_jiqrp") +"texture": SubResource("AtlasTexture_xxmx2") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_id4d1") +"texture": SubResource("AtlasTexture_gvitc") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_dun04") +"texture": SubResource("AtlasTexture_pu8no") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1rfr2") +"texture": SubResource("AtlasTexture_odchw") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_c8ka5") +"texture": SubResource("AtlasTexture_kcny1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_uvf4v") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gdaup") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pvmn2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5cqxt") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6plqf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_eljnj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_km3b8") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_l6mb4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_flrvv") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_873cg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6qen8") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qmv44") }], "loop": false, "name": &"closeDoor", -"speed": 10.0 +"speed": 20.0 }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_3jbbr") +"texture": SubResource("AtlasTexture_x3d11") }], "loop": false, "name": &"default", @@ -78,19 +179,31 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_xuwj8") +"texture": SubResource("AtlasTexture_y1j0t") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_xx0rn") +"texture": SubResource("AtlasTexture_0lg71") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_5h1on") +"texture": SubResource("AtlasTexture_al4vf") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rwd5l") +"texture": SubResource("AtlasTexture_odhj1") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_wov8g") +"texture": SubResource("AtlasTexture_ammds") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_rt3bg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3qiys") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_smh0c") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ewvdi") }], "loop": false, "name": &"openDoor", diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index 01826a7..0669ca8 100644 --- a/DungeonShooting_Godot/scene/Hall.tscn +++ b/DungeonShooting_Godot/scene/Hall.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=3 uid="uid://c2hynqudkykxl"] -[ext_resource type="PackedScene" uid="uid://bqf2vks5ggnsp" path="res://scene/Dungeon.tscn" id="1_31od0"] +[ext_resource type="PackedScene" path="res://scene/Dungeon.tscn" id="1_31od0"] [ext_resource type="Script" path="res://src/game/hall/Hall.cs" id="2_43fdu"] [ext_resource type="Texture2D" uid="uid://b2j5mkqm3uv6w" path="res://resource/sprite/hall/HallBg.png" id="3_p8v6p"] [ext_resource type="Script" path="res://src/game/hall/DungeonEntrance.cs" id="3_t3my6"] @@ -41,7 +41,7 @@ shape = SubResource("RectangleShape2D_ru8u4") [node name="BirthMark" type="Marker2D" parent="." index="3"] -position = Vector2(140, 315) +position = Vector2(553, 320) [node name="PointLight2D" type="PointLight2D" parent="." index="4"] position = Vector2(138, 306)