diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
index e8146c1..67a7fdd 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/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
index c92ea19..6f54753 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 ed25dfe..da195d0 100644
--- a/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
+++ b/DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
@@ -1,33 +1,21 @@
-[gd_scene load_steps=9 format=3 uid="uid://bqkj0rn72ppge"]
+[gd_scene load_steps=8 format=3 uid="uid://bqkj0rn72ppge"]
 
-[ext_resource type="Script" path="res://src/game/activity/bullet/Bullet.cs" id="1_wphe7"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_l3yjy"]
-[ext_resource type="Texture2D" uid="uid://ctsvj4y1t538u" path="res://resource/sprite/bullet/bullet3.png" id="3_nf7ic"]
-
+[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"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_5a4f2"]
 resource_local_to_scene = true
-shader = ExtResource("2_l3yjy")
+shader = ExtResource("2_n44pd")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_o0655"]
 resource_local_to_scene = true
-shader = ExtResource("2_l3yjy")
+shader = ExtResource("2_n44pd")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
-[sub_resource type="SpriteFrames" id="SpriteFrames_5wvmf"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("3_nf7ic")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
-
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_c0onq"]
 size = Vector2(44.72, 12)
 
@@ -36,7 +24,7 @@
 
 [node name="Bullet0002" type="CharacterBody2D" node_paths=PackedStringArray("CollisionArea", "ShadowSprite", "AnimatedSprite", "Collision")]
 collision_layer = 2
-script = ExtResource("1_wphe7")
+script = ExtResource("1_hga3h")
 CollisionArea = NodePath("CollisionArea")
 ShadowSprite = NodePath("ShadowSprite")
 AnimatedSprite = NodePath("AnimatedSprite")
@@ -49,7 +37,7 @@
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
 modulate = Color(1.8, 1.8, 1.8, 1)
 material = SubResource("ShaderMaterial_o0655")
-sprite_frames = SubResource("SpriteFrames_5wvmf")
+sprite_frames = ExtResource("3_uvuj8")
 
 [node name="CollisionArea" type="Area2D" parent="."]
 visible = false
diff --git a/DungeonShooting_Godot/prefab/effect/activityObject/Effect0001.tscn b/DungeonShooting_Godot/prefab/effect/activityObject/Effect0001.tscn
new file mode 100644
index 0000000..bf30d58
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/effect/activityObject/Effect0001.tscn
@@ -0,0 +1,193 @@
+[gd_scene load_steps=30 format=3 uid="uid://pr88a1phtxgb"]
+
+[ext_resource type="Script" path="res://src/game/effects/EnemyDebris.cs" id="1_jnsw0"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_b3d83"]
+[ext_resource type="Texture2D" uid="uid://d2f55lu60x64i" path="res://resource/sprite/role/enemy0001/Enemy0001_Debris.png" id="3_ntutm"]
+[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/Smoke.png" id="4_egbbr"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"]
+resource_local_to_scene = true
+shader = ExtResource("2_b3d83")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_08fn3"]
+resource_local_to_scene = true
+shader = ExtResource("2_b3d83")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_cldwb"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ehtnl"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j05gd"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(32, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7el6f"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(48, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n7sw3"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(64, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mumsm"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(80, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_gx41d"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(96, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_r4nx1"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(112, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_s8j4o"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(128, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2svrb"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(144, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_twd5t"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(160, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8w5ka"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(176, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6iumv"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(192, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_lpilf"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(208, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n1a5a"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(224, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q0oeq"]
+atlas = ExtResource("3_ntutm")
+region = Rect2(240, 0, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_15g84"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_cldwb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ehtnl")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j05gd")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7el6f")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_n7sw3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mumsm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_gx41d")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_r4nx1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_s8j4o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2svrb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_twd5t")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8w5ka")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6iumv")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_lpilf")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_n1a5a")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q0oeq")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
+
+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_p3lv8"]
+particles_animation = true
+particles_anim_h_frames = 3
+particles_anim_v_frames = 1
+particles_anim_loop = false
+
+[sub_resource type="Gradient" id="Gradient_ryemi"]
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.537255)
+
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_orgu0"]
+gradient = SubResource("Gradient_ryemi")
+
+[sub_resource type="Curve" id="Curve_21dxk"]
+_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.177419, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.0272727), 0.0, 0.0, 0, 0]
+point_count = 3
+
+[sub_resource type="CurveTexture" id="CurveTexture_rutlp"]
+curve = SubResource("Curve_21dxk")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ku1mm"]
+particle_flag_disable_z = true
+gravity = Vector3(0, 0, 0)
+orbit_velocity_min = 0.0
+orbit_velocity_max = 0.0
+angle_max = 360.0
+scale_min = 0.4
+scale_max = 1.5
+scale_curve = SubResource("CurveTexture_rutlp")
+color = Color(0.811765, 0.0980392, 0.0980392, 0.627451)
+color_ramp = SubResource("GradientTexture1D_orgu0")
+anim_offset_max = 1.0
+
+[node name="Effect0001" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
+script = ExtResource("1_jnsw0")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_s1mj2")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_08fn3")
+sprite_frames = SubResource("SpriteFrames_15g84")
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+
+[node name="GPUParticles2D" type="GPUParticles2D" parent="."]
+material = SubResource("CanvasItemMaterial_p3lv8")
+emitting = false
+process_material = SubResource("ParticleProcessMaterial_ku1mm")
+texture = ExtResource("4_egbbr")
+fixed_fps = 20
diff --git a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn b/DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn
index fad95e4..b19d4aa 100644
--- a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn
+++ b/DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn
@@ -1,8 +1,8 @@
-[gd_scene load_steps=5 format=3]
+[gd_scene load_steps=5 format=3 uid="uid://m0s0k5nw7nbi"]
 
-[ext_resource type="Material" uid="uid://c1chld6lkpgji" path="res://resource/material/SmokeParticleMaterial.tres" id="1_wwb7t"]
-[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/Smoke.png" id="2_5rrhq"]
-[ext_resource type="Script" path="res://src/game/effects/AutoDestroyEffect.cs" id="3_cvfk3"]
+[ext_resource type="Material" uid="uid://c1chld6lkpgji" path="res://resource/material/SmokeParticleMaterial.tres" id="1_jp2tw"]
+[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/Smoke.png" id="2_xg444"]
+[ext_resource type="Script" path="res://src/game/effects/AutoDestroyEffect.cs" id="3_lldtd"]
 
 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_emuda"]
 particles_animation = true
@@ -15,11 +15,11 @@
 material = SubResource("CanvasItemMaterial_emuda")
 emitting = false
 amount = 10
-process_material = ExtResource("1_wwb7t")
-texture = ExtResource("2_5rrhq")
+process_material = ExtResource("1_jp2tw")
+texture = ExtResource("2_xg444")
 lifetime = 1.2
 one_shot = true
 explosiveness = 1.0
 fixed_fps = 20
-script = ExtResource("3_cvfk3")
+script = ExtResource("3_lldtd")
 DelayTime = 1.5
diff --git a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn b/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn
deleted file mode 100644
index c7e5b29..0000000
--- a/DungeonShooting_Godot/prefab/effect/activityObject/EnemyDebris.tscn
+++ /dev/null
@@ -1,191 +0,0 @@
-[gd_scene load_steps=30 format=3 uid="uid://pr88a1phtxgb"]
-
-[ext_resource type="Script" path="res://src/framework/activity/ActivityObjectTemplate.cs" id="1_h7exw"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_vlp01"]
-[ext_resource type="Texture2D" uid="uid://d2f55lu60x64i" path="res://resource/sprite/role/enemy0001/Enemy0001_Debris.png" id="3_ohnrx"]
-[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/effects/Smoke.png" id="4_e30nm"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_s1mj2"]
-resource_local_to_scene = true
-shader = ExtResource("2_vlp01")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_08fn3"]
-resource_local_to_scene = true
-shader = ExtResource("2_vlp01")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_cldwb"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(0, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ehtnl"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(16, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j05gd"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(32, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7el6f"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(48, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_n7sw3"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(64, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mumsm"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(80, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_gx41d"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(96, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_r4nx1"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(112, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_s8j4o"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(128, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2svrb"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(144, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_twd5t"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(160, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_8w5ka"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(176, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6iumv"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(192, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_lpilf"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(208, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_n1a5a"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(224, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_q0oeq"]
-atlas = ExtResource("3_ohnrx")
-region = Rect2(240, 0, 16, 16)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_15g84"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_cldwb")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ehtnl")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j05gd")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_7el6f")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_n7sw3")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_mumsm")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_gx41d")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_r4nx1")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_s8j4o")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_2svrb")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_twd5t")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_8w5ka")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_6iumv")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_lpilf")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_n1a5a")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_q0oeq")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
-
-[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_p3lv8"]
-particles_animation = true
-particles_anim_h_frames = 3
-particles_anim_v_frames = 1
-particles_anim_loop = false
-
-[sub_resource type="Gradient" id="Gradient_ryemi"]
-colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.537255)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_orgu0"]
-gradient = SubResource("Gradient_ryemi")
-
-[sub_resource type="Curve" id="Curve_21dxk"]
-_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.177419, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.0272727), 0.0, 0.0, 0, 0]
-point_count = 3
-
-[sub_resource type="CurveTexture" id="CurveTexture_rutlp"]
-curve = SubResource("Curve_21dxk")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ku1mm"]
-particle_flag_disable_z = true
-gravity = Vector3(0, 0, 0)
-orbit_velocity_min = 0.0
-orbit_velocity_max = 0.0
-angle_max = 360.0
-scale_min = 0.4
-scale_max = 1.5
-scale_curve = SubResource("CurveTexture_rutlp")
-color = Color(0.811765, 0.0980392, 0.0980392, 0.627451)
-color_ramp = SubResource("GradientTexture1D_orgu0")
-anim_offset_max = 1.0
-
-[node name="EnemyDebris" type="Node"]
-script = ExtResource("1_h7exw")
-collision_mask = 1
-
-[node name="ShadowSprite" type="Sprite2D" parent="."]
-z_index = -1
-material = SubResource("ShaderMaterial_s1mj2")
-
-[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-material = SubResource("ShaderMaterial_08fn3")
-sprite_frames = SubResource("SpriteFrames_15g84")
-
-[node name="Collision" type="CollisionShape2D" parent="."]
-
-[node name="GPUParticles2D" type="GPUParticles2D" parent="."]
-material = SubResource("CanvasItemMaterial_p3lv8")
-emitting = false
-process_material = SubResource("ParticleProcessMaterial_ku1mm")
-texture = ExtResource("4_e30nm")
-fixed_fps = 20
diff --git a/DungeonShooting_Godot/prefab/role/Enemy.tscn b/DungeonShooting_Godot/prefab/role/Enemy.tscn
deleted file mode 100644
index 50a946a..0000000
--- a/DungeonShooting_Godot/prefab/role/Enemy.tscn
+++ /dev/null
@@ -1,155 +0,0 @@
-[gd_scene load_steps=20 format=3 uid="uid://dbrig6dq441wo"]
-
-[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_p0w41"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_xrpvd"]
-[ext_resource type="Texture2D" uid="uid://chd2vtesap5cf" path="res://resource/sprite/role/enemy0001/Enemy0001.png" id="3_b8g1d"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_8vxx6"]
-resource_local_to_scene = true
-shader = ExtResource("2_xrpvd")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_k8mt5"]
-resource_local_to_scene = true
-shader = ExtResource("2_xrpvd")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_0rmv6"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(0, 0, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_3ira8"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(0, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_7fx5y"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(16, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_5wd43"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(32, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kbrex"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(48, 24, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_bhiip"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(0, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_41c1u"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1o2v8"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_niadr"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(48, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j73hc"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(48, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_3bgji"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(32, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_besw3"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(16, 48, 16, 24)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_350uy"]
-atlas = ExtResource("3_b8g1d")
-region = Rect2(0, 48, 16, 24)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_m7t3e"]
-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
-}]
-
-[node name="Enemy" instance=ExtResource("1_p0w41")]
-collision_layer = 16
-collision_mask = 25
-
-[node name="ShadowSprite" parent="." index="0"]
-material = SubResource("ShaderMaterial_8vxx6")
-
-[node name="AnimatedSprite" parent="." index="2"]
-material = SubResource("ShaderMaterial_k8mt5")
-sprite_frames = SubResource("SpriteFrames_m7t3e")
-animation = &"run"
-
-[node name="ViewRay" type="RayCast2D" parent="." index="6"]
-position = Vector2(0, -8)
-enabled = false
-
-[node name="NavigationPoint" type="Marker2D" parent="." index="8"]
-position = Vector2(0, -5)
-
-[node name="NavigationAgent2D" type="NavigationAgent2D" parent="NavigationPoint" index="0"]
-path_desired_distance = 3.0
-target_desired_distance = 3.0
-radius = 20.0
diff --git a/DungeonShooting_Godot/prefab/role/Enemy0001.tscn b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn
new file mode 100644
index 0000000..b40cbfa
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/role/Enemy0001.tscn
@@ -0,0 +1,50 @@
+[gd_scene load_steps=7 format=3 uid="uid://dbrig6dq441wo"]
+
+[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_5po38"]
+[ext_resource type="Script" path="res://src/game/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"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_8vxx6"]
+resource_local_to_scene = true
+shader = ExtResource("3_x8agd")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_k8mt5"]
+resource_local_to_scene = true
+shader = ExtResource("3_x8agd")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0
+
+[node name="Enemy0001" node_paths=PackedStringArray("HurtArea", "MountPoint", "BackMountPoint", "InteractiveArea", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_5po38")]
+collision_layer = 16
+collision_mask = 25
+script = ExtResource("2_1plrq")
+HurtArea = NodePath("HurtArea")
+MountPoint = NodePath("MountPoint")
+BackMountPoint = NodePath("BackMountPoint")
+InteractiveArea = NodePath("InteractiveArea")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" parent="." index="0"]
+material = SubResource("ShaderMaterial_8vxx6")
+
+[node name="AnimatedSprite" parent="." index="2"]
+material = SubResource("ShaderMaterial_k8mt5")
+sprite_frames = ExtResource("4_qv8w5")
+animation = &"run"
+
+[node name="ViewRay" type="RayCast2D" parent="." index="6"]
+position = Vector2(0, -8)
+enabled = false
+
+[node name="NavigationPoint" type="Marker2D" parent="." index="8"]
+position = Vector2(0, -5)
+
+[node name="NavigationAgent2D" type="NavigationAgent2D" parent="NavigationPoint" index="0"]
+path_desired_distance = 3.0
+target_desired_distance = 3.0
+radius = 20.0
diff --git a/DungeonShooting_Godot/prefab/role/Role0001.tscn b/DungeonShooting_Godot/prefab/role/Role0001.tscn
index adce875..4190ab6 100644
--- a/DungeonShooting_Godot/prefab/role/Role0001.tscn
+++ b/DungeonShooting_Godot/prefab/role/Role0001.tscn
@@ -1,25 +1,25 @@
 [gd_scene load_steps=7 format=3 uid="uid://cxhrcytrx0kcf"]
 
-[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_2wm0h"]
-[ext_resource type="Script" path="res://src/game/role/Player.cs" id="2_d2vk6"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_pvgbh"]
-[ext_resource type="SpriteFrames" uid="uid://n11thtali6es" path="res://resource/spriteFrames/Role0001.tres" id="4_qf1q4"]
+[ext_resource type="PackedScene" uid="uid://cyrcv2jdgr8cf" path="res://prefab/role/RoleTemplate.tscn" id="1_10c2n"]
+[ext_resource type="Script" path="res://src/game/role/Player.cs" id="2_7dmp4"]
+[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"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lvutq"]
 resource_local_to_scene = true
-shader = ExtResource("2_pvgbh")
+shader = ExtResource("3_rk4gg")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_5ok5s"]
 resource_local_to_scene = true
-shader = ExtResource("2_pvgbh")
+shader = ExtResource("3_rk4gg")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
-[node name="Role0001" node_paths=PackedStringArray("HurtArea", "MountPoint", "BackMountPoint", "InteractiveArea", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_2wm0h")]
+[node name="Role0001" node_paths=PackedStringArray("HurtArea", "MountPoint", "BackMountPoint", "InteractiveArea", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_10c2n")]
 collision_layer = 8
-script = ExtResource("2_d2vk6")
+script = ExtResource("2_7dmp4")
 HurtArea = NodePath("HurtArea")
 MountPoint = NodePath("MountPoint")
 BackMountPoint = NodePath("BackMountPoint")
@@ -33,5 +33,5 @@
 
 [node name="AnimatedSprite" parent="." index="2"]
 material = SubResource("ShaderMaterial_5ok5s")
-sprite_frames = ExtResource("4_qf1q4")
+sprite_frames = ExtResource("4_galcc")
 frame_progress = 0.0995217
diff --git a/DungeonShooting_Godot/prefab/role/RoleTemplate.tscn b/DungeonShooting_Godot/prefab/role/RoleTemplate.tscn
index d1d87cb..31c3ab7 100644
--- a/DungeonShooting_Godot/prefab/role/RoleTemplate.tscn
+++ b/DungeonShooting_Godot/prefab/role/RoleTemplate.tscn
@@ -1,17 +1,17 @@
 [gd_scene load_steps=8 format=3 uid="uid://cyrcv2jdgr8cf"]
 
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_vuu4w"]
-[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="2_22sl5"]
+[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="1_xk5yk"]
+[ext_resource type="Script" path="res://src/game/role/MountRotation.cs" id="2_5ddpw"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_v2kfw"]
 resource_local_to_scene = true
-shader = ExtResource("1_vuu4w")
+shader = ExtResource("1_xk5yk")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_yif6x"]
 resource_local_to_scene = true
-shader = ExtResource("1_vuu4w")
+shader = ExtResource("1_xk5yk")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
@@ -62,4 +62,4 @@
 
 [node name="MountPoint" type="Marker2D" parent="."]
 position = Vector2(1, -6)
-script = ExtResource("2_22sl5")
+script = ExtResource("2_5ddpw")
diff --git a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
index 6deb5aa..1d7c32b 100644
--- a/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
+++ b/DungeonShooting_Godot/prefab/shell/Shell0001.tscn
@@ -1,35 +1,23 @@
-[gd_scene load_steps=7 format=3 uid="uid://bj4yr6ru8nhwr"]
+[gd_scene load_steps=6 format=3 uid="uid://bj4yr6ru8nhwr"]
 
-[ext_resource type="Script" path="res://src/game/activity/shell/Shell.cs" id="1_ph0ad"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_k705i"]
-[ext_resource type="Texture2D" uid="uid://dto03bc2qbhnj" path="res://resource/sprite/shell/shellCase.png" id="3_0fth1"]
-
+[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"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_px12l"]
 resource_local_to_scene = true
-shader = ExtResource("2_k705i")
+shader = ExtResource("2_tdny6")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_7e6fo"]
 resource_local_to_scene = true
-shader = ExtResource("2_k705i")
+shader = ExtResource("2_tdny6")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
-[sub_resource type="SpriteFrames" id="SpriteFrames_4huvy"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("3_0fth1")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
-
 [node name="Shell0001" type="CharacterBody2D" node_paths=PackedStringArray("ShadowSprite", "AnimatedSprite", "Collision")]
-script = ExtResource("1_ph0ad")
+script = ExtResource("1_2g70c")
 ShadowSprite = NodePath("ShadowSprite")
 AnimatedSprite = NodePath("AnimatedSprite")
 Collision = NodePath("Collision")
@@ -40,6 +28,6 @@
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
 material = SubResource("ShaderMaterial_7e6fo")
-sprite_frames = SubResource("SpriteFrames_4huvy")
+sprite_frames = ExtResource("3_ujn5y")
 
 [node name="Collision" type="CollisionShape2D" parent="."]
diff --git a/DungeonShooting_Godot/prefab/weapon/Knife.tscn b/DungeonShooting_Godot/prefab/weapon/Knife.tscn
deleted file mode 100644
index f940453..0000000
--- a/DungeonShooting_Godot/prefab/weapon/Knife.tscn
+++ /dev/null
@@ -1,48 +0,0 @@
-[gd_scene load_steps=8 format=3]
-
-[ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_xk7sg"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_vwwhv"]
-[ext_resource type="Texture2D" uid="uid://bxhbsq0wb2yo1" path="res://resource/sprite/weapon/knife1.png" id="3_s52oh"]
-[ext_resource type="PackedScene" path="res://prefab/FanCollisionShape.tscn" id="3_wdje6"]
-
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_o5ytq"]
-resource_local_to_scene = true
-shader = ExtResource("2_vwwhv")
-shader_parameter/blend = Color(0, 0, 0, 0.470588)
-shader_parameter/schedule = 1
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_rtliw"]
-resource_local_to_scene = true
-shader = ExtResource("2_vwwhv")
-shader_parameter/blend = Color(1, 1, 1, 1)
-shader_parameter/schedule = 0
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_fbixs"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": ExtResource("3_s52oh")
-}],
-"loop": true,
-"name": &"default",
-"speed": 5.0
-}]
-
-[node name="Knife" instance=ExtResource("1_xk7sg")]
-
-[node name="ShadowSprite" parent="." index="0"]
-material = SubResource("ShaderMaterial_o5ytq")
-
-[node name="AnimatedSprite" parent="." index="1"]
-material = SubResource("ShaderMaterial_rtliw")
-position = Vector2(0, 0)
-sprite_frames = SubResource("SpriteFrames_fbixs")
-
-[node name="HitArea" type="Area2D" parent="." index="4"]
-monitoring = false
-monitorable = false
-
-[node name="FanCollisionShape" parent="HitArea" index="0" instance=ExtResource("3_wdje6")]
-rotation = -1.5708
-scale = Vector2(3, 3)
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
index c4030a2..ef51173 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
@@ -1,24 +1,24 @@
 [gd_scene load_steps=7 format=3 uid="uid://c6etppq4v63xw"]
 
-[ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_0nysf"]
-[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_28mkv"]
-[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_ksckd"]
-[ext_resource type="SpriteFrames" uid="uid://5m0qs7m4er5u" path="res://resource/spriteFrames/Weapon0001.tres" id="4_xo84l"]
+[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"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_5bfqf"]
 resource_local_to_scene = true
-shader = ExtResource("3_ksckd")
+shader = ExtResource("3_x1q03")
 shader_parameter/blend = Color(0, 0, 0, 0.470588)
 shader_parameter/schedule = 1
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_bj7y3"]
 resource_local_to_scene = true
-shader = ExtResource("3_ksckd")
+shader = ExtResource("3_x1q03")
 shader_parameter/blend = Color(1, 1, 1, 1)
 shader_parameter/schedule = 0
 
-[node name="Weapon0001" node_paths=PackedStringArray("FirePoint", "ShellPoint", "GripPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_0nysf")]
-script = ExtResource("2_28mkv")
+[node name="Weapon0001" node_paths=PackedStringArray("FirePoint", "ShellPoint", "GripPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_ykl0r")]
+script = ExtResource("2_t56pk")
 FirePoint = NodePath("AnimatedSprite/FirePoint")
 ShellPoint = NodePath("AnimatedSprite/ShellPoint")
 GripPoint = NodePath("GripPoint")
@@ -32,13 +32,13 @@
 
 [node name="AnimatedSprite" parent="." index="1"]
 material = SubResource("ShaderMaterial_bj7y3")
-sprite_frames = ExtResource("4_xo84l")
+sprite_frames = ExtResource("4_d5c81")
 
 [node name="ShellPoint" parent="AnimatedSprite" index="0"]
 position = Vector2(1.5, -3.5)
 
 [node name="FirePoint" parent="AnimatedSprite" index="1"]
-position = Vector2(14, -2)
+position = Vector2(15, -2)
 
 [node name="GripPoint" parent="." index="2"]
 position = Vector2(-5, -1)
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
new file mode 100644
index 0000000..c31221e
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
@@ -0,0 +1,94 @@
+[gd_scene load_steps=10 format=3 uid="uid://doj2eilx1xtxf"]
+
+[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Shotgun.cs" id="1_8kiv4"]
+[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"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
+resource_local_to_scene = true
+shader = ExtResource("2_8nvny")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_o36tv"]
+resource_local_to_scene = true
+shader = ExtResource("2_8nvny")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_3p5jk"]
+size = Vector2(19.5, 8.75)
+
+[sub_resource type="Animation" id="Animation_x136i"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [0]
+}
+
+[sub_resource type="Animation" id="Animation_3piau"]
+resource_name = "floodlight"
+length = 3.0
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 2.3, 2.6, 2.7, 3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [0, 0, 0.5, 0.5, 0]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_trkjd"]
+_data = {
+"RESET": SubResource("Animation_x136i"),
+"floodlight": SubResource("Animation_3piau")
+}
+
+[node name="Weapon0002" type="CharacterBody2D" node_paths=PackedStringArray("FirePoint", "ShellPoint", "GripPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_8kiv4")
+FirePoint = NodePath("AnimatedSprite/FirePoint")
+ShellPoint = NodePath("AnimatedSprite/ShellPoint")
+GripPoint = NodePath("GripPoint")
+AnimationPlayer = NodePath("AnimationPlayer")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_cbiyh")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_o36tv")
+sprite_frames = ExtResource("3_4h3je")
+
+[node name="ShellPoint" type="Marker2D" parent="AnimatedSprite"]
+position = Vector2(-3, -2)
+
+[node name="FirePoint" type="Marker2D" parent="AnimatedSprite"]
+position = Vector2(12, -2)
+
+[node name="GripPoint" type="Marker2D" parent="."]
+position = Vector2(-10, 1)
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_3p5jk")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+"": SubResource("AnimationLibrary_trkjd")
+}
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
new file mode 100644
index 0000000..a4548d1
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
@@ -0,0 +1,94 @@
+[gd_scene load_steps=10 format=3 uid="uid://dqy4trli5wcms"]
+
+[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"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_cbiyh"]
+resource_local_to_scene = true
+shader = ExtResource("2_4yjnk")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_o36tv"]
+resource_local_to_scene = true
+shader = ExtResource("2_4yjnk")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_3p5jk"]
+size = Vector2(14, 8)
+
+[sub_resource type="Animation" id="Animation_x136i"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [0]
+}
+
+[sub_resource type="Animation" id="Animation_3piau"]
+resource_name = "floodlight"
+length = 3.0
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedSprite:material:shader_parameter/schedule")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 2.3, 2.6, 2.7, 3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [0, 0, 0.5, 0.5, 0]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_trkjd"]
+_data = {
+"RESET": SubResource("Animation_x136i"),
+"floodlight": SubResource("Animation_3piau")
+}
+
+[node name="Weapon0003" type="CharacterBody2D" node_paths=PackedStringArray("FirePoint", "ShellPoint", "GripPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision")]
+collision_layer = 4
+script = ExtResource("1_aeolk")
+FirePoint = NodePath("AnimatedSprite/FirePoint")
+ShellPoint = NodePath("AnimatedSprite/ShellPoint")
+GripPoint = NodePath("GripPoint")
+AnimationPlayer = NodePath("AnimationPlayer")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" type="Sprite2D" parent="."]
+z_index = -1
+material = SubResource("ShaderMaterial_cbiyh")
+
+[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
+material = SubResource("ShaderMaterial_o36tv")
+sprite_frames = ExtResource("3_upkjt")
+
+[node name="ShellPoint" type="Marker2D" parent="AnimatedSprite"]
+position = Vector2(0, -3)
+
+[node name="FirePoint" type="Marker2D" parent="AnimatedSprite"]
+position = Vector2(9, -2)
+
+[node name="GripPoint" type="Marker2D" parent="."]
+position = Vector2(-4, 0)
+
+[node name="Collision" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_3p5jk")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+"": SubResource("AnimationLibrary_trkjd")
+}
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
new file mode 100644
index 0000000..40556be
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
@@ -0,0 +1,47 @@
+[gd_scene load_steps=8 format=3 uid="uid://c4kckcisk7opo"]
+
+[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="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")
+shader_parameter/blend = Color(0, 0, 0, 0.470588)
+shader_parameter/schedule = 1
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_rtliw"]
+resource_local_to_scene = true
+shader = ExtResource("3_63s5g")
+shader_parameter/blend = Color(1, 1, 1, 1)
+shader_parameter/schedule = 0
+
+[node name="Weapon0004" node_paths=PackedStringArray("FirePoint", "ShellPoint", "GripPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_kg172")]
+script = ExtResource("2_v1wer")
+FirePoint = NodePath("AnimatedSprite/FirePoint")
+ShellPoint = NodePath("AnimatedSprite/ShellPoint")
+GripPoint = NodePath("GripPoint")
+AnimationPlayer = NodePath("AnimationPlayer")
+ShadowSprite = NodePath("ShadowSprite")
+AnimatedSprite = NodePath("AnimatedSprite")
+Collision = NodePath("Collision")
+
+[node name="ShadowSprite" parent="." index="0"]
+material = SubResource("ShaderMaterial_o5ytq")
+
+[node name="AnimatedSprite" parent="." index="1"]
+material = SubResource("ShaderMaterial_rtliw")
+sprite_frames = ExtResource("4_uymcs")
+
+[node name="GripPoint" parent="." index="2"]
+position = Vector2(-12, -1)
+
+[node name="HitArea" type="Area2D" parent="." index="4"]
+monitoring = false
+monitorable = false
+
+[node name="FanCollisionShape" parent="HitArea" index="0" instance=ExtResource("5_nr15b")]
+rotation = -1.5708
+scale = Vector2(3, 3)
diff --git a/DungeonShooting_Godot/resource/config/ActivityObject.json b/DungeonShooting_Godot/resource/config/ActivityObject.json
index 616a7fc..ba0b651 100644
--- a/DungeonShooting_Godot/resource/config/ActivityObject.json
+++ b/DungeonShooting_Godot/resource/config/ActivityObject.json
@@ -6,12 +6,36 @@
     "Remark": "\u73A9\u5BB6"
   },
   {
+    "Id": "enemy0001",
+    "Type": 4,
+    "Prefab": "res://prefab/role/Enemy0001.tscn",
+    "Remark": "\u654C\u4EBA"
+  },
+  {
     "Id": "weapon0001",
     "Type": 5,
     "Prefab": "res://prefab/weapon/Weapon0001.tscn",
     "Remark": ""
   },
   {
+    "Id": "weapon0002",
+    "Type": 5,
+    "Prefab": "res://prefab/weapon/Weapon0002.tscn",
+    "Remark": ""
+  },
+  {
+    "Id": "weapon0003",
+    "Type": 5,
+    "Prefab": "res://prefab/weapon/Weapon0003.tscn",
+    "Remark": ""
+  },
+  {
+    "Id": "weapon0004",
+    "Type": 5,
+    "Prefab": "res://prefab/weapon/Weapon0004.tscn",
+    "Remark": ""
+  },
+  {
     "Id": "bullet0001",
     "Type": 6,
     "Prefab": "res://prefab/bullet/Bullet0001.tscn",
@@ -20,7 +44,7 @@
   {
     "Id": "bullet0002",
     "Type": 6,
-    "Prefab": "res://prefab/bullet/Bullet0001.tscn",
+    "Prefab": "res://prefab/bullet/Bullet0002.tscn",
     "Remark": ""
   },
   {
@@ -30,6 +54,12 @@
     "Remark": ""
   },
   {
+    "Id": "effect0001",
+    "Type": 8,
+    "Prefab": "res://prefab/effect/activityObject/Effect0001.tscn",
+    "Remark": "\u654C\u4EBA\u6B7B\u4EA1\u788E\u7247"
+  },
+  {
     "Id": "other_door_e",
     "Type": 9,
     "Prefab": "res://prefab/map/RoomDoor_E.tscn",
diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json
index 0c4063f..4e79170 100644
--- a/DungeonShooting_Godot/resource/config/Weapon.json
+++ b/DungeonShooting_Godot/resource/config/Weapon.json
@@ -9,10 +9,10 @@
     "ContinuousShoot": true,
     "AmmoCapacity": 30,
     "MaxAmmoCapacity": 90,
-    "StandbyAmmoCapacity": 30,
+    "StandbyAmmoCapacity": 90,
     "ReloadTime": 2.5,
     "AloneReload": false,
-    "AloneReloadCount": 0,
+    "AloneReloadCount": 1,
     "AloneReloadCanShoot": false,
     "LooseShoot": false,
     "MinChargeTime": 0,
@@ -62,7 +62,7 @@
     "StandbyAmmoCapacity": 30,
     "ReloadTime": 2.5,
     "AloneReload": false,
-    "AloneReloadCount": 0,
+    "AloneReloadCount": 1,
     "AloneReloadCanShoot": false,
     "LooseShoot": false,
     "MinChargeTime": 0,
@@ -98,5 +98,305 @@
     "AiTargetLockingTime": 0.5,
     "AiBulletSpeedScale": 0.7,
     "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0003",
+    "WeaponId": "weapon0002",
+    "Name": "\u9730\u5F39\u67AA",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 40,
+    "WeightType": 2,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 7,
+    "MaxAmmoCapacity": 42,
+    "StandbyAmmoCapacity": 42,
+    "ReloadTime": 0.6,
+    "AloneReload": true,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": true,
+    "LooseShoot": false,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 0,
+    "StartFiringSpeed": 400,
+    "FinalFiringSpeed": 400,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 5,
+    "MaxFireBulletCount": 5,
+    "DelayedTime": 0,
+    "StartScatteringRange": 30,
+    "FinalScatteringRange": 90,
+    "ScatteringRangeAddValue": 50,
+    "ScatteringRangeBackSpeed": 50,
+    "ScatteringRangeBackTime": 0.5,
+    "MinDistance": 200,
+    "MaxDistance": 250,
+    "MinBacklash": 5,
+    "MaxBacklash": 6,
+    "BacklashRegressionSpeed": 35,
+    "UpliftAngle": 15,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0002",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "0004",
+    "AiTargetLockingTime": 0,
+    "AiBulletSpeedScale": 0,
+    "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0004",
+    "WeaponId": "",
+    "Name": "\u9730\u5F39\u67AA",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 40,
+    "WeightType": 2,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 7,
+    "MaxAmmoCapacity": 42,
+    "StandbyAmmoCapacity": 42,
+    "ReloadTime": 0.6,
+    "AloneReload": true,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": true,
+    "LooseShoot": false,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 3.5,
+    "StartFiringSpeed": 400,
+    "FinalFiringSpeed": 400,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 5,
+    "MaxFireBulletCount": 5,
+    "DelayedTime": 0,
+    "StartScatteringRange": 30,
+    "FinalScatteringRange": 90,
+    "ScatteringRangeAddValue": 50,
+    "ScatteringRangeBackSpeed": 50,
+    "ScatteringRangeBackTime": 0.5,
+    "MinDistance": 200,
+    "MaxDistance": 250,
+    "MinBacklash": 5,
+    "MaxBacklash": 6,
+    "BacklashRegressionSpeed": 35,
+    "UpliftAngle": 15,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0002",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "",
+    "AiTargetLockingTime": 0.4,
+    "AiBulletSpeedScale": 0.7,
+    "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0005",
+    "WeaponId": "weapon0003",
+    "Name": "\u624B\u67AA",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 20,
+    "WeightType": 1,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 12,
+    "MaxAmmoCapacity": 72,
+    "StandbyAmmoCapacity": 72,
+    "ReloadTime": 1.5,
+    "AloneReload": false,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": false,
+    "LooseShoot": false,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 0.1,
+    "StartFiringSpeed": 300,
+    "FinalFiringSpeed": 300,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 1,
+    "MaxFireBulletCount": 1,
+    "DelayedTime": 0,
+    "StartScatteringRange": 5,
+    "FinalScatteringRange": 60,
+    "ScatteringRangeAddValue": 8,
+    "ScatteringRangeBackSpeed": 40,
+    "ScatteringRangeBackTime": 0.5,
+    "MinDistance": 250,
+    "MaxDistance": 300,
+    "MinBacklash": 3,
+    "MaxBacklash": 5,
+    "BacklashRegressionSpeed": 35,
+    "UpliftAngle": 20,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0001",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "0006",
+    "AiTargetLockingTime": 0,
+    "AiBulletSpeedScale": 0,
+    "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0006",
+    "WeaponId": "",
+    "Name": "\u624B\u67AA",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 20,
+    "WeightType": 1,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 12,
+    "MaxAmmoCapacity": 72,
+    "StandbyAmmoCapacity": 72,
+    "ReloadTime": 1.5,
+    "AloneReload": false,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": false,
+    "LooseShoot": false,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 2,
+    "StartFiringSpeed": 300,
+    "FinalFiringSpeed": 300,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 1,
+    "MaxFireBulletCount": 1,
+    "DelayedTime": 0,
+    "StartScatteringRange": 5,
+    "FinalScatteringRange": 60,
+    "ScatteringRangeAddValue": 8,
+    "ScatteringRangeBackSpeed": 40,
+    "ScatteringRangeBackTime": 0.5,
+    "MinDistance": 250,
+    "MaxDistance": 300,
+    "MinBacklash": 3,
+    "MaxBacklash": 5,
+    "BacklashRegressionSpeed": 35,
+    "UpliftAngle": 20,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0001",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "",
+    "AiTargetLockingTime": 1,
+    "AiBulletSpeedScale": 0.7,
+    "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0007",
+    "WeaponId": "weapon0004",
+    "Name": "\u5200",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 40,
+    "WeightType": 2,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 180,
+    "MaxAmmoCapacity": 180,
+    "StandbyAmmoCapacity": 180,
+    "ReloadTime": 2.5,
+    "AloneReload": false,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": false,
+    "LooseShoot": true,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 0,
+    "StartFiringSpeed": 180,
+    "FinalFiringSpeed": 180,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 1,
+    "MaxFireBulletCount": 1,
+    "DelayedTime": 0,
+    "StartScatteringRange": 0,
+    "FinalScatteringRange": 0,
+    "ScatteringRangeAddValue": 0,
+    "ScatteringRangeBackSpeed": 0,
+    "ScatteringRangeBackTime": 0,
+    "MinDistance": 35,
+    "MaxDistance": 35,
+    "MinBacklash": -8,
+    "MaxBacklash": -8,
+    "BacklashRegressionSpeed": 24,
+    "UpliftAngle": -95,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0001",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "0008",
+    "AiTargetLockingTime": 0,
+    "AiBulletSpeedScale": 0,
+    "AiAmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0008",
+    "WeaponId": "",
+    "Name": "\u5200",
+    "Icon": "res://resource/sprite/gun/gun4.png",
+    "Weight": 40,
+    "WeightType": 2,
+    "ContinuousShoot": false,
+    "AmmoCapacity": 180,
+    "MaxAmmoCapacity": 180,
+    "StandbyAmmoCapacity": 180,
+    "ReloadTime": 2.5,
+    "AloneReload": false,
+    "AloneReloadCount": 1,
+    "AloneReloadCanShoot": false,
+    "LooseShoot": true,
+    "MinChargeTime": 0,
+    "MinContinuousCount": 1,
+    "MaxContinuousCount": 1,
+    "TriggerInterval": 3,
+    "StartFiringSpeed": 180,
+    "FinalFiringSpeed": 180,
+    "FiringSpeedAddSpeed": 0,
+    "FiringSpeedBackSpeed": 0,
+    "MinFireBulletCount": 1,
+    "MaxFireBulletCount": 1,
+    "DelayedTime": 0,
+    "StartScatteringRange": 0,
+    "FinalScatteringRange": 0,
+    "ScatteringRangeAddValue": 0,
+    "ScatteringRangeBackSpeed": 0,
+    "ScatteringRangeBackTime": 0,
+    "MinDistance": 35,
+    "MaxDistance": 35,
+    "MinBacklash": -8,
+    "MaxBacklash": -8,
+    "BacklashRegressionSpeed": 24,
+    "UpliftAngle": -95,
+    "DefaultAngle": 0,
+    "UpliftAngleRestore": 1,
+    "BulletId": "bullet0001",
+    "ThrowCollisionSize": {
+      "X": 20,
+      "Y": 15
+    },
+    "AiUseAttributeId": "",
+    "AiTargetLockingTime": 0.7,
+    "AiBulletSpeedScale": 0.7,
+    "AiAmmoConsumptionProbability": 0
   }
 ]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
index ab19dea..5173fe2 100644
--- a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
+++ b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
@@ -1,9 +1,9 @@
 [gd_resource type="TileSet" load_steps=3 format=3 uid="uid://b00g22o1cqhe8"]
 
-[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_5j3le"]
+[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_e0f3i"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_yvgyd"]
-texture = ExtResource("1_5j3le")
+texture = ExtResource("1_e0f3i")
 0:0/0 = 0
 0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 0:0/0/physics_layer_0/angular_velocity = 0.0
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Bullet0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Bullet0001.tres
new file mode 100644
index 0000000..6af29a8
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/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/Bullet0002.tres b/DungeonShooting_Godot/resource/spriteFrames/Bullet0002.tres
new file mode 100644
index 0000000..cb31134
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/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/Role0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres
index 2008cc6..c813ce3 100644
--- a/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres
+++ b/DungeonShooting_Godot/resource/spriteFrames/Role0001.tres
@@ -1,57 +1,57 @@
 [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_012k1"]
+[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_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(0, 0, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_dvg4a"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(0, 24, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_kvuct"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(16, 24, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_5op76"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(32, 24, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_helyc"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(48, 24, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_67mn8"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(48, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_jeywq"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(32, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_oycx8"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(16, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_tjg1t"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(0, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_2ltxw"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(0, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_x1va1"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(16, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_ic2p5"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(32, 48, 16, 24)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_j3hdu"]
-atlas = ExtResource("1_012k1")
+atlas = ExtResource("1_n8j7s")
 region = Rect2(48, 48, 16, 24)
 
 [resource]
diff --git a/DungeonShooting_Godot/resource/spriteFrames/Role1001.tres b/DungeonShooting_Godot/resource/spriteFrames/Role1001.tres
new file mode 100644
index 0000000..1a49770
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/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/Shell0001.tres b/DungeonShooting_Godot/resource/spriteFrames/Shell0001.tres
new file mode 100644
index 0000000..5d2b5b6
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/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/shellCase.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/Weapon0004.tres b/DungeonShooting_Godot/resource/spriteFrames/Weapon0004.tres
new file mode 100644
index 0000000..57dbe94
--- /dev/null
+++ b/DungeonShooting_Godot/resource/spriteFrames/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/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index 13537f9..7a5c690 100644
--- a/DungeonShooting_Godot/resource/theme/mainTheme.tres
+++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=78 format=3 uid="uid://ds668te2rph30"]
 
-[ext_resource type="FontFile" uid="uid://cad0in7dtweo5" path="res://resource/font/VonwaonBitmap-16px.ttf" id="1_yjvvv"]
+[ext_resource type="FontFile" uid="uid://cad0in7dtweo5" path="res://resource/font/VonwaonBitmap-16px.ttf" id="1_1e6k7"]
 
 [sub_resource type="StyleBoxFlat" id="1"]
 content_margin_left = 6.0
@@ -352,7 +352,7 @@
 
 [sub_resource type="ImageTexture" id="58"]
 
-[sub_resource type="Image" id="Image_tvxyf"]
+[sub_resource type="Image" id="Image_6b3q0"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -362,7 +362,7 @@
 }
 
 [sub_resource type="ImageTexture" id="60"]
-image = SubResource("Image_tvxyf")
+image = SubResource("Image_6b3q0")
 
 [sub_resource type="StyleBoxTexture" id="61"]
 content_margin_left = 2.0
@@ -372,7 +372,7 @@
 texture = SubResource("60")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_4ylaa"]
+[sub_resource type="Image" id="Image_6twnh"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -382,7 +382,7 @@
 }
 
 [sub_resource type="ImageTexture" id="63"]
-image = SubResource("Image_4ylaa")
+image = SubResource("Image_6twnh")
 
 [sub_resource type="StyleBoxTexture" id="64"]
 content_margin_left = 2.0
@@ -392,7 +392,7 @@
 texture = SubResource("63")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_8cfag"]
+[sub_resource type="Image" id="Image_m5y4y"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -402,7 +402,7 @@
 }
 
 [sub_resource type="ImageTexture" id="66"]
-image = SubResource("Image_8cfag")
+image = SubResource("Image_m5y4y")
 
 [sub_resource type="StyleBoxTexture" id="67"]
 content_margin_left = 2.0
@@ -412,7 +412,7 @@
 texture = SubResource("66")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_dgvbi"]
+[sub_resource type="Image" id="Image_767t4"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -422,7 +422,7 @@
 }
 
 [sub_resource type="ImageTexture" id="69"]
-image = SubResource("Image_dgvbi")
+image = SubResource("Image_767t4")
 
 [sub_resource type="StyleBoxTexture" id="70"]
 content_margin_left = 0.0
@@ -446,7 +446,7 @@
 content_margin_right = 4.0
 content_margin_bottom = 4.0
 
-[sub_resource type="Image" id="Image_qhdle"]
+[sub_resource type="Image" id="Image_iykrc"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -456,7 +456,7 @@
 }
 
 [sub_resource type="ImageTexture" id="56"]
-image = SubResource("Image_qhdle")
+image = SubResource("Image_iykrc")
 
 [sub_resource type="StyleBoxFlat" id="57"]
 content_margin_left = 6.0
@@ -506,7 +506,7 @@
 region_rect = Rect2(0, 0, 12, 12)
 
 [resource]
-default_font = ExtResource("1_yjvvv")
+default_font = ExtResource("1_1e6k7")
 default_font_size = 32
 Button/colors/font_color = Color(0.780392, 0.780392, 0.780392, 1)
 Button/colors/font_color_disabled = Color(1, 1, 1, 0.3)
@@ -516,7 +516,7 @@
 Button/colors/icon_color_hover = Color(1.15, 1.15, 1.15, 1)
 Button/colors/icon_color_pressed = Color(0.135294, 0.496079, 1.04176, 1)
 Button/constants/hseparation = 2
-Button/fonts/font = ExtResource("1_yjvvv")
+Button/fonts/font = ExtResource("1_1e6k7")
 Button/styles/disabled = SubResource("1")
 Button/styles/focus = SubResource("2")
 Button/styles/hover = SubResource("3")
@@ -618,7 +618,7 @@
 Label/constants/shadow_as_outline = 0
 Label/constants/shadow_offset_x = 1
 Label/constants/shadow_offset_y = 1
-Label/fonts/font = ExtResource("1_yjvvv")
+Label/fonts/font = ExtResource("1_1e6k7")
 Label/styles/normal = SubResource("54")
 LineEdit/colors/clear_button_color = Color(0.780392, 0.780392, 0.780392, 1)
 LineEdit/colors/clear_button_color_pressed = Color(0.117647, 0.431373, 0.905882, 1)
@@ -629,7 +629,7 @@
 LineEdit/colors/read_only = Color(1, 1, 1, 0.3)
 LineEdit/colors/selection_color = Color(0.117647, 0.431373, 0.905882, 0.4)
 LineEdit/constants/minimum_spaces = 12
-LineEdit/fonts/font = ExtResource("1_yjvvv")
+LineEdit/fonts/font = ExtResource("1_1e6k7")
 LineEdit/icons/clear = SubResource("56")
 LineEdit/styles/focus = SubResource("2")
 LineEdit/styles/normal = SubResource("4")
diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn
index 8ba9d85..aeba075 100644
--- a/DungeonShooting_Godot/scene/Main.tscn
+++ b/DungeonShooting_Godot/scene/Main.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://lbe753cb8heb"]
 
-[ext_resource type="Script" path="res://src/game/GameApplication.cs" id="1_8bmj5"]
-[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_5j1s8"]
+[ext_resource type="Script" path="res://src/game/GameApplication.cs" id="1_mh1cq"]
+[ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="2_2j367"]
 
 [sub_resource type="Shader" id="1"]
 code = "shader_type canvas_item;
@@ -21,7 +21,7 @@
 shader_parameter/offset = Vector2(0, 0)
 
 [node name="Main" type="Node2D" node_paths=PackedStringArray("SubViewport", "SubViewportContainer", "SceneRoot", "GlobalNodeRoot")]
-script = ExtResource("1_8bmj5")
+script = ExtResource("1_mh1cq")
 SubViewport = NodePath("ViewCanvas/SubViewportContainer/SubViewport")
 SubViewportContainer = NodePath("ViewCanvas/SubViewportContainer")
 SceneRoot = NodePath("ViewCanvas/SubViewportContainer/SubViewport/SceneRoot")
@@ -49,6 +49,6 @@
 process_callback = 0
 limit_smoothed = true
 editor_draw_drag_margin = true
-script = ExtResource("2_5j1s8")
+script = ExtResource("2_2j367")
 
 [node name="GlobalNodeRoot" type="Node2D" parent="."]
diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs
index 200bb39..3e7bd66 100644
--- a/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs
+++ b/DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs
@@ -14,7 +14,7 @@
         public string Id;
 
         /// <summary>
-        /// 属性绑定武器的Id,如果是Ai使用的数据, 则填空串
+        /// 属性绑定武器的Id,如果是Ai使用的数据, 则填空字符串串
         /// </summary>
         [JsonInclude]
         public string WeaponId;
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
index e1076aa..1825de5 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
@@ -12,11 +12,22 @@
         /// 玩家
         /// </summary>
         public const string Id_role0001 = "role0001";
+        /// <summary>
+        /// 敌人
+        /// </summary>
+        public const string Id_enemy0001 = "enemy0001";
         public const string Id_weapon0001 = "weapon0001";
+        public const string Id_weapon0002 = "weapon0002";
+        public const string Id_weapon0003 = "weapon0003";
+        public const string Id_weapon0004 = "weapon0004";
         public const string Id_bullet0001 = "bullet0001";
         public const string Id_bullet0002 = "bullet0002";
         public const string Id_shell0001 = "shell0001";
         /// <summary>
+        /// 敌人死亡碎片
+        /// </summary>
+        public const string Id_effect0001 = "effect0001";
+        /// <summary>
         /// 地牢房间的门(东侧)
         /// </summary>
         public const string Id_other_door_e = "other_door_e";
@@ -36,10 +47,15 @@
     private static void _InitRegister()
     {
         _activityRegisterMap.Add("role0001", "res://prefab/role/Role0001.tscn");
+        _activityRegisterMap.Add("enemy0001", "res://prefab/role/Enemy0001.tscn");
         _activityRegisterMap.Add("weapon0001", "res://prefab/weapon/Weapon0001.tscn");
+        _activityRegisterMap.Add("weapon0002", "res://prefab/weapon/Weapon0002.tscn");
+        _activityRegisterMap.Add("weapon0003", "res://prefab/weapon/Weapon0003.tscn");
+        _activityRegisterMap.Add("weapon0004", "res://prefab/weapon/Weapon0004.tscn");
         _activityRegisterMap.Add("bullet0001", "res://prefab/bullet/Bullet0001.tscn");
-        _activityRegisterMap.Add("bullet0002", "res://prefab/bullet/Bullet0001.tscn");
+        _activityRegisterMap.Add("bullet0002", "res://prefab/bullet/Bullet0002.tscn");
         _activityRegisterMap.Add("shell0001", "res://prefab/shell/Shell0001.tscn");
+        _activityRegisterMap.Add("effect0001", "res://prefab/effect/activityObject/Effect0001.tscn");
         _activityRegisterMap.Add("other_door_e", "res://prefab/map/RoomDoor_E.tscn");
         _activityRegisterMap.Add("other_door_w", "res://prefab/map/RoomDoor_W.tscn");
         _activityRegisterMap.Add("other_door_s", "res://prefab/map/RoomDoor_S.tscn");
diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs
index 2b2490b..e76a4cf 100644
--- a/DungeonShooting_Godot/src/game/GameApplication.cs
+++ b/DungeonShooting_Godot/src/game/GameApplication.cs
@@ -100,7 +100,7 @@
 		
 		DungeonConfig = new DungeonConfig();
 		DungeonConfig.GroupName = "testGroup";
-		DungeonConfig.RoomCount = 0;
+		DungeonConfig.RoomCount = 20;
 	}
 	
 	public override void _EnterTree()
diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
index 82567d9..ab91b9b 100644
--- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
@@ -1174,7 +1174,7 @@
         var verticalSpeed = Utils.RandomRangeInt(60, 120);
         var velocity = new Vector2(Utils.RandomRangeInt(20, 60), 0).Rotated(direction * Mathf.Pi / 180);
         var rotate = Utils.RandomRangeInt(-720, 720);
-        var shell = Create(ActivityIdPrefix.Shell + shellId);
+        var shell = Create(shellId);
         shell.Rotation = Master.MountPoint.RealRotation;
         shell.InheritVelocity(Master);
         shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate);
diff --git a/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs
index 4267f78..db67c2a 100644
--- a/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs
@@ -161,7 +161,7 @@
     protected override void OnFire()
     {
         //创建一个弹壳
-        ThrowShell("0001");
+        ThrowShell(ActivityObject.Ids.Id_shell0001);
         
         if (Master == Player.Current)
         {
diff --git a/DungeonShooting_Godot/src/game/activity/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/activity/weapon/gun/Shotgun.cs
index 4490496..de45035 100644
--- a/DungeonShooting_Godot/src/game/activity/weapon/gun/Shotgun.cs
+++ b/DungeonShooting_Godot/src/game/activity/weapon/gun/Shotgun.cs
@@ -54,22 +54,11 @@
     //         AiUseAttribute.TriggerInterval = 3.5f;
     //     }
     // }
-    
-    /// <summary>
-    /// 弹壳预制体
-    /// </summary>
-    public PackedScene ShellPack;
-
-    public override void OnInit()
-    {
-        base.OnInit();
-        ShellPack = ResourceManager.Load<PackedScene>(ResourcePath.prefab_weapon_shell_ShellCase_tscn);
-    }
 
     protected override void OnFire()
     {
         //创建一个弹壳
-        ThrowShell("0001");
+        ThrowShell(ActivityObject.Ids.Id_shell0001);
         
         if (Master == Player.Current)
         {
diff --git a/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs b/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs
index 04a85f4..0a967f2 100644
--- a/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs
+++ b/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using Godot;
 
+[Tool, GlobalClass]
 public partial class EnemyDebris : ActivityObject
 {
 
diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
index 20be424..9e709fc 100644
--- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
+++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
@@ -6,24 +6,28 @@
     public const string default_bus_layout_tres = "res://default_bus_layout.tres";
     public const string default_env_tres = "res://default_env.tres";
     public const string icon_png = "res://icon.png";
+    public const string excel_DungeonShooting_ExcelTool_deps_json = "res://excel/DungeonShooting_ExcelTool.deps.json";
+    public const string excel_DungeonShooting_ExcelTool_runtimeconfig_json = "res://excel/DungeonShooting_ExcelTool.runtimeconfig.json";
     public const string prefab_Cursor_tscn = "res://prefab/Cursor.tscn";
     public const string prefab_FanCollisionShape_tscn = "res://prefab/FanCollisionShape.tscn";
+    public const string prefab_bullet_Bullet0001_tscn = "res://prefab/bullet/Bullet0001.tscn";
+    public const string prefab_bullet_Bullet0002_tscn = "res://prefab/bullet/Bullet0002.tscn";
     public const string prefab_effect_Blood_tscn = "res://prefab/effect/Blood.tscn";
     public const string prefab_effect_BulletDisappear_tscn = "res://prefab/effect/BulletDisappear.tscn";
     public const string prefab_effect_BulletSmoke_tscn = "res://prefab/effect/BulletSmoke.tscn";
     public const string prefab_effect_Effect1_tscn = "res://prefab/effect/Effect1.tscn";
     public const string prefab_effect_FirePart_tscn = "res://prefab/effect/FirePart.tscn";
     public const string prefab_effect_ShotFire_tscn = "res://prefab/effect/ShotFire.tscn";
+    public const string prefab_effect_activityObject_Effect0001_tscn = "res://prefab/effect/activityObject/Effect0001.tscn";
     public const string prefab_effect_activityObject_EnemyBloodEffect_tscn = "res://prefab/effect/activityObject/EnemyBloodEffect.tscn";
-    public const string prefab_effect_activityObject_EnemyDebris_tscn = "res://prefab/effect/activityObject/EnemyDebris.tscn";
-    public const string prefab_map_RoomDoor_tscn = "res://prefab/map/RoomDoor.tscn";
     public const string prefab_map_RoomDoor_E_tscn = "res://prefab/map/RoomDoor_E.tscn";
     public const string prefab_map_RoomDoor_N_tscn = "res://prefab/map/RoomDoor_N.tscn";
     public const string prefab_map_RoomDoor_S_tscn = "res://prefab/map/RoomDoor_S.tscn";
     public const string prefab_map_RoomDoor_W_tscn = "res://prefab/map/RoomDoor_W.tscn";
-    public const string prefab_role_Enemy_tscn = "res://prefab/role/Enemy.tscn";
-    public const string prefab_role_Player_tscn = "res://prefab/role/Player.tscn";
-    public const string prefab_role_Role_tscn = "res://prefab/role/Role.tscn";
+    public const string prefab_role_Enemy0001_tscn = "res://prefab/role/Enemy0001.tscn";
+    public const string prefab_role_Role0001_tscn = "res://prefab/role/Role0001.tscn";
+    public const string prefab_role_RoleTemplate_tscn = "res://prefab/role/RoleTemplate.tscn";
+    public const string prefab_shell_Shell0001_tscn = "res://prefab/shell/Shell0001.tscn";
     public const string prefab_test_MoveComponent_tscn = "res://prefab/test/MoveComponent.tscn";
     public const string prefab_test_TestActivity_tscn = "res://prefab/test/TestActivity.tscn";
     public const string prefab_ui_EditorTools_tscn = "res://prefab/ui/EditorTools.tscn";
@@ -31,13 +35,13 @@
     public const string prefab_ui_Main_tscn = "res://prefab/ui/Main.tscn";
     public const string prefab_ui_RoomUI_tscn = "res://prefab/ui/RoomUI.tscn";
     public const string prefab_ui_Settlement_tscn = "res://prefab/ui/Settlement.tscn";
-    public const string prefab_weapon_Knife_tscn = "res://prefab/weapon/Knife.tscn";
-    public const string prefab_weapon_Weapon_tscn = "res://prefab/weapon/Weapon.tscn";
-    public const string prefab_weapon_WeaponPreview_tscn = "res://prefab/weapon/WeaponPreview.tscn";
-    public const string prefab_weapon_bullet_Bullet1_tscn = "res://prefab/weapon/bullet/Bullet1.tscn";
-    public const string prefab_weapon_bullet_Bullet2_tscn = "res://prefab/weapon/bullet/Bullet2.tscn";
-    public const string prefab_weapon_shell_ShellCase_tscn = "res://prefab/weapon/shell/ShellCase.tscn";
-    public const string resource_0x72_16x16DungeonTileset_v5_png = "res://resource/0x72_16x16DungeonTileset.v5.png";
+    public const string prefab_weapon_Weapon0001_tscn = "res://prefab/weapon/Weapon0001.tscn";
+    public const string prefab_weapon_Weapon0002_tscn = "res://prefab/weapon/Weapon0002.tscn";
+    public const string prefab_weapon_Weapon0003_tscn = "res://prefab/weapon/Weapon0003.tscn";
+    public const string prefab_weapon_Weapon0004_tscn = "res://prefab/weapon/Weapon0004.tscn";
+    public const string prefab_weapon_WeaponTemplate_tscn = "res://prefab/weapon/WeaponTemplate.tscn";
+    public const string resource_config_ActivityObject_json = "res://resource/config/ActivityObject.json";
+    public const string resource_config_Weapon_json = "res://resource/config/Weapon.json";
     public const string resource_curve_Curve1_tres = "res://resource/curve/Curve1.tres";
     public const string resource_font_DinkieBitmap7pxDemo_ttf = "res://resource/font/DinkieBitmap-7pxDemo.ttf";
     public const string resource_font_DinkieBitmap9pxDemo_ttf = "res://resource/font/DinkieBitmap-9pxDemo.ttf";
@@ -67,20 +71,6 @@
     public const string resource_sprite_effects_KnifeHit1_png = "res://resource/sprite/effects/KnifeHit1.png";
     public const string resource_sprite_effects_ShotFire_png = "res://resource/sprite/effects/ShotFire.png";
     public const string resource_sprite_effects_Smoke_png = "res://resource/sprite/effects/Smoke.png";
-    public const string resource_sprite_gun_bow_png = "res://resource/sprite/gun/bow.png";
-    public const string resource_sprite_gun_gun1_png = "res://resource/sprite/gun/gun1.png";
-    public const string resource_sprite_gun_gun2_png = "res://resource/sprite/gun/gun2.png";
-    public const string resource_sprite_gun_gun3_png = "res://resource/sprite/gun/gun3.png";
-    public const string resource_sprite_gun_gun4_png = "res://resource/sprite/gun/gun4.png";
-    public const string resource_sprite_gun_gun5_png = "res://resource/sprite/gun/gun5.png";
-    public const string resource_sprite_gun_gun6_png = "res://resource/sprite/gun/gun6.png";
-    public const string resource_sprite_gun_gun7_png = "res://resource/sprite/gun/gun7.png";
-    public const string resource_sprite_gun_gun8_png = "res://resource/sprite/gun/gun8.png";
-    public const string resource_sprite_gun_knife1_png = "res://resource/sprite/gun/knife1.png";
-    public const string resource_sprite_gun_weapon0001_Weapon0001_png = "res://resource/sprite/gun/weapon0001/Weapon0001.png";
-    public const string resource_sprite_gun_weapon0002_Weapon0002_png = "res://resource/sprite/gun/weapon0002/Weapon0002.png";
-    public const string resource_sprite_gun_weapon0003_Weapon0003_png = "res://resource/sprite/gun/weapon0003/Weapon0003.png";
-    public const string resource_sprite_gun_weapon0005_Weapon0005_png = "res://resource/sprite/gun/weapon0005/Weapon0005.png";
     public const string resource_sprite_map_map1_16x16dungeoniiwallreconfigv04spritesheet_png = "res://resource/sprite/map/map1/16x16 dungeon ii wall reconfig v04 spritesheet.png";
     public const string resource_sprite_map_map1_door1_down_png = "res://resource/sprite/map/map1/door1_down.png";
     public const string resource_sprite_map_map1_website_txt = "res://resource/sprite/map/map1/website.txt";
@@ -114,12 +104,32 @@
     public const string resource_sprite_ui_icon_icon_pickup_png = "res://resource/sprite/ui/icon/icon_pickup.png";
     public const string resource_sprite_ui_icon_icon_replace_png = "res://resource/sprite/ui/icon/icon_replace.png";
     public const string resource_sprite_ui_keyboard_e_png = "res://resource/sprite/ui/keyboard/e.png";
+    public const string resource_sprite_weapon_bow_png = "res://resource/sprite/weapon/bow.png";
+    public const string resource_sprite_weapon_gun1_png = "res://resource/sprite/weapon/gun1.png";
+    public const string resource_sprite_weapon_gun2_png = "res://resource/sprite/weapon/gun2.png";
+    public const string resource_sprite_weapon_gun3_png = "res://resource/sprite/weapon/gun3.png";
+    public const string resource_sprite_weapon_gun4_png = "res://resource/sprite/weapon/gun4.png";
+    public const string resource_sprite_weapon_gun5_png = "res://resource/sprite/weapon/gun5.png";
+    public const string resource_sprite_weapon_gun6_png = "res://resource/sprite/weapon/gun6.png";
+    public const string resource_sprite_weapon_gun7_png = "res://resource/sprite/weapon/gun7.png";
+    public const string resource_sprite_weapon_gun8_png = "res://resource/sprite/weapon/gun8.png";
+    public const string resource_sprite_weapon_knife1_png = "res://resource/sprite/weapon/knife1.png";
+    public const string resource_sprite_weapon_weapon0001_Weapon0001_png = "res://resource/sprite/weapon/weapon0001/Weapon0001.png";
+    public const string resource_sprite_weapon_weapon0002_Weapon0002_png = "res://resource/sprite/weapon/weapon0002/Weapon0002.png";
+    public const string resource_sprite_weapon_weapon0003_Weapon0003_png = "res://resource/sprite/weapon/weapon0003/Weapon0003.png";
+    public const string resource_sprite_weapon_weapon0005_Weapon0005_png = "res://resource/sprite/weapon/weapon0005/Weapon0005.png";
+    public const string resource_spriteFrames_Bullet0001_tres = "res://resource/spriteFrames/Bullet0001.tres";
+    public const string resource_spriteFrames_Bullet0002_tres = "res://resource/spriteFrames/Bullet0002.tres";
     public const string resource_spriteFrames_KnifeHit1_tres = "res://resource/spriteFrames/KnifeHit1.tres";
+    public const string resource_spriteFrames_Role0001_tres = "res://resource/spriteFrames/Role0001.tres";
+    public const string resource_spriteFrames_Role1001_tres = "res://resource/spriteFrames/Role1001.tres";
     public const string resource_spriteFrames_RoomDoor_EW_tres = "res://resource/spriteFrames/RoomDoor_EW.tres";
     public const string resource_spriteFrames_RoomDoor_NS_tres = "res://resource/spriteFrames/RoomDoor_NS.tres";
+    public const string resource_spriteFrames_Shell0001_tres = "res://resource/spriteFrames/Shell0001.tres";
     public const string resource_spriteFrames_Weapon0001_tres = "res://resource/spriteFrames/Weapon0001.tres";
     public const string resource_spriteFrames_Weapon0002_tres = "res://resource/spriteFrames/Weapon0002.tres";
     public const string resource_spriteFrames_Weapon0003_tres = "res://resource/spriteFrames/Weapon0003.tres";
+    public const string resource_spriteFrames_Weapon0004_tres = "res://resource/spriteFrames/Weapon0004.tres";
     public const string resource_spriteFrames_Weapon0005_tres = "res://resource/spriteFrames/Weapon0005.tres";
     public const string resource_theme_mainTheme_tres = "res://resource/theme/mainTheme.tres";
     public const string resource_theme_theme1_tres = "res://resource/theme/theme1.tres";
@@ -132,5 +142,6 @@
     public const string scene_test_TestNavigation2_tscn = "res://scene/test/TestNavigation2.tscn";
     public const string scene_test_TestNavigationPolygon_tscn = "res://scene/test/TestNavigationPolygon.tscn";
     public const string scene_test_TestNewTileMap_tscn = "res://scene/test/TestNewTileMap.tscn";
+    public const string scene_test_TestReadExcel_tscn = "res://scene/test/TestReadExcel.tscn";
     public const string scene_test_TestTileLayer_tscn = "res://scene/test/TestTileLayer.tscn";
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
index b52fa59..72735b9 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
@@ -127,7 +127,7 @@
         var count = Utils.RandomRangeInt(3, 6);
         for (var i = 0; i < count; i++)
         {
-            var debris = Create(ActivityIdPrefix.Effect + "0001");
+            var debris = Create(Ids.Id_effect0001);
             debris.PutDown(effPos, RoomLayerEnum.NormalLayer);
             debris.InheritVelocity(this);
         }
diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs
index a7e4755..f28aa01 100644
--- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs
+++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs
@@ -152,6 +152,12 @@
         //player.PickUpWeapon(ActivityObject.Create<Weapon>(ActivityObject.Ids.Id_weapon0001));
         var weapon = ActivityObject.Create<Weapon>(ActivityObject.Ids.Id_weapon0001);
         weapon.PutDown(player.Position, RoomLayerEnum.NormalLayer);
+        var weapon2 = ActivityObject.Create<Weapon>(ActivityObject.Ids.Id_weapon0002);
+        weapon2.PutDown(player.Position, RoomLayerEnum.NormalLayer);
+        var weapon3 = ActivityObject.Create<Weapon>(ActivityObject.Ids.Id_weapon0003);
+        weapon3.PutDown(player.Position, RoomLayerEnum.NormalLayer);
+        var weapon4 = ActivityObject.Create<Weapon>(ActivityObject.Ids.Id_weapon0004);
+        weapon4.PutDown(player.Position, RoomLayerEnum.NormalLayer);
 
         GameApplication.Instance.Cursor.SetGuiMode(false);
         yield return 0;