diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
index b077d46..78078a9 100644
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
@@ -19,7 +19,7 @@
         public override void _EnterTree()
         {
             _instance = this;
-            var script = GD.Load<Script>("res://addons/dungeonShooting_plugin/ActivityObjectTemplate.cs");
+            var script = GD.Load<Script>("res://src/framework/ActivityObjectTemplate.cs");
             var texture = GD.Load<Texture2D>("res://addons/dungeonShooting_plugin/ActivityObject.svg");
             AddCustomType("ActivityObjectTemplate", "Node", script, texture);
             
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index 4d763c4..e3a3a10 100644
--- a/DungeonShooting_Godot/resource/theme/mainTheme.tres
+++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres
@@ -350,7 +350,7 @@
 
 [sub_resource type="ImageTexture" id="58"]
 
-[sub_resource type="Image" id="Image_ayhgc"]
+[sub_resource type="Image" id="Image_d1oqo"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -360,7 +360,7 @@
 }
 
 [sub_resource type="ImageTexture" id="60"]
-image = SubResource("Image_ayhgc")
+image = SubResource("Image_d1oqo")
 
 [sub_resource type="StyleBoxTexture" id="61"]
 content_margin_left = 2.0
@@ -370,7 +370,7 @@
 texture = SubResource("60")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_xhr4f"]
+[sub_resource type="Image" id="Image_d1vtr"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -380,7 +380,7 @@
 }
 
 [sub_resource type="ImageTexture" id="63"]
-image = SubResource("Image_xhr4f")
+image = SubResource("Image_d1vtr")
 
 [sub_resource type="StyleBoxTexture" id="64"]
 content_margin_left = 2.0
@@ -390,7 +390,7 @@
 texture = SubResource("63")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_yov8p"]
+[sub_resource type="Image" id="Image_7wxck"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -400,7 +400,7 @@
 }
 
 [sub_resource type="ImageTexture" id="66"]
-image = SubResource("Image_yov8p")
+image = SubResource("Image_7wxck")
 
 [sub_resource type="StyleBoxTexture" id="67"]
 content_margin_left = 2.0
@@ -410,7 +410,7 @@
 texture = SubResource("66")
 region_rect = Rect2(0, 0, 12, 12)
 
-[sub_resource type="Image" id="Image_fc1nk"]
+[sub_resource type="Image" id="Image_2hs3o"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -420,7 +420,7 @@
 }
 
 [sub_resource type="ImageTexture" id="69"]
-image = SubResource("Image_fc1nk")
+image = SubResource("Image_2hs3o")
 
 [sub_resource type="StyleBoxTexture" id="70"]
 content_margin_left = 0.0
@@ -444,7 +444,7 @@
 content_margin_right = 4.0
 content_margin_bottom = 4.0
 
-[sub_resource type="Image" id="Image_o7njb"]
+[sub_resource type="Image" id="Image_cdopv"]
 data = {
 "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 "format": "RGBA8",
@@ -454,7 +454,7 @@
 }
 
 [sub_resource type="ImageTexture" id="56"]
-image = SubResource("Image_o7njb")
+image = SubResource("Image_cdopv")
 
 [sub_resource type="StyleBoxFlat" id="57"]
 content_margin_left = 6.0
diff --git a/DungeonShooting_Godot/scene/Main.tscn b/DungeonShooting_Godot/scene/Main.tscn
index 2319b6a..879e70e 100644
--- a/DungeonShooting_Godot/scene/Main.tscn
+++ b/DungeonShooting_Godot/scene/Main.tscn
@@ -24,7 +24,6 @@
 
 [node name="Main" type="Node2D"]
 script = ExtResource("3")
-Debug = true
 CursorPack = ExtResource("4")
 RoomPath = NodePath("ViewCanvas/SubViewportContainer/SubViewport/Room")
 ViewportPath = NodePath("ViewCanvas/SubViewportContainer/SubViewport")
diff --git a/DungeonShooting_Godot/scene/Room.tscn b/DungeonShooting_Godot/scene/Room.tscn
index c71a855..90246e1 100644
--- a/DungeonShooting_Godot/scene/Room.tscn
+++ b/DungeonShooting_Godot/scene/Room.tscn
@@ -4,10 +4,10 @@
 [ext_resource type="Script" path="res://src/game/room/RoomManager.cs" id="1_3w1c7"]
 [ext_resource type="Script" path="res://src/game/camera/GameCamera.cs" id="5"]
 
-[sub_resource type="Environment" id="1"]
-background_mode = 4
+[sub_resource type="Environment" id="Environment_ji6mi"]
+background_mode = 3
 glow_enabled = true
-glow_intensity = 3.0
+glow_intensity = 4.74
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rkmbu"]
 texture = ExtResource("1")
@@ -563,15 +563,15 @@
 physics_layer_0/collision_mask = 0
 sources/1 = SubResource("TileSetAtlasSource_rkmbu")
 
-[node name="Room" type="Node2D" node_paths=PackedStringArray("ObjectRoot", "YSortRoot", "TileRoot")]
+[node name="Room" type="Node2D" node_paths=PackedStringArray("NormalLayer", "YSortLayer", "TileRoot")]
 script = ExtResource("1_3w1c7")
-ObjectRoot = NodePath("ObjectRoot")
-YSortRoot = NodePath("SortRoot")
-TileRoot = NodePath("SortRoot/TileRoot")
+NormalLayer = NodePath("NormalLayer")
+YSortLayer = NodePath("YSortLayer")
+TileRoot = NodePath("YSortLayer/TileRoot")
 metadata/_edit_vertical_guides_ = []
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("1")
+environment = SubResource("Environment_ji6mi")
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2(253, 219)
@@ -580,13 +580,13 @@
 editor_draw_drag_margin = true
 script = ExtResource("5")
 
-[node name="ObjectRoot" type="Node2D" parent="."]
+[node name="NormalLayer" type="Node2D" parent="."]
 z_index = -1
 
-[node name="SortRoot" type="Node2D" parent="."]
+[node name="YSortLayer" type="Node2D" parent="."]
 y_sort_enabled = true
 
-[node name="TileRoot" type="TileMap" parent="SortRoot"]
+[node name="TileRoot" type="TileMap" parent="YSortLayer"]
 y_sort_enabled = true
 tile_set = SubResource("TileSet_bspf4")
 format = 2
diff --git a/DungeonShooting_Godot/src/framework/ActivityObject.cs b/DungeonShooting_Godot/src/framework/ActivityObject.cs
index 428dd14..15153b1 100644
--- a/DungeonShooting_Godot/src/framework/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/ActivityObject.cs
@@ -20,11 +20,6 @@
     public string ItemId { get; private set; }
 
     /// <summary>
-    /// 是否放入 ySort 节点下
-    /// </summary>
-    public bool UseYSort { get; }
-
-    /// <summary>
     /// 当前物体显示的精灵图像, 节点名称必须叫 "AnimatedSprite2D", 类型为 AnimatedSprite2D
     /// </summary>
     public AnimatedSprite2D AnimatedSprite { get; }
@@ -73,12 +68,6 @@
         get => MoveController.BasisVelocity;
         set => MoveController.BasisVelocity = value;
     }
-    
-    // /// <summary>
-    // /// 这个速度就是玩家当前物理帧移动的真实速率, 该速度由物理帧循环更新, 并不会马上更新
-    // /// 该速度就是 BasisVelocity + 外力总和
-    // /// </summary>
-    // public Vector2 Velocity => MoveController.Velocity;
 
     //组件集合
     private List<KeyValuePair<Type, Component>> _components = new List<KeyValuePair<Type, Component>>();
@@ -96,10 +85,12 @@
     //混色shader材质
     private ShaderMaterial _blendShaderMaterial;
     
-
     //存储投抛该物体时所产生的数据
     private ObjectThrowData _throwData;
-
+    
+    //所在层级
+    private RoomLayerEnum _currLayer;
+    
     //标记字典
     private Dictionary<string, object> _signMap;
 
@@ -119,7 +110,6 @@
         ZIndex = tempNode.z_index;
         CollisionLayer = tempNode.collision_layer;
         CollisionMask = tempNode.collision_mask;
-        UseYSort = tempNode.UseYSort;
         Scale = tempNode.scale;
         Visible = tempNode.visible;
 
@@ -340,19 +330,21 @@
 
     /// <summary>
     /// 将一个节点扔到地上, 并设置显示的阴影
-    /// <param name="useYSort">是否放到 ySort 下</param>
+    /// <param name="layer">放入的层</param>
     /// </summary>
-    public virtual void PutDown(bool useYSort = false)
+    public virtual void PutDown(RoomLayerEnum layer)
     {
+        _currLayer = layer;
         var parent = GetParent();
-        if (parent != (useYSort ? GameApplication.Instance.RoomManager.YSortRoot : GameApplication.Instance.RoomManager.ObjectRoot))
+        var root = GameApplication.Instance.RoomManager.GetRoomLayer(layer);
+        if (parent != root)
         {
             if (parent != null)
             {
                 parent.RemoveChild(this);
             }
 
-            this.AddToActivityRoot(useYSort);
+            this.AddToActivityRoot(layer);
         }
 
         if (IsInsideTree())
@@ -370,10 +362,10 @@
     /// 将一个节点扔到地上, 并设置显示的阴影
     /// </summary>
     /// <param name="position">放置的位置</param>
-    /// <param name="useYSort">是否放到 ySort 下</param>
-    public void PutDown(Vector2 position, bool useYSort = false)
+    /// <param name="layer">放入的层</param>
+    public void PutDown(Vector2 position, RoomLayerEnum layer)
     {
-        PutDown(useYSort);
+        PutDown(layer);
         Position = position;
     }
 
@@ -765,15 +757,15 @@
     private void Throw()
     {
         var parent = GetParent();
-        //投抛时必须要加入 sortRoot 节点下
+        //投抛时必须要加入 YSortLayer 节点下
         if (parent == null)
         {
-            this.AddToActivityRoot(true);
+            this.AddToActivityRoot(RoomLayerEnum.YSortLayer);
         }
-        else if (parent == GameApplication.Instance.RoomManager.ObjectRoot)
+        else if (parent == GameApplication.Instance.RoomManager.NormalLayer)
         {
             parent.RemoveChild(this);
-            this.AddToActivityRoot(true);
+            this.AddToActivityRoot(RoomLayerEnum.YSortLayer);
         }
 
         GlobalPosition = _throwData.StartPosition;
@@ -857,7 +849,7 @@
         MoveController.RemoveForce(_throwData.ThrowForce);
         
         GetParent().RemoveChild(this);
-        this.AddToActivityRoot(UseYSort);
+        this.AddToActivityRoot(_currLayer);
         RestoreCollision();
 
         OnThrowOver();
diff --git a/DungeonShooting_Godot/src/framework/ActivityObjectTemplate.cs b/DungeonShooting_Godot/src/framework/ActivityObjectTemplate.cs
index 68b9572..21b6d28 100644
--- a/DungeonShooting_Godot/src/framework/ActivityObjectTemplate.cs
+++ b/DungeonShooting_Godot/src/framework/ActivityObjectTemplate.cs
@@ -8,10 +8,10 @@
     [Tool]
     public partial class ActivityObjectTemplate : Node
     {
-        /// <summary>
-        /// 是否放入 ySort 节点下
-        /// </summary>
-        [Export] public bool UseYSort;
+        // /// <summary>
+        // /// 默认放入的层级
+        // /// </summary>
+        // [Export] public RoomLayerEnum DefaultLayer = RoomLayerEnum.NormalLayer;
 
         /// <summary>
         /// 物体初始缩放
diff --git a/DungeonShooting_Godot/src/framework/common/NodeExtend.cs b/DungeonShooting_Godot/src/framework/common/NodeExtend.cs
index 525e43a..3f77676 100644
--- a/DungeonShooting_Godot/src/framework/common/NodeExtend.cs
+++ b/DungeonShooting_Godot/src/framework/common/NodeExtend.cs
@@ -1,3 +1,4 @@
+using System;
 using Godot;
 
 /// <summary>
@@ -43,18 +44,9 @@
     /// 将节点插入的房间物体根节点
     /// </summary>
     /// <param name="node">实例</param>
-    /// <param name="useYSort">是否启用 YSort 排序</param>
-    public static void AddToActivityRoot(this Node2D node, bool useYSort = false)
+    /// <param name="layer">放入的层</param>
+    public static void AddToActivityRoot(this Node2D node, RoomLayerEnum layer)
     {
-        if (useYSort)
-        {
-            //node.YSortEnabled = true;
-            GameApplication.Instance.RoomManager.YSortRoot.AddChild(node);
-        }
-        else
-        {
-            //node.YSortEnabled = false;
-            GameApplication.Instance.RoomManager.ObjectRoot.AddChild(node);
-        }
+        GameApplication.Instance.RoomManager.GetRoomLayer(layer).AddChild(node);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
index 498eeb7..0b340b8 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
@@ -433,7 +433,7 @@
     /// <returns></returns>
     public bool IsInGround()
     {
-        return Master == null && GetParent() == GameApplication.Instance.RoomManager.ObjectRoot;
+        return Master == null && GetParent() == GameApplication.Instance.RoomManager.NormalLayer;
     }
     
     /// <summary>
@@ -948,9 +948,9 @@
         AnimationPlayer.Play("floodlight");
     }
 
-    public override void PutDown(bool useYSort = false)
+    public override void PutDown(RoomLayerEnum layer)
     {
-        base.PutDown(useYSort);
+        base.PutDown(layer);
         AnimationPlayer.Play("floodlight");
     }
 
diff --git a/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs b/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
index 0e2e218..cac55b9 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/bullet/Bullet.cs
@@ -53,7 +53,7 @@
             var smoke = packedScene.Instantiate<GpuParticles2D>();
             smoke.GlobalPosition = lastSlideCollision.GetPosition();
             smoke.GlobalRotation = lastSlideCollision.GetNormal().Angle();
-            smoke.AddToActivityRoot(true);
+            smoke.AddToActivityRoot(RoomLayerEnum.YSortLayer);
 
             Destroy();
             return;
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
index 78863e1..309242b 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
@@ -112,7 +112,7 @@
         var sprite = packedScene.Instantiate<Sprite2D>();
         sprite.GlobalPosition = FirePoint.GlobalPosition;
         sprite.GlobalRotation = FirePoint.GlobalRotation;
-        sprite.AddToActivityRoot(true);
+        sprite.AddToActivityRoot(RoomLayerEnum.YSortLayer);
 
         //播放射击音效
         SoundManager.PlaySoundEffectPosition(ResourcePath.resource_sound_sfx_ordinaryBullet2_mp3, GameApplication.Instance.ViewToGlobalPosition(GlobalPosition), -8);
@@ -130,6 +130,6 @@
             fireRotation,
             GetAttackLayer()
         );
-        bullet.PutDown(true);
+        bullet.PutDown(RoomLayerEnum.YSortLayer);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
index 50f0956..c40aac4 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
@@ -78,7 +78,7 @@
         var sprite = packedScene.Instantiate<Sprite2D>();
         sprite.GlobalPosition = FirePoint.GlobalPosition;
         sprite.GlobalRotation = FirePoint.GlobalRotation;
-        sprite.AddToActivityRoot(true);
+        sprite.AddToActivityRoot(RoomLayerEnum.YSortLayer);
         
         //播放射击音效
         SoundManager.PlaySoundEffectPosition(ResourcePath.resource_sound_sfx_ordinaryBullet3_mp3, GameApplication.Instance.ViewToGlobalPosition(GlobalPosition), -15);
@@ -95,6 +95,6 @@
             fireRotation + Utils.RandfRange(-20 / 180f * Mathf.Pi, 20 / 180f * Mathf.Pi),
             GetAttackLayer()
         );
-        bullet.PutDown(true);
+        bullet.PutDown(RoomLayerEnum.YSortLayer);
     }
 }
diff --git a/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs b/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
index 0c9cb5e..c5e59bb 100644
--- a/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
+++ b/DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
@@ -1,5 +1,4 @@
 
-using System.Collections.Generic;
 using Godot;
 
 /// <summary>
@@ -64,6 +63,6 @@
         specialEffect.LoopCount = loopCount;
         specialEffect.SpriteFrames = spriteFrames;
         specialEffect.Play(animName);
-        specialEffect.AddToActivityRoot(true);
+        specialEffect.AddToActivityRoot(RoomLayerEnum.YSortLayer);
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index f4ca489..a3693df 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -15,12 +15,12 @@
     /// <summary>
     /// //对象根节点
     /// </summary>
-    [Export] public Node2D ObjectRoot;
+    [Export] public Node2D NormalLayer;
     
     /// <summary>
     /// 对象根节点, 带y轴排序功能
     /// </summary>
-    [Export] public Node2D YSortRoot;
+    [Export] public Node2D YSortLayer;
     
     /// <summary>
     /// 地图根节点
@@ -65,7 +65,7 @@
         Player = new Player();
         Player.Position = new Vector2(100, 100);
         Player.Name = "Player";
-        Player.PutDown(true);
+        Player.PutDown(RoomLayerEnum.YSortLayer);
     }
 
     public override void _Ready()
@@ -100,11 +100,11 @@
         //播放bgm
         SoundManager.PlayMusic(ResourcePath.resource_sound_bgm_Intro_ogg, -17f);
 
-        var enemy1 = new Enemy();
-        enemy1.Name = "Enemy";
-        enemy1.PutDown(new Vector2(100, 100));
-        enemy1.PickUpWeapon(WeaponManager.GetGun("1003"));
-        enemy1.PickUpWeapon(WeaponManager.GetGun("1001"));
+        // var enemy1 = new Enemy();
+        // enemy1.Name = "Enemy";
+        // enemy1.PutDown(new Vector2(100, 100));
+        // enemy1.PickUpWeapon(WeaponManager.GetGun("1003"));
+        // enemy1.PickUpWeapon(WeaponManager.GetGun("1001"));
         
         // for (int i = 0; i < 10; i++)
         // {
@@ -115,31 +115,49 @@
         //     enemyTemp.PickUpWeapon(WeaponManager.GetGun("1001"));
         // }
         
-        var enemy2 = new Enemy();
-        enemy2.Name = "Enemy2";
-        enemy2.PutDown(new Vector2(120, 100));
-        enemy2.PickUpWeapon(WeaponManager.GetGun("1002"));
-        //enemy2.PickUpWeapon(WeaponManager.GetGun("1004"));
-        //enemy2.PickUpWeapon(WeaponManager.GetGun("1003"));
-        
-        var enemy3 = new Enemy();
-        enemy3.Name = "Enemy3";
-        enemy3.PutDown(new Vector2(100, 120));
-        enemy3.PickUpWeapon(WeaponManager.GetGun("1003"));
-        enemy3.PickUpWeapon(WeaponManager.GetGun("1002"));
+        // var enemy2 = new Enemy();
+        // enemy2.Name = "Enemy2";
+        // enemy2.PutDown(new Vector2(120, 100));
+        // enemy2.PickUpWeapon(WeaponManager.GetGun("1002"));
+        // //enemy2.PickUpWeapon(WeaponManager.GetGun("1004"));
+        // //enemy2.PickUpWeapon(WeaponManager.GetGun("1003"));
+        //
+        // var enemy3 = new Enemy();
+        // enemy3.Name = "Enemy3";
+        // enemy3.PutDown(new Vector2(100, 120));
+        // enemy3.PickUpWeapon(WeaponManager.GetGun("1003"));
+        // enemy3.PickUpWeapon(WeaponManager.GetGun("1002"));
 
-        WeaponManager.GetGun("1004").PutDown(new Vector2(80, 100));
-        WeaponManager.GetGun("1001").PutDown(new Vector2(220, 120));
-        WeaponManager.GetGun("1001").PutDown(new Vector2(80, 80));
-        WeaponManager.GetGun("1002").PutDown(new Vector2(80, 120));
-        WeaponManager.GetGun("1003").PutDown(new Vector2(120, 80));
+        WeaponManager.GetGun("1004").PutDown(new Vector2(80, 100), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1001").PutDown(new Vector2(220, 120), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1001").PutDown(new Vector2(80, 80), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1002").PutDown(new Vector2(80, 120), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1003").PutDown(new Vector2(120, 80), RoomLayerEnum.NormalLayer);
         
-        WeaponManager.GetGun("1003").PutDown(new Vector2(180, 80));
-        WeaponManager.GetGun("1003").PutDown(new Vector2(180, 180));
-        WeaponManager.GetGun("1002").PutDown(new Vector2(180, 120));
+        WeaponManager.GetGun("1003").PutDown(new Vector2(180, 80), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1003").PutDown(new Vector2(180, 180), RoomLayerEnum.NormalLayer);
+        WeaponManager.GetGun("1002").PutDown(new Vector2(180, 120), RoomLayerEnum.NormalLayer);
 
     }
 
+    /// <summary>
+    /// 获取指定层级根节点
+    /// </summary>
+    /// <param name="layerEnum"></param>
+    /// <returns></returns>
+    public Node2D GetRoomLayer(RoomLayerEnum layerEnum)
+    {
+        switch (layerEnum)
+        {
+            case RoomLayerEnum.NormalLayer:
+                return NormalLayer;
+            case RoomLayerEnum.YSortLayer:
+                return YSortLayer;
+        }
+
+        return null;
+    }
+
     public override void _Process(double delta)
     {
         Enemy.UpdateEnemiesView();