diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
index 527ed3b..7863c17 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 ea4622f..897fd3a 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 d8c5fb5..90e5bef 100644
--- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
index e2bbb87..d2e2035 100644
--- a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
+++ b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/activity/bullet/Bullet.cs" id="1_hga3h"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_n44pd"]
-[ext_resource type="SpriteFrames" uid="uid://bpeodjqiy3mil" path="res://resource/spriteFrames/Bullet0002.tres" id="3_uvuj8"]
+[ext_resource type="SpriteFrames" uid="uid://bpeodjqiy3mil" path="res://resource/spriteFrames/bullet/Bullet0002.tres" id="3_uvuj8"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn
index 1c4997b..70d7f16 100644
--- a/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn
+++ b/DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn
@@ -2,7 +2,8 @@
[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/RoomDoor_EW.tres" id="3_pjvd8"]
+[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_EW.tres" id="3_pjvd8"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn
index 77fcfce..fe84b67 100644
--- a/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn
+++ b/DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/room/RoomDoor.cs" id="1_220be"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_h5ru6"]
-[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_apluc"]
+[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/other/RoomDoor_NS.tres" id="3_apluc"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn
index f7a1217..5d3dc92 100644
--- a/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn
+++ b/DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn
@@ -2,7 +2,8 @@
[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://xs72aopsgpg6" path="res://resource/spriteFrames/RoomDoor_NS.tres" id="3_at5v2"]
+[ext_resource type="SpriteFrames" uid="uid://xs72aopsgpg6" path="res://resource/spriteFrames/other/RoomDoor_NS.tres" id="3_at5v2"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn
index 0e5a557..0dbf427 100644
--- a/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn
+++ b/DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn
@@ -2,7 +2,8 @@
[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://3ps6h2f54qa5" path="res://resource/spriteFrames/RoomDoor_EW.tres" id="3_a2hvw"]
+[ext_resource type="SpriteFrames" uid="uid://3ps6h2f54qa5" path="res://resource/spriteFrames/other/RoomDoor_EW.tres" id="3_a2hvw"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yvwpk"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Buff0001.tscn b/DungeonShooting_Godot/prefab/prop/buff/Buff0001.tscn
new file mode 100644
index 0000000..6e3dfe5
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/prop/buff/Buff0001.tscn
@@ -0,0 +1,40 @@
+[gd_scene load_steps=7 format=3 uid="uid://cb4k0wmt3rhjc"]
+
+[ext_resource type="Script" path="res://src/game/activity/prop/buff/Buff0001.cs" id="1_sfoyx"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_5y838"]
+[ext_resource type="SpriteFrames" uid="uid://wtvfyprel72y" path="res://resource/spriteFrames/prop/buff/Buff0001.tres" id="3_ae54v"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
+resource_local_to_scene = true
+shader = ExtResource("2_5y838")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
+resource_local_to_scene = true
+shader = ExtResource("2_5y838")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
+size = Vector2(12, 10)
+
+[node name="Buff0001" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_sfoyx")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_mrkt4")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_b6ii6")
+sprite_frames = ExtResource("3_ae54v")
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Buff0002.tscn b/DungeonShooting_Godot/prefab/prop/buff/Buff0002.tscn
new file mode 100644
index 0000000..a7e48c2
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/prop/buff/Buff0002.tscn
@@ -0,0 +1,40 @@
+[gd_scene load_steps=7 format=3 uid="uid://cnh7h0ti23dwm"]
+
+[ext_resource type="Script" path="res://src/game/activity/prop/buff/Buff0002.cs" id="1_5m6aa"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ca7fx"]
+[ext_resource type="SpriteFrames" uid="uid://7t57gsyff470" path="res://resource/spriteFrames/prop/buff/Buff0002.tres" id="3_meeoj"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
+resource_local_to_scene = true
+shader = ExtResource("2_ca7fx")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
+resource_local_to_scene = true
+shader = ExtResource("2_ca7fx")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
+size = Vector2(12, 10)
+
+[node name="Buff0002" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_5m6aa")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_mrkt4")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_b6ii6")
+sprite_frames = ExtResource("3_meeoj")
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Buff0003.tscn b/DungeonShooting_Godot/prefab/prop/buff/Buff0003.tscn
new file mode 100644
index 0000000..a1c30e6
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/prop/buff/Buff0003.tscn
@@ -0,0 +1,40 @@
+[gd_scene load_steps=7 format=3 uid="uid://im64ft74hmmg"]
+
+[ext_resource type="Script" path="res://src/game/activity/prop/buff/Buff0003.cs" id="1_put1t"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_r3cwy"]
+[ext_resource type="SpriteFrames" uid="uid://nqoieett75t3" path="res://resource/spriteFrames/prop/buff/Buff0003.tres" id="3_cdr8i"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
+resource_local_to_scene = true
+shader = ExtResource("2_r3cwy")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
+resource_local_to_scene = true
+shader = ExtResource("2_r3cwy")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
+size = Vector2(12, 10)
+
+[node name="Buff0003" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_put1t")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_mrkt4")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_b6ii6")
+sprite_frames = ExtResource("3_cdr8i")
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Buff0004.tscn b/DungeonShooting_Godot/prefab/prop/buff/Buff0004.tscn
new file mode 100644
index 0000000..d9555fb
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/prop/buff/Buff0004.tscn
@@ -0,0 +1,40 @@
+[gd_scene load_steps=7 format=3 uid="uid://dw3fey3hybie4"]
+
+[ext_resource type="Script" path="res://src/game/activity/prop/buff/Buff0004.cs" id="1_77wev"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_j5d6t"]
+[ext_resource type="SpriteFrames" uid="uid://bj0k3pipwp46x" path="res://resource/spriteFrames/prop/buff/Buff0004.tres" id="3_amsdk"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
+resource_local_to_scene = true
+shader = ExtResource("2_j5d6t")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
+resource_local_to_scene = true
+shader = ExtResource("2_j5d6t")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0.0
+shader_parameter/alpha = 1.0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
+size = Vector2(12, 10)
+
+[node name="Buff0004" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_77wev")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_mrkt4")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_b6ii6")
+sprite_frames = ExtResource("3_amsdk")
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Prop0001.tscn b/DungeonShooting_Godot/prefab/prop/buff/Prop0001.tscn
deleted file mode 100644
index e4a5795..0000000
--- a/DungeonShooting_Godot/prefab/prop/buff/Prop0001.tscn
+++ /dev/null
@@ -1,40 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://cb4k0wmt3rhjc"]
-
-[ext_resource type="Script" path="res://src/game/activity/prop/buff/MoveSpeedBuff.cs" id="1_haxff"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ao13f"]
-[ext_resource type="SpriteFrames" uid="uid://wtvfyprel72y" path="res://resource/spriteFrames/Buff0001.tres" id="3_jv1el"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
-resource_local_to_scene = true
-shader = ExtResource("2_ao13f")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
-resource_local_to_scene = true
-shader = ExtResource("2_ao13f")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
-size = Vector2(12, 10)
-
-[node name="Prop0001" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
-collision_layer = 4
-script = ExtResource("1_haxff")
-ShadowSprite = NodePath("ShadowSprite")
-AnimatedSprite = NodePath("AnimatedSprite")
-Collision = NodePath("Collision")
-
-[node name="ShadowSprite" type="Sprite2D" parent="."]
-z_index = -1
-material = SubResource("ShaderMaterial_mrkt4")
-
-[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_b6ii6")
-sprite_frames = ExtResource("3_jv1el")
-
-[node name="Collision" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Prop0002.tscn b/DungeonShooting_Godot/prefab/prop/buff/Prop0002.tscn
deleted file mode 100644
index ea24c2f..0000000
--- a/DungeonShooting_Godot/prefab/prop/buff/Prop0002.tscn
+++ /dev/null
@@ -1,40 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://cnh7h0ti23dwm"]
-
-[ext_resource type="Script" path="res://src/game/activity/prop/buff/HeartContainerBuff.cs" id="1_1kha7"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_cwlyf"]
-[ext_resource type="SpriteFrames" uid="uid://7t57gsyff470" path="res://resource/spriteFrames/Buff0002.tres" id="3_k4xtc"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
-resource_local_to_scene = true
-shader = ExtResource("2_cwlyf")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
-resource_local_to_scene = true
-shader = ExtResource("2_cwlyf")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
-size = Vector2(12, 10)
-
-[node name="Prop0002" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
-collision_layer = 4
-script = ExtResource("1_1kha7")
-ShadowSprite = NodePath("ShadowSprite")
-AnimatedSprite = NodePath("AnimatedSprite")
-Collision = NodePath("Collision")
-
-[node name="ShadowSprite" type="Sprite2D" parent="."]
-z_index = -1
-material = SubResource("ShaderMaterial_mrkt4")
-
-[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_b6ii6")
-sprite_frames = ExtResource("3_k4xtc")
-
-[node name="Collision" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Prop0003.tscn b/DungeonShooting_Godot/prefab/prop/buff/Prop0003.tscn
deleted file mode 100644
index d9ace93..0000000
--- a/DungeonShooting_Godot/prefab/prop/buff/Prop0003.tscn
+++ /dev/null
@@ -1,40 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://im64ft74hmmg"]
-
-[ext_resource type="Script" path="res://src/game/activity/prop/buff/ShieldContainerBuff.cs" id="1_10xkd"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_q55qh"]
-[ext_resource type="SpriteFrames" uid="uid://nqoieett75t3" path="res://resource/spriteFrames/Buff0003.tres" id="3_tffkd"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
-resource_local_to_scene = true
-shader = ExtResource("2_q55qh")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
-resource_local_to_scene = true
-shader = ExtResource("2_q55qh")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
-size = Vector2(12, 10)
-
-[node name="Prop0003" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
-collision_layer = 4
-script = ExtResource("1_10xkd")
-ShadowSprite = NodePath("ShadowSprite")
-AnimatedSprite = NodePath("AnimatedSprite")
-Collision = NodePath("Collision")
-
-[node name="ShadowSprite" type="Sprite2D" parent="."]
-z_index = -1
-material = SubResource("ShaderMaterial_mrkt4")
-
-[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_b6ii6")
-sprite_frames = ExtResource("3_tffkd")
-
-[node name="Collision" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/prop/buff/Prop0004.tscn b/DungeonShooting_Godot/prefab/prop/buff/Prop0004.tscn
deleted file mode 100644
index 90adf44..0000000
--- a/DungeonShooting_Godot/prefab/prop/buff/Prop0004.tscn
+++ /dev/null
@@ -1,40 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://dw3fey3hybie4"]
-
-[ext_resource type="Script" path="res://src/game/activity/prop/buff/ShieldRecoveryTimeBuff.cs" id="1_kn8t4"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_ron1k"]
-[ext_resource type="SpriteFrames" uid="uid://bj0k3pipwp46x" path="res://resource/spriteFrames/Buff0004.tres" id="3_gdu32"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_mrkt4"]
-resource_local_to_scene = true
-shader = ExtResource("2_ron1k")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_b6ii6"]
-resource_local_to_scene = true
-shader = ExtResource("2_ron1k")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0.0
-shader_parameter/alpha = 1.0
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_cpqup"]
-size = Vector2(12, 10)
-
-[node name="Prop0004" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
-collision_layer = 4
-script = ExtResource("1_kn8t4")
-ShadowSprite = NodePath("ShadowSprite")
-AnimatedSprite = NodePath("AnimatedSprite")
-Collision = NodePath("Collision")
-
-[node name="ShadowSprite" type="Sprite2D" parent="."]
-z_index = -1
-material = SubResource("ShaderMaterial_mrkt4")
-
-[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_b6ii6")
-sprite_frames = ExtResource("3_gdu32")
-
-[node name="Collision" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_cpqup")
diff --git a/DungeonShooting_Godot/prefab/role/Enemy0001.tscn b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn
index d0e2f25..fabf09d 100644
--- a/DungeonShooting_Godot/prefab/role/Enemy0001.tscn
+++ b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn
@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_5po38"]
[ext_resource type="Script" path="res://src/game/activity/role/enemy/Enemy.cs" id="2_1plrq"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_x8agd"]
-[ext_resource type="SpriteFrames" uid="uid://cnctpyrn02rhd" path="res://resource/spriteFrames/Role1001.tres" id="4_qv8w5"]
+[ext_resource type="SpriteFrames" uid="uid://cnctpyrn02rhd" path="res://resource/spriteFrames/role/Role1001.tres" id="4_qv8w5"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_8vxx6"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/role/Role0001.tscn b/DungeonShooting_Godot/prefab/role/Role0001.tscn
index 0ecb088..e9539ad 100644
--- a/DungeonShooting_Godot/prefab/role/Role0001.tscn
+++ b/DungeonShooting_Godot/prefab/role/Role0001.tscn
@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_10c2n"]
[ext_resource type="Script" path="res://src/game/activity/role/Player.cs" id="2_i08u4"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_rk4gg"]
-[ext_resource type="SpriteFrames" uid="uid://n11thtali6es" path="res://resource/spriteFrames/Role0001.tres" id="4_galcc"]
+[ext_resource type="SpriteFrames" uid="uid://n11thtali6es" path="res://resource/spriteFrames/role/Role0001.tres" id="4_galcc"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lvutq"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
index b7f2eb4..b921399 100644
--- a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
+++ b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_2g70c"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_tdny6"]
-[ext_resource type="SpriteFrames" uid="uid://b8gksxl7auquc" path="res://resource/spriteFrames/Shell0001.tres" id="3_ujn5y"]
+[ext_resource type="SpriteFrames" uid="uid://b8gksxl7auquc" path="res://resource/spriteFrames/shell/Shell0001.tres" id="3_ujn5y"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/shell/Shell0002.tscn b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn
index edc3418..8b9ce01 100644
--- a/DungeonShooting_Godot/prefab/shell/Shell0002.tscn
+++ b/DungeonShooting_Godot/prefab/shell/Shell0002.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_qi64y"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_s28nu"]
-[ext_resource type="SpriteFrames" uid="uid://cj8psdl2pova6" path="res://resource/spriteFrames/Shell0002.tres" id="3_r560h"]
+[ext_resource type="SpriteFrames" uid="uid://cj8psdl2pova6" path="res://resource/spriteFrames/shell/Shell0002.tres" id="3_r560h"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/shell/Shell0003.tscn b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn
index 42221a6..3c884b1 100644
--- a/DungeonShooting_Godot/prefab/shell/Shell0003.tscn
+++ b/DungeonShooting_Godot/prefab/shell/Shell0003.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_5hfb2"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_586dn"]
-[ext_resource type="SpriteFrames" uid="uid://kc1jwvwdg660" path="res://resource/spriteFrames/Shell0003.tres" id="3_j2kre"]
+[ext_resource type="SpriteFrames" uid="uid://kc1jwvwdg660" path="res://resource/spriteFrames/shell/Shell0003.tres" id="3_j2kre"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
index ae6e01b..46ffb26 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_ykl0r"]
[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_t56pk"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_x1q03"]
-[ext_resource type="SpriteFrames" uid="uid://5m0qs7m4er5u" path="res://resource/spriteFrames/Weapon0001.tres" id="4_d5c81"]
+[ext_resource type="SpriteFrames" uid="uid://5m0qs7m4er5u" path="res://resource/spriteFrames/weapon/Weapon0001.tres" id="4_d5c81"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_5bfqf"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
index 6bfbeb4..0942b19 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_hgtyo"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_8nvny"]
-[ext_resource type="SpriteFrames" uid="uid://domhmo4flmlt0" path="res://resource/spriteFrames/Weapon0002.tres" id="3_4h3je"]
+[ext_resource type="SpriteFrames" uid="uid://domhmo4flmlt0" path="res://resource/spriteFrames/weapon/Weapon0002.tres" id="3_4h3je"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
index 6a19802..18e0dd4 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_aeolk"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_4yjnk"]
-[ext_resource type="SpriteFrames" uid="uid://c7dt1uwdybn5" path="res://resource/spriteFrames/Weapon0003.tres" id="3_upkjt"]
+[ext_resource type="SpriteFrames" uid="uid://c7dt1uwdybn5" path="res://resource/spriteFrames/weapon/Weapon0003.tres" id="3_upkjt"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
index 7843a77..dde6dec 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
@@ -3,9 +3,10 @@
[ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_kg172"]
[ext_resource type="Script" path="res://src/game/activity/weapon/knife/Knife.cs" id="2_v1wer"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_63s5g"]
-[ext_resource type="SpriteFrames" uid="uid://k2tktysa7j86" path="res://resource/spriteFrames/Weapon0004.tres" id="4_uymcs"]
+[ext_resource type="SpriteFrames" uid="uid://k2tktysa7j86" path="res://resource/spriteFrames/weapon/Weapon0004.tres" id="4_uymcs"]
[ext_resource type="PackedScene" path="res://prefab/FanCollisionShape.tscn" id="5_nr15b"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_o5ytq"]
resource_local_to_scene = true
shader = ExtResource("3_63s5g")
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn
index 342ee85..f9f1911 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_3lu3r"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_466gw"]
-[ext_resource type="SpriteFrames" uid="uid://djdvlmqsn8bie" path="res://resource/spriteFrames/Weapon0005.tres" id="2_m3plc"]
+[ext_resource type="SpriteFrames" uid="uid://djdvlmqsn8bie" path="res://resource/spriteFrames/weapon/Weapon0005.tres" id="2_m3plc"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn
index c6c2e9b..63caa2e 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn
@@ -2,7 +2,8 @@
[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="1_5nx8j"]
[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_rp1bw"]
-[ext_resource type="SpriteFrames" uid="uid://dx1mjbx4acs3q" path="res://resource/spriteFrames/Weapon0006.tres" id="2_j3sji"]
+[ext_resource type="SpriteFrames" uid="uid://dx1mjbx4acs3q" path="res://resource/spriteFrames/weapon/Weapon0006.tres" id="2_j3sji"]
+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
resource_local_to_scene = true
diff --git a/DungeonShooting_Godot/resource/config/ActivityObject.json b/DungeonShooting_Godot/resource/config/ActivityObject.json
index f7bac3a..d294d93 100644
--- a/DungeonShooting_Godot/resource/config/ActivityObject.json
+++ b/DungeonShooting_Godot/resource/config/ActivityObject.json
@@ -102,28 +102,28 @@
"Type": 9,
"Name": "\u978B\u5B50",
"Remark": "\u589E\u52A0\u79FB\u901F\u7684buff",
- "Prefab": "res://prefab/prop/buff/Prop0001.tscn"
+ "Prefab": "res://prefab/prop/buff/Buff0001.tscn"
},
{
"Id": "prop0002",
"Type": 9,
"Name": "\u5FC3\u4E4B\u5BB9\u5668",
"Remark": "\u589E\u52A0\u8840\u91CF\u4E0A\u9650",
- "Prefab": "res://prefab/prop/buff/Prop0002.tscn"
+ "Prefab": "res://prefab/prop/buff/Buff0002.tscn"
},
{
"Id": "prop0003",
"Type": 9,
"Name": "\u62A4\u76FE",
"Remark": "\u589E\u52A0\u62A4\u76FE\u4E0A\u9650",
- "Prefab": "res://prefab/prop/buff/Prop0003.tscn"
+ "Prefab": "res://prefab/prop/buff/Buff0003.tscn"
},
{
"Id": "prop0004",
"Type": 9,
"Name": "\u62A4\u76FE\u5FEB\u901F\u6062\u590D",
"Remark": "\u63D0\u9AD8\u62A4\u76FE\u6062\u590D\u901F\u5EA6",
- "Prefab": "res://prefab/prop/buff/Prop0004.tscn"
+ "Prefab": "res://prefab/prop/buff/Buff0004.tscn"
},
{
"Id": "other_door_e",
diff --git a/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png b/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png
new file mode 100644
index 0000000..bb37c35
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png.import b/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png.import
new file mode 100644
index 0000000..085be93
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sprite/prop/buff/Buff0005.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dse0mbg06ngya"
+path="res://.godot/imported/Buff0005.png-f0e3c022ce4baafb91a48332b46fb6dc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprite/prop/buff/Buff0005.png"
+dest_files=["res://.godot/imported/Buff0005.png-f0e3c022ce4baafb91a48332b46fb6dc.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/Buff0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Buff0001.tres
deleted file mode 100644
index 6a0ec5f..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Buff0001.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://wtvfyprel72y"]
-
-[ext_resource type="Texture2D" uid="uid://bls55gj8h3mgv" path="res://resource/sprite/prop/buff/Buff0001.png" id="1_scm06"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_scm06")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Buff0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Buff0002.tres
deleted file mode 100644
index 10e71f0..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Buff0002.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://7t57gsyff470"]
-
-[ext_resource type="Texture2D" uid="uid://cv2joc07ymofw" path="res://resource/sprite/prop/buff/Buff0002.png" id="1_8nnhb"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_8nnhb")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Buff0003.tres b/DungeonShooting_Godot/resource/spriteFrames/Buff0003.tres
deleted file mode 100644
index ee3770b..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Buff0003.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://nqoieett75t3"]
-
-[ext_resource type="Texture2D" uid="uid://osr0v1c6l8ly" path="res://resource/sprite/prop/buff/Buff0003.png" id="1_p16yr"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_p16yr")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Buff0004.tres b/DungeonShooting_Godot/resource/spriteFrames/Buff0004.tres
deleted file mode 100644
index 05d16c9..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Buff0004.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://bj0k3pipwp46x"]
-
-[ext_resource type="Texture2D" uid="uid://c0c25nihdcgt1" path="res://resource/sprite/prop/buff/Buff0004.png" id="1_a2o8b"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_a2o8b")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Bullet0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Bullet0001.tres
deleted file mode 100644
index 6af29a8..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Bullet0001.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://baoxep7vami72"]
-
-[ext_resource type="Texture2D" uid="uid://bu0b11hiuecxy" path="res://resource/sprite/bullet/bullet.png" id="1_ktu7r"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_ktu7r")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Bullet0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Bullet0002.tres
deleted file mode 100644
index cb31134..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Bullet0002.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://bpeodjqiy3mil"]
-
-[ext_resource type="Texture2D" uid="uid://ctsvj4y1t538u" path="res://resource/sprite/bullet/bullet3.png" id="1_53f3g"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_53f3g")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/KnifeHit1.tres b/DungeonShooting_Godot/resource/spriteFrames/KnifeHit1.tres
deleted file mode 100644
index a491979..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/KnifeHit1.tres
+++ /dev/null
@@ -1,53 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=8 format=3 uid="uid://dj8o7ws03bik4"]
-
-[ext_resource type="Texture2D" uid="uid://dx07ta0asnmuw" path="res://resource/sprite/effects/KnifeHit1.png" id="1_0yl3h"]
-
-[sub_resource type="AtlasTexture" id="1"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(0, 0, 64, 68)
-
-[sub_resource type="AtlasTexture" id="2"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(64, 0, 64, 68)
-
-[sub_resource type="AtlasTexture" id="3"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(128, 0, 64, 68)
-
-[sub_resource type="AtlasTexture" id="4"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(192, 0, 64, 68)
-
-[sub_resource type="AtlasTexture" id="5"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(256, 0, 64, 68)
-
-[sub_resource type="AtlasTexture" id="6"]
-atlas = ExtResource("1_0yl3h")
-region = Rect2(320, 0, 64, 68)
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("1")
-}, {
-"duration": 1.0,
-"texture": SubResource("2")
-}, {
-"duration": 1.0,
-"texture": SubResource("3")
-}, {
-"duration": 1.0,
-"texture": SubResource("4")
-}, {
-"duration": 1.0,
-"texture": SubResource("5")
-}, {
-"duration": 1.0,
-"texture": SubResource("6")
-}],
-"loop": true,
-"name": &"default",
-"speed": 30.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres
deleted file mode 100644
index c813ce3..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres
+++ /dev/null
@@ -1,117 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=15 format=3 uid="uid://n11thtali6es"]
-
-[ext_resource type="Texture2D" uid="uid://bhwhhg2dfsr26" path="res://resource/sprite/role/role2.png" id="1_n8j7s"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_tmewn"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(0, 0, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_dvg4a"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(0, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kvuct"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(16, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5op76"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(32, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_helyc"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(48, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_67mn8"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(48, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_jeywq"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_oycx8"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_tjg1t"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(0, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2ltxw"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(0, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_x1va1"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ic2p5"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j3hdu"]
-atlas = ExtResource("1_n8j7s")
-region = Rect2(48, 48, 16, 24)
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_tmewn")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_dvg4a")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_kvuct")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_5op76")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_helyc")
-}],
-"loop": true,
-"name": &"idle",
-"speed": 7.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_67mn8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_jeywq")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_oycx8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_tjg1t")
-}],
-"loop": true,
-"name": &"reverseRun",
-"speed": 10.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_2ltxw")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_x1va1")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ic2p5")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j3hdu")
-}],
-"loop": true,
-"name": &"run",
-"speed": 10.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Role1001.tres b/DungeonShooting_Godot/resource/spriteFrames/Role1001.tres
deleted file mode 100644
index 1a49770..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Role1001.tres
+++ /dev/null
@@ -1,117 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=15 format=3 uid="uid://cnctpyrn02rhd"]
-
-[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/enemy0001/Enemy0001.png" id="1_5jhli"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_0rmv6"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(0, 0, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_3ira8"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(0, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7fx5y"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(16, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5wd43"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(32, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kbrex"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(48, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_bhiip"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(0, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_41c1u"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1o2v8"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_niadr"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(48, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j73hc"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(48, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_3bgji"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_besw3"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_350uy"]
-atlas = ExtResource("1_5jhli")
-region = Rect2(0, 48, 16, 24)
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_0rmv6")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_3ira8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_7fx5y")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_5wd43")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_kbrex")
-}],
-"loop": true,
-"name": &"idle",
-"speed": 7.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_bhiip")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_41c1u")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_1o2v8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_niadr")
-}],
-"loop": true,
-"name": &"reverseRun",
-"speed": 10.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j73hc")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_3bgji")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_besw3")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_350uy")
-}],
-"loop": true,
-"name": &"run",
-"speed": 10.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres
deleted file mode 100644
index 8fa6c2a..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_EW.tres
+++ /dev/null
@@ -1,161 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=22 format=3 uid="uid://3ps6h2f54qa5"]
-
-[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_7f8h7"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(144, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kmhtl"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(128, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_umaop"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(112, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_aqex7"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(96, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_hdocg"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(80, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_aiymw"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(64, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_8f7dv"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(32, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_iv82l"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(16, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ycmnv"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(0, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_o7xw0"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(144, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j8iw2"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(0, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_823if"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(16, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7hyae"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(32, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6lhu3"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(48, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a026j"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(64, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_wfjf7"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(80, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_rhj60"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(96, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_06y08"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(112, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1200j"]
-atlas = ExtResource("1_7f8h7")
-region = Rect2(128, 48, 16, 48)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mbnbx"]
-atlas = ExtResource("1_7f8h7")
-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_o7xw0")
-}],
-"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/RoomDoor_NS.tres b/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres
deleted file mode 100644
index 48f90e2..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/RoomDoor_NS.tres
+++ /dev/null
@@ -1,154 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=21 format=3 uid="uid://xs72aopsgpg6"]
-
-[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_ugffo"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_77i3w"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(256, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_112lq"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(224, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2ojr8"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(192, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_q58ag"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(160, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ghweb"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(128, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_28y4l"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(96, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_0fk5y"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(64, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_eu8jg"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(32, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_rw4x5"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(0, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5dlkq"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(256, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_dnc85"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(0, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_8wepo"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(32, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_s2c1g"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(64, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_umj5m"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(96, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_sceep"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(128, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_0vntu"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(160, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_66ox7"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(192, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_o2uxo"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(224, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_m6v3e"]
-atlas = ExtResource("1_ugffo")
-region = Rect2(256, 0, 32, 32)
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_77i3w")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_112lq")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_2ojr8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_q58ag")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ghweb")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_28y4l")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_0fk5y")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_eu8jg")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_rw4x5")
-}],
-"loop": false,
-"name": &"closeDoor",
-"speed": 20.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_5dlkq")
-}],
-"loop": false,
-"name": &"default",
-"speed": 20.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_dnc85")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_8wepo")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_s2c1g")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_umj5m")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_sceep")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_0vntu")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_66ox7")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_o2uxo")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_m6v3e")
-}],
-"loop": false,
-"name": &"openDoor",
-"speed": 20.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Shell0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0001.tres
deleted file mode 100644
index 6ab6b47..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Shell0001.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://b8gksxl7auquc"]
-
-[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/Shell0001.png" id="1_4nusd"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_4nusd")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Shell0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0002.tres
deleted file mode 100644
index cda2547..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Shell0002.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://cj8psdl2pova6"]
-
-[ext_resource type="Texture2D" uid="uid://biiplgrnviefe" path="res://resource/sprite/shell/Shell0002.png" id="1_gpa8q"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_gpa8q")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres
deleted file mode 100644
index 99ecb0e..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Shell0003.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://kc1jwvwdg660"]
-
-[ext_resource type="Texture2D" uid="uid://tq8vhc2kycax" path="res://resource/sprite/shell/Shell0003.png" id="1_qhaf7"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_qhaf7")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres
deleted file mode 100644
index da7b2a8..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0001.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://5m0qs7m4er5u"]
-
-[ext_resource type="Texture2D" uid="uid://civvcowt2wklr" path="res://resource/sprite/weapon/weapon0001/Weapon0001.png" id="1_derf1"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_derf1")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres
deleted file mode 100644
index 4186037..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0002.tres
+++ /dev/null
@@ -1,62 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=9 format=3 uid="uid://domhmo4flmlt0"]
-
-[ext_resource type="Texture2D" uid="uid://b53kofmyan42g" path="res://resource/sprite/weapon/weapon0002/Weapon0002.png" id="1_2tglc"]
-[ext_resource type="Texture2D" uid="uid://cog4u2dr46anc" path="res://resource/sprite/weapon/weapon0002/Weapon0002_reloading.png" id="2_kr54x"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_b4jme"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(0, 0, 36, 15)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_hhpo6"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(36, 0, 36, 15)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_vicgs"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(72, 0, 36, 15)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_addwe"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(108, 0, 36, 15)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6nxvp"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(144, 0, 36, 15)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_p0dy6"]
-atlas = ExtResource("2_kr54x")
-region = Rect2(180, 0, 36, 15)
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_b4jme")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_hhpo6")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_vicgs")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_addwe")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_6nxvp")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_p0dy6")
-}],
-"loop": false,
-"name": &"beLoaded",
-"speed": 10.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_2tglc")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0003.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0003.tres
deleted file mode 100644
index 0b2c99f..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0003.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://c7dt1uwdybn5"]
-
-[ext_resource type="Texture2D" uid="uid://clgf63extg800" path="res://resource/sprite/weapon/weapon0003/Weapon0003.png" id="1_ioiy8"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_ioiy8")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0004.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0004.tres
deleted file mode 100644
index 57dbe94..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0004.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://k2tktysa7j86"]
-
-[ext_resource type="Texture2D" uid="uid://bxhbsq0wb2yo1" path="res://resource/sprite/weapon/knife1.png" id="1_jb24v"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_jb24v")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0005.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0005.tres
deleted file mode 100644
index 42bfa7e..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0005.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://djdvlmqsn8bie"]
-
-[ext_resource type="Texture2D" uid="uid://504f1r0mi33n" path="res://resource/sprite/weapon/weapon0005/Weapon0005.png" id="1_85vfm"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_85vfm")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Weapon0006.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0006.tres
deleted file mode 100644
index bfeb80a..0000000
--- a/DungeonShooting_Godot/resource/spriteFrames/Weapon0006.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://dx1mjbx4acs3q"]
-
-[ext_resource type="Texture2D" uid="uid://dn0un05nr8xun" path="res://resource/sprite/weapon/weapon0006/Weapon0006.png" id="1_di3kf"]
-
-[resource]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("1_di3kf")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0001.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0001.tres
new file mode 100644
index 0000000..6af29a8
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0001.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://baoxep7vami72"]
+
+[ext_resource type="Texture2D" uid="uid://bu0b11hiuecxy" path="res://resource/sprite/bullet/bullet.png" id="1_ktu7r"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_ktu7r")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0002.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0002.tres
new file mode 100644
index 0000000..cb31134
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0002.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://bpeodjqiy3mil"]
+
+[ext_resource type="Texture2D" uid="uid://ctsvj4y1t538u" path="res://resource/sprite/bullet/bullet3.png" id="1_53f3g"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_53f3g")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres b/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres
new file mode 100644
index 0000000..a491979
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres
@@ -0,0 +1,53 @@
+[gd_resource type="SpriteFrames" load_steps=8 format=3 uid="uid://dj8o7ws03bik4"]
+
+[ext_resource type="Texture2D" uid="uid://dx07ta0asnmuw" path="res://resource/sprite/effects/KnifeHit1.png" id="1_0yl3h"]
+
+[sub_resource type="AtlasTexture" id="1"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(0, 0, 64, 68)
+
+[sub_resource type="AtlasTexture" id="2"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(64, 0, 64, 68)
+
+[sub_resource type="AtlasTexture" id="3"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(128, 0, 64, 68)
+
+[sub_resource type="AtlasTexture" id="4"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(192, 0, 64, 68)
+
+[sub_resource type="AtlasTexture" id="5"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(256, 0, 64, 68)
+
+[sub_resource type="AtlasTexture" id="6"]
+atlas = ExtResource("1_0yl3h")
+region = Rect2(320, 0, 64, 68)
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("1")
+}, {
+"duration": 1.0,
+"texture": SubResource("2")
+}, {
+"duration": 1.0,
+"texture": SubResource("3")
+}, {
+"duration": 1.0,
+"texture": SubResource("4")
+}, {
+"duration": 1.0,
+"texture": SubResource("5")
+}, {
+"duration": 1.0,
+"texture": SubResource("6")
+}],
+"loop": true,
+"name": &"default",
+"speed": 30.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_EW.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_EW.tres
new file mode 100644
index 0000000..8fa6c2a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_EW.tres
@@ -0,0 +1,161 @@
+[gd_resource type="SpriteFrames" load_steps=22 format=3 uid="uid://3ps6h2f54qa5"]
+
+[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_7f8h7"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5m6ya"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(144, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kmhtl"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(128, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_umaop"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(112, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aqex7"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(96, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hdocg"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(80, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aiymw"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(64, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8f7dv"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(32, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_iv82l"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(16, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ycmnv"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(0, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_o7xw0"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(144, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j8iw2"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(0, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_823if"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(16, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7hyae"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(32, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6lhu3"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(48, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_a026j"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(64, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wfjf7"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(80, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rhj60"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(96, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_06y08"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(112, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1200j"]
+atlas = ExtResource("1_7f8h7")
+region = Rect2(128, 48, 16, 48)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mbnbx"]
+atlas = ExtResource("1_7f8h7")
+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_o7xw0")
+}],
+"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_NS.tres b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_NS.tres
new file mode 100644
index 0000000..48f90e2
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_NS.tres
@@ -0,0 +1,154 @@
+[gd_resource type="SpriteFrames" load_steps=21 format=3 uid="uid://xs72aopsgpg6"]
+
+[ext_resource type="Texture2D" uid="uid://dviv44fhwvkb1" path="res://resource/sprite/map/map1/door1_down.png" id="1_ugffo"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_77i3w"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_112lq"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2ojr8"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q58ag"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ghweb"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_28y4l"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0fk5y"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_eu8jg"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rw4x5"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5dlkq"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(256, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dnc85"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(0, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8wepo"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(32, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s2c1g"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(64, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_umj5m"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(96, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sceep"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(128, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0vntu"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(160, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_66ox7"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(192, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_o2uxo"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(224, 0, 32, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_m6v3e"]
+atlas = ExtResource("1_ugffo")
+region = Rect2(256, 0, 32, 32)
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_77i3w")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_112lq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2ojr8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q58ag")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ghweb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_28y4l")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0fk5y")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_eu8jg")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rw4x5")
+}],
+"loop": false,
+"name": &"closeDoor",
+"speed": 20.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5dlkq")
+}],
+"loop": false,
+"name": &"default",
+"speed": 20.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dnc85")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8wepo")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_s2c1g")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_umj5m")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sceep")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0vntu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_66ox7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_o2uxo")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_m6v3e")
+}],
+"loop": false,
+"name": &"openDoor",
+"speed": 20.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0001.tres b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0001.tres
new file mode 100644
index 0000000..6a0ec5f
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0001.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://wtvfyprel72y"]
+
+[ext_resource type="Texture2D" uid="uid://bls55gj8h3mgv" path="res://resource/sprite/prop/buff/Buff0001.png" id="1_scm06"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_scm06")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0002.tres b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0002.tres
new file mode 100644
index 0000000..10e71f0
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0002.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://7t57gsyff470"]
+
+[ext_resource type="Texture2D" uid="uid://cv2joc07ymofw" path="res://resource/sprite/prop/buff/Buff0002.png" id="1_8nnhb"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_8nnhb")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0003.tres b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0003.tres
new file mode 100644
index 0000000..ee3770b
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0003.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://nqoieett75t3"]
+
+[ext_resource type="Texture2D" uid="uid://osr0v1c6l8ly" path="res://resource/sprite/prop/buff/Buff0003.png" id="1_p16yr"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_p16yr")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0004.tres b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0004.tres
new file mode 100644
index 0000000..05d16c9
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/prop/buff/Buff0004.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://bj0k3pipwp46x"]
+
+[ext_resource type="Texture2D" uid="uid://c0c25nihdcgt1" path="res://resource/sprite/prop/buff/Buff0004.png" id="1_a2o8b"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_a2o8b")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres b/DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres
new file mode 100644
index 0000000..c813ce3
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres
@@ -0,0 +1,117 @@
+[gd_resource type="SpriteFrames" load_steps=15 format=3 uid="uid://n11thtali6es"]
+
+[ext_resource type="Texture2D" uid="uid://bhwhhg2dfsr26" path="res://resource/sprite/role/role2.png" id="1_n8j7s"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tmewn"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(0, 0, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dvg4a"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(0, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kvuct"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(16, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5op76"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(32, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_helyc"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(48, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_67mn8"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(48, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jeywq"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(32, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_oycx8"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(16, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tjg1t"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(0, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2ltxw"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(0, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_x1va1"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(16, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ic2p5"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(32, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j3hdu"]
+atlas = ExtResource("1_n8j7s")
+region = Rect2(48, 48, 16, 24)
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tmewn")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dvg4a")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kvuct")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5op76")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_helyc")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 7.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_67mn8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jeywq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_oycx8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tjg1t")
+}],
+"loop": true,
+"name": &"reverseRun",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2ltxw")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_x1va1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ic2p5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j3hdu")
+}],
+"loop": true,
+"name": &"run",
+"speed": 10.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres b/DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres
new file mode 100644
index 0000000..1a49770
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres
@@ -0,0 +1,117 @@
+[gd_resource type="SpriteFrames" load_steps=15 format=3 uid="uid://cnctpyrn02rhd"]
+
+[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/enemy0001/Enemy0001.png" id="1_5jhli"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0rmv6"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(0, 0, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3ira8"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(0, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7fx5y"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(16, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5wd43"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(32, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kbrex"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(48, 24, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bhiip"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(0, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_41c1u"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(16, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1o2v8"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(32, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_niadr"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(48, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j73hc"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(48, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3bgji"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(32, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_besw3"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(16, 48, 16, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_350uy"]
+atlas = ExtResource("1_5jhli")
+region = Rect2(0, 48, 16, 24)
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0rmv6")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3ira8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7fx5y")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5wd43")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kbrex")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 7.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bhiip")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_41c1u")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1o2v8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_niadr")
+}],
+"loop": true,
+"name": &"reverseRun",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j73hc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3bgji")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_besw3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_350uy")
+}],
+"loop": true,
+"name": &"run",
+"speed": 10.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0001.tres b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0001.tres
new file mode 100644
index 0000000..6ab6b47
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0001.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://b8gksxl7auquc"]
+
+[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/Shell0001.png" id="1_4nusd"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_4nusd")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0002.tres b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0002.tres
new file mode 100644
index 0000000..cda2547
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0002.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://cj8psdl2pova6"]
+
+[ext_resource type="Texture2D" uid="uid://biiplgrnviefe" path="res://resource/sprite/shell/Shell0002.png" id="1_gpa8q"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_gpa8q")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0003.tres b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0003.tres
new file mode 100644
index 0000000..99ecb0e
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/shell/Shell0003.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://kc1jwvwdg660"]
+
+[ext_resource type="Texture2D" uid="uid://tq8vhc2kycax" path="res://resource/sprite/shell/Shell0003.png" id="1_qhaf7"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_qhaf7")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0001.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0001.tres
new file mode 100644
index 0000000..da7b2a8
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0001.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://5m0qs7m4er5u"]
+
+[ext_resource type="Texture2D" uid="uid://civvcowt2wklr" path="res://resource/sprite/weapon/weapon0001/Weapon0001.png" id="1_derf1"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_derf1")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0002.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0002.tres
new file mode 100644
index 0000000..4186037
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0002.tres
@@ -0,0 +1,62 @@
+[gd_resource type="SpriteFrames" load_steps=9 format=3 uid="uid://domhmo4flmlt0"]
+
+[ext_resource type="Texture2D" uid="uid://b53kofmyan42g" path="res://resource/sprite/weapon/weapon0002/Weapon0002.png" id="1_2tglc"]
+[ext_resource type="Texture2D" uid="uid://cog4u2dr46anc" path="res://resource/sprite/weapon/weapon0002/Weapon0002_reloading.png" id="2_kr54x"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_b4jme"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(0, 0, 36, 15)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hhpo6"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(36, 0, 36, 15)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vicgs"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(72, 0, 36, 15)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_addwe"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(108, 0, 36, 15)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6nxvp"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(144, 0, 36, 15)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_p0dy6"]
+atlas = ExtResource("2_kr54x")
+region = Rect2(180, 0, 36, 15)
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_b4jme")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hhpo6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vicgs")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_addwe")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6nxvp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_p0dy6")
+}],
+"loop": false,
+"name": &"beLoaded",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_2tglc")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0003.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0003.tres
new file mode 100644
index 0000000..0b2c99f
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0003.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://c7dt1uwdybn5"]
+
+[ext_resource type="Texture2D" uid="uid://clgf63extg800" path="res://resource/sprite/weapon/weapon0003/Weapon0003.png" id="1_ioiy8"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_ioiy8")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres
new file mode 100644
index 0000000..57dbe94
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0004.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://k2tktysa7j86"]
+
+[ext_resource type="Texture2D" uid="uid://bxhbsq0wb2yo1" path="res://resource/sprite/weapon/knife1.png" id="1_jb24v"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_jb24v")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0005.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0005.tres
new file mode 100644
index 0000000..42bfa7e
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0005.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://djdvlmqsn8bie"]
+
+[ext_resource type="Texture2D" uid="uid://504f1r0mi33n" path="res://resource/sprite/weapon/weapon0005/Weapon0005.png" id="1_85vfm"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_85vfm")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0006.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0006.tres
new file mode 100644
index 0000000..bfeb80a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0006.tres
@@ -0,0 +1,14 @@
+[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://dx1mjbx4acs3q"]
+
+[ext_resource type="Texture2D" uid="uid://dn0un05nr8xun" path="res://resource/sprite/weapon/weapon0006/Weapon0006.png" id="1_di3kf"]
+
+[resource]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("1_di3kf")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
diff --git a/DungeonShooting_Godot/src/framework/RefValue.cs b/DungeonShooting_Godot/src/framework/RefValue.cs
new file mode 100644
index 0000000..3f2e861
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/RefValue.cs
@@ -0,0 +1,13 @@
+
+///
+/// 引用值数据类
+///
+public class RefValue
+{
+ public T Value;
+
+ public RefValue(T value)
+ {
+ Value = value;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
index 9d7aa94..22bbb97 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
@@ -137,10 +137,10 @@
_activityRegisterMap.Add("shell0002", new RegisterActivityData("res://prefab/shell/Shell0002.tscn", ExcelConfig.ActivityObject_Map["shell0002"]));
_activityRegisterMap.Add("shell0003", new RegisterActivityData("res://prefab/shell/Shell0003.tscn", ExcelConfig.ActivityObject_Map["shell0003"]));
_activityRegisterMap.Add("effect0001", new RegisterActivityData("res://prefab/effect/activityObject/Effect0001.tscn", ExcelConfig.ActivityObject_Map["effect0001"]));
- _activityRegisterMap.Add("prop0001", new RegisterActivityData("res://prefab/prop/buff/Prop0001.tscn", ExcelConfig.ActivityObject_Map["prop0001"]));
- _activityRegisterMap.Add("prop0002", new RegisterActivityData("res://prefab/prop/buff/Prop0002.tscn", ExcelConfig.ActivityObject_Map["prop0002"]));
- _activityRegisterMap.Add("prop0003", new RegisterActivityData("res://prefab/prop/buff/Prop0003.tscn", ExcelConfig.ActivityObject_Map["prop0003"]));
- _activityRegisterMap.Add("prop0004", new RegisterActivityData("res://prefab/prop/buff/Prop0004.tscn", ExcelConfig.ActivityObject_Map["prop0004"]));
+ _activityRegisterMap.Add("prop0001", new RegisterActivityData("res://prefab/prop/buff/Buff0001.tscn", ExcelConfig.ActivityObject_Map["prop0001"]));
+ _activityRegisterMap.Add("prop0002", new RegisterActivityData("res://prefab/prop/buff/Buff0002.tscn", ExcelConfig.ActivityObject_Map["prop0002"]));
+ _activityRegisterMap.Add("prop0003", new RegisterActivityData("res://prefab/prop/buff/Buff0003.tscn", ExcelConfig.ActivityObject_Map["prop0003"]));
+ _activityRegisterMap.Add("prop0004", new RegisterActivityData("res://prefab/prop/buff/Buff0004.tscn", ExcelConfig.ActivityObject_Map["prop0004"]));
_activityRegisterMap.Add("other_door_e", new RegisterActivityData("res://prefab/map/RoomDoor_E.tscn", ExcelConfig.ActivityObject_Map["other_door_e"]));
_activityRegisterMap.Add("other_door_w", new RegisterActivityData("res://prefab/map/RoomDoor_W.tscn", ExcelConfig.ActivityObject_Map["other_door_w"]));
_activityRegisterMap.Add("other_door_s", new RegisterActivityData("res://prefab/map/RoomDoor_S.tscn", ExcelConfig.ActivityObject_Map["other_door_s"]));
diff --git a/DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs
index 9def84a..873feb6 100644
--- a/DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs
+++ b/DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs
@@ -16,6 +16,11 @@
/// 发射该子弹的武器
///
public Weapon Weapon { get; private set; }
+
+ ///
+ /// 发射该子弹的角色
+ ///
+ public Role Role { get; private set; }
///
/// 最小伤害
@@ -39,6 +44,7 @@
public void Init(Weapon weapon, float speed, float maxDistance, Vector2 position, float rotation, uint targetLayer)
{
Weapon = weapon;
+ Role = weapon.Master;
CollisionArea.CollisionMask = targetLayer;
CollisionArea.AreaEntered += OnArea2dEntered;
@@ -98,8 +104,10 @@
var node = packedScene.Instantiate();
node.GlobalPosition = GlobalPosition;
node.AddToActivityRoot(RoomLayerEnum.YSortLayer);
-
- role.CallDeferred(nameof(Role.Hurt), Utils.RandomRangeInt(MinHarm, MaxHarm), Rotation);
+
+ //计算子弹造成的伤害
+ var damage = role.RoleState.CallCalcDamageEvent(Utils.RandomRangeInt(MinHarm, MaxHarm));
+ role.CallDeferred(nameof(Role.Hurt), damage, Rotation);
Destroy();
}
}
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0001.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0001.cs
new file mode 100644
index 0000000..4133458
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0001.cs
@@ -0,0 +1,23 @@
+
+using Godot;
+
+///
+/// 移速 buff, 移速 + 3
+///
+[GlobalClass, Tool]
+public partial class Buff0001 : Buff
+{
+ protected override void OnPickUp(Role master)
+ {
+ master.RoleState.MoveSpeed += 30;
+ master.RoleState.Acceleration += 400;
+ master.RoleState.Friction += 300;
+ }
+
+ protected override void OnRemove(Role master)
+ {
+ master.RoleState.MoveSpeed -= 30;
+ master.RoleState.Acceleration -= 400;
+ master.RoleState.Friction -= 300;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0002.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0002.cs
new file mode 100644
index 0000000..43d7347
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0002.cs
@@ -0,0 +1,20 @@
+
+using Godot;
+
+///
+/// 血量上限buff, 心之容器 + 1
+///
+[GlobalClass, Tool]
+public partial class Buff0002 : Buff
+{
+ protected override void OnPickUp(Role master)
+ {
+ master.MaxHp += 2;
+ master.Hp += 2;
+ }
+
+ protected override void OnRemove(Role master)
+ {
+ master.MaxHp -= 2;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0003.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0003.cs
new file mode 100644
index 0000000..679bdbc
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0003.cs
@@ -0,0 +1,20 @@
+
+using Godot;
+
+///
+/// 护盾上限buff, 护盾 + 1
+///
+[GlobalClass, Tool]
+public partial class Buff0003 : Buff
+{
+ protected override void OnPickUp(Role master)
+ {
+ master.MaxShield += 1;
+ master.Shield += 1;
+ }
+
+ protected override void OnRemove(Role master)
+ {
+ master.MaxShield -= 1;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0004.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0004.cs
new file mode 100644
index 0000000..bcb05be
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/activity/prop/buff/Buff0004.cs
@@ -0,0 +1,19 @@
+
+using Godot;
+
+///
+/// 护盾恢复时间buff, 恢复时间 - 1.5s
+///
+[GlobalClass, Tool]
+public partial class Buff0004 : Buff
+{
+ protected override void OnPickUp(Role master)
+ {
+ master.RoleState.ShieldRecoveryTime -= 1.5f;
+ }
+
+ protected override void OnRemove(Role master)
+ {
+ master.RoleState.ShieldRecoveryTime += 1.5f;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/HeartContainerBuff.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/HeartContainerBuff.cs
deleted file mode 100644
index e2c500f..0000000
--- a/DungeonShooting_Godot/src/game/activity/prop/buff/HeartContainerBuff.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-using Godot;
-
-///
-/// 血量上限buff, 心之容器 + 1
-///
-[GlobalClass, Tool]
-public partial class HeartContainerBuff : Buff
-{
- protected override void OnPickUp(Role master)
- {
- master.MaxHp += 2;
- master.Hp += 2;
- }
-
- protected override void OnRemove(Role master)
- {
- master.MaxHp -= 2;
- }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/MoveSpeedBuff.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/MoveSpeedBuff.cs
deleted file mode 100644
index bee5301..0000000
--- a/DungeonShooting_Godot/src/game/activity/prop/buff/MoveSpeedBuff.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-
-using Godot;
-
-///
-/// 移速 buff, 移速 + 3
-///
-[GlobalClass, Tool]
-public partial class MoveSpeedBuff : Buff
-{
- protected override void OnPickUp(Role master)
- {
- master.RoleState.MoveSpeed += 30;
- master.RoleState.Acceleration += 400;
- master.RoleState.Friction += 300;
- }
-
- protected override void OnRemove(Role master)
- {
- master.RoleState.MoveSpeed -= 30;
- master.RoleState.Acceleration -= 400;
- master.RoleState.Friction -= 300;
- }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldContainerBuff.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldContainerBuff.cs
deleted file mode 100644
index 4826b06..0000000
--- a/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldContainerBuff.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-using Godot;
-
-///
-/// 护盾上限buff, 护盾 + 1
-///
-[GlobalClass, Tool]
-public partial class ShieldContainerBuff : Buff
-{
- protected override void OnPickUp(Role master)
- {
- master.MaxShield += 1;
- master.Shield += 1;
- }
-
- protected override void OnRemove(Role master)
- {
- master.MaxShield -= 1;
- }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldRecoveryTimeBuff.cs b/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldRecoveryTimeBuff.cs
deleted file mode 100644
index 1e17305..0000000
--- a/DungeonShooting_Godot/src/game/activity/prop/buff/ShieldRecoveryTimeBuff.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-using Godot;
-
-///
-/// 护盾恢复时间buff, 恢复时间 - 1.5s
-///
-[GlobalClass, Tool]
-public partial class ShieldRecoveryTimeBuff : Buff
-{
- protected override void OnPickUp(Role master)
- {
- master.RoleState.ShieldRecoveryTime -= 1.5f;
- }
-
- protected override void OnRemove(Role master)
- {
- master.RoleState.ShieldRecoveryTime += 1.5f;
- }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/activity/role/RoleState.cs b/DungeonShooting_Godot/src/game/activity/role/RoleState.cs
index db381f0..b38e9e0 100644
--- a/DungeonShooting_Godot/src/game/activity/role/RoleState.cs
+++ b/DungeonShooting_Godot/src/game/activity/role/RoleState.cs
@@ -1,4 +1,6 @@
+using System;
+
///
/// 角色属性类
///
@@ -23,4 +25,25 @@
/// 单格护盾恢复时间, 单位: 秒
///
public float ShieldRecoveryTime = 8;
+
+ ///
+ /// 伤害加成
+ ///
+ public float DamageBonus = 0;
+
+ ///
+ /// 攻击/发射后计算伤害
+ ///
+ public event Action> CalcDamageEvent;
+ public int CallCalcDamageEvent(int damage)
+ {
+ if (CalcDamageEvent != null)
+ {
+ var result = new RefValue(damage);
+ CalcDamageEvent(result);
+ return result.Value;
+ }
+
+ return damage;
+ }
}
\ No newline at end of file