diff --git a/DungeonShooting_Godot/excel/AiAttackAttr.xlsx b/DungeonShooting_Godot/excel/AiAttackAttr.xlsx
index 8d3cdf5..937aafc 100644
--- a/DungeonShooting_Godot/excel/AiAttackAttr.xlsx
+++ b/DungeonShooting_Godot/excel/AiAttackAttr.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/BulletBase.xlsx b/DungeonShooting_Godot/excel/BulletBase.xlsx
index 3848b0d..be74a03 100644
--- a/DungeonShooting_Godot/excel/BulletBase.xlsx
+++ b/DungeonShooting_Godot/excel/BulletBase.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/Sound.xlsx b/DungeonShooting_Godot/excel/Sound.xlsx
index ff7944e..517fc08 100644
--- a/DungeonShooting_Godot/excel/Sound.xlsx
+++ b/DungeonShooting_Godot/excel/Sound.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/WeaponBase.xlsx b/DungeonShooting_Godot/excel/WeaponBase.xlsx
index a535b25..f969e2d 100644
--- a/DungeonShooting_Godot/excel/WeaponBase.xlsx
+++ b/DungeonShooting_Godot/excel/WeaponBase.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn
index e4e7314..0586c5b 100644
--- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn
+++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0006.tscn
@@ -29,10 +29,10 @@
 shader_parameter/grey = 0.0
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_4mw2b"]
-radius = 4.0
+radius = 3.0
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_vqdkp"]
-radius = 4.0
+radius = 3.0
 
 [node name="Bullet0006" type="CharacterBody2D" node_paths=PackedStringArray("CollisionArea", "CollisionShape2D", "Particles2D", "ShadowSprite", "AnimatedSprite", "Collision")]
 collision_layer = 2
diff --git a/DungeonShooting_Godot/prefab/effect/common/Trail0001.tscn b/DungeonShooting_Godot/prefab/effect/common/Trail0001.tscn
index ca24925..d7d9242 100644
--- a/DungeonShooting_Godot/prefab/effect/common/Trail0001.tscn
+++ b/DungeonShooting_Godot/prefab/effect/common/Trail0001.tscn
@@ -6,12 +6,13 @@
 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.5), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="Gradient" id="Gradient_lp1h8"]
+[sub_resource type="Gradient" id="Gradient_cjh8g"]
+resource_local_to_scene = true
 offsets = PackedFloat32Array(0.825949, 1)
-colors = PackedColorArray(0.96, 0.496, 0.48, 0.705882, 0.960784, 0.494118, 0.478431, 0)
+colors = PackedColorArray(1, 1, 1, 0.705882, 1, 1, 1, 0)
 
 [node name="Trail" type="Line2D"]
 width = 3.0
 width_curve = SubResource("Curve_fnvhf")
-gradient = SubResource("Gradient_lp1h8")
+gradient = SubResource("Gradient_cjh8g")
 script = ExtResource("1_i68ib")
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn
deleted file mode 100644
index 159734f..0000000
--- a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn
+++ /dev/null
@@ -1,51 +0,0 @@
-[gd_scene load_steps=8 format=3 uid="uid://433h6huyctl1"]
-
-[ext_resource type="Texture2D" uid="uid://b0jsyrbk4bydt" path="res://resource/sprite/shootFire/ShotFire0001.png" id="1_sencp"]
-[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_lnwju"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_asq5h"]
-atlas = ExtResource("1_sencp")
-region = Rect2(0, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_n77w8"]
-atlas = ExtResource("1_sencp")
-region = Rect2(16, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_10rnx"]
-atlas = ExtResource("1_sencp")
-region = Rect2(32, 0, 16, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_qi1pq"]
-atlas = ExtResource("1_sencp")
-region = Rect2(48, 0, 16, 16)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_73j16"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_asq5h")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_n77w8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_10rnx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_qi1pq")
-}, {
-"duration": 1.0,
-"texture": null
-}],
-"loop": false,
-"name": &"default",
-"speed": 20.0
-}]
-
-[node name="ShotFire" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")]
-modulate = Color(1.6, 1.6, 1.6, 1)
-sprite_frames = SubResource("SpriteFrames_73j16")
-offset = Vector2(8, 0)
-script = ExtResource("2_lnwju")
-DelayTime = 0.5
-Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0001.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0001.tscn
new file mode 100644
index 0000000..159734f
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0001.tscn
@@ -0,0 +1,51 @@
+[gd_scene load_steps=8 format=3 uid="uid://433h6huyctl1"]
+
+[ext_resource type="Texture2D" uid="uid://b0jsyrbk4bydt" path="res://resource/sprite/shootFire/ShotFire0001.png" id="1_sencp"]
+[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_lnwju"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_asq5h"]
+atlas = ExtResource("1_sencp")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n77w8"]
+atlas = ExtResource("1_sencp")
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_10rnx"]
+atlas = ExtResource("1_sencp")
+region = Rect2(32, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qi1pq"]
+atlas = ExtResource("1_sencp")
+region = Rect2(48, 0, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_73j16"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_asq5h")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_n77w8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_10rnx")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qi1pq")
+}, {
+"duration": 1.0,
+"texture": null
+}],
+"loop": false,
+"name": &"default",
+"speed": 20.0
+}]
+
+[node name="ShotFire" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")]
+modulate = Color(1.6, 1.6, 1.6, 1)
+sprite_frames = SubResource("SpriteFrames_73j16")
+offset = Vector2(8, 0)
+script = ExtResource("2_lnwju")
+DelayTime = 0.5
+Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0002.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0002.tscn
new file mode 100644
index 0000000..5a3355d
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0002.tscn
@@ -0,0 +1,52 @@
+[gd_scene load_steps=8 format=3 uid="uid://drcvbo0xam6q"]
+
+[ext_resource type="Texture2D" uid="uid://cj8gb5dxnk8ov" path="res://resource/sprite/shootFire/ShotFire0002.png" id="1_02pnb"]
+[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_uoe2l"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2nk6j"]
+atlas = ExtResource("1_02pnb")
+region = Rect2(0, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ht7ag"]
+atlas = ExtResource("1_02pnb")
+region = Rect2(9, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jwqy0"]
+atlas = ExtResource("1_02pnb")
+region = Rect2(18, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ud7n7"]
+atlas = ExtResource("1_02pnb")
+region = Rect2(27, 0, 9, 11)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_rry1m"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2nk6j")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ht7ag")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jwqy0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ud7n7")
+}, {
+"duration": 1.0,
+"texture": null
+}],
+"loop": false,
+"name": &"default",
+"speed": 20.0
+}]
+
+[node name="ShotFire2" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")]
+modulate = Color(1.6, 1.6, 1.6, 1)
+position = Vector2(-1, 0)
+sprite_frames = SubResource("SpriteFrames_rry1m")
+offset = Vector2(5.5, 0)
+script = ExtResource("2_uoe2l")
+DelayTime = 0.5
+Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0003.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0003.tscn
new file mode 100644
index 0000000..751fef8
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0003.tscn
@@ -0,0 +1,43 @@
+[gd_scene load_steps=7 format=3 uid="uid://dbas3vph0i2ro"]
+
+[ext_resource type="Script" path="res://src/game/effects/AutoDestroyParticles.cs" id="1_pdyqx"]
+[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1_r2unj"]
+
+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_4wcis"]
+particles_animation = true
+particles_anim_h_frames = 3
+particles_anim_v_frames = 1
+particles_anim_loop = false
+
+[sub_resource type="Curve" id="Curve_86ye5"]
+_data = [Vector2(0.0215054, 1), 0.0, 0.0, 0, 0, Vector2(0.512545, 0.882353), 0.0, 0.0, 0, 0, Vector2(1, 0.152941), 0.0, 0.0, 0, 0]
+point_count = 3
+
+[sub_resource type="CurveTexture" id="CurveTexture_j77i6"]
+curve = SubResource("Curve_86ye5")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_8n28q"]
+lifetime_randomness = 0.3
+particle_flag_disable_z = true
+angle_max = 360.0
+initial_velocity_min = 5.0
+initial_velocity_max = 35.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.6
+scale_max = 1.5
+scale_curve = SubResource("CurveTexture_j77i6")
+anim_offset_max = 1.0
+
+[node name="ShotFire3" type="GPUParticles2D" node_paths=PackedStringArray("Particles2D")]
+modulate = Color(0.95, 0.70965, 0.6365, 0.470588)
+material = SubResource("CanvasItemMaterial_4wcis")
+emitting = false
+process_material = SubResource("ParticleProcessMaterial_8n28q")
+texture = ExtResource("1_r2unj")
+lifetime = 0.7
+one_shot = true
+explosiveness = 1.0
+randomness = 0.5
+fixed_fps = 20
+script = ExtResource("1_pdyqx")
+Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0004.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0004.tscn
new file mode 100644
index 0000000..448192f
--- /dev/null
+++ b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire0004.tscn
@@ -0,0 +1,52 @@
+[gd_scene load_steps=8 format=3 uid="uid://yg8n8xi3ucqi"]
+
+[ext_resource type="Texture2D" uid="uid://dw3amegyt2ehh" path="res://resource/sprite/shootFire/ShotFire0003.png" id="1_lxoh4"]
+[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_qlt57"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1cqk8"]
+atlas = ExtResource("1_lxoh4")
+region = Rect2(0, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hfpwi"]
+atlas = ExtResource("1_lxoh4")
+region = Rect2(9, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dvimy"]
+atlas = ExtResource("1_lxoh4")
+region = Rect2(18, 0, 9, 11)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bk1sq"]
+atlas = ExtResource("1_lxoh4")
+region = Rect2(27, 0, 9, 11)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_rry1m"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1cqk8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hfpwi")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dvimy")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bk1sq")
+}, {
+"duration": 1.0,
+"texture": null
+}],
+"loop": false,
+"name": &"default",
+"speed": 20.0
+}]
+
+[node name="ShotFire4" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")]
+modulate = Color(1.6, 1.6, 1.6, 1)
+position = Vector2(-1, 0)
+sprite_frames = SubResource("SpriteFrames_rry1m")
+offset = Vector2(5.5, 0)
+script = ExtResource("2_qlt57")
+DelayTime = 0.5
+Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn
deleted file mode 100644
index 768d4d4..0000000
--- a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire2.tscn
+++ /dev/null
@@ -1,51 +0,0 @@
-[gd_scene load_steps=8 format=3 uid="uid://drcvbo0xam6q"]
-
-[ext_resource type="Texture2D" uid="uid://cj8gb5dxnk8ov" path="res://resource/sprite/shootFire/ShotFire0002.png" id="1_ljjfn"]
-[ext_resource type="Script" path="res://src/game/effects/AutoDestroySprite.cs" id="2_4ecjw"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_2nk6j"]
-atlas = ExtResource("1_ljjfn")
-region = Rect2(0, 0, 9, 11)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ht7ag"]
-atlas = ExtResource("1_ljjfn")
-region = Rect2(9, 0, 9, 11)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_jwqy0"]
-atlas = ExtResource("1_ljjfn")
-region = Rect2(18, 0, 9, 11)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ud7n7"]
-atlas = ExtResource("1_ljjfn")
-region = Rect2(27, 0, 9, 11)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_rry1m"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_2nk6j")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ht7ag")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_jwqy0")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ud7n7")
-}, {
-"duration": 1.0,
-"texture": null
-}],
-"loop": false,
-"name": &"default",
-"speed": 20.0
-}]
-
-[node name="ShotFire2" type="AnimatedSprite2D" node_paths=PackedStringArray("Particles2D")]
-modulate = Color(1.6, 1.6, 1.6, 1)
-sprite_frames = SubResource("SpriteFrames_rry1m")
-offset = Vector2(5.5, 0)
-script = ExtResource("2_4ecjw")
-DelayTime = 0.5
-Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn b/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn
deleted file mode 100644
index 751fef8..0000000
--- a/DungeonShooting_Godot/prefab/effect/weapon/ShotFire3.tscn
+++ /dev/null
@@ -1,43 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://dbas3vph0i2ro"]
-
-[ext_resource type="Script" path="res://src/game/effects/AutoDestroyParticles.cs" id="1_pdyqx"]
-[ext_resource type="Texture2D" uid="uid://h7hkgbwj1li" path="res://resource/sprite/common/Smoke.png" id="1_r2unj"]
-
-[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_4wcis"]
-particles_animation = true
-particles_anim_h_frames = 3
-particles_anim_v_frames = 1
-particles_anim_loop = false
-
-[sub_resource type="Curve" id="Curve_86ye5"]
-_data = [Vector2(0.0215054, 1), 0.0, 0.0, 0, 0, Vector2(0.512545, 0.882353), 0.0, 0.0, 0, 0, Vector2(1, 0.152941), 0.0, 0.0, 0, 0]
-point_count = 3
-
-[sub_resource type="CurveTexture" id="CurveTexture_j77i6"]
-curve = SubResource("Curve_86ye5")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_8n28q"]
-lifetime_randomness = 0.3
-particle_flag_disable_z = true
-angle_max = 360.0
-initial_velocity_min = 5.0
-initial_velocity_max = 35.0
-gravity = Vector3(0, 0, 0)
-scale_min = 0.6
-scale_max = 1.5
-scale_curve = SubResource("CurveTexture_j77i6")
-anim_offset_max = 1.0
-
-[node name="ShotFire3" type="GPUParticles2D" node_paths=PackedStringArray("Particles2D")]
-modulate = Color(0.95, 0.70965, 0.6365, 0.470588)
-material = SubResource("CanvasItemMaterial_4wcis")
-emitting = false
-process_material = SubResource("ParticleProcessMaterial_8n28q")
-texture = ExtResource("1_r2unj")
-lifetime = 0.7
-one_shot = true
-explosiveness = 1.0
-randomness = 0.5
-fixed_fps = 20
-script = ExtResource("1_pdyqx")
-Particles2D = []
diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn
index d8afea6..3810950 100644
--- a/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn
+++ b/DungeonShooting_Godot/prefab/weapon/Weapon0010.tscn
@@ -85,7 +85,7 @@
 
 [sub_resource type="Animation" id="Animation_8xqs8"]
 resource_name = "reloading"
-length = 1.3
+length = 1.7
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -93,7 +93,7 @@
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 1.3),
+"times": PackedFloat32Array(0, 1.7),
 "transitions": PackedFloat32Array(1, 1),
 "update": 1,
 "values": [&"reloading_frame", &"default"]
@@ -105,7 +105,7 @@
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 1.3),
+"times": PackedFloat32Array(0, 1.7),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [0, 18]
@@ -117,7 +117,7 @@
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.2, 1.1, 1.3),
+"times": PackedFloat32Array(0, 0.2, 1.5, 1.7),
 "transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
 "values": [0.0, -0.436332, -0.436332, 0.0]
diff --git a/DungeonShooting_Godot/project.godot b/DungeonShooting_Godot/project.godot
index 2588b93..bf53351 100644
--- a/DungeonShooting_Godot/project.godot
+++ b/DungeonShooting_Godot/project.godot
@@ -118,36 +118,43 @@
 fire={
 "deadzone": 0.5,
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 move_left={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
 ]
 }
 move_right={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
 ]
 }
 move_up={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
 ]
 }
 move_down={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
 ]
 }
 exchangeWeapon={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 throwWeapon={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":103,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":71,"physical_keycode":71,"key_label":71,"unicode":103,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 mouse_roll_up={
@@ -163,31 +170,37 @@
 interactive={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 reload={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 meleeAttack={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 roll={
 "deadzone": 0.5,
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":2,"position":Vector2(75, 15),"global_position":Vector2(79, 56),"factor":1.0,"button_index":2,"canceled":false,"pressed":true,"double_click":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 useActiveProp={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"key_label":0,"unicode":102,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 removeProp={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":11,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 exchangeProp={
@@ -198,11 +211,13 @@
 map={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null)
 ]
 }
 menu={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 mouse_left={
diff --git a/DungeonShooting_Godot/resource/config/AiAttackAttr.json b/DungeonShooting_Godot/resource/config/AiAttackAttr.json
index 251daae..ebc5579 100644
--- a/DungeonShooting_Godot/resource/config/AiAttackAttr.json
+++ b/DungeonShooting_Godot/resource/config/AiAttackAttr.json
@@ -1,7 +1,7 @@
 [
   {
     "Id": "0001",
-    "Remark": "",
+    "Remark": "\u6B65\u67AA",
     "LockingStand": true,
     "FiringStand": true,
     "ShowSubline": false,
@@ -13,7 +13,7 @@
   },
   {
     "Id": "0002",
-    "Remark": "",
+    "Remark": "\u9730\u5F39\u67AA",
     "LockingStand": true,
     "FiringStand": true,
     "ShowSubline": false,
@@ -25,7 +25,7 @@
   },
   {
     "Id": "0003",
-    "Remark": "",
+    "Remark": "\u624B\u67AA",
     "LockingStand": true,
     "FiringStand": true,
     "ShowSubline": false,
@@ -94,5 +94,17 @@
     "AttackLockAngle": true,
     "BulletSpeedScale": 0.8,
     "AmmoConsumptionProbability": 0
+  },
+  {
+    "Id": "0009",
+    "Remark": "Weapon0010",
+    "LockingStand": true,
+    "FiringStand": true,
+    "ShowSubline": false,
+    "LockingTime": 1.5,
+    "LockAngleTime": 0.5,
+    "AttackLockAngle": true,
+    "BulletSpeedScale": 0.4,
+    "AmmoConsumptionProbability": 0
   }
 ]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/config/BulletBase.json b/DungeonShooting_Godot/resource/config/BulletBase.json
index 6cebba7..07bee32 100644
--- a/DungeonShooting_Godot/resource/config/BulletBase.json
+++ b/DungeonShooting_Godot/resource/config/BulletBase.json
@@ -225,8 +225,8 @@
       0
     ],
     "SpeedRange": [
-      300,
-      320
+      350,
+      350
     ],
     "LifeTimeRange": [
       -1
@@ -239,10 +239,10 @@
       0
     ],
     "BounceCount": [
-      2
+      3
     ],
     "Penetration": [
-      0
+      1
     ]
   },
   {
diff --git a/DungeonShooting_Godot/resource/config/Sound.json b/DungeonShooting_Godot/resource/config/Sound.json
index 73d3cb1..a79ef6a 100644
--- a/DungeonShooting_Godot/resource/config/Sound.json
+++ b/DungeonShooting_Godot/resource/config/Sound.json
@@ -66,6 +66,12 @@
     "Remark": "\u69B4\u5F39\u53D1\u5C04\u5668"
   },
   {
+    "Id": "shooting0012",
+    "Path": "res://resource/sound/sfx/shooting/Shooting0012.ogg",
+    "Volume": 1,
+    "Remark": "\u6FC0\u5149\u6B66\u5668"
+  },
+  {
     "Id": "reloading0001",
     "Path": "res://resource/sound/sfx/reloading/Reloading0001.ogg",
     "Volume": 1,
@@ -138,6 +144,12 @@
     "Remark": ""
   },
   {
+    "Id": "reloadBegin0013",
+    "Path": "res://resource/sound/sfx/reloading/Reloading_begin0013.ogg",
+    "Volume": 1.2,
+    "Remark": ""
+  },
+  {
     "Id": "reloadFinish0002",
     "Path": "res://resource/sound/sfx/reloading/Reloading_finish0002.ogg",
     "Volume": 1,
@@ -156,6 +168,12 @@
     "Remark": ""
   },
   {
+    "Id": "reloadFinish0005",
+    "Path": "res://resource/sound/sfx/reloading/Reloading_finish0005.ogg",
+    "Volume": 1.2,
+    "Remark": ""
+  },
+  {
     "Id": "beLoaded0001",
     "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0001.ogg",
     "Volume": 1,
diff --git a/DungeonShooting_Godot/resource/config/WeaponBase.json b/DungeonShooting_Godot/resource/config/WeaponBase.json
index d93ed7d..767dc0e 100644
--- a/DungeonShooting_Godot/resource/config/WeaponBase.json
+++ b/DungeonShooting_Godot/resource/config/WeaponBase.json
@@ -10,7 +10,7 @@
     "AmmoCapacity": 30,
     "MaxAmmoCapacity": 420,
     "StandbyAmmoCapacity": 390,
-    "ReloadTime": 2.2,
+    "ReloadTime": 2,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -48,7 +48,7 @@
     "UpliftAngle": 10,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0001",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -87,7 +87,7 @@
     "AmmoCapacity": 30,
     "MaxAmmoCapacity": 420,
     "StandbyAmmoCapacity": 390,
-    "ReloadTime": 2.2,
+    "ReloadTime": 2,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -125,7 +125,7 @@
     "UpliftAngle": 10,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0001",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -164,11 +164,11 @@
     "AmmoCapacity": 7,
     "MaxAmmoCapacity": 140,
     "StandbyAmmoCapacity": 133,
-    "ReloadTime": 0.4,
+    "ReloadTime": 0.26,
     "AloneReload": true,
     "AloneReloadCount": 1,
-    "AloneReloadBeginIntervalTime": 0.6,
-    "AloneReloadFinishIntervalTime": 0.6,
+    "AloneReloadBeginIntervalTime": 0.5,
+    "AloneReloadFinishIntervalTime": 0.45,
     "AloneReloadCanShoot": true,
     "LooseShoot": false,
     "MinChargeTime": 0,
@@ -202,7 +202,7 @@
     "UpliftAngle": 15,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0002",
     "__Shell": "shell0002",
     "ReloadThrowShell": false,
@@ -241,11 +241,11 @@
     "AmmoCapacity": 7,
     "MaxAmmoCapacity": 140,
     "StandbyAmmoCapacity": 133,
-    "ReloadTime": 0.4,
+    "ReloadTime": 0.26,
     "AloneReload": true,
     "AloneReloadCount": 1,
-    "AloneReloadBeginIntervalTime": 0.6,
-    "AloneReloadFinishIntervalTime": 0.6,
+    "AloneReloadBeginIntervalTime": 0.5,
+    "AloneReloadFinishIntervalTime": 0.45,
     "AloneReloadCanShoot": true,
     "LooseShoot": false,
     "MinChargeTime": 0,
@@ -279,7 +279,7 @@
     "UpliftAngle": 15,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0002",
     "__Shell": "shell0002",
     "ReloadThrowShell": false,
@@ -318,7 +318,7 @@
     "AmmoCapacity": 12,
     "MaxAmmoCapacity": 180,
     "StandbyAmmoCapacity": 168,
-    "ReloadTime": 1.5,
+    "ReloadTime": 1.4,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -356,7 +356,7 @@
     "UpliftAngle": 20,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0001",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -395,7 +395,7 @@
     "AmmoCapacity": 12,
     "MaxAmmoCapacity": 180,
     "StandbyAmmoCapacity": 168,
-    "ReloadTime": 1.5,
+    "ReloadTime": 1.4,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -409,7 +409,7 @@
     "ContinuousCountRange": [
       1
     ],
-    "TriggerInterval": 1.3,
+    "TriggerInterval": 1,
     "StartFiringSpeed": 300,
     "FinalFiringSpeed": 300,
     "FiringSpeedAddSpeed": 0,
@@ -433,7 +433,7 @@
     "UpliftAngle": 20,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0001",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -624,7 +624,7 @@
     "AmmoCapacity": 10,
     "MaxAmmoCapacity": 80,
     "StandbyAmmoCapacity": 70,
-    "ReloadTime": 3,
+    "ReloadTime": 2.8,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -662,7 +662,7 @@
     "UpliftAngle": 15,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0004",
     "__Shell": "shell0003",
     "ReloadThrowShell": false,
@@ -701,7 +701,7 @@
     "AmmoCapacity": 10,
     "MaxAmmoCapacity": 80,
     "StandbyAmmoCapacity": 70,
-    "ReloadTime": 3,
+    "ReloadTime": 2.8,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -739,7 +739,7 @@
     "UpliftAngle": 15,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0004",
     "__Shell": "shell0003",
     "ReloadThrowShell": false,
@@ -778,7 +778,7 @@
     "AmmoCapacity": 20,
     "MaxAmmoCapacity": 600,
     "StandbyAmmoCapacity": 580,
-    "ReloadTime": 2.2,
+    "ReloadTime": 1.8,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -816,7 +816,7 @@
     "UpliftAngle": 5,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0002",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -834,11 +834,11 @@
     ],
     "__ShootSound": "shooting0002",
     "__BeginReloadSound": "reloadBegin0005",
-    "BeginReloadSoundDelayTime": 0.2,
+    "BeginReloadSoundDelayTime": 0,
     "__ReloadSound": "",
     "ReloadSoundDelayTime": 0,
     "__ReloadFinishSound": "beLoaded0016",
-    "ReloadFinishSoundAdvanceTime": 0.5,
+    "ReloadFinishSoundAdvanceTime": 0.6,
     "__BeLoadedSound": "",
     "BeLoadedSoundDelayTime": 0,
     "__OtherSoundMap": null,
@@ -855,7 +855,7 @@
     "AmmoCapacity": 20,
     "MaxAmmoCapacity": 600,
     "StandbyAmmoCapacity": 580,
-    "ReloadTime": 2.2,
+    "ReloadTime": 1.8,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -893,7 +893,7 @@
     "UpliftAngle": 5,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0002",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -911,11 +911,11 @@
     ],
     "__ShootSound": "shooting0002",
     "__BeginReloadSound": "reloadBegin0005",
-    "BeginReloadSoundDelayTime": 0.2,
+    "BeginReloadSoundDelayTime": 0,
     "__ReloadSound": "",
     "ReloadSoundDelayTime": 0,
     "__ReloadFinishSound": "beLoaded0016",
-    "ReloadFinishSoundAdvanceTime": 0.5,
+    "ReloadFinishSoundAdvanceTime": 0.6,
     "__BeLoadedSound": "",
     "BeLoadedSoundDelayTime": 0,
     "__OtherSoundMap": null,
@@ -970,7 +970,7 @@
     "UpliftAngle": 5,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0003",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -1047,7 +1047,7 @@
     "UpliftAngle": 5,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0003",
     "__Shell": "shell0001",
     "ReloadThrowShell": false,
@@ -1124,7 +1124,7 @@
     "UpliftAngle": 13,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0002.tscn",
     "__Bullet": "1001",
     "__Shell": "",
     "ReloadThrowShell": false,
@@ -1201,7 +1201,7 @@
     "UpliftAngle": 13,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0002.tscn",
     "__Bullet": "1001",
     "__Shell": "",
     "ReloadThrowShell": false,
@@ -1278,7 +1278,7 @@
     "UpliftAngle": 16,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 3,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0005",
     "__Shell": "shell0004",
     "ReloadThrowShell": true,
@@ -1355,7 +1355,7 @@
     "UpliftAngle": 16,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 3,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn",
     "__Bullet": "0005",
     "__Shell": "shell0004",
     "ReloadThrowShell": true,
@@ -1391,10 +1391,10 @@
     "WeightType": 2,
     "IsMelee": false,
     "ContinuousShoot": false,
-    "AmmoCapacity": 10,
-    "MaxAmmoCapacity": 240,
-    "StandbyAmmoCapacity": 120,
-    "ReloadTime": 1.8,
+    "AmmoCapacity": 5,
+    "MaxAmmoCapacity": 150,
+    "StandbyAmmoCapacity": 80,
+    "ReloadTime": 2,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -1409,8 +1409,8 @@
       1
     ],
     "TriggerInterval": 0,
-    "StartFiringSpeed": 300,
-    "FinalFiringSpeed": 300,
+    "StartFiringSpeed": 210,
+    "FinalFiringSpeed": 210,
     "FiringSpeedAddSpeed": 0,
     "FiringSpeedBackSpeed": 0,
     "FiringSpeedBackTime": 0,
@@ -1419,8 +1419,8 @@
     ],
     "DelayedTime": 0,
     "StartScatteringRange": 0,
-    "FinalScatteringRange": 8,
-    "ScatteringRangeAddValue": 3,
+    "FinalScatteringRange": 20,
+    "ScatteringRangeAddValue": 7,
     "ScatteringRangeBackSpeed": 20,
     "ScatteringRangeBackDelayTime": 0.5,
     "CameraShake": 2,
@@ -1429,10 +1429,10 @@
       3
     ],
     "BacklashRegressionSpeed": 25,
-    "UpliftAngle": 13,
+    "UpliftAngle": 16,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0004.tscn",
     "__Bullet": "0007",
     "__Shell": "",
     "ReloadThrowShell": false,
@@ -1448,13 +1448,13 @@
     "MeleeAttackRepelRange": [
       100
     ],
-    "__ShootSound": "shooting0010",
-    "__BeginReloadSound": "reloadBegin0011",
+    "__ShootSound": "shooting0012",
+    "__BeginReloadSound": "reloadBegin0013",
     "BeginReloadSoundDelayTime": 0,
     "__ReloadSound": "",
     "ReloadSoundDelayTime": 0,
-    "__ReloadFinishSound": "reloadFinish0003",
-    "ReloadFinishSoundAdvanceTime": 0.8,
+    "__ReloadFinishSound": "reloadFinish0005",
+    "ReloadFinishSoundAdvanceTime": 0.6,
     "__BeLoadedSound": "",
     "BeLoadedSoundDelayTime": 0,
     "__OtherSoundMap": null,
@@ -1468,10 +1468,10 @@
     "WeightType": 2,
     "IsMelee": false,
     "ContinuousShoot": false,
-    "AmmoCapacity": 10,
-    "MaxAmmoCapacity": 240,
-    "StandbyAmmoCapacity": 120,
-    "ReloadTime": 1.8,
+    "AmmoCapacity": 5,
+    "MaxAmmoCapacity": 150,
+    "StandbyAmmoCapacity": 80,
+    "ReloadTime": 2,
     "AloneReload": false,
     "AloneReloadCount": 1,
     "AloneReloadBeginIntervalTime": 0,
@@ -1486,8 +1486,8 @@
       1
     ],
     "TriggerInterval": 4,
-    "StartFiringSpeed": 300,
-    "FinalFiringSpeed": 300,
+    "StartFiringSpeed": 210,
+    "FinalFiringSpeed": 210,
     "FiringSpeedAddSpeed": 0,
     "FiringSpeedBackSpeed": 0,
     "FiringSpeedBackTime": 0,
@@ -1496,8 +1496,8 @@
     ],
     "DelayedTime": 0,
     "StartScatteringRange": 0,
-    "FinalScatteringRange": 8,
-    "ScatteringRangeAddValue": 3,
+    "FinalScatteringRange": 20,
+    "ScatteringRangeAddValue": 7,
     "ScatteringRangeBackSpeed": 20,
     "ScatteringRangeBackDelayTime": 0.5,
     "CameraShake": 2,
@@ -1506,10 +1506,10 @@
       3
     ],
     "BacklashRegressionSpeed": 25,
-    "UpliftAngle": 13,
+    "UpliftAngle": 16,
     "DefaultAngle": 0,
     "UpliftAngleRestore": 1,
-    "FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
+    "FireEffect": "res://prefab/effect/weapon/ShotFire0004.tscn",
     "__Bullet": "0007",
     "__Shell": "",
     "ReloadThrowShell": false,
@@ -1525,16 +1525,16 @@
     "MeleeAttackRepelRange": [
       100
     ],
-    "__ShootSound": "shooting0010",
-    "__BeginReloadSound": "reloadBegin0011",
+    "__ShootSound": "shooting0012",
+    "__BeginReloadSound": "reloadBegin0013",
     "BeginReloadSoundDelayTime": 0,
     "__ReloadSound": "",
     "ReloadSoundDelayTime": 0,
-    "__ReloadFinishSound": "reloadFinish0003",
-    "ReloadFinishSoundAdvanceTime": 0.8,
+    "__ReloadFinishSound": "reloadFinish0005",
+    "ReloadFinishSoundAdvanceTime": 0.6,
     "__BeLoadedSound": "",
     "BeLoadedSoundDelayTime": 0,
     "__OtherSoundMap": null,
-    "__AiAttackAttr": "0007"
+    "__AiAttackAttr": "0009"
   }
 ]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
index d225328..9b89740 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
+++ b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
@@ -10,6 +10,18 @@
       {
         "ErrorType": 0,
         "Path": "resource/map/tileMaps/Test1/battle/Battle2"
+      },
+      {
+        "ErrorType": 0,
+        "Path": "resource/map/tileMaps/Test1/battle/Battle3"
+      },
+      {
+        "ErrorType": 0,
+        "Path": "resource/map/tileMaps/Test1/battle/Battle4"
+      },
+      {
+        "ErrorType": 0,
+        "Path": "resource/map/tileMaps/Test1/battle/Battle5"
       }
     ],
     "InletList": [
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preinstall.json
new file mode 100644
index 0000000..a9f951a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preinstall.json
@@ -0,0 +1 @@
+[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[]]}]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png
new file mode 100644
index 0000000..0885a05
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png.import b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png.import
new file mode 100644
index 0000000..3a15cae
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/Preview.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://djatlwx25yc04"
+path="res://.godot/imported/Preview.png-059b7ebb6f66594cdd23b790819a4a0c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/map/tileMaps/Test1/battle/Battle3/Preview.png"
+dest_files=["res://.godot/imported/Preview.png-059b7ebb6f66594cdd23b790819a4a0c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/RoomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/RoomInfo.json
new file mode 100644
index 0000000..d3e0245
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/RoomInfo.json
@@ -0,0 +1 @@
+{"Position":{"X":-10,"Y":-12},"Size":{"X":28,"Y":22},"DoorAreaInfos":[{"Direction":3,"Start":0,"End":128},{"Direction":3,"Start":256,"End":384},{"Direction":2,"Start":256,"End":384},{"Direction":2,"Start":0,"End":128},{"Direction":1,"Start":0,"End":272},{"Direction":0,"Start":0,"End":272}],"GroupName":"Test1","RoomType":1,"RoomName":"Battle3","Weight":100,"Remark":""}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/TileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/TileInfo.json
new file mode 100644
index 0000000..6e8cc90
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle3/TileInfo.json
@@ -0,0 +1 @@
+{"NavigationVertices":[{"X":134,"Y":-74},{"X":134,"Y":-138},{"X":250,"Y":-138},{"X":250,"Y":130},{"X":134,"Y":130},{"X":134,"Y":82},{"X":-6,"Y":-74},{"X":-6,"Y":82},{"X":-122,"Y":-138},{"X":-6,"Y":130},{"X":-122,"Y":130},{"X":-6,"Y":-138}],"NavigationPolygon":[[0,1,2,3],[3,4,5],[0,3,5,6],[6,5,7,8],[7,9,10,8],[11,6,8]],"Floor":[-3,-5,0,3,-3,-4,0,3,-3,-3,0,3,-3,-2,0,3,-3,-1,0,3,-3,0,0,3,-3,1,0,3,-3,2,0,3,-3,3,0,3,-3,4,0,3,-2,-5,0,3,-2,-4,0,3,-2,-3,0,3,-2,-2,0,3,-2,-1,0,3,-2,0,0,3,-2,1,0,3,-2,2,0,3,-2,3,0,3,-2,4,0,3,-1,-5,0,3,-1,-4,0,3,-1,-3,0,3,-1,-2,0,3,-1,-1,0,3,-1,0,0,3,-1,1,0,3,-1,2,0,3,-1,3,0,3,-1,4,0,3,0,-5,0,3,0,-4,0,3,0,-3,0,3,0,-2,0,3,0,-1,0,3,0,0,0,3,0,1,0,3,0,2,0,3,0,3,0,3,0,4,0,3,1,-5,0,3,1,-4,0,3,1,-3,0,3,1,-2,0,3,1,-1,0,3,1,0,0,3,1,1,0,3,1,2,0,3,1,3,0,3,1,4,0,3,2,-5,0,3,2,-4,0,3,2,-3,0,3,2,-2,0,3,2,-1,0,3,2,0,0,3,2,1,0,3,2,2,0,3,2,3,0,3,2,4,0,3,3,-5,0,3,3,-4,0,3,3,-3,0,3,3,-2,0,3,3,-1,0,3,3,0,0,3,3,1,0,3,3,2,0,3,3,3,0,3,3,4,0,3,4,-5,0,3,4,-4,0,3,4,-3,0,3,4,-2,0,3,4,-1,0,3,4,0,0,3,4,1,0,3,4,2,0,3,4,3,0,3,4,4,0,3,5,-5,0,3,5,-4,0,3,5,-3,0,3,5,-2,0,3,5,-1,0,3,5,0,0,3,5,1,0,3,5,2,0,3,5,3,0,3,5,4,0,3,6,-5,0,3,6,-4,0,3,6,-3,0,3,6,-2,0,3,6,-1,0,3,6,0,0,3,6,1,0,3,6,2,0,3,6,3,0,3,6,4,0,3,7,-5,0,3,7,-4,0,3,7,-3,0,3,7,-2,0,3,7,-1,0,3,7,0,0,3,7,1,0,3,7,2,0,3,7,3,0,3,7,4,0,3,8,-5,0,3,8,-4,0,3,8,-3,0,3,8,-2,0,3,8,-1,0,3,8,0,0,3,8,1,0,3,8,2,0,3,8,3,0,3,8,4,0,3,9,-5,0,3,9,-4,0,3,9,-3,0,3,9,-2,0,3,9,-1,0,3,9,0,0,3,9,1,0,3,9,2,0,3,9,3,0,3,9,4,0,3,10,-5,0,3,10,-4,0,3,10,-3,0,3,10,-2,0,3,10,-1,0,3,10,0,0,3,10,1,0,3,10,2,0,3,10,3,0,3,10,4,0,3,-8,-9,0,3,-8,-8,0,3,-8,-7,0,3,-8,-6,0,3,-8,-5,0,3,-8,-4,0,3,-8,-3,0,3,-8,-2,0,3,-8,-1,0,3,-8,0,0,3,-8,1,0,3,-8,2,0,3,-8,3,0,3,-8,4,0,3,-8,5,0,3,-8,6,0,3,-8,7,0,3,-7,-9,0,3,-7,-8,0,3,-7,-7,0,3,-7,-6,0,3,-7,-5,0,3,-7,-4,0,3,-7,-3,0,3,-7,-2,0,3,-7,-1,0,3,-7,0,0,3,-7,1,0,3,-7,2,0,3,-7,3,0,3,-7,4,0,3,-7,5,0,3,-7,6,0,3,-7,7,0,3,-6,-9,0,3,-6,-8,0,3,-6,-7,0,3,-6,-6,0,3,-6,-5,0,3,-6,-4,0,3,-6,-3,0,3,-6,-2,0,3,-6,-1,0,3,-6,0,0,3,-6,1,0,3,-6,2,0,3,-6,3,0,3,-6,4,0,3,-6,5,0,3,-6,6,0,3,-6,7,0,3,-5,-9,0,3,-5,-8,0,3,-5,-7,0,3,-5,-6,0,3,-5,-5,0,3,-5,-4,0,3,-5,-3,0,3,-5,-2,0,3,-5,-1,0,3,-5,0,0,3,-5,1,0,3,-5,2,0,3,-5,3,0,3,-5,4,0,3,-5,5,0,3,-5,6,0,3,-5,7,0,3,-4,-9,0,3,-4,-8,0,3,-4,-7,0,3,-4,-6,0,3,-4,-5,0,3,-4,-4,0,3,-4,-3,0,3,-4,-2,0,3,-4,-1,0,3,-4,0,0,3,-4,1,0,3,-4,2,0,3,-4,3,0,3,-4,4,0,3,-4,5,0,3,-4,6,0,3,-4,7,0,3,-3,-9,0,3,-3,-8,0,3,-3,-7,0,3,-3,-6,0,3,-3,5,0,3,-3,6,0,3,-3,7,0,3,-2,-9,0,3,-2,-8,0,3,-2,-7,0,3,-2,-6,0,3,-2,5,0,3,-2,6,0,3,-2,7,0,3,-1,-9,0,3,-1,-8,0,3,-1,-7,0,3,-1,-6,0,3,-1,5,0,3,-1,6,0,3,-1,7,0,3,8,-9,0,3,8,-8,0,3,8,-7,0,3,8,-6,0,3,8,5,0,3,8,6,0,3,8,7,0,3,9,-9,0,3,9,-8,0,3,9,-7,0,3,9,-6,0,3,9,5,0,3,9,6,0,3,9,7,0,3,10,-9,0,3,10,-8,0,3,10,-7,0,3,10,-6,0,3,10,5,0,3,10,6,0,3,10,7,0,3,11,-9,0,3,11,-8,0,3,11,-7,0,3,11,-6,0,3,11,-5,0,3,11,-4,0,3,11,-3,0,3,11,-2,0,3,11,-1,0,3,11,0,0,3,11,1,0,3,11,2,0,3,11,3,0,3,11,4,0,3,11,5,0,3,11,6,0,3,11,7,0,3,12,-9,0,3,12,-8,0,3,12,-7,0,3,12,-6,0,3,12,-5,0,3,12,-4,0,3,12,-3,0,3,12,-2,0,3,12,-1,0,3,12,0,0,3,12,1,0,3,12,2,0,3,12,3,0,3,12,4,0,3,12,5,0,3,12,6,0,3,12,7,0,3,13,-9,0,3,13,-8,0,3,13,-7,0,3,13,-6,0,3,13,-5,0,3,13,-4,0,3,13,-3,0,3,13,-2,0,3,13,-1,0,3,13,0,0,3,13,1,0,3,13,2,0,3,13,3,0,3,13,4,0,3,13,5,0,3,13,6,0,3,13,7,0,3,14,-9,0,3,14,-8,0,3,14,-7,0,3,14,-6,0,3,14,-5,0,3,14,-4,0,3,14,-3,0,3,14,-2,0,3,14,-1,0,3,14,0,0,3,14,1,0,3,14,2,0,3,14,3,0,3,14,4,0,3,14,5,0,3,14,6,0,3,14,7,0,3,15,-9,0,3,15,-8,0,3,15,-7,0,3,15,-6,0,3,15,-5,0,3,15,-4,0,3,15,-3,0,3,15,-2,0,3,15,-1,0,3,15,0,0,3,15,1,0,3,15,2,0,3,15,3,0,3,15,4,0,3,15,5,0,3,15,6,0,3,15,7,0,3],"Middle":[-8,-11,63,1,-8,-10,2,2,-7,-11,63,1,-7,-10,2,2,-6,-11,63,1,-6,-10,2,2,-5,-11,63,1,-5,-10,2,2,-4,-11,63,1,-4,-10,2,2,-3,-11,63,1,-3,-10,2,2,-2,-11,63,1,-2,-10,2,2,-1,-11,63,1,-1,-10,2,2,0,-7,54,1,0,-6,1,2,1,-7,63,1,1,-6,2,2,2,-7,63,1,2,-6,2,2,3,-7,63,1,3,-6,2,2,4,-7,63,1,4,-6,2,2,5,-7,63,1,5,-6,2,2,6,-7,63,1,6,-6,2,2,7,-7,27,1,7,-6,3,2,8,-11,63,1,8,-10,2,2,9,-11,63,1,9,-10,2,2,10,-11,63,1,10,-10,2,2,11,-11,63,1,11,-10,2,2,12,-11,63,1,12,-10,2,2,13,-11,63,1,13,-10,2,2,14,-11,63,1,14,-10,2,2,15,-11,63,1,15,-10,2,2],"Top":[-10,-12,511,1,-10,-11,511,1,-10,-10,511,1,-10,-9,511,1,-10,-8,511,1,-10,-7,511,1,-10,-6,511,1,-10,-5,511,1,-10,-4,511,1,-10,-3,511,1,-10,-2,511,1,-10,-1,511,1,-10,0,511,1,-10,1,511,1,-10,2,511,1,-10,3,511,1,-10,4,511,1,-10,5,511,1,-10,6,511,1,-10,7,511,1,-10,8,511,1,-10,9,511,1,-9,-12,511,1,-9,-11,255,1,-9,-10,219,1,-9,-9,219,1,-9,-8,219,1,-9,-7,219,1,-9,-6,219,1,-9,-5,219,1,-9,-4,219,1,-9,-3,219,1,-9,-2,219,1,-9,-1,219,1,-9,0,219,1,-9,1,219,1,-9,2,219,1,-9,3,219,1,-9,4,219,1,-9,5,219,1,-9,6,219,1,-9,7,219,1,-9,8,507,1,-9,9,511,1,-8,-12,511,1,-8,8,504,1,-8,9,511,1,-7,-12,511,1,-7,8,504,1,-7,9,511,1,-6,-12,511,1,-6,8,504,1,-6,9,511,1,-5,-12,511,1,-5,8,504,1,-5,9,511,1,-4,-12,511,1,-4,8,504,1,-4,9,511,1,-3,-12,511,1,-3,8,504,1,-3,9,511,1,-2,-12,511,1,-2,8,504,1,-2,9,511,1,-1,-12,511,1,-1,8,504,1,-1,9,511,1,0,-12,511,1,0,-11,447,1,0,-10,438,1,0,-9,438,1,0,-8,438,1,0,5,432,1,0,6,438,1,0,7,438,1,0,8,510,1,0,9,511,1,1,-12,511,1,1,-11,511,1,1,-10,511,1,1,-9,511,1,1,-8,511,1,1,5,504,1,1,6,511,1,1,7,511,1,1,8,511,1,1,9,511,1,2,-8,511,1,2,5,504,1,2,6,511,1,3,-8,511,1,3,5,504,1,3,6,511,1,4,-8,511,1,4,5,504,1,4,6,511,1,5,-8,511,1,5,5,504,1,5,6,511,1,6,-12,511,1,6,-11,511,1,6,-10,511,1,6,-9,511,1,6,-8,511,1,6,5,504,1,6,6,511,1,6,7,511,1,6,8,511,1,6,9,511,1,7,-12,511,1,7,-11,255,1,7,-10,219,1,7,-9,219,1,7,-8,219,1,7,5,216,1,7,6,219,1,7,7,219,1,7,8,507,1,7,9,511,1,8,-12,511,1,8,8,504,1,8,9,511,1,9,-12,511,1,9,8,504,1,9,9,511,1,10,-12,511,1,10,8,504,1,10,9,511,1,11,-12,511,1,11,8,504,1,11,9,511,1,12,-12,511,1,12,8,504,1,12,9,511,1,13,-12,511,1,13,8,504,1,13,9,511,1,14,-12,511,1,14,8,504,1,14,9,511,1,15,-12,511,1,15,8,504,1,15,9,511,1,16,-12,511,1,16,-11,447,1,16,-10,438,1,16,-9,438,1,16,-8,438,1,16,-7,438,1,16,-6,438,1,16,-5,438,1,16,-4,438,1,16,-3,438,1,16,-2,438,1,16,-1,438,1,16,0,438,1,16,1,438,1,16,2,438,1,16,3,438,1,16,4,438,1,16,5,438,1,16,6,438,1,16,7,438,1,16,8,510,1,16,9,511,1,17,-12,511,1,17,-11,511,1,17,-10,511,1,17,-9,511,1,17,-8,511,1,17,-7,511,1,17,-6,511,1,17,-5,511,1,17,-4,511,1,17,-3,511,1,17,-2,511,1,17,-1,511,1,17,0,511,1,17,1,511,1,17,2,511,1,17,3,511,1,17,4,511,1,17,5,511,1,17,6,511,1,17,7,511,1,17,8,511,1,17,9,511,1],"CustomFloor1":[-6,-8,2,2,6,-6,-7,2,2,7,-7,-7,2,1,7,-7,-8,2,1,6,-5,-8,2,2,6,-5,-7,2,2,7,-4,-8,2,2,6,-4,-7,2,2,7,-3,-8,2,2,6,-3,-7,2,2,7,-2,-8,2,3,6,-2,-7,2,3,7,-2,-6,2,3,7,-3,-6,2,2,7,-2,-5,2,3,7,-3,-5,2,2,7,-2,-4,2,4,9,-3,-4,2,2,7,-2,-3,2,2,7,-3,-3,2,2,7,-4,-3,2,2,7,-4,-4,2,2,7,-3,-2,2,2,7,-4,-2,2,2,7,-3,-1,2,2,7,-4,-1,2,2,7,-3,0,2,2,7,-4,0,2,2,7,-6,-6,2,2,7,-7,-6,2,1,7,-6,-5,2,2,7,-7,-5,2,1,7,-6,-4,2,2,7,-7,-4,2,1,7,-6,-3,2,2,7,-7,-3,2,1,7,-6,-2,2,2,7,-7,-2,2,1,7,-6,-1,2,2,7,-7,-1,2,1,7,-6,0,2,2,7,-7,0,2,1,7,-6,1,2,2,7,-7,1,2,1,7,-6,2,2,2,7,-7,2,2,1,7,-6,3,2,2,7,-7,3,2,1,7,-6,4,2,2,7,-7,4,2,1,7,-6,5,2,2,7,-7,5,2,1,7,-6,6,2,2,8,-7,6,2,1,8,-5,5,2,2,7,-5,6,2,2,8,-4,5,2,2,7,-4,6,2,2,8,-3,5,2,2,7,-3,6,2,2,8,-2,5,2,3,7,-2,6,2,3,8,-2,4,2,3,7,-3,4,2,2,7,-2,3,2,4,8,-3,3,2,2,7,-2,2,2,2,7,-3,2,2,2,7,-2,1,2,2,7,-3,1,2,2,7,-2,0,2,2,7,-2,-1,2,2,7,-2,-2,2,2,7,-4,-6,2,2,7,-4,-5,2,2,7,-5,-5,2,2,7,-5,-6,2,2,7,-5,-4,2,2,7,-5,-3,2,2,7,-5,-2,2,2,7,-5,-1,2,2,7,-5,0,2,2,7,-4,1,2,2,7,-5,1,2,2,7,-4,2,2,2,7,-5,2,2,2,7,-4,3,2,2,7,-5,3,2,2,7,-4,4,2,2,7,-5,4,2,2,7,0,-4,2,2,6,0,-3,2,2,7,-1,-3,2,2,7,-1,-4,2,2,6,1,-4,2,2,6,1,-3,2,2,7,2,-4,2,2,6,2,-3,2,2,7,3,-4,2,2,6,3,-3,2,2,7,4,-4,2,2,6,4,-3,2,2,7,5,-4,2,2,6,5,-3,2,2,7,6,-4,2,2,6,6,-3,2,2,7,7,-4,2,2,6,7,-3,2,2,7,8,-4,2,2,6,8,-3,2,2,7,-1,2,2,2,7,-1,3,2,2,8,0,2,2,2,7,0,3,2,2,8,1,2,2,2,7,1,3,2,2,8,2,2,2,2,7,2,3,2,2,8,3,2,2,2,7,3,3,2,2,8,4,2,2,2,7,4,3,2,2,8,5,2,2,2,7,5,3,2,2,8,6,2,2,2,7,6,3,2,2,8,7,2,2,2,7,7,3,2,2,8,8,2,2,2,7,8,3,2,2,8,9,2,2,2,7,9,3,2,5,8,10,2,2,2,7,10,3,2,2,7,11,2,2,2,7,11,3,2,2,7,11,1,2,2,7,10,1,2,2,7,11,0,2,2,7,10,0,2,2,7,9,1,2,2,7,9,0,2,2,7,10,-1,2,2,7,9,-1,2,2,7,10,-2,2,2,7,9,-2,2,2,7,8,-1,2,2,7,8,-2,2,2,7,7,-1,2,2,7,7,-2,2,2,7,6,-1,2,2,7,6,-2,2,2,7,5,-1,2,2,7,5,-2,2,2,7,4,-1,2,2,7,4,-2,2,2,7,3,-1,2,2,7,3,-2,2,2,7,2,-1,2,2,7,2,-2,2,2,7,1,-1,2,2,7,1,-2,2,2,7,0,-1,2,2,7,0,-2,2,2,7,-1,-1,2,2,7,-1,-2,2,2,7,-1,0,2,2,7,-1,1,2,2,7,0,1,2,2,7,1,1,2,2,7,2,1,2,2,7,3,1,2,2,7,4,1,2,2,7,5,1,2,2,7,6,1,2,2,7,7,1,2,2,7,7,0,2,2,7,6,0,2,2,7,5,0,2,2,7,4,0,2,2,7,3,0,2,2,7,2,0,2,2,7,1,0,2,2,7,0,0,2,2,7,8,0,2,2,7,8,1,2,2,7,10,4,2,2,7,9,4,2,1,7,10,5,2,2,7,9,5,2,1,7,10,6,2,2,8,9,6,2,1,8,11,5,2,2,7,11,6,2,2,8,12,5,2,2,7,12,6,2,2,8,13,5,2,2,7,13,6,2,2,8,14,5,2,3,7,14,6,2,3,8,14,4,2,3,7,13,4,2,2,7,14,3,2,3,7,13,3,2,2,7,14,2,2,3,7,13,2,2,2,7,14,1,2,3,7,13,1,2,2,7,14,0,2,3,7,13,0,2,2,7,14,-1,2,3,7,14,-2,2,3,7,14,-3,2,3,7,14,-4,2,3,7,14,-5,2,3,7,14,-6,2,3,7,14,-7,2,3,7,13,-1,2,2,7,13,-2,2,2,7,13,-3,2,2,7,13,-4,2,2,7,13,-5,2,2,7,13,-6,2,2,7,13,-7,2,2,7,12,4,2,2,7,12,3,2,2,7,12,2,2,2,7,12,1,2,2,7,12,0,2,2,7,12,-1,2,2,7,12,-2,2,2,7,12,-3,2,2,7,12,-4,2,2,7,12,-5,2,2,7,12,-6,2,2,7,12,-7,2,2,7,11,4,2,2,7,11,-1,2,2,7,11,-2,2,2,7,11,-3,2,2,7,11,-4,2,2,7,11,-5,2,2,7,11,-6,2,2,7,11,-7,2,2,7,10,-3,2,2,7,10,-4,2,2,7,10,-5,2,2,7,10,-6,2,2,7,10,-7,2,2,7,9,-3,2,2,7,9,-4,2,5,9,9,-5,2,1,7,9,-6,2,1,7,9,-7,2,1,7,14,-8,2,3,6,13,-8,2,2,6,12,-8,2,2,6,11,-8,2,2,6,10,-8,2,2,6,9,-8,2,1,6],"CustomFloor2":[-5,-1,1,12,4,-4,-1,1,13,4,-2,1,1,14,6,11,3,1,13,6,12,-5,1,13,5,-6,-7,1,8,11,8,0,1,6,14,8,1,1,6,15,9,1,1,7,15,10,1,1,8,15,10,0,1,8,14,9,0,1,7,14,2,-3,1,6,14,2,-2,1,6,15,3,-2,1,7,15,4,-2,1,8,15,4,-3,1,8,14,3,-3,1,7,14,10,-3,1,7,12,10,-2,1,7,13,11,-2,1,8,13,11,-3,1,8,12],"CustomFloor3":[],"CustomMiddle1":[],"CustomMiddle2":[],"CustomTop":[]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preinstall.json
new file mode 100644
index 0000000..a9f951a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preinstall.json
@@ -0,0 +1 @@
+[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[]]}]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png
new file mode 100644
index 0000000..782fcd0
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png.import b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png.import
new file mode 100644
index 0000000..dba2a30
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/Preview.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://8mo2r2lt12sx"
+path="res://.godot/imported/Preview.png-b0ff3b32424b16028ed7b4659c78de50.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/map/tileMaps/Test1/battle/Battle4/Preview.png"
+dest_files=["res://.godot/imported/Preview.png-b0ff3b32424b16028ed7b4659c78de50.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/RoomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/RoomInfo.json
new file mode 100644
index 0000000..c9960e1
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/RoomInfo.json
@@ -0,0 +1 @@
+{"Position":{"X":-13,"Y":-26},"Size":{"X":36,"Y":33},"DoorAreaInfos":[{"Direction":1,"Start":0,"End":448},{"Direction":2,"Start":0,"End":512},{"Direction":0,"Start":0,"End":448},{"Direction":3,"Start":0,"End":512}],"GroupName":"Test1","RoomType":1,"RoomName":"Battle4","Weight":100,"Remark":""}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/TileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/TileInfo.json
new file mode 100644
index 0000000..3b4762a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle4/TileInfo.json
@@ -0,0 +1 @@
+{"NavigationVertices":[{"X":278,"Y":-218},{"X":278,"Y":-302},{"X":330,"Y":-362},{"X":330,"Y":82},{"X":-170,"Y":-362},{"X":186,"Y":-302},{"X":278,"Y":6},{"X":-170,"Y":82},{"X":186,"Y":6},{"X":-10,"Y":6},{"X":186,"Y":-78},{"X":-102,"Y":6},{"X":-102,"Y":-78},{"X":-10,"Y":-78},{"X":186,"Y":-218},{"X":-10,"Y":-218},{"X":-10,"Y":-302},{"X":-102,"Y":-302},{"X":-102,"Y":-218},{"X":278,"Y":-78}],"NavigationPolygon":[[0,1,2,3],[4,2,1,5],[6,3,7,8],[8,7,9,10],[11,9,7],[11,7,4,12],[10,9,13],[5,14,15,16],[4,5,16],[4,16,17],[4,17,18],[12,4,18],[13,12,18,15],[10,13,15,14],[19,10,14,0],[19,0,3],[19,3,6]],"Floor":[-11,-23,0,3,-11,-22,0,3,-11,-21,0,3,-11,-20,0,3,-11,-19,0,3,-11,-18,0,3,-11,-17,0,3,-11,-16,0,3,-11,-15,0,3,-11,-14,0,3,-11,-13,0,3,-11,-12,0,3,-11,-11,0,3,-11,-10,0,3,-11,-9,0,3,-11,-8,0,3,-11,-7,0,3,-11,-6,0,3,-11,-5,0,3,-11,-4,0,3,-11,-3,0,3,-11,-2,0,3,-11,-1,0,3,-11,0,0,3,-11,1,0,3,-11,2,0,3,-11,3,0,3,-11,4,0,3,-10,-23,0,3,-10,-22,0,3,-10,-21,0,3,-10,-20,0,3,-10,-19,0,3,-10,-18,0,3,-10,-17,0,3,-10,-16,0,3,-10,-15,0,3,-10,-14,0,3,-10,-13,0,3,-10,-12,0,3,-10,-11,0,3,-10,-10,0,3,-10,-9,0,3,-10,-8,0,3,-10,-7,0,3,-10,-6,0,3,-10,-5,0,3,-10,-4,0,3,-10,-3,0,3,-10,-2,0,3,-10,-1,0,3,-10,0,0,3,-10,1,0,3,-10,2,0,3,-10,3,0,3,-10,4,0,3,-9,-23,0,3,-9,-22,0,3,-9,-21,0,3,-9,-20,0,3,-9,-19,0,3,-9,-18,0,3,-9,-17,0,3,-9,-16,0,3,-9,-15,0,3,-9,-14,0,3,-9,-13,0,3,-9,-12,0,3,-9,-11,0,3,-9,-10,0,3,-9,-9,0,3,-9,-8,0,3,-9,-7,0,3,-9,-6,0,3,-9,-5,0,3,-9,-4,0,3,-9,-3,0,3,-9,-2,0,3,-9,-1,0,3,-9,0,0,3,-9,1,0,3,-9,2,0,3,-9,3,0,3,-9,4,0,3,-8,-23,0,3,-8,-22,0,3,-8,-21,0,3,-8,-20,0,3,-8,-19,0,3,-8,-18,0,3,-8,-17,0,3,-8,-16,0,3,-8,-15,0,3,-8,-14,0,3,-8,-13,0,3,-8,-12,0,3,-8,-11,0,3,-8,-10,0,3,-8,-9,0,3,-8,-8,0,3,-8,-7,0,3,-8,-6,0,3,-8,-5,0,3,-8,-4,0,3,-8,-3,0,3,-8,-2,0,3,-8,-1,0,3,-8,0,0,3,-8,1,0,3,-8,2,0,3,-8,3,0,3,-8,4,0,3,-7,-23,0,3,-7,-22,0,3,-7,-21,0,3,-7,-20,0,3,-7,-19,0,3,-7,-18,0,3,-7,-17,0,3,-7,-16,0,3,-7,-15,0,3,-7,-14,0,3,-7,-13,0,3,-7,-12,0,3,-7,-11,0,3,-7,-10,0,3,-7,-9,0,3,-7,-8,0,3,-7,-7,0,3,-7,-6,0,3,-7,-5,0,3,-7,-4,0,3,-7,-3,0,3,-7,-2,0,3,-7,-1,0,3,-7,0,0,3,-7,1,0,3,-7,2,0,3,-7,3,0,3,-7,4,0,3,-6,-23,0,3,-6,-22,0,3,-6,-21,0,3,-6,-20,0,3,-6,-14,0,3,-6,-13,0,3,-6,-12,0,3,-6,-11,0,3,-6,-10,0,3,-6,-9,0,3,-6,-8,0,3,-6,-7,0,3,-6,-6,0,3,-6,0,0,3,-6,1,0,3,-6,2,0,3,-6,3,0,3,-6,4,0,3,-5,-23,0,3,-5,-22,0,3,-5,-21,0,3,-5,-20,0,3,-5,-14,0,3,-5,-13,0,3,-5,-12,0,3,-5,-11,0,3,-5,-10,0,3,-5,-9,0,3,-5,-8,0,3,-5,-7,0,3,-5,-6,0,3,-5,0,0,3,-5,1,0,3,-5,2,0,3,-5,3,0,3,-5,4,0,3,-4,-23,0,3,-4,-22,0,3,-4,-21,0,3,-4,-20,0,3,-4,-14,0,3,-4,-13,0,3,-4,-12,0,3,-4,-11,0,3,-4,-10,0,3,-4,-9,0,3,-4,-8,0,3,-4,-7,0,3,-4,-6,0,3,-4,0,0,3,-4,1,0,3,-4,2,0,3,-4,3,0,3,-4,4,0,3,-3,-23,0,3,-3,-22,0,3,-3,-21,0,3,-3,-20,0,3,-3,-14,0,3,-3,-13,0,3,-3,-12,0,3,-3,-11,0,3,-3,-10,0,3,-3,-9,0,3,-3,-8,0,3,-3,-7,0,3,-3,-6,0,3,-3,0,0,3,-3,1,0,3,-3,2,0,3,-3,3,0,3,-3,4,0,3,-2,-23,0,3,-2,-22,0,3,-2,-21,0,3,-2,-20,0,3,-2,-14,0,3,-2,-13,0,3,-2,-12,0,3,-2,-11,0,3,-2,-10,0,3,-2,-9,0,3,-2,-8,0,3,-2,-7,0,3,-2,-6,0,3,-2,0,0,3,-2,1,0,3,-2,2,0,3,-2,3,0,3,-2,4,0,3,-1,-23,0,3,-1,-22,0,3,-1,-21,0,3,-1,-20,0,3,-1,-19,0,3,-1,-18,0,3,-1,-17,0,3,-1,-16,0,3,-1,-15,0,3,-1,-14,0,3,-1,-13,0,3,-1,-12,0,3,-1,-11,0,3,-1,-10,0,3,-1,-9,0,3,-1,-8,0,3,-1,-7,0,3,-1,-6,0,3,-1,-5,0,3,-1,-4,0,3,-1,-3,0,3,-1,-2,0,3,-1,-1,0,3,-1,0,0,3,-1,1,0,3,-1,2,0,3,-1,3,0,3,-1,4,0,3,0,-23,0,3,0,-22,0,3,0,-21,0,3,0,-20,0,3,0,-19,0,3,0,-18,0,3,0,-17,0,3,0,-16,0,3,0,-15,0,3,0,-14,0,3,0,-13,0,3,0,-12,0,3,0,-11,0,3,0,-10,0,3,0,-9,0,3,0,-8,0,3,0,-7,0,3,0,-6,0,3,0,-5,0,3,0,-4,0,3,0,-3,0,3,0,-2,0,3,0,-1,0,3,0,0,0,3,0,1,0,3,0,2,0,3,0,3,0,3,0,4,0,3,1,-23,0,3,1,-22,0,3,1,-21,0,3,1,-20,0,3,1,-19,0,3,1,-18,0,3,1,-17,0,3,1,-16,0,3,1,-15,0,3,1,-14,0,3,1,-13,0,3,1,-12,0,3,1,-11,0,3,1,-10,0,3,1,-9,0,3,1,-8,0,3,1,-7,0,3,1,-6,0,3,1,-5,0,3,1,-4,0,3,1,-3,0,3,1,-2,0,3,1,-1,0,3,1,0,0,3,1,1,0,3,1,2,0,3,1,3,0,3,1,4,0,3,2,-23,0,3,2,-22,0,3,2,-21,0,3,2,-20,0,3,2,-19,0,3,2,-18,0,3,2,-17,0,3,2,-16,0,3,2,-15,0,3,2,-14,0,3,2,-13,0,3,2,-12,0,3,2,-11,0,3,2,-10,0,3,2,-9,0,3,2,-8,0,3,2,-7,0,3,2,-6,0,3,2,-5,0,3,2,-4,0,3,2,-3,0,3,2,-2,0,3,2,-1,0,3,2,0,0,3,2,1,0,3,2,2,0,3,2,3,0,3,2,4,0,3,3,-23,0,3,3,-22,0,3,3,-21,0,3,3,-20,0,3,3,-19,0,3,3,-18,0,3,3,-17,0,3,3,-16,0,3,3,-15,0,3,3,-14,0,3,3,-13,0,3,3,-12,0,3,3,-11,0,3,3,-10,0,3,3,-9,0,3,3,-8,0,3,3,-7,0,3,3,-6,0,3,3,-5,0,3,3,-4,0,3,3,-3,0,3,3,-2,0,3,3,-1,0,3,3,0,0,3,3,1,0,3,3,2,0,3,3,3,0,3,3,4,0,3,4,-23,0,3,4,-22,0,3,4,-21,0,3,4,-20,0,3,4,-19,0,3,4,-18,0,3,4,-17,0,3,4,-16,0,3,4,-15,0,3,4,-14,0,3,4,-13,0,3,4,-12,0,3,4,-11,0,3,4,-10,0,3,4,-9,0,3,4,-8,0,3,4,-7,0,3,4,-6,0,3,4,-5,0,3,4,-4,0,3,4,-3,0,3,4,-2,0,3,4,-1,0,3,4,0,0,3,4,1,0,3,4,2,0,3,4,3,0,3,4,4,0,3,5,-23,0,3,5,-22,0,3,5,-21,0,3,5,-20,0,3,5,-19,0,3,5,-18,0,3,5,-17,0,3,5,-16,0,3,5,-15,0,3,5,-14,0,3,5,-13,0,3,5,-12,0,3,5,-11,0,3,5,-10,0,3,5,-9,0,3,5,-8,0,3,5,-7,0,3,5,-6,0,3,5,-5,0,3,5,-4,0,3,5,-3,0,3,5,-2,0,3,5,-1,0,3,5,0,0,3,5,1,0,3,5,2,0,3,5,3,0,3,5,4,0,3,6,-23,0,3,6,-22,0,3,6,-21,0,3,6,-20,0,3,6,-19,0,3,6,-18,0,3,6,-17,0,3,6,-16,0,3,6,-15,0,3,6,-14,0,3,6,-13,0,3,6,-12,0,3,6,-11,0,3,6,-10,0,3,6,-9,0,3,6,-8,0,3,6,-7,0,3,6,-6,0,3,6,-5,0,3,6,-4,0,3,6,-3,0,3,6,-2,0,3,6,-1,0,3,6,0,0,3,6,1,0,3,6,2,0,3,6,3,0,3,6,4,0,3,7,-23,0,3,7,-22,0,3,7,-21,0,3,7,-20,0,3,7,-19,0,3,7,-18,0,3,7,-17,0,3,7,-16,0,3,7,-15,0,3,7,-14,0,3,7,-13,0,3,7,-12,0,3,7,-11,0,3,7,-10,0,3,7,-9,0,3,7,-8,0,3,7,-7,0,3,7,-6,0,3,7,-5,0,3,7,-4,0,3,7,-3,0,3,7,-2,0,3,7,-1,0,3,7,0,0,3,7,1,0,3,7,2,0,3,7,3,0,3,7,4,0,3,8,-23,0,3,8,-22,0,3,8,-21,0,3,8,-20,0,3,8,-19,0,3,8,-18,0,3,8,-17,0,3,8,-16,0,3,8,-15,0,3,8,-14,0,3,8,-13,0,3,8,-12,0,3,8,-11,0,3,8,-10,0,3,8,-9,0,3,8,-8,0,3,8,-7,0,3,8,-6,0,3,8,-5,0,3,8,-4,0,3,8,-3,0,3,8,-2,0,3,8,-1,0,3,8,0,0,3,8,1,0,3,8,2,0,3,8,3,0,3,8,4,0,3,9,-23,0,3,9,-22,0,3,9,-21,0,3,9,-20,0,3,9,-19,0,3,9,-18,0,3,9,-17,0,3,9,-16,0,3,9,-15,0,3,9,-14,0,3,9,-13,0,3,9,-12,0,3,9,-11,0,3,9,-10,0,3,9,-9,0,3,9,-8,0,3,9,-7,0,3,9,-6,0,3,9,-5,0,3,9,-4,0,3,9,-3,0,3,9,-2,0,3,9,-1,0,3,9,0,0,3,9,1,0,3,9,2,0,3,9,3,0,3,9,4,0,3,10,-23,0,3,10,-22,0,3,10,-21,0,3,10,-20,0,3,10,-19,0,3,10,-18,0,3,10,-17,0,3,10,-16,0,3,10,-15,0,3,10,-14,0,3,10,-13,0,3,10,-12,0,3,10,-11,0,3,10,-10,0,3,10,-9,0,3,10,-8,0,3,10,-7,0,3,10,-6,0,3,10,-5,0,3,10,-4,0,3,10,-3,0,3,10,-2,0,3,10,-1,0,3,10,0,0,3,10,1,0,3,10,2,0,3,10,3,0,3,10,4,0,3,11,-23,0,3,11,-22,0,3,11,-21,0,3,11,-20,0,3,11,-19,0,3,11,-18,0,3,11,-17,0,3,11,-16,0,3,11,-15,0,3,11,-14,0,3,11,-13,0,3,11,-12,0,3,11,-11,0,3,11,-10,0,3,11,-9,0,3,11,-8,0,3,11,-7,0,3,11,-6,0,3,11,-5,0,3,11,-4,0,3,11,-3,0,3,11,-2,0,3,11,-1,0,3,11,0,0,3,11,1,0,3,11,2,0,3,11,3,0,3,11,4,0,3,12,-23,0,3,12,-22,0,3,12,-21,0,3,12,-20,0,3,12,-14,0,3,12,-13,0,3,12,-12,0,3,12,-11,0,3,12,-10,0,3,12,-9,0,3,12,-8,0,3,12,-7,0,3,12,-6,0,3,12,0,0,3,12,1,0,3,12,2,0,3,12,3,0,3,12,4,0,3,13,-23,0,3,13,-22,0,3,13,-21,0,3,13,-20,0,3,13,-14,0,3,13,-13,0,3,13,-12,0,3,13,-11,0,3,13,-10,0,3,13,-9,0,3,13,-8,0,3,13,-7,0,3,13,-6,0,3,13,0,0,3,13,1,0,3,13,2,0,3,13,3,0,3,13,4,0,3,14,-23,0,3,14,-22,0,3,14,-21,0,3,14,-20,0,3,14,-14,0,3,14,-13,0,3,14,-12,0,3,14,-11,0,3,14,-10,0,3,14,-9,0,3,14,-8,0,3,14,-7,0,3,14,-6,0,3,14,0,0,3,14,1,0,3,14,2,0,3,14,3,0,3,14,4,0,3,15,-23,0,3,15,-22,0,3,15,-21,0,3,15,-20,0,3,15,-14,0,3,15,-13,0,3,15,-12,0,3,15,-11,0,3,15,-10,0,3,15,-9,0,3,15,-8,0,3,15,-7,0,3,15,-6,0,3,15,0,0,3,15,1,0,3,15,2,0,3,15,3,0,3,15,4,0,3,16,-23,0,3,16,-22,0,3,16,-21,0,3,16,-20,0,3,16,-14,0,3,16,-13,0,3,16,-12,0,3,16,-11,0,3,16,-10,0,3,16,-9,0,3,16,-8,0,3,16,-7,0,3,16,-6,0,3,16,0,0,3,16,1,0,3,16,2,0,3,16,3,0,3,16,4,0,3,17,-23,0,3,17,-22,0,3,17,-21,0,3,17,-20,0,3,17,-19,0,3,17,-18,0,3,17,-17,0,3,17,-16,0,3,17,-15,0,3,17,-14,0,3,17,-13,0,3,17,-12,0,3,17,-11,0,3,17,-10,0,3,17,-9,0,3,17,-8,0,3,17,-7,0,3,17,-6,0,3,17,-5,0,3,17,-4,0,3,17,-3,0,3,17,-2,0,3,17,-1,0,3,17,0,0,3,17,1,0,3,17,2,0,3,17,3,0,3,17,4,0,3,18,-23,0,3,18,-22,0,3,18,-21,0,3,18,-20,0,3,18,-19,0,3,18,-18,0,3,18,-17,0,3,18,-16,0,3,18,-15,0,3,18,-14,0,3,18,-13,0,3,18,-12,0,3,18,-11,0,3,18,-10,0,3,18,-9,0,3,18,-8,0,3,18,-7,0,3,18,-6,0,3,18,-5,0,3,18,-4,0,3,18,-3,0,3,18,-2,0,3,18,-1,0,3,18,0,0,3,18,1,0,3,18,2,0,3,18,3,0,3,18,4,0,3,19,-23,0,3,19,-22,0,3,19,-21,0,3,19,-20,0,3,19,-19,0,3,19,-18,0,3,19,-17,0,3,19,-16,0,3,19,-15,0,3,19,-14,0,3,19,-13,0,3,19,-12,0,3,19,-11,0,3,19,-10,0,3,19,-9,0,3,19,-8,0,3,19,-7,0,3,19,-6,0,3,19,-5,0,3,19,-4,0,3,19,-3,0,3,19,-2,0,3,19,-1,0,3,19,0,0,3,19,1,0,3,19,2,0,3,19,3,0,3,19,4,0,3,20,-23,0,3,20,-22,0,3,20,-21,0,3,20,-20,0,3,20,-19,0,3,20,-18,0,3,20,-17,0,3,20,-16,0,3,20,-15,0,3,20,-14,0,3,20,-13,0,3,20,-12,0,3,20,-11,0,3,20,-10,0,3,20,-9,0,3,20,-8,0,3,20,-7,0,3,20,-6,0,3,20,-5,0,3,20,-4,0,3,20,-3,0,3,20,-2,0,3,20,-1,0,3,20,0,0,3,20,1,0,3,20,2,0,3,20,3,0,3,20,4,0,3],"Middle":[-11,-25,63,1,-11,-24,2,2,-10,-25,63,1,-10,-24,2,2,-9,-25,63,1,-9,-24,2,2,-8,-25,63,1,-8,-24,2,2,-7,-25,63,1,-7,-24,2,2,-6,-25,63,1,-6,-24,2,2,-6,-16,54,1,-6,-15,1,2,-6,-2,54,1,-6,-1,1,2,-5,-25,63,1,-5,-24,2,2,-5,-16,63,1,-5,-15,2,2,-5,-2,63,1,-5,-1,2,2,-4,-25,63,1,-4,-24,2,2,-4,-16,63,1,-4,-15,2,2,-4,-2,63,1,-4,-1,2,2,-3,-25,63,1,-3,-24,2,2,-3,-16,63,1,-3,-15,2,2,-3,-2,63,1,-3,-1,2,2,-2,-25,63,1,-2,-24,2,2,-2,-16,27,1,-2,-15,3,2,-2,-2,27,1,-2,-1,3,2,-1,-25,63,1,-1,-24,2,2,0,-25,63,1,0,-24,2,2,1,-25,63,1,1,-24,2,2,2,-25,63,1,2,-24,2,2,3,-25,63,1,3,-24,2,2,4,-25,63,1,4,-24,2,2,5,-25,63,1,5,-24,2,2,6,-25,63,1,6,-24,2,2,7,-25,63,1,7,-24,2,2,8,-25,63,1,8,-24,2,2,9,-25,63,1,9,-24,2,2,10,-25,63,1,10,-24,2,2,11,-25,63,1,11,-24,2,2,12,-25,63,1,12,-24,2,2,12,-16,54,1,12,-15,1,2,12,-2,54,1,12,-1,1,2,13,-25,63,1,13,-24,2,2,13,-16,63,1,13,-15,2,2,13,-2,63,1,13,-1,2,2,14,-25,63,1,14,-24,2,2,14,-16,63,1,14,-15,2,2,14,-2,63,1,14,-1,2,2,15,-25,63,1,15,-24,2,2,15,-16,63,1,15,-15,2,2,15,-2,63,1,15,-1,2,2,16,-25,63,1,16,-24,2,2,16,-16,27,1,16,-15,3,2,16,-2,27,1,16,-1,3,2,17,-25,63,1,17,-24,2,2,18,-25,63,1,18,-24,2,2,19,-25,63,1,19,-24,2,2,20,-25,63,1,20,-24,2,2],"Top":[-13,-26,511,1,-13,-25,511,1,-13,-24,511,1,-13,-23,511,1,-13,-22,511,1,-13,-21,511,1,-13,-20,511,1,-13,-19,511,1,-13,-18,511,1,-13,-17,511,1,-13,-16,511,1,-13,-15,511,1,-13,-14,511,1,-13,-13,511,1,-13,-12,511,1,-13,-11,511,1,-13,-10,511,1,-13,-9,511,1,-13,-8,511,1,-13,-7,511,1,-13,-6,511,1,-13,-5,511,1,-13,-4,511,1,-13,-3,511,1,-13,-2,511,1,-13,-1,511,1,-13,0,511,1,-13,1,511,1,-13,2,511,1,-13,3,511,1,-13,4,511,1,-13,5,511,1,-13,6,511,1,-12,-26,511,1,-12,-25,255,1,-12,-24,219,1,-12,-23,219,1,-12,-22,219,1,-12,-21,219,1,-12,-20,219,1,-12,-19,219,1,-12,-18,219,1,-12,-17,219,1,-12,-16,219,1,-12,-15,219,1,-12,-14,219,1,-12,-13,219,1,-12,-12,219,1,-12,-11,219,1,-12,-10,219,1,-12,-9,219,1,-12,-8,219,1,-12,-7,219,1,-12,-6,219,1,-12,-5,219,1,-12,-4,219,1,-12,-3,219,1,-12,-2,219,1,-12,-1,219,1,-12,0,219,1,-12,1,219,1,-12,2,219,1,-12,3,219,1,-12,4,219,1,-12,5,507,1,-12,6,511,1,-11,-26,511,1,-11,5,504,1,-11,6,511,1,-10,-26,511,1,-10,5,504,1,-10,6,511,1,-9,-26,511,1,-9,5,504,1,-9,6,511,1,-8,-26,511,1,-8,5,504,1,-8,6,511,1,-7,-26,511,1,-7,5,504,1,-7,6,511,1,-6,-26,511,1,-6,-19,432,1,-6,-18,438,1,-6,-17,438,1,-6,-5,432,1,-6,-4,438,1,-6,-3,438,1,-6,5,504,1,-6,6,511,1,-5,-26,511,1,-5,-19,504,1,-5,-18,511,1,-5,-17,511,1,-5,-5,504,1,-5,-4,511,1,-5,-3,511,1,-5,5,504,1,-5,6,511,1,-4,-26,511,1,-4,-19,504,1,-4,-18,511,1,-4,-17,511,1,-4,-5,504,1,-4,-4,511,1,-4,-3,511,1,-4,5,504,1,-4,6,511,1,-3,-26,511,1,-3,-19,504,1,-3,-18,511,1,-3,-17,511,1,-3,-5,504,1,-3,-4,511,1,-3,-3,511,1,-3,5,504,1,-3,6,511,1,-2,-26,511,1,-2,-19,216,1,-2,-18,219,1,-2,-17,219,1,-2,-5,216,1,-2,-4,219,1,-2,-3,219,1,-2,5,504,1,-2,6,511,1,-1,-26,511,1,-1,5,504,1,-1,6,511,1,0,-26,511,1,0,5,504,1,0,6,511,1,1,-26,511,1,1,5,504,1,1,6,511,1,2,-26,511,1,2,5,504,1,2,6,511,1,3,-26,511,1,3,5,504,1,3,6,511,1,4,-26,511,1,4,5,504,1,4,6,511,1,5,-26,511,1,5,5,504,1,5,6,511,1,6,-26,511,1,6,5,504,1,6,6,511,1,7,-26,511,1,7,5,504,1,7,6,511,1,8,-26,511,1,8,5,504,1,8,6,511,1,9,-26,511,1,9,5,504,1,9,6,511,1,10,-26,511,1,10,5,504,1,10,6,511,1,11,-26,511,1,11,5,504,1,11,6,511,1,12,-26,511,1,12,-19,432,1,12,-18,438,1,12,-17,438,1,12,-5,432,1,12,-4,438,1,12,-3,438,1,12,5,504,1,12,6,511,1,13,-26,511,1,13,-19,504,1,13,-18,511,1,13,-17,511,1,13,-5,504,1,13,-4,511,1,13,-3,511,1,13,5,504,1,13,6,511,1,14,-26,511,1,14,-19,504,1,14,-18,511,1,14,-17,511,1,14,-5,504,1,14,-4,511,1,14,-3,511,1,14,5,504,1,14,6,511,1,15,-26,511,1,15,-19,504,1,15,-18,511,1,15,-17,511,1,15,-5,504,1,15,-4,511,1,15,-3,511,1,15,5,504,1,15,6,511,1,16,-26,511,1,16,-19,216,1,16,-18,219,1,16,-17,219,1,16,-5,216,1,16,-4,219,1,16,-3,219,1,16,5,504,1,16,6,511,1,17,-26,511,1,17,5,504,1,17,6,511,1,18,-26,511,1,18,5,504,1,18,6,511,1,19,-26,511,1,19,5,504,1,19,6,511,1,20,-26,511,1,20,5,504,1,20,6,511,1,21,-26,511,1,21,-25,447,1,21,-24,438,1,21,-23,438,1,21,-22,438,1,21,-21,438,1,21,-20,438,1,21,-19,438,1,21,-18,438,1,21,-17,438,1,21,-16,438,1,21,-15,438,1,21,-14,438,1,21,-13,438,1,21,-12,438,1,21,-11,438,1,21,-10,438,1,21,-9,438,1,21,-8,438,1,21,-7,438,1,21,-6,438,1,21,-5,438,1,21,-4,438,1,21,-3,438,1,21,-2,438,1,21,-1,438,1,21,0,438,1,21,1,438,1,21,2,438,1,21,3,438,1,21,4,438,1,21,5,510,1,21,6,511,1,22,-26,511,1,22,-25,511,1,22,-24,511,1,22,-23,511,1,22,-22,511,1,22,-21,511,1,22,-20,511,1,22,-19,511,1,22,-18,511,1,22,-17,511,1,22,-16,511,1,22,-15,511,1,22,-14,511,1,22,-13,511,1,22,-12,511,1,22,-11,511,1,22,-10,511,1,22,-9,511,1,22,-8,511,1,22,-7,511,1,22,-6,511,1,22,-5,511,1,22,-4,511,1,22,-3,511,1,22,-2,511,1,22,-1,511,1,22,0,511,1,22,1,511,1,22,2,511,1,22,3,511,1,22,4,511,1,22,5,511,1,22,6,511,1],"CustomFloor1":[],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[],"CustomMiddle2":[],"CustomTop":[]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preinstall.json
new file mode 100644
index 0000000..a9f951a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preinstall.json
@@ -0,0 +1 @@
+[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[]]}]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png
new file mode 100644
index 0000000..8c2568d
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png.import b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png.import
new file mode 100644
index 0000000..338aee7
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/Preview.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://brikrxahc8h8p"
+path="res://.godot/imported/Preview.png-1cb30b87cf71ad1cb9553eeb340968d5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/map/tileMaps/Test1/battle/Battle5/Preview.png"
+dest_files=["res://.godot/imported/Preview.png-1cb30b87cf71ad1cb9553eeb340968d5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/RoomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/RoomInfo.json
new file mode 100644
index 0000000..b592355
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/RoomInfo.json
@@ -0,0 +1 @@
+{"Position":{"X":-10,"Y":-18},"Size":{"X":21,"Y":24},"DoorAreaInfos":[{"Direction":2,"Start":0,"End":64},{"Direction":2,"Start":128,"End":272},{"Direction":0,"Start":192,"End":288},{"Direction":1,"Start":0,"End":288},{"Direction":3,"Start":0,"End":144}],"GroupName":"Test1","RoomType":1,"RoomName":"Battle5","Weight":100,"Remark":""}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/TileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/TileInfo.json
new file mode 100644
index 0000000..d10141a
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle5/TileInfo.json
@@ -0,0 +1 @@
+{"NavigationVertices":[{"X":10,"Y":-186},{"X":42,"Y":-186},{"X":42,"Y":-154},{"X":-26,"Y":-78},{"X":-70,"Y":-78},{"X":74,"Y":-154},{"X":74,"Y":-106},{"X":6,"Y":-14},{"X":-26,"Y":-14},{"X":106,"Y":-106},{"X":106,"Y":-74},{"X":122,"Y":-74},{"X":122,"Y":-42},{"X":6,"Y":66},{"X":138,"Y":-42},{"X":138,"Y":66},{"X":-70,"Y":66},{"X":-122,"Y":66},{"X":-122,"Y":-234},{"X":10,"Y":-234}],"NavigationPolygon":[[0,1,2,3,4],[3,2,5,6,7,8],[6,9,10,7],[7,10,11,12,13],[12,14,15,13],[4,16,17,18],[4,18,19,0]],"Floor":[-8,-15,0,3,-8,-14,0,3,-8,-13,0,3,-8,-12,0,3,-8,-11,0,3,-8,-10,0,3,-7,-15,0,3,-7,-14,0,3,-7,-13,0,3,-7,-12,0,3,-7,-11,0,3,-7,-10,0,3,-6,-15,0,3,-6,-14,0,3,-6,-13,0,3,-6,-12,0,3,-6,-11,0,3,-6,-10,0,3,-5,-15,0,3,-5,-14,0,3,-5,-13,0,3,-5,-12,0,3,-5,-11,0,3,-5,-10,0,3,-4,-15,0,3,-4,-14,0,3,-4,-13,0,3,-4,-12,0,3,-4,-11,0,3,-4,-10,0,3,-4,-9,0,3,-4,-8,0,3,-4,-7,0,3,-4,-6,0,3,-3,-15,0,3,-3,-14,0,3,-3,-13,0,3,-3,-12,0,3,-3,-11,0,3,-3,-10,0,3,-3,-9,0,3,-3,-8,0,3,-3,-7,0,3,-3,-6,0,3,-2,-15,0,3,-2,-14,0,3,-2,-13,0,3,-2,-12,0,3,-2,-11,0,3,-2,-10,0,3,-2,-9,0,3,-2,-8,0,3,-2,-7,0,3,-2,-6,0,3,-2,-5,0,3,-2,-4,0,3,-2,-3,0,3,-2,-2,0,3,-1,-15,0,3,-1,-14,0,3,-1,-13,0,3,-1,-12,0,3,-1,-11,0,3,-1,-10,0,3,-1,-9,0,3,-1,-8,0,3,-1,-7,0,3,-1,-6,0,3,-1,-5,0,3,-1,-4,0,3,-1,-3,0,3,-1,-2,0,3,0,-15,0,3,0,-14,0,3,0,-13,0,3,0,-12,0,3,0,-11,0,3,0,-10,0,3,0,-9,0,3,0,-8,0,3,0,-7,0,3,0,-6,0,3,0,-5,0,3,0,-4,0,3,0,-3,0,3,0,-2,0,3,1,-12,0,3,1,-11,0,3,1,-10,0,3,1,-9,0,3,1,-8,0,3,1,-7,0,3,1,-6,0,3,1,-5,0,3,1,-4,0,3,1,-3,0,3,1,-2,0,3,2,-12,0,3,2,-11,0,3,2,-10,0,3,2,-9,0,3,2,-8,0,3,2,-7,0,3,2,-6,0,3,2,-5,0,3,2,-4,0,3,2,-3,0,3,2,-2,0,3,3,-10,0,3,3,-9,0,3,3,-8,0,3,3,-7,0,3,3,-6,0,3,3,-5,0,3,3,-4,0,3,3,-3,0,3,3,-2,0,3,4,-10,0,3,4,-9,0,3,4,-8,0,3,4,-7,0,3,4,-6,0,3,4,-5,0,3,4,-4,0,3,4,-3,0,3,4,-2,0,3,5,-7,0,3,5,-6,0,3,5,-5,0,3,5,-4,0,3,5,-3,0,3,5,-2,0,3,6,-7,0,3,6,-6,0,3,6,-5,0,3,6,-4,0,3,6,-3,0,3,6,-2,0,3,7,-5,0,3,7,-4,0,3,7,-3,0,3,7,-2,0,3,0,-1,0,3,0,0,0,3,0,1,0,3,0,2,0,3,1,-1,0,3,1,0,0,3,1,1,0,3,1,2,0,3,2,-1,0,3,2,0,0,3,2,1,0,3,2,2,0,3,3,-1,0,3,3,0,0,3,3,1,0,3,3,2,0,3,4,-1,0,3,4,0,0,3,4,1,0,3,4,2,0,3,5,-1,0,3,5,0,0,3,5,1,0,3,5,2,0,3,6,-1,0,3,6,0,0,3,6,1,0,3,6,2,0,3,7,-1,0,3,7,0,0,3,7,1,0,3,7,2,0,3,8,-3,0,3,8,-2,0,3,8,-1,0,3,8,0,0,3,8,1,0,3,8,2,0,3,-8,-9,0,3,-8,-8,0,3,-8,-7,0,3,-8,-6,0,3,-8,-5,0,3,-8,-4,0,3,-8,-3,0,3,-8,-2,0,3,-8,-1,0,3,-8,0,0,3,-8,1,0,3,-8,2,0,3,-8,3,0,3,-7,-9,0,3,-7,-8,0,3,-7,-7,0,3,-7,-6,0,3,-7,-5,0,3,-7,-4,0,3,-7,-3,0,3,-7,-2,0,3,-7,-1,0,3,-7,0,0,3,-7,1,0,3,-7,2,0,3,-7,3,0,3,-6,-9,0,3,-6,-8,0,3,-6,-7,0,3,-6,-6,0,3,-6,-5,0,3,-6,-4,0,3,-6,-3,0,3,-6,-2,0,3,-6,-1,0,3,-6,0,0,3,-6,1,0,3,-6,2,0,3,-6,3,0,3,-5,-9,0,3,-5,-8,0,3,-5,-7,0,3,-5,-6,0,3,-5,-5,0,3,-5,-4,0,3,-5,-3,0,3,-5,-2,0,3,-5,-1,0,3,-5,0,0,3,-5,1,0,3,-5,2,0,3,-5,3,0,3,0,3,0,3,1,3,0,3,2,3,0,3,3,3,0,3,4,3,0,3,5,3,0,3,6,3,0,3,7,3,0,3,8,3,0,3],"Middle":[-8,-17,63,1,-8,-16,2,2,-7,-17,63,1,-7,-16,2,2,-6,-17,63,1,-6,-16,2,2,-5,-17,63,1,-5,-16,2,2,-4,-17,63,1,-4,-16,2,2,-3,-17,63,1,-3,-16,2,2,-2,-17,63,1,-2,-16,2,2,-1,-17,63,1,-1,-16,2,2,0,-17,63,1,0,-16,2,2,1,-14,54,1,1,-13,1,2,2,-14,63,1,2,-13,2,2,3,-12,54,1,3,-11,1,2,4,-12,63,1,4,-11,2,2,5,-9,54,1,5,-8,1,2,6,-9,63,1,6,-8,2,2,7,-7,54,1,7,-6,1,2,8,-5,54,1,8,-4,1,2],"Top":[-10,-18,511,1,-10,-17,511,1,-10,-16,511,1,-10,-15,511,1,-10,-14,511,1,-10,-13,511,1,-10,-12,511,1,-10,-11,511,1,-10,-10,511,1,-10,-9,511,1,-10,-8,511,1,-10,-7,511,1,-10,-6,511,1,-10,-5,511,1,-10,-4,511,1,-10,-3,511,1,-10,-2,511,1,-10,-1,511,1,-10,0,511,1,-10,1,511,1,-10,2,511,1,-10,3,511,1,-10,4,511,1,-10,5,511,1,-9,-18,511,1,-9,-17,255,1,-9,-16,219,1,-9,-15,219,1,-9,-14,219,1,-9,-13,219,1,-9,-12,219,1,-9,-11,219,1,-9,-10,219,1,-9,-9,219,1,-9,-8,219,1,-9,-7,219,1,-9,-6,219,1,-9,-5,219,1,-9,-4,219,1,-9,-3,219,1,-9,-2,219,1,-9,-1,219,1,-9,0,219,1,-9,1,219,1,-9,2,219,1,-9,3,219,1,-9,4,507,1,-9,5,511,1,-8,-18,511,1,-8,4,504,1,-8,5,511,1,-7,-18,511,1,-7,4,504,1,-7,5,511,1,-6,-18,511,1,-6,4,504,1,-6,5,511,1,-5,-18,511,1,-5,4,504,1,-5,5,511,1,-4,-18,511,1,-4,-5,432,1,-4,-4,438,1,-4,-3,438,1,-4,-2,438,1,-4,-1,438,1,-4,0,438,1,-4,1,438,1,-4,2,438,1,-4,3,438,1,-4,4,510,1,-4,5,511,1,-3,-18,511,1,-3,-5,216,1,-3,-4,219,1,-3,-3,219,1,-3,-2,219,1,-3,-1,507,1,-3,0,511,1,-3,1,511,1,-3,2,511,1,-3,3,511,1,-3,4,511,1,-3,5,511,1,-2,-18,511,1,-2,-1,504,1,-2,0,511,1,-2,1,511,1,-2,2,511,1,-2,3,511,1,-2,4,511,1,-2,5,511,1,-1,-18,511,1,-1,-1,216,1,-1,0,219,1,-1,1,219,1,-1,2,219,1,-1,3,219,1,-1,4,507,1,-1,5,511,1,0,-18,511,1,0,4,504,1,0,5,511,1,1,-18,511,1,1,-17,447,1,1,-16,438,1,1,-15,438,1,1,4,504,1,1,5,511,1,2,-18,511,1,2,-17,511,1,2,-16,511,1,2,-15,511,1,2,4,504,1,2,5,511,1,3,-15,511,1,3,-14,447,1,3,-13,438,1,3,4,504,1,3,5,511,1,4,-15,511,1,4,-14,511,1,4,-13,511,1,4,4,504,1,4,5,511,1,5,-13,511,1,5,-12,447,1,5,-11,438,1,5,-10,438,1,5,4,504,1,5,5,511,1,6,-13,511,1,6,-12,511,1,6,-11,511,1,6,-10,511,1,6,4,504,1,6,5,511,1,7,-10,511,1,7,-9,447,1,7,-8,438,1,7,4,504,1,7,5,511,1,8,-10,511,1,8,-9,511,1,8,-8,511,1,8,-7,447,1,8,-6,438,1,8,4,504,1,8,5,511,1,9,-8,511,1,9,-7,511,1,9,-6,511,1,9,-5,447,1,9,-4,438,1,9,-3,438,1,9,-2,438,1,9,-1,438,1,9,0,438,1,9,1,438,1,9,2,438,1,9,3,438,1,9,4,510,1,9,5,511,1,10,-6,511,1,10,-5,511,1,10,-4,511,1,10,-3,511,1,10,-2,511,1,10,-1,511,1,10,0,511,1,10,1,511,1,10,2,511,1,10,3,511,1,10,4,511,1,10,5,511,1],"CustomFloor1":[],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[],"CustomMiddle2":[],"CustomTop":[]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json
index a789ff7..46c08ad 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json
@@ -1 +1 @@
-[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[{"Position":{"X":39,"Y":8},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]},{"Position":{"X":-16,"Y":-18},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":6},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0009","Weight":100,"Attr":{"CurrAmmon":"1","ResidueAmmo":"25"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":47},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0010","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":47,"Y":-32},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0008","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]}]]}]
\ No newline at end of file
+[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[{"Position":{"X":39,"Y":8},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]},{"Position":{"X":-16,"Y":-18},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":6},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0009","Weight":100,"Attr":{"CurrAmmon":"1","ResidueAmmo":"25"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":47},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0010","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":47,"Y":-32},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0008","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":23,"Y":37},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0010","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":2,"Y":18},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0005","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":24,"Y":-30},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0006","Weight":100,"Attr":{"CurrAmmon":"20","ResidueAmmo":"300"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":40,"Y":-10},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0003","Weight":100,"Attr":{"CurrAmmon":"12","ResidueAmmo":"90"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":2,"Y":-37},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0007","Weight":100,"Attr":{"CurrAmmon":"60","ResidueAmmo":"300"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-2,"Y":47},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0002","Weight":100,"Attr":{"CurrAmmon":"7","ResidueAmmo":"70"},"Altitude":8,"VerticalSpeed":0}]}]]}]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preview.png
index 8fb50a7..a47be3d 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preview.png
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/TileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/TileInfo.json
index a8bff43..30500bf 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/TileInfo.json
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/TileInfo.json
@@ -1 +1 @@
-{"NavigationVertices":[{"X":138,"Y":-42},{"X":138,"Y":82},{"X":134,"Y":22},{"X":134,"Y":-14},{"X":58,"Y":82},{"X":54,"Y":54},{"X":74,"Y":38},{"X":118,"Y":38},{"X":22,"Y":118},{"X":58,"Y":130},{"X":-58,"Y":130},{"X":-22,"Y":118},{"X":-26,"Y":22},{"X":-26,"Y":-14},{"X":-22,"Y":18},{"X":-22,"Y":54},{"X":54,"Y":18},{"X":74,"Y":2},{"X":22,"Y":82},{"X":-58,"Y":98},{"X":-22,"Y":82},{"X":90,"Y":-42},{"X":90,"Y":-14},{"X":90,"Y":2},{"X":-42,"Y":-42},{"X":118,"Y":22},{"X":-42,"Y":-58},{"X":90,"Y":-58},{"X":-86,"Y":-14},{"X":-106,"Y":-42},{"X":-106,"Y":98},{"X":-86,"Y":22}],"NavigationPolygon":[[0,1,2,3],[4,5,6,7,1],[8,9,10,11],[12,13,14,15],[6,5,16,17],[4,9,8,18,5],[11,10,19,20],[21,0,3,22],[22,23,17,24],[7,25,2,1],[15,5,18,20],[24,26,27,21],[24,21,22],[24,17,16,13],[16,14,13],[24,13,28,29],[30,29,28,31],[19,30,31,12,15,20]],"Floor":[-3,-4,0,3,-2,-4,0,3,-2,-3,0,3,-3,-3,0,3,-7,-3,0,3,-7,-2,0,3,-7,-1,0,3,-7,0,0,3,-7,1,0,3,-7,2,0,3,-7,3,0,3,-7,4,0,3,-7,5,0,3,-6,-3,0,3,-6,-2,0,3,-6,-1,0,3,-6,0,0,3,-6,1,0,3,-6,2,0,3,-6,3,0,3,-6,4,0,3,-6,5,0,3,-5,-3,0,3,-5,-2,0,3,-5,1,0,3,-5,2,0,3,-5,3,0,3,-5,4,0,3,-5,5,0,3,-4,-3,0,3,-4,-2,0,3,-4,1,0,3,-4,2,0,3,-4,3,0,3,-4,4,0,3,-4,5,0,3,-3,-2,0,3,-3,1,0,3,-3,2,0,3,-3,3,0,3,-3,4,0,3,-3,5,0,3,-2,-2,0,3,-2,-1,0,3,-2,0,0,3,-2,1,0,3,-2,2,0,3,-2,3,0,3,-2,4,0,3,-2,5,0,3,-4,6,0,3,-4,7,0,3,-3,6,0,3,-3,7,0,3,-2,6,0,3,-2,7,0,3,-1,3,0,3,-1,4,0,3,-1,7,0,3,0,3,0,3,0,4,0,3,0,7,0,3,1,3,0,3,1,4,0,3,1,5,0,3,1,6,0,3,1,7,0,3,2,3,0,3,2,4,0,3,2,5,0,3,2,6,0,3,2,7,0,3,3,3,0,3,3,4,0,3,3,5,0,3,3,6,0,3,3,7,0,3,-1,-4,0,3,-1,-3,0,3,-1,-2,0,3,-1,-1,0,3,-1,0,0,3,0,-4,0,3,0,-3,0,3,0,-2,0,3,0,-1,0,3,0,0,0,3,1,-4,0,3,1,-3,0,3,1,-2,0,3,1,-1,0,3,1,0,0,3,2,-4,0,3,2,-3,0,3,2,-2,0,3,2,-1,0,3,2,0,0,3,3,-4,0,3,3,-3,0,3,3,-2,0,3,3,-1,0,3,3,0,0,3,4,-4,0,3,4,-3,0,3,4,-2,0,3,4,-1,0,3,4,0,0,3,5,-4,0,3,5,-3,0,3,5,-2,0,3,5,-1,0,3,3,1,0,3,3,2,0,3,4,1,0,3,4,2,0,3,4,3,0,3,4,4,0,3,5,2,0,3,5,3,0,3,5,4,0,3,6,2,0,3,6,3,0,3,6,4,0,3,6,-3,0,3,6,-2,0,3,7,-3,0,3,7,-2,0,3,7,1,0,3,7,2,0,3,7,3,0,3,7,4,0,3,8,-3,0,3,8,-2,0,3,8,-1,0,3,8,0,0,3,8,1,0,3,8,2,0,3,8,3,0,3,8,4,0,3],"Middle":[-7,-5,63,1,-7,-4,2,2,-6,-5,63,1,-6,-4,2,2,-5,-5,63,1,-5,-4,2,2,-5,-1,48,1,-5,0,1,2,-4,-5,27,1,-4,-4,3,2,-4,-1,56,1,-4,0,2,2,-3,-6,63,1,-3,-5,2,2,-3,-1,24,1,-3,0,3,2,-2,-6,63,1,-2,-5,2,2,-1,-6,63,1,-1,-5,2,2,-1,1,48,1,-1,2,1,2,-1,5,48,1,-1,6,1,2,0,-6,63,1,0,-5,2,2,0,1,56,1,0,2,2,2,0,5,24,1,0,6,3,2,1,-6,63,1,1,-5,2,2,1,1,56,1,1,2,2,2,2,-6,63,1,2,-5,2,2,2,1,24,1,2,2,3,2,3,-6,63,1,3,-5,2,2,4,-6,63,1,4,-5,2,2,5,-6,63,1,5,-5,2,2,5,0,48,1,5,1,1,2,6,-5,54,1,6,-4,1,2,6,0,26,1,6,1,3,2,7,-5,63,1,7,-4,2,2,7,-1,24,1,7,0,3,2,8,-5,63,1,8,-4,2,2],"Top":[-9,-6,511,1,-9,-5,511,1,-9,-4,511,1,-9,-3,511,1,-9,-2,511,1,-9,-1,511,1,-9,0,511,1,-9,1,511,1,-9,2,511,1,-9,3,511,1,-9,4,511,1,-9,5,511,1,-9,6,511,1,-9,7,511,1,-8,-6,511,1,-8,-5,255,1,-8,-4,219,1,-8,-3,219,1,-8,-2,219,1,-8,-1,219,1,-8,0,219,1,-8,1,219,1,-8,2,219,1,-8,3,219,1,-8,4,219,1,-8,5,219,1,-8,6,507,1,-8,7,511,1,-7,-6,511,1,-7,6,504,1,-7,7,511,1,-6,-6,511,1,-6,6,504,1,-6,7,511,1,-6,8,511,1,-6,9,511,1,-5,-7,511,1,-5,-6,511,1,-5,6,216,1,-5,7,219,1,-5,8,507,1,-5,9,511,1,-4,-7,511,1,-4,-6,255,1,-4,8,504,1,-4,9,511,1,-3,-7,511,1,-3,8,504,1,-3,9,511,1,-2,-7,511,1,-2,8,504,1,-2,9,511,1,-1,-7,511,1,-1,8,504,1,-1,9,511,1,0,-7,511,1,0,8,504,1,0,9,511,1,1,-7,511,1,1,8,504,1,1,9,511,1,2,-7,511,1,2,8,504,1,2,9,511,1,3,-7,511,1,3,8,504,1,3,9,511,1,4,-7,511,1,4,5,432,1,4,6,438,1,4,7,438,1,4,8,510,1,4,9,511,1,5,-7,511,1,5,5,504,1,5,6,511,1,5,7,511,1,5,8,511,1,5,9,511,1,6,-7,511,1,6,-6,447,1,6,-1,176,1,6,5,504,1,6,6,511,1,7,-7,511,1,7,-6,511,1,7,5,504,1,7,6,511,1,8,-6,511,1,8,5,504,1,8,6,511,1,9,-6,511,1,9,-5,447,1,9,-4,438,1,9,-3,438,1,9,-2,438,1,9,-1,438,1,9,0,438,1,9,1,438,1,9,2,438,1,9,3,438,1,9,4,438,1,9,5,510,1,9,6,511,1,10,-6,511,1,10,-5,511,1,10,-4,511,1,10,-3,511,1,10,-2,511,1,10,-1,511,1,10,0,511,1,10,1,511,1,10,2,511,1,10,3,511,1,10,4,511,1,10,5,511,1,10,6,511,1],"CustomFloor1":[-4,2,1,7,14,-3,3,1,8,15,-4,3,1,7,15,-5,3,1,6,15,6,4,1,8,15,5,4,1,7,15,-14,-6,0,24,7,-14,-5,0,24,7,-13,-5,0,24,7,-13,-6,0,25,7,-14,-4,0,24,8,-13,-4,0,24,8,-12,-4,0,24,8,-12,-5,0,24,7,-11,-4,0,24,8,-11,-5,0,24,7,-10,-4,0,24,7,-10,-5,0,24,7,-9,-4,0,24,7,-9,-5,0,25,7,-10,-3,0,24,8,-9,-3,0,24,8,-5,2,1,6,14,4,3,1,6,14,4,4,1,6,15,6,3,1,8,14,5,3,1,7,14],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[-3,4,1,10,5,-3,5,1,10,6,2,4,1,10,5,2,5,1,10,6],"CustomMiddle2":[5,-4,1,6,0,5,-3,1,6,1,-2,-1,1,5,0,-2,0,1,5,1],"CustomTop":[]}
\ No newline at end of file
+{"NavigationVertices":[{"X":138,"Y":-42},{"X":138,"Y":82},{"X":134,"Y":22},{"X":134,"Y":-14},{"X":74,"Y":2},{"X":74,"Y":38},{"X":58,"Y":82},{"X":-26,"Y":22},{"X":-26,"Y":-14},{"X":90,"Y":-42},{"X":90,"Y":-14},{"X":90,"Y":2},{"X":118,"Y":38},{"X":118,"Y":22},{"X":58,"Y":130},{"X":-58,"Y":130},{"X":-58,"Y":98},{"X":-86,"Y":22},{"X":-106,"Y":98},{"X":-106,"Y":-42},{"X":-86,"Y":-14},{"X":-42,"Y":-42},{"X":-42,"Y":-58},{"X":90,"Y":-58}],"NavigationPolygon":[[0,1,2,3],[4,5,6,7,8],[9,0,3,10],[10,11,4],[12,13,2,1],[12,1,6,5],[7,6,14,15,16],[17,7,16,18],[17,18,19,20],[20,19,21,8],[4,8,21,22,23,9],[4,9,10]],"Floor":[-3,-4,0,3,-2,-4,0,3,-2,-3,0,3,-3,-3,0,3,-7,-3,0,3,-7,-2,0,3,-7,-1,0,3,-7,0,0,3,-7,1,0,3,-7,2,0,3,-7,3,0,3,-7,4,0,3,-7,5,0,3,-6,-3,0,3,-6,-2,0,3,-6,-1,0,3,-6,0,0,3,-6,1,0,3,-6,2,0,3,-6,3,0,3,-6,4,0,3,-6,5,0,3,-5,-3,0,3,-5,-2,0,3,-5,1,0,3,-5,2,0,3,-5,3,0,3,-5,4,0,3,-5,5,0,3,-4,-3,0,3,-4,-2,0,3,-4,1,0,3,-4,2,0,3,-4,3,0,3,-4,4,0,3,-4,5,0,3,-3,-2,0,3,-3,1,0,3,-3,2,0,3,-3,3,0,3,-3,4,0,3,-3,5,0,3,-2,-2,0,3,-2,-1,0,3,-2,0,0,3,-2,1,0,3,-2,2,0,3,-2,3,0,3,-2,4,0,3,-2,5,0,3,-4,6,0,3,-4,7,0,3,-3,6,0,3,-3,7,0,3,-2,6,0,3,-2,7,0,3,-1,3,0,3,-1,4,0,3,-1,7,0,3,0,3,0,3,0,4,0,3,0,7,0,3,1,3,0,3,1,4,0,3,1,5,0,3,1,6,0,3,1,7,0,3,2,3,0,3,2,4,0,3,2,5,0,3,2,6,0,3,2,7,0,3,3,3,0,3,3,4,0,3,3,5,0,3,3,6,0,3,3,7,0,3,-1,-4,0,3,-1,-3,0,3,-1,-2,0,3,-1,-1,0,3,-1,0,0,3,0,-4,0,3,0,-3,0,3,0,-2,0,3,0,-1,0,3,0,0,0,3,1,-4,0,3,1,-3,0,3,1,-2,0,3,1,-1,0,3,1,0,0,3,2,-4,0,3,2,-3,0,3,2,-2,0,3,2,-1,0,3,2,0,0,3,3,-4,0,3,3,-3,0,3,3,-2,0,3,3,-1,0,3,3,0,0,3,4,-4,0,3,4,-3,0,3,4,-2,0,3,4,-1,0,3,4,0,0,3,5,-4,0,3,5,-3,0,3,5,-2,0,3,5,-1,0,3,3,1,0,3,3,2,0,3,4,1,0,3,4,2,0,3,4,3,0,3,4,4,0,3,5,2,0,3,5,3,0,3,5,4,0,3,6,2,0,3,6,3,0,3,6,4,0,3,6,-3,0,3,6,-2,0,3,7,-3,0,3,7,-2,0,3,7,1,0,3,7,2,0,3,7,3,0,3,7,4,0,3,8,-3,0,3,8,-2,0,3,8,-1,0,3,8,0,0,3,8,1,0,3,8,2,0,3,8,3,0,3,8,4,0,3,-1,2,0,3,0,2,0,3,1,2,0,3,2,2,0,3,2,1,0,3,1,1,0,3,0,1,0,3,-1,1,0,3,-1,5,0,3,0,5,0,3,0,6,0,3,-1,6,0,3],"Middle":[-7,-5,63,1,-7,-4,2,2,-6,-5,63,1,-6,-4,2,2,-5,-5,63,1,-5,-4,2,2,-5,-1,48,1,-5,0,1,2,-4,-5,27,1,-4,-4,3,2,-4,-1,56,1,-4,0,2,2,-3,-6,63,1,-3,-5,2,2,-3,-1,24,1,-3,0,3,2,-2,-6,63,1,-2,-5,2,2,-1,-6,63,1,-1,-5,2,2,0,-6,63,1,0,-5,2,2,1,-6,63,1,1,-5,2,2,2,-6,63,1,2,-5,2,2,3,-6,63,1,3,-5,2,2,4,-6,63,1,4,-5,2,2,5,-6,63,1,5,-5,2,2,5,0,48,1,5,1,1,2,6,-5,54,1,6,-4,1,2,6,0,26,1,6,1,3,2,7,-5,63,1,7,-4,2,2,7,-1,24,1,7,0,3,2,8,-5,63,1,8,-4,2,2],"Top":[-9,-6,511,1,-9,-5,511,1,-9,-4,511,1,-9,-3,511,1,-9,-2,511,1,-9,-1,511,1,-9,0,511,1,-9,1,511,1,-9,2,511,1,-9,3,511,1,-9,4,511,1,-9,5,511,1,-9,6,511,1,-9,7,511,1,-8,-6,511,1,-8,-5,255,1,-8,-4,219,1,-8,-3,219,1,-8,-2,219,1,-8,-1,219,1,-8,0,219,1,-8,1,219,1,-8,2,219,1,-8,3,219,1,-8,4,219,1,-8,5,219,1,-8,6,507,1,-8,7,511,1,-7,-6,511,1,-7,6,504,1,-7,7,511,1,-6,-6,511,1,-6,6,504,1,-6,7,511,1,-6,8,511,1,-6,9,511,1,-5,-7,511,1,-5,-6,511,1,-5,6,216,1,-5,7,219,1,-5,8,507,1,-5,9,511,1,-4,-7,511,1,-4,-6,255,1,-4,8,504,1,-4,9,511,1,-3,-7,511,1,-3,8,504,1,-3,9,511,1,-2,-7,511,1,-2,8,504,1,-2,9,511,1,-1,-7,511,1,-1,8,504,1,-1,9,511,1,0,-7,511,1,0,8,504,1,0,9,511,1,1,-7,511,1,1,8,504,1,1,9,511,1,2,-7,511,1,2,8,504,1,2,9,511,1,3,-7,511,1,3,8,504,1,3,9,511,1,4,-7,511,1,4,5,432,1,4,6,438,1,4,7,438,1,4,8,510,1,4,9,511,1,5,-7,511,1,5,5,504,1,5,6,511,1,5,7,511,1,5,8,511,1,5,9,511,1,6,-7,511,1,6,-6,447,1,6,-1,176,1,6,5,504,1,6,6,511,1,7,-7,511,1,7,-6,511,1,7,5,504,1,7,6,511,1,8,-6,511,1,8,5,504,1,8,6,511,1,9,-6,511,1,9,-5,447,1,9,-4,438,1,9,-3,438,1,9,-2,438,1,9,-1,438,1,9,0,438,1,9,1,438,1,9,2,438,1,9,3,438,1,9,4,438,1,9,5,510,1,9,6,511,1,10,-6,511,1,10,-5,511,1,10,-4,511,1,10,-3,511,1,10,-2,511,1,10,-1,511,1,10,0,511,1,10,1,511,1,10,2,511,1,10,3,511,1,10,4,511,1,10,5,511,1,10,6,511,1],"CustomFloor1":[-4,2,1,7,14,-3,3,1,8,15,-4,3,1,7,15,-5,3,1,6,15,6,4,1,8,15,5,4,1,7,15,-14,-6,0,24,7,-14,-5,0,24,7,-13,-5,0,24,7,-13,-6,0,25,7,-14,-4,0,24,8,-13,-4,0,24,8,-12,-4,0,24,8,-12,-5,0,24,7,-11,-4,0,24,8,-11,-5,0,24,7,-10,-4,0,24,7,-10,-5,0,24,7,-9,-4,0,24,7,-9,-5,0,25,7,-10,-3,0,24,8,-9,-3,0,24,8,-5,2,1,6,14,4,3,1,6,14,4,4,1,6,15,6,3,1,8,14,5,3,1,7,14,-3,2,1,8,14],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[-3,4,1,10,5,-3,5,1,10,6,2,4,1,10,5,2,5,1,10,6],"CustomMiddle2":[5,-4,1,6,0,5,-3,1,6,1,-2,-1,1,5,0,-2,0,1,5,1],"CustomTop":[]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg
new file mode 100644
index 0000000..937aa7b
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg
Binary files differ
diff --git a/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg.import
new file mode 100644
index 0000000..f339289
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_begin0013.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://vcstbu7wion4"
+path="res://.godot/imported/Reloading_begin0013.ogg-9e3fec03cec4408e1ae49f78ae7fd10c.oggvorbisstr"
+
+[deps]
+
+source_file="res://resource/sound/sfx/reloading/Reloading_begin0013.ogg"
+dest_files=["res://.godot/imported/Reloading_begin0013.ogg-9e3fec03cec4408e1ae49f78ae7fd10c.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg
new file mode 100644
index 0000000..1cd4a17
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg
Binary files differ
diff --git a/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg.import
new file mode 100644
index 0000000..04fad80
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/reloading/Reloading_finish0005.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://lf3yfq82qetp"
+path="res://.godot/imported/Reloading_finish0005.ogg-6f8f9af81ced17f866850f45f4e2a055.oggvorbisstr"
+
+[deps]
+
+source_file="res://resource/sound/sfx/reloading/Reloading_finish0005.ogg"
+dest_files=["res://.godot/imported/Reloading_finish0005.ogg-6f8f9af81ced17f866850f45f4e2a055.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg
new file mode 100644
index 0000000..00d92b6
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg
Binary files differ
diff --git a/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg.import
new file mode 100644
index 0000000..54a9ae7
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0012.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bhpgoq6oqhd24"
+path="res://.godot/imported/Shooting0012.ogg-6d1b24c8d5291f0e566c777a5c1a223b.oggvorbisstr"
+
+[deps]
+
+source_file="res://resource/sound/sfx/shooting/Shooting0012.ogg"
+dest_files=["res://.godot/imported/Shooting0012.ogg-6d1b24c8d5291f0e566c777a5c1a223b.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png
new file mode 100644
index 0000000..944ab2f
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png.import b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png.import
new file mode 100644
index 0000000..cfd03e8
--- /dev/null
+++ b/DungeonShooting_Godot/resource/sprite/shootFire/ShotFire0003.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dw3amegyt2ehh"
+path="res://.godot/imported/ShotFire0003.png-96bf214260aefa07ecedf1608829c903.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprite/shootFire/ShotFire0003.png"
+dest_files=["res://.godot/imported/ShotFire0003.png-96bf214260aefa07ecedf1608829c903.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/DungeonShooting_Godot/scene/test/TestTrail.tscn b/DungeonShooting_Godot/scene/test/TestTrail.tscn
index 221f2b9..79afee9 100644
--- a/DungeonShooting_Godot/scene/test/TestTrail.tscn
+++ b/DungeonShooting_Godot/scene/test/TestTrail.tscn
@@ -1,13 +1,19 @@
-[gd_scene load_steps=4 format=3 uid="uid://brum5fmbt1br4"]
+[gd_scene load_steps=5 format=3 uid="uid://brum5fmbt1br4"]
 
 [ext_resource type="Script" path="res://src/test/TestTrail.cs" id="1_mefd0"]
 [ext_resource type="PackedScene" uid="uid://ddwikcidm0gsi" path="res://prefab/effect/common/Trail0001.tscn" id="2_t308a"]
 [ext_resource type="Texture2D" uid="uid://bn8k07n2y6lmr" path="res://resource/sprite/bullet/normal/bullet0006.png" id="2_w7ffd"]
 
+[sub_resource type="Gradient" id="Gradient_gds2p"]
+resource_local_to_scene = true
+offsets = PackedFloat32Array(0.825949, 1)
+colors = PackedColorArray(1, 1, 1, 0.705882, 1, 1, 1, 0)
+
 [node name="TestTrail" type="Node2D"]
 script = ExtResource("1_mefd0")
 
 [node name="Trail" parent="." instance=ExtResource("2_t308a")]
+gradient = SubResource("Gradient_gds2p")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource("2_w7ffd")
diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs b/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
index 1f6e85d..23a5b5b 100644
--- a/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
+++ b/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
@@ -259,7 +259,7 @@
         public float UpliftAngleRestore;
 
         /// <summary>
-        /// 开火特效
+        /// 开火特效, 该特效脚本必须实现IEffect接口
         /// </summary>
         [JsonInclude]
         public string FireEffect;
diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs
index 7741652..800cb64 100644
--- a/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs
+++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/Bullet.cs
@@ -54,11 +54,15 @@
     /// </summary>
     public int CurrentPenetration { get; protected set; } = 0;
     
+    /// <summary>
+    /// 是否是敌人使用的子弹
+    /// </summary>
+    public bool IsEnemyBullet { get; private set; } = false;
+
     //当前子弹已经飞行的距离
     private float CurrFlyDistance = 0;
 
     private bool _init = false;
-    private bool _isEnemyBullet = false;
 
     public override void OnInit()
     {
@@ -109,18 +113,16 @@
         //如果子弹会对玩家造成伤害, 则显示红色描边
         if (Player.Current.CollisionWithMask(attackLayer))
         {
-            if (!_isEnemyBullet)
+            if (!IsEnemyBullet)
             {
-                _isEnemyBullet = true;
-                ShowOutline = true;
-                SetBlendSchedule(1);
+                IsEnemyBullet = true;
+                OnRefreshBulletColor(IsEnemyBullet);
             }
         }
-        else if (_isEnemyBullet)
+        else if (IsEnemyBullet)
         {
-            _isEnemyBullet = false;
-            ShowOutline = false;
-            SetBlendSchedule(0);
+            IsEnemyBullet = false;
+            OnRefreshBulletColor(IsEnemyBullet);
         }
         
         PutDown(RoomLayerEnum.YSortLayer);
@@ -144,6 +146,24 @@
         }
     }
 
+    /// <summary>
+    /// 刷新子弹的颜色
+    /// </summary>
+    /// <param name="isEnemyBullet">是否是敌人使用的子弹</param>
+    public virtual void OnRefreshBulletColor(bool isEnemyBullet)
+    {
+        if (isEnemyBullet)
+        {
+            ShowOutline = true;
+            SetBlendSchedule(1);
+        }
+        else
+        {
+            ShowOutline = false;
+            SetBlendSchedule(0);
+        }
+    }
+    
     public override void OnMoveCollision(KinematicCollision2D collision)
     {
         CurrentBounce++;
diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/TrailBullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/TrailBullet.cs
index 108e05c..67f6da9 100644
--- a/DungeonShooting_Godot/src/game/activity/bullet/normal/TrailBullet.cs
+++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/TrailBullet.cs
@@ -4,6 +4,8 @@
 [Tool]
 public partial class TrailBullet : Bullet
 {
+    private static Color TerrainColor = new Color(0xf5 / 255f + 0.8f, 0x7e / 255f + 0.45f, 0x7a / 255f + 0.45f, 0.7f);
+    private static Color EnemyTerrainColor = new Color(1.5f, 0, 0, 0.7f);
     private Trail trail;
 
     public override void InitData(BulletData data, uint attackLayer)
@@ -12,11 +14,20 @@
         
         trail = ObjectManager.GetPoolItem<Trail>(ResourcePath.prefab_effect_common_Trail0001_tscn);
         trail.SetTarget(AnimatedSprite);
+        trail.AddPoint(trail.Target.GlobalPosition);
         trail.AddToActivityRoot(RoomLayerEnum.YSortLayer);
-        trail.AddPoint(trail.Target.GlobalPosition, 0);
         trail.ZIndex = 1;
+        
+        if (IsEnemyBullet)
+        {
+            trail.SetColor(EnemyTerrainColor);
+        }
+        else
+        {
+            trail.SetColor(TerrainColor);
+        }
     }
-    
+
 
     public override void OnReclaim()
     {
diff --git a/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs b/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs
index 937f133..1ac7183 100644
--- a/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs
+++ b/DungeonShooting_Godot/src/game/activity/role/enemy/NoWeaponEnemy.cs
@@ -42,7 +42,7 @@
     public virtual void OnAttack()
     {
         //攻击特效
-        var effect = ObjectManager.GetPoolItem<IEffect>(ResourcePath.prefab_effect_weapon_ShotFire3_tscn);
+        var effect = ObjectManager.GetPoolItem<IEffect>(ResourcePath.prefab_effect_weapon_ShotFire0003_tscn);
         var node = (Node2D)effect;
         node.GlobalPosition = FirePoint.GlobalPosition;
         node.Rotation = MountPoint.Rotation;
diff --git a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs
index 3d386d0..dcb13e3 100644
--- a/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs
+++ b/DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs
@@ -82,7 +82,7 @@
         if (IsActive) //被使用
         {
             //播放挥刀特效
-            SpecialEffectManager.Play(
+            SpecialEffectManager.PlaySpriteFrames(
                 Master,
                 ResourcePath.resource_spriteFrames_weapon_Weapon0004_hit_tres, "default",
                 Master.MountPoint.Position,
diff --git a/DungeonShooting_Godot/src/game/effects/Trail.cs b/DungeonShooting_Godot/src/game/effects/Trail.cs
index 6137bcd..91825a5 100644
--- a/DungeonShooting_Godot/src/game/effects/Trail.cs
+++ b/DungeonShooting_Godot/src/game/effects/Trail.cs
@@ -1,10 +1,22 @@
 using Godot;
 
+/// <summary>
+/// 拖尾效果
+/// </summary>
 public partial class Trail : Line2D, IPoolItem
 {
+    /// <summary>
+    /// 拖尾效果固定更新帧率
+    /// </summary>
     public const int TrailUpdateFrame = 20;
     
-    public int length { get; set; } = 30;
+    /// <summary>
+    /// 拖尾最大点数
+    /// </summary>
+    public int MaxLength { get; set; } = 20;
+    /// <summary>
+    /// 拖尾绑定的物体
+    /// </summary>
     public Node2D Target { get; private set; }
 
     public bool IsDestroyed { get; private set; }
@@ -15,6 +27,9 @@
     private double _time = 0;
     private IPoolItem _targetPoolItem;
 
+    /// <summary>
+    /// 设置拖尾跟随的物体
+    /// </summary>
     public void SetTarget(Node2D target)
     {
         Target = target;
@@ -32,7 +47,14 @@
             ClearPoints();
         }
 
-        _time = TrailUpdateFrame;
+        _time = 1f / TrailUpdateFrame;
+    }
+
+    public void SetColor(Color color)
+    {
+        Gradient.SetColor(0, color);
+        color.A = 0;
+        Gradient.SetColor(1, color);
     }
 
     public override void _Process(double delta)
@@ -52,9 +74,9 @@
             if (Target != null) //没有被回收
             {
                 AddPoint(Target.GlobalPosition, 0);
-                if (pointCount > length)
+                if (pointCount > MaxLength)
                 {
-                    RemovePoint(pointCount - 1);
+                    RemovePoint(pointCount);
                 }
             }
             else //被回收了, 
@@ -70,7 +92,7 @@
                 }
             }
         }
-        else if (Target != null) //没有被回收, 更新第一个点
+        else if (Target != null && GetPointCount() >= 2) //没有被回收, 更新第一个点
         {
             SetPointPosition(0, Target.GlobalPosition);
         }
diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
index a6b5cbd..f709889 100644
--- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
+++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
@@ -39,9 +39,10 @@
     public const string prefab_effect_enemy_EnemyDead0002_tscn = "res://prefab/effect/enemy/EnemyDead0002.tscn";
     public const string prefab_effect_weapon_MeleeAttack1_tscn = "res://prefab/effect/weapon/MeleeAttack1.tscn";
     public const string prefab_effect_weapon_MeleeAttack2_tscn = "res://prefab/effect/weapon/MeleeAttack2.tscn";
-    public const string prefab_effect_weapon_ShotFire_tscn = "res://prefab/effect/weapon/ShotFire.tscn";
-    public const string prefab_effect_weapon_ShotFire2_tscn = "res://prefab/effect/weapon/ShotFire2.tscn";
-    public const string prefab_effect_weapon_ShotFire3_tscn = "res://prefab/effect/weapon/ShotFire3.tscn";
+    public const string prefab_effect_weapon_ShotFire0001_tscn = "res://prefab/effect/weapon/ShotFire0001.tscn";
+    public const string prefab_effect_weapon_ShotFire0002_tscn = "res://prefab/effect/weapon/ShotFire0002.tscn";
+    public const string prefab_effect_weapon_ShotFire0003_tscn = "res://prefab/effect/weapon/ShotFire0003.tscn";
+    public const string prefab_effect_weapon_ShotFire0004_tscn = "res://prefab/effect/weapon/ShotFire0004.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";
@@ -208,6 +209,7 @@
     public const string resource_sound_sfx_shooting_Shooting0009_ogg = "res://resource/sound/sfx/shooting/Shooting0009.ogg";
     public const string resource_sound_sfx_shooting_Shooting0010_ogg = "res://resource/sound/sfx/shooting/Shooting0010.ogg";
     public const string resource_sound_sfx_shooting_Shooting0011_ogg = "res://resource/sound/sfx/shooting/Shooting0011.ogg";
+    public const string resource_sound_sfx_shooting_Shooting0012_ogg = "res://resource/sound/sfx/shooting/Shooting0012.ogg";
     public const string resource_sprite_brush_Brush1_png = "res://resource/sprite/brush/Brush1.png";
     public const string resource_sprite_brush_Brush2_png = "res://resource/sprite/brush/Brush2.png";
     public const string resource_sprite_brush_Brush3_png = "res://resource/sprite/brush/Brush3.png";
@@ -326,6 +328,7 @@
     public const string resource_sprite_shell_Shell0004_png = "res://resource/sprite/shell/Shell0004.png";
     public const string resource_sprite_shootFire_ShotFire0001_png = "res://resource/sprite/shootFire/ShotFire0001.png";
     public const string resource_sprite_shootFire_ShotFire0002_png = "res://resource/sprite/shootFire/ShotFire0002.png";
+    public const string resource_sprite_shootFire_ShotFire0003_png = "res://resource/sprite/shootFire/ShotFire0003.png";
     public const string resource_sprite_ui_font_bg_png = "res://resource/sprite/ui/font_bg.png";
     public const string resource_sprite_ui_GUI_png = "res://resource/sprite/ui/GUI.png";
     public const string resource_sprite_ui_commonIcon_Add_png = "res://resource/sprite/ui/commonIcon/Add.png";
diff --git a/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs b/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
index 0d74206..5e5330e 100644
--- a/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
+++ b/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
@@ -51,7 +51,7 @@
     /// <param name="zIndex">层级</param>
     /// <param name="speed">播放速度</param>
     /// <param name="loopCount">循环次数, 到达该次数特效停止播放</param>
-    public static void Play(Node root, string path, string animName, Vector2 pos, float rotation, Vector2 scale, Vector2 offset, int zIndex = 0, float speed = 1, int loopCount = 1)
+    public static void PlaySpriteFrames(Node root, string path, string animName, Vector2 pos, float rotation, Vector2 scale, Vector2 offset, int zIndex = 0, float speed = 1, int loopCount = 1)
     {
         var spriteFrames = ResourceManager.Load<SpriteFrames>(path);
         var specialEffect = new SpecialEffect();