diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index dbdd157..0dc2ea0 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index b2185d4..31ff6a4 100644 --- a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index bba5663..494a8e2 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn index 300044e..3a07eb2 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=7 format=3 uid="uid://yhewdkpru0up"] +[gd_scene load_steps=8 format=3 uid="uid://yhewdkpru0up"] [ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_4c6sw"] [ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_lwx51"] -[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_E.tres" id="3_pjvd8"] +[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_E_Up.tres" id="3_pjvd8"] +[ext_resource type="SpriteFrames" uid="uid://b34tddsmqnj8s" path="res://resource/spriteFrames/other/RoomDoor_E_Down.tres" id="4_ln8k4"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true @@ -40,9 +41,21 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(3, -8) +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" +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 8b0e2d7..0dafcdf 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn @@ -42,9 +42,12 @@ material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) sprite_frames = ExtResource("3_apluc") -animation = &"openDoor" +animation = &"closeDoor" autoplay = "default" +frame = 4 +frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] +visible = false position = Vector2(0, -3.5) shape = SubResource("RectangleShape2D_opsb6") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn index 10e3a09..b6ba79b 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn @@ -42,11 +42,12 @@ material = SubResource("ShaderMaterial_t4ayq") position = Vector2(0, -8) sprite_frames = ExtResource("3_hhmd5") -animation = &"closeDoor" +animation = &"openDoor" autoplay = "default" frame = 4 frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] +visible = false position = Vector2(0, -3.5) shape = SubResource("RectangleShape2D_opsb6") diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn index ffebe96..96586e0 100644 --- a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn +++ b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=7 format=3 uid="uid://wmedlesabvr3"] +[gd_scene load_steps=8 format=3 uid="uid://wmedlesabvr3"] [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.tres" id="3_veggu"] +[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://qq3h0mh4r12i" path="res://resource/spriteFrames/other/RoomDoor_W_Down.tres" id="4_dnjb6"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"] resource_local_to_scene = true @@ -40,10 +41,23 @@ [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] material = SubResource("ShaderMaterial_t4ayq") -position = Vector2(0, -13) +position = Vector2(-9, -10) sprite_frames = ExtResource("3_veggu") +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_dnjb6") +animation = &"openDoor" +autoplay = "default" +frame = 4 +frame_progress = 1.0 [node name="Collision" type="CollisionShape2D" parent="."] +visible = false position = Vector2(0, 4) shape = SubResource("RectangleShape2D_2ko2r") diff --git a/DungeonShooting_Godot/resource/sprite/map/door.png b/DungeonShooting_Godot/resource/sprite/map/door.png index a4ad47a..5a02887 100644 --- a/DungeonShooting_Godot/resource/sprite/map/door.png +++ b/DungeonShooting_Godot/resource/sprite/map/door.png Binary files differ diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E.tres deleted file mode 100644 index c402c9d..0000000 --- a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E.tres +++ /dev/null @@ -1,162 +0,0 @@ -[gd_resource type="SpriteFrames" load_steps=23 format=3 uid="uid://3ps6h2f54qa5"] - -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/door1_down.png" id="1_peglf"] -[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="2_u3fum"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"] -atlas = ExtResource("1_peglf") -region = Rect2(144, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_kmhtl"] -atlas = ExtResource("1_peglf") -region = Rect2(128, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_umaop"] -atlas = ExtResource("1_peglf") -region = Rect2(112, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aqex7"] -atlas = ExtResource("1_peglf") -region = Rect2(96, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hdocg"] -atlas = ExtResource("1_peglf") -region = Rect2(80, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aiymw"] -atlas = ExtResource("1_peglf") -region = Rect2(64, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_8f7dv"] -atlas = ExtResource("1_peglf") -region = Rect2(32, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_iv82l"] -atlas = ExtResource("1_peglf") -region = Rect2(16, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ycmnv"] -atlas = ExtResource("1_peglf") -region = Rect2(0, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_oyi3c"] -atlas = ExtResource("2_u3fum") -region = Rect2(128, 52, 32, 52) - -[sub_resource type="AtlasTexture" id="AtlasTexture_j8iw2"] -atlas = ExtResource("1_peglf") -region = Rect2(0, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_823if"] -atlas = ExtResource("1_peglf") -region = Rect2(16, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7hyae"] -atlas = ExtResource("1_peglf") -region = Rect2(32, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6lhu3"] -atlas = ExtResource("1_peglf") -region = Rect2(48, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_a026j"] -atlas = ExtResource("1_peglf") -region = Rect2(64, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_wfjf7"] -atlas = ExtResource("1_peglf") -region = Rect2(80, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rhj60"] -atlas = ExtResource("1_peglf") -region = Rect2(96, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_06y08"] -atlas = ExtResource("1_peglf") -region = Rect2(112, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1200j"] -atlas = ExtResource("1_peglf") -region = Rect2(128, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_mbnbx"] -atlas = ExtResource("1_peglf") -region = Rect2(144, 48, 16, 48) - -[resource] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_5m6ya") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_kmhtl") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_umaop") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aqex7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_hdocg") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aiymw") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_8f7dv") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_iv82l") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ycmnv") -}], -"loop": false, -"name": &"closeDoor", -"speed": 20.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_oyi3c") -}], -"loop": false, -"name": &"default", -"speed": 20.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_j8iw2") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_823if") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7hyae") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_6lhu3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_a026j") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_wfjf7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rhj60") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_06y08") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_1200j") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_mbnbx") -}], -"loop": false, -"name": &"openDoor", -"speed": 20.0 -}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Down.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Down.tres new file mode 100644 index 0000000..9669b44 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Down.tres @@ -0,0 +1,98 @@ +[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://b34tddsmqnj8s"] + +[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="1_nc77d"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_4o2e1"] +atlas = ExtResource("1_nc77d") +region = Rect2(128, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_d1gjl"] +atlas = ExtResource("1_nc77d") +region = Rect2(96, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_g4rm7"] +atlas = ExtResource("1_nc77d") +region = Rect2(64, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5d5bq"] +atlas = ExtResource("1_nc77d") +region = Rect2(32, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ekma7"] +atlas = ExtResource("1_nc77d") +region = Rect2(0, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7y01b"] +atlas = ExtResource("1_nc77d") +region = Rect2(128, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jm1e2"] +atlas = ExtResource("1_nc77d") +region = Rect2(0, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1bb60"] +atlas = ExtResource("1_nc77d") +region = Rect2(32, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_oylje"] +atlas = ExtResource("1_nc77d") +region = Rect2(64, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_truep"] +atlas = ExtResource("1_nc77d") +region = Rect2(96, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_lfr82"] +atlas = ExtResource("1_nc77d") +region = Rect2(128, 104, 32, 52) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_4o2e1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_d1gjl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_g4rm7") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5d5bq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ekma7") +}], +"loop": false, +"name": &"closeDoor", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_7y01b") +}], +"loop": false, +"name": &"default", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_jm1e2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1bb60") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_oylje") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_truep") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_lfr82") +}], +"loop": false, +"name": &"openDoor", +"speed": 10.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres new file mode 100644 index 0000000..8e74aa6 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres @@ -0,0 +1,98 @@ +[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://3ps6h2f54qa5"] + +[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="2_u3fum"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_8f67t"] +atlas = ExtResource("2_u3fum") +region = Rect2(128, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qlja2"] +atlas = ExtResource("2_u3fum") +region = Rect2(96, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_glno6"] +atlas = ExtResource("2_u3fum") +region = Rect2(64, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_frnbt"] +atlas = ExtResource("2_u3fum") +region = Rect2(32, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2ytfc"] +atlas = ExtResource("2_u3fum") +region = Rect2(0, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_oyi3c"] +atlas = ExtResource("2_u3fum") +region = Rect2(128, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_e68us"] +atlas = ExtResource("2_u3fum") +region = Rect2(0, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_e7wqp"] +atlas = ExtResource("2_u3fum") +region = Rect2(32, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qcket"] +atlas = ExtResource("2_u3fum") +region = Rect2(64, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_genp5"] +atlas = ExtResource("2_u3fum") +region = Rect2(96, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_krdph"] +atlas = ExtResource("2_u3fum") +region = Rect2(128, 52, 32, 52) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_8f67t") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qlja2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_glno6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_frnbt") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2ytfc") +}], +"loop": false, +"name": &"closeDoor", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_oyi3c") +}], +"loop": false, +"name": &"default", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_e68us") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_e7wqp") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qcket") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_genp5") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_krdph") +}], +"loop": false, +"name": &"openDoor", +"speed": 10.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W.tres deleted file mode 100644 index a708080..0000000 --- a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W.tres +++ /dev/null @@ -1,162 +0,0 @@ -[gd_resource type="SpriteFrames" load_steps=23 format=3 uid="uid://cpdt5ywrsruu3"] - -[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/door1_down.png" id="1_s535y"] -[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="2_klr41"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"] -atlas = ExtResource("1_s535y") -region = Rect2(144, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_kmhtl"] -atlas = ExtResource("1_s535y") -region = Rect2(128, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_umaop"] -atlas = ExtResource("1_s535y") -region = Rect2(112, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aqex7"] -atlas = ExtResource("1_s535y") -region = Rect2(96, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hdocg"] -atlas = ExtResource("1_s535y") -region = Rect2(80, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aiymw"] -atlas = ExtResource("1_s535y") -region = Rect2(64, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_8f7dv"] -atlas = ExtResource("1_s535y") -region = Rect2(32, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_iv82l"] -atlas = ExtResource("1_s535y") -region = Rect2(16, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ycmnv"] -atlas = ExtResource("1_s535y") -region = Rect2(0, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_qqug3"] -atlas = ExtResource("2_klr41") -region = Rect2(128, 52, 32, 52) - -[sub_resource type="AtlasTexture" id="AtlasTexture_j8iw2"] -atlas = ExtResource("1_s535y") -region = Rect2(0, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_823if"] -atlas = ExtResource("1_s535y") -region = Rect2(16, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7hyae"] -atlas = ExtResource("1_s535y") -region = Rect2(32, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6lhu3"] -atlas = ExtResource("1_s535y") -region = Rect2(48, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_a026j"] -atlas = ExtResource("1_s535y") -region = Rect2(64, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_wfjf7"] -atlas = ExtResource("1_s535y") -region = Rect2(80, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rhj60"] -atlas = ExtResource("1_s535y") -region = Rect2(96, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_06y08"] -atlas = ExtResource("1_s535y") -region = Rect2(112, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1200j"] -atlas = ExtResource("1_s535y") -region = Rect2(128, 48, 16, 48) - -[sub_resource type="AtlasTexture" id="AtlasTexture_mbnbx"] -atlas = ExtResource("1_s535y") -region = Rect2(144, 48, 16, 48) - -[resource] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_5m6ya") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_kmhtl") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_umaop") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aqex7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_hdocg") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aiymw") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_8f7dv") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_iv82l") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ycmnv") -}], -"loop": false, -"name": &"closeDoor", -"speed": 20.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_qqug3") -}], -"loop": false, -"name": &"default", -"speed": 20.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_j8iw2") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_823if") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7hyae") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_6lhu3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_a026j") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_wfjf7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rhj60") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_06y08") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_1200j") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_mbnbx") -}], -"loop": false, -"name": &"openDoor", -"speed": 20.0 -}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Down.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Down.tres new file mode 100644 index 0000000..86fc6ad --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Down.tres @@ -0,0 +1,98 @@ +[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://qq3h0mh4r12i"] + +[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="1_b4js3"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_526no"] +atlas = ExtResource("1_b4js3") +region = Rect2(288, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_84kmd"] +atlas = ExtResource("1_b4js3") +region = Rect2(256, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_km4i6"] +atlas = ExtResource("1_b4js3") +region = Rect2(224, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_wtul1"] +atlas = ExtResource("1_b4js3") +region = Rect2(192, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vbu5n"] +atlas = ExtResource("1_b4js3") +region = Rect2(160, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yxx5v"] +atlas = ExtResource("1_b4js3") +region = Rect2(288, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4ncdo"] +atlas = ExtResource("1_b4js3") +region = Rect2(160, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bxfu1"] +atlas = ExtResource("1_b4js3") +region = Rect2(192, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8082a"] +atlas = ExtResource("1_b4js3") +region = Rect2(224, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mjuqg"] +atlas = ExtResource("1_b4js3") +region = Rect2(256, 104, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_rc634"] +atlas = ExtResource("1_b4js3") +region = Rect2(288, 104, 32, 52) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_526no") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_84kmd") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_km4i6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_wtul1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vbu5n") +}], +"loop": false, +"name": &"closeDoor", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_yxx5v") +}], +"loop": false, +"name": &"default", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_4ncdo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bxfu1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_8082a") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_mjuqg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_rc634") +}], +"loop": false, +"name": &"openDoor", +"speed": 10.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Up.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Up.tres new file mode 100644 index 0000000..6c18e9e --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Up.tres @@ -0,0 +1,98 @@ +[gd_resource type="SpriteFrames" load_steps=13 format=3 uid="uid://cpdt5ywrsruu3"] + +[ext_resource type="Texture2D" uid="uid://f7d7qsdxqx28" path="res://resource/sprite/map/door.png" id="2_klr41"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_skb20"] +atlas = ExtResource("2_klr41") +region = Rect2(288, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dk55p"] +atlas = ExtResource("2_klr41") +region = Rect2(256, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_78qdb"] +atlas = ExtResource("2_klr41") +region = Rect2(224, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_sqirq"] +atlas = ExtResource("2_klr41") +region = Rect2(192, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_c65nc"] +atlas = ExtResource("2_klr41") +region = Rect2(160, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6tswf"] +atlas = ExtResource("2_klr41") +region = Rect2(288, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hg8wo"] +atlas = ExtResource("2_klr41") +region = Rect2(160, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qkhur"] +atlas = ExtResource("2_klr41") +region = Rect2(192, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6rqcm"] +atlas = ExtResource("2_klr41") +region = Rect2(224, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_y0tub"] +atlas = ExtResource("2_klr41") +region = Rect2(256, 52, 32, 52) + +[sub_resource type="AtlasTexture" id="AtlasTexture_w8xe5"] +atlas = ExtResource("2_klr41") +region = Rect2(288, 52, 32, 52) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_skb20") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dk55p") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_78qdb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_sqirq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_c65nc") +}], +"loop": false, +"name": &"closeDoor", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_6tswf") +}], +"loop": false, +"name": &"default", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_hg8wo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qkhur") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6rqcm") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_y0tub") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_w8xe5") +}], +"loop": false, +"name": &"openDoor", +"speed": 10.0 +}] diff --git a/DungeonShooting_Godot/src/config/ExcelConfig.cs b/DungeonShooting_Godot/src/config/ExcelConfig.cs index 86550d4..b0abf46 100644 --- a/DungeonShooting_Godot/src/config/ExcelConfig.cs +++ b/DungeonShooting_Godot/src/config/ExcelConfig.cs @@ -64,7 +64,7 @@ } catch (Exception e) { - Debug.LogError(e.ToString()); + GD.PrintErr(e.ToString()); throw new Exception("初始化表'ActivityObject'失败!"); } } @@ -82,7 +82,7 @@ } catch (Exception e) { - Debug.LogError(e.ToString()); + GD.PrintErr(e.ToString()); throw new Exception("初始化表'Sound'失败!"); } } @@ -100,7 +100,7 @@ } catch (Exception e) { - Debug.LogError(e.ToString()); + GD.PrintErr(e.ToString()); throw new Exception("初始化表'Weapon'失败!"); } } @@ -153,7 +153,7 @@ } catch (Exception e) { - Debug.LogError(e.ToString()); + GD.PrintErr(e.ToString()); throw new Exception("初始化'Weapon'引用其他表数据失败, 当前行id: " + item.Id); } } diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index 8b3dd8a..3ff5957 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -1,8 +1,6 @@ using Config; -/// -/// 根据配置表注册物体, 该类是自动生成的, 请不要手动编辑! -/// +// 根据配置表注册物体, 该类是自动生成的, 请不要手动编辑! public partial class ActivityObject { /// diff --git a/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs b/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs index cd72216..ee59049 100644 --- a/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs +++ b/DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs @@ -56,9 +56,7 @@ } var str = $"using Config;\n\n"; - str += $"/// \n"; - str += $"/// 根据配置表注册物体, 该类是自动生成的, 请不要手动编辑!\n"; - str += $"/// \n"; + str += $"// 根据配置表注册物体, 该类是自动生成的, 请不要手动编辑!\n"; str += $"public partial class ActivityObject\n"; str += $"{{\n"; diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index c788fc7..40f2ec7 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -280,10 +280,12 @@ public const string resource_spriteFrames_bullet_Bullet0002_tres = "res://resource/spriteFrames/bullet/Bullet0002.tres"; public const string resource_spriteFrames_bullet_Bullet0003_tres = "res://resource/spriteFrames/bullet/Bullet0003.tres"; public const string resource_spriteFrames_effect_KnifeHit1_tres = "res://resource/spriteFrames/effect/KnifeHit1.tres"; - public const string resource_spriteFrames_other_RoomDoor_E_tres = "res://resource/spriteFrames/other/RoomDoor_E.tres"; + public const string resource_spriteFrames_other_RoomDoor_E_Down_tres = "res://resource/spriteFrames/other/RoomDoor_E_Down.tres"; + public const string resource_spriteFrames_other_RoomDoor_E_Up_tres = "res://resource/spriteFrames/other/RoomDoor_E_Up.tres"; public const string resource_spriteFrames_other_RoomDoor_N_tres = "res://resource/spriteFrames/other/RoomDoor_N.tres"; public const string resource_spriteFrames_other_RoomDoor_S_tres = "res://resource/spriteFrames/other/RoomDoor_S.tres"; - public const string resource_spriteFrames_other_RoomDoor_W_tres = "res://resource/spriteFrames/other/RoomDoor_W.tres"; + public const string resource_spriteFrames_other_RoomDoor_W_Down_tres = "res://resource/spriteFrames/other/RoomDoor_W_Down.tres"; + public const string resource_spriteFrames_other_RoomDoor_W_Up_tres = "res://resource/spriteFrames/other/RoomDoor_W_Up.tres"; public const string resource_spriteFrames_prop_active_ActiveProp5000_tres = "res://resource/spriteFrames/prop/active/ActiveProp5000.tres"; public const string resource_spriteFrames_prop_active_ActiveProp5001_tres = "res://resource/spriteFrames/prop/active/ActiveProp5001.tres"; public const string resource_spriteFrames_prop_buff_BuffProp0001_tres = "res://resource/spriteFrames/prop/buff/BuffProp0001.tres"; diff --git a/DungeonShooting_Godot/src/game/room/RoomDoor.cs b/DungeonShooting_Godot/src/game/room/RoomDoor.cs index 5558dbb..4d15411 100644 --- a/DungeonShooting_Godot/src/game/room/RoomDoor.cs +++ b/DungeonShooting_Godot/src/game/room/RoomDoor.cs @@ -19,6 +19,7 @@ private RoomDoorInfo _door; private bool waitDisabledCollision = false; + private AnimatedSprite2D _animatedDown; public override void OnInit() { @@ -32,6 +33,10 @@ { _door = doorInfo; IsClose = false; + if (doorInfo.Direction == DoorDirection.E || doorInfo.Direction == DoorDirection.W) + { + _animatedDown = GetNode("AnimatedSpriteDown"); + } OpenDoorHandler(); } @@ -47,6 +52,11 @@ { AnimatedSprite.Play(AnimatorNames.OpenDoor); } + + if (_animatedDown != null && _animatedDown.SpriteFrames.HasAnimation(AnimatorNames.OpenDoor)) + { + _animatedDown.Play(AnimatorNames.OpenDoor); + } } /// @@ -64,19 +74,35 @@ _door.Navigation.CloseNavigationNode.Enabled = true; _door.Navigation.CloseNavigationNode.Visible = true; } - + if (AnimatedSprite.SpriteFrames.HasAnimation(AnimatorNames.CloseDoor)) { AnimatedSprite.Play(AnimatorNames.CloseDoor); } + + if (_animatedDown != null && _animatedDown.SpriteFrames.HasAnimation(AnimatorNames.CloseDoor)) + { + _animatedDown.Play(AnimatorNames.CloseDoor); + } + //调整门的层级 switch (Direction) { case DoorDirection.E: - ZIndex = GameConfig.MiddleMapLayer; + ZIndex = GameConfig.TopMapLayer; + if (_animatedDown != null) + { + _animatedDown.ZIndex = GameConfig.TopMapLayer; + } + break; case DoorDirection.W: - ZIndex = GameConfig.MiddleMapLayer; + ZIndex = GameConfig.TopMapLayer; + if (_animatedDown != null) + { + _animatedDown.ZIndex = GameConfig.TopMapLayer; + } + break; case DoorDirection.S: ZIndex = GameConfig.TopMapLayer; @@ -114,9 +140,19 @@ { case DoorDirection.E: ZIndex = GameConfig.MiddleMapLayer; + if (_animatedDown != null) + { + _animatedDown.ZIndex = GameConfig.TopMapLayer; + } + break; case DoorDirection.W: ZIndex = GameConfig.MiddleMapLayer; + if (_animatedDown != null) + { + _animatedDown.ZIndex = GameConfig.TopMapLayer; + } + break; case DoorDirection.S: ZIndex = GameConfig.TopMapLayer;