diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn index 5d86ce4..dae2606 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn @@ -23,7 +23,7 @@ shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0.0 shader_parameter/modulate = Color(1, 1, 1, 1) -shader_parameter/show_outline = false +shader_parameter/show_outline = true shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true @@ -45,11 +45,13 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(9, -10) +position = Vector2(20, 10) sprite_frames = ExtResource("3_pjvd8") +animation = &"closeDoor" autoplay = "default" [node name="AnimatedSpriteDown" type="AnimatedSprite2D" parent="."] +visible = false material = SubResource("ShaderMaterial_t4ayq") position = Vector2(9, -10) sprite_frames = ExtResource("4_ln8k4") @@ -57,5 +59,5 @@ autoplay = "default" [node name="Collision" type="CollisionShape2D" parent="."] -position = Vector2(0, 4) +position = Vector2(0, 13) shape = SubResource("RectangleShape2D_opsb6") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn index 5499eb3..f832e19 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn @@ -22,7 +22,7 @@ shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0.0 shader_parameter/modulate = Color(1, 1, 1, 1) -shader_parameter/show_outline = false +shader_parameter/show_outline = true shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true @@ -45,8 +45,8 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") sprite_frames = ExtResource("3_apluc") +animation = &"closeDoor" autoplay = "default" -frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] position = Vector2(0, -3.5) diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn index 4ad042d..b93954f 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn @@ -22,7 +22,7 @@ shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0.0 shader_parameter/modulate = Color(1, 1, 1, 1) -shader_parameter/show_outline = false +shader_parameter/show_outline = true shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true @@ -45,6 +45,7 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") sprite_frames = ExtResource("3_vbbxp") +animation = &"openDoor" autoplay = "default" [node name="Collision" type="CollisionShape2D" parent="."] diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn index f401bfb..7bb1e78 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_agux2"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_wx2w3"] -[ext_resource type="SpriteFrames" uid="uid://cpdt5ywrsruu3" path="res://resource/spriteFrames/other/RoomDoor_W_Up.tres" id="3_veggu"] +[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_E_Up.tres" id="3_jquy0"] [ext_resource type="SpriteFrames" uid="uid://qq3h0mh4r12i" path="res://resource/spriteFrames/other/RoomDoor_W_Down.tres" id="4_dnjb6"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] @@ -23,7 +23,7 @@ shader_parameter/blend = Color(1, 1, 1, 1) shader_parameter/schedule = 0.0 shader_parameter/modulate = Color(1, 1, 1, 1) -shader_parameter/show_outline = false +shader_parameter/show_outline = true shader_parameter/outline_color = Color(0, 0, 0, 1) shader_parameter/outline_rainbow = false shader_parameter/outline_use_blend = true @@ -45,14 +45,14 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(-9, -10) -sprite_frames = ExtResource("3_veggu") -animation = &"openDoor" +position = Vector2(-21, 10) +scale = Vector2(-1, 1) +sprite_frames = ExtResource("3_jquy0") +animation = &"closeDoor" autoplay = "default" -frame = 4 -frame_progress = 1.0 [node name="AnimatedSpriteDown" type="AnimatedSprite2D" parent="."] +visible = false material = SubResource("ShaderMaterial_t4ayq") position = Vector2(-9, -10) sprite_frames = ExtResource("4_dnjb6") @@ -62,5 +62,5 @@ frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] -position = Vector2(0, 4) +position = Vector2(2.08165e-12, 13) shape = SubResource("RectangleShape2D_2ko2r") diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot index 325a35c..06a6754 100644 --- a/DungeonShooting_Godot/project.godot +++ b/DungeonShooting_Godot/project.godot @@ -21,8 +21,8 @@ [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/stretch/aspect="keep_width" [dotnet] diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle2/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle2/Preview.png index 45085d9..a2253ad 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle2/Preview.png +++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle2/Preview.png Binary files differ diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png index 5a4ee42..a7ad03b 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png +++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/door_close.png b/DungeonShooting_Godot/resource/sprite/map/door_close.png index 46fc591..527260c 100644 --- a/DungeonShooting_Godot/resource/sprite/map/door_close.png +++ b/DungeonShooting_Godot/resource/sprite/map/door_close.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/map/door_open.png b/DungeonShooting_Godot/resource/sprite/map/door_open.png index 4f602b7..7644d9f 100644 --- a/DungeonShooting_Godot/resource/sprite/map/door_open.png +++ b/DungeonShooting_Godot/resource/sprite/map/door_open.png Binary files differ diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres index 8e74aa6..3085acb 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres @@ -1,68 +1,197 @@ -[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://3ps6h2f54qa5"] +[gd_resource type="SpriteFrames" load_steps=34 format=3 uid="uid://3ps6h2f54qa5"] -[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="2_u3fum"] +[ext_resource type="Texture2D" uid="uid://dem4b762asjry" path="res://resource/sprite/map/door_close.png" id="1_5ymra"] +[ext_resource type="Texture2D" uid="uid://dv63neggj3xtl" path="res://resource/sprite/map/door_open.png" id="2_niclj"] -[sub_resource type="AtlasTexture" id="AtlasTexture_8f67t"] -atlas = ExtResource("2_u3fum") -region = Rect2(128, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_6i65d"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_qlja2"] -atlas = ExtResource("2_u3fum") -region = Rect2(96, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_gvd0a"] +atlas = ExtResource("1_5ymra") +region = Rect2(192, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_glno6"] -atlas = ExtResource("2_u3fum") -region = Rect2(64, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_kbtel"] +atlas = ExtResource("1_5ymra") +region = Rect2(320, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_frnbt"] -atlas = ExtResource("2_u3fum") -region = Rect2(32, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_4o7p2"] +atlas = ExtResource("1_5ymra") +region = Rect2(448, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_2ytfc"] -atlas = ExtResource("2_u3fum") -region = Rect2(0, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_2urqt"] +atlas = ExtResource("1_5ymra") +region = Rect2(576, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_oyi3c"] -atlas = ExtResource("2_u3fum") -region = Rect2(128, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_pcxt2"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_e68us"] -atlas = ExtResource("2_u3fum") -region = Rect2(0, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_vuqy3"] +atlas = ExtResource("1_5ymra") +region = Rect2(192, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_e7wqp"] -atlas = ExtResource("2_u3fum") -region = Rect2(32, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_abxng"] +atlas = ExtResource("1_5ymra") +region = Rect2(320, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_qcket"] -atlas = ExtResource("2_u3fum") -region = Rect2(64, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_lstal"] +atlas = ExtResource("1_5ymra") +region = Rect2(448, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_genp5"] -atlas = ExtResource("2_u3fum") -region = Rect2(96, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_0l1oe"] +atlas = ExtResource("1_5ymra") +region = Rect2(576, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_krdph"] -atlas = ExtResource("2_u3fum") -region = Rect2(128, 52, 32, 52) +[sub_resource type="AtlasTexture" id="AtlasTexture_rxxco"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bbdxx"] +atlas = ExtResource("1_5ymra") +region = Rect2(192, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0ig2j"] +atlas = ExtResource("1_5ymra") +region = Rect2(320, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y6ht0"] +atlas = ExtResource("1_5ymra") +region = Rect2(448, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7b7xb"] +atlas = ExtResource("1_5ymra") +region = Rect2(576, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yxxxi"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_g75mr"] +atlas = ExtResource("1_5ymra") +region = Rect2(192, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1467k"] +atlas = ExtResource("1_5ymra") +region = Rect2(320, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2o7eb"] +atlas = ExtResource("1_5ymra") +region = Rect2(448, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yobme"] +atlas = ExtResource("1_5ymra") +region = Rect2(576, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ylcxs"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 320, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ohx3w"] +atlas = ExtResource("1_5ymra") +region = Rect2(64, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_edun5"] +atlas = ExtResource("2_niclj") +region = Rect2(64, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_udxe4"] +atlas = ExtResource("2_niclj") +region = Rect2(192, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_knqv5"] +atlas = ExtResource("2_niclj") +region = Rect2(320, 0, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1d1rp"] +atlas = ExtResource("2_niclj") +region = Rect2(64, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ki550"] +atlas = ExtResource("2_niclj") +region = Rect2(192, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8tfix"] +atlas = ExtResource("2_niclj") +region = Rect2(320, 80, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jvsmj"] +atlas = ExtResource("2_niclj") +region = Rect2(64, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mk01a"] +atlas = ExtResource("2_niclj") +region = Rect2(192, 160, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_j6b5g"] +atlas = ExtResource("2_niclj") +region = Rect2(320, 160, 64, 80) [resource] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_8f67t") +"texture": SubResource("AtlasTexture_6i65d") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qlja2") +"texture": SubResource("AtlasTexture_gvd0a") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_glno6") +"texture": SubResource("AtlasTexture_kbtel") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_frnbt") +"texture": SubResource("AtlasTexture_4o7p2") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_2ytfc") +"texture": SubResource("AtlasTexture_2urqt") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pcxt2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vuqy3") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_abxng") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_lstal") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_0l1oe") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_rxxco") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bbdxx") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_0ig2j") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_y6ht0") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7b7xb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_yxxxi") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_g75mr") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1467k") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2o7eb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_yobme") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ylcxs") }], "loop": false, "name": &"closeDoor", @@ -70,7 +199,7 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_oyi3c") +"texture": SubResource("AtlasTexture_ohx3w") }], "loop": false, "name": &"default", @@ -78,19 +207,31 @@ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_e68us") +"texture": SubResource("AtlasTexture_edun5") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_e7wqp") +"texture": SubResource("AtlasTexture_udxe4") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qcket") +"texture": SubResource("AtlasTexture_knqv5") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_genp5") +"texture": SubResource("AtlasTexture_1d1rp") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_krdph") +"texture": SubResource("AtlasTexture_ki550") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_8tfix") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_jvsmj") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_mk01a") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_j6b5g") }], "loop": false, "name": &"openDoor", diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres index 0d55e81..91599bd 100644 --- a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres @@ -1,77 +1,93 @@ -[gd_resource type="SpriteFrames" load_steps=30 format=3 uid="uid://xs72aopsgpg6"] +[gd_resource type="SpriteFrames" load_steps=34 format=3 uid="uid://xs72aopsgpg6"] [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_xxmx2"] +[sub_resource type="AtlasTexture" id="AtlasTexture_4ljkw"] atlas = ExtResource("1_ei0vs") region = Rect2(0, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_gvitc"] +[sub_resource type="AtlasTexture" id="AtlasTexture_gsbr3"] atlas = ExtResource("1_ei0vs") region = Rect2(128, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_pu8no"] +[sub_resource type="AtlasTexture" id="AtlasTexture_3xyad"] atlas = ExtResource("1_ei0vs") region = Rect2(256, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_odchw"] +[sub_resource type="AtlasTexture" id="AtlasTexture_3rhje"] atlas = ExtResource("1_ei0vs") region = Rect2(384, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_kcny1"] +[sub_resource type="AtlasTexture" id="AtlasTexture_scmwd"] atlas = ExtResource("1_ei0vs") region = Rect2(512, 0, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_uvf4v"] +[sub_resource type="AtlasTexture" id="AtlasTexture_yahdi"] atlas = ExtResource("1_ei0vs") region = Rect2(0, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_gdaup"] +[sub_resource type="AtlasTexture" id="AtlasTexture_b3qcg"] atlas = ExtResource("1_ei0vs") region = Rect2(128, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_pvmn2"] +[sub_resource type="AtlasTexture" id="AtlasTexture_btbte"] atlas = ExtResource("1_ei0vs") region = Rect2(256, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_5cqxt"] +[sub_resource type="AtlasTexture" id="AtlasTexture_0b28w"] atlas = ExtResource("1_ei0vs") region = Rect2(384, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_6plqf"] +[sub_resource type="AtlasTexture" id="AtlasTexture_6ukg1"] atlas = ExtResource("1_ei0vs") region = Rect2(512, 80, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_eljnj"] +[sub_resource type="AtlasTexture" id="AtlasTexture_jiet8"] atlas = ExtResource("1_ei0vs") region = Rect2(0, 160, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_km3b8"] +[sub_resource type="AtlasTexture" id="AtlasTexture_r28tm"] atlas = ExtResource("1_ei0vs") region = Rect2(128, 160, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_l6mb4"] +[sub_resource type="AtlasTexture" id="AtlasTexture_jkf57"] atlas = ExtResource("1_ei0vs") region = Rect2(256, 160, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_flrvv"] +[sub_resource type="AtlasTexture" id="AtlasTexture_frdgf"] atlas = ExtResource("1_ei0vs") region = Rect2(384, 160, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_873cg"] +[sub_resource type="AtlasTexture" id="AtlasTexture_573yg"] atlas = ExtResource("1_ei0vs") region = Rect2(512, 160, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_6qen8"] +[sub_resource type="AtlasTexture" id="AtlasTexture_xafye"] atlas = ExtResource("1_ei0vs") region = Rect2(0, 240, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_qmv44"] +[sub_resource type="AtlasTexture" id="AtlasTexture_tsxiw"] atlas = ExtResource("1_ei0vs") region = Rect2(128, 240, 64, 80) -[sub_resource type="AtlasTexture" id="AtlasTexture_x3d11"] +[sub_resource type="AtlasTexture" id="AtlasTexture_67ks6"] +atlas = ExtResource("1_ei0vs") +region = Rect2(256, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_plgh2"] +atlas = ExtResource("1_ei0vs") +region = Rect2(384, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_68xl6"] +atlas = ExtResource("1_ei0vs") +region = Rect2(512, 240, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_40vaw"] +atlas = ExtResource("1_ei0vs") +region = Rect2(0, 320, 64, 80) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4cyi6"] atlas = ExtResource("1_ei0vs") region = Rect2(0, 0, 64, 80) @@ -115,63 +131,75 @@ animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_xxmx2") +"texture": SubResource("AtlasTexture_4ljkw") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_gvitc") +"texture": SubResource("AtlasTexture_gsbr3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_pu8no") +"texture": SubResource("AtlasTexture_3xyad") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_odchw") +"texture": SubResource("AtlasTexture_3rhje") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_kcny1") +"texture": SubResource("AtlasTexture_scmwd") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_uvf4v") +"texture": SubResource("AtlasTexture_yahdi") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_gdaup") +"texture": SubResource("AtlasTexture_b3qcg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_pvmn2") +"texture": SubResource("AtlasTexture_btbte") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_5cqxt") +"texture": SubResource("AtlasTexture_0b28w") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6plqf") +"texture": SubResource("AtlasTexture_6ukg1") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_eljnj") +"texture": SubResource("AtlasTexture_jiet8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_km3b8") +"texture": SubResource("AtlasTexture_r28tm") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_l6mb4") +"texture": SubResource("AtlasTexture_jkf57") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_flrvv") +"texture": SubResource("AtlasTexture_frdgf") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_873cg") +"texture": SubResource("AtlasTexture_573yg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6qen8") +"texture": SubResource("AtlasTexture_xafye") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qmv44") +"texture": SubResource("AtlasTexture_tsxiw") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_67ks6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_plgh2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_68xl6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_40vaw") }], "loop": false, "name": &"closeDoor", -"speed": 20.0 +"speed": 10.0 }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_x3d11") +"texture": SubResource("AtlasTexture_4cyi6") }], "loop": false, "name": &"default", diff --git a/DungeonShooting_Godot/scene/Hall.tscn b/DungeonShooting_Godot/scene/Hall.tscn index bd3f936..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"] diff --git a/DungeonShooting_Godot/src/framework/map/room/RoomInfo.cs b/DungeonShooting_Godot/src/framework/map/room/RoomInfo.cs index 15d95ac..0d0e3b2 100644 --- a/DungeonShooting_Godot/src/framework/map/room/RoomInfo.cs +++ b/DungeonShooting_Godot/src/framework/map/room/RoomInfo.cs @@ -462,7 +462,7 @@ /// public void OnFirstEnter() { - if (RoomPreinstall.IsRunWave) + if (RoomPreinstall == null || RoomPreinstall.IsRunWave) { return; }