diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
index 7d6f487..7c0d299 100644
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
@@ -54,24 +54,6 @@
"res://src/framework/map/mark/ActivityMark.cs",
"res://addons/dungeonShooting_plugin/Mark.svg"
),
- new CustomTypeInfo(
- "EnemyMark",
- "Node2D",
- "res://src/framework/map/mark/EnemyMark.cs",
- "res://addons/dungeonShooting_plugin/Mark.svg"
- ),
- new CustomTypeInfo(
- "WeaponMark",
- "Node2D",
- "res://src/framework/map/mark/WeaponMark.cs",
- "res://addons/dungeonShooting_plugin/Mark.svg"
- ),
- new CustomTypeInfo(
- "PlayerBirthMark",
- "Node2D",
- "res://src/framework/map/mark/PlayerBirthMark.cs",
- "res://addons/dungeonShooting_plugin/Mark.svg"
- ),
};
public override void _Process(double delta)
diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json
index 96ba25d..6500bfc 100644
--- a/DungeonShooting_Godot/resource/map/RoomConfig.json
+++ b/DungeonShooting_Godot/resource/map/RoomConfig.json
@@ -3,32 +3,8 @@
"GroupName": "testGroup",
"BattleList": [
{
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room1.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room1.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room2.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room2.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room3.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room3.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room4.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room4.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room5.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room5.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room6.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room6.json"
- },
- {
- "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room7.tscn",
- "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room7.json"
+ "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room8.tscn",
+ "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room8.json"
}
],
"InletList": [
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn
deleted file mode 100644
index 365cd55..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn
+++ /dev/null
@@ -1,54 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bxpcy34g7cmex"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_luio1"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_2xk8s"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_luio1")
-format = 2
-layer_0/tile_data = PackedInt32Array(196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, 196619, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, -65525, 0, 8, -131061, 0, 8, -196597, 0, 8, -262133, 0, 8, 196618, 0, 8, 131082, 0, 8, 65546, 0, 8, -131062, 0, 8, -196598, 0, 8, -262134, 0, 8, 196617, 0, 8, 131081, 0, 8, -196599, 0, 8, -262135, 0, 8, 196616, 0, 8, 131080, 0, 8, -196600, 0, 8, -262136, 0, 8, 196615, 0, 8, 131079, 0, 8, -196601, 0, 8, -262137, 0, 8, 196614, 0, 8, 131078, 0, 8, -196602, 0, 8, -262138, 0, 8, 196613, 0, 8, 131077, 0, 8, -196603, 0, 8, -262139, 0, 8, 196612, 0, 8, 131076, 0, 8, -196604, 0, 8, -262140, 0, 8, 196611, 0, 8, 131075, 0, 8, -196605, 0, 8, -262141, 0, 8, 196610, 0, 8, 131074, 0, 8, -196606, 0, 8, -262142, 0, 8, 196609, 0, 8, 131073, 0, 8, -196607, 0, 8, -262143, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, -131072, 0, 8, -196608, 0, 8, -262144, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, -131073, 0, 8, -196609, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -131074, 0, 8, -196610, 0, 8, -131075, 196608, 3, -196611, 196608, 3, -262147, 196608, 4, -262146, 131072, 7, -262145, 131072, 7, -65539, 196608, 3, -3, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 196608, 3, 262141, 196608, 3, 327679, 131072, 2, 327678, 131072, 2, 327677, 720896, 2, -327680, 131072, 7, 262144, 131072, 2, -327679, 131072, 7, 262145, 131072, 2, -327678, 131072, 7, 262146, 131072, 2, -327677, 131072, 7, 262147, 131072, 2, -327676, 131072, 7, 262148, 131072, 2, -327675, 131072, 7, 262149, 131072, 2, -327674, 131072, 7, 262150, 131072, 2, -327673, 131072, 7, 262151, 131072, 2, -327672, 131072, 7, 262152, 131072, 2, -327671, 131072, 7, 262153, 131072, 2, -327670, 131072, 7, 262154, 131072, 2, -327669, 131072, 7, 262155, 131072, 2, -327668, 131072, 7, 262156, 131072, 2, -262131, 65536, 3, -196595, 65536, 3, -327667, 65536, 4, -131059, 65536, 3, -65523, 65536, 3, 13, 65536, 3, 65549, 65536, 3, 131085, 65536, 3, 196621, 65536, 3, 262157, 851968, 2, 10, 0, 8, -65526, 0, 8, -131071, 65536, 2, -131070, 131072, 2, -131069, 131072, 2, -131068, 131072, 2, -131067, 131072, 2, -131066, 131072, 2, -131065, 131072, 2, -131064, 131072, 2, -131063, 196608, 2, -65527, 196608, 3, 9, 196608, 3, 65545, 196608, 7, 65537, 65536, 7, 65538, 131072, 7, 65539, 131072, 7, 65540, 131072, 7, 65541, 131072, 7, 65542, 131072, 7, 65543, 131072, 7, 65544, 131072, 7, -65535, 65536, 3, 1, 65536, 3)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(-9, -1)
-script = ExtResource("3_2xk8s")
-Weapon1Id = "0003"
-Weapon1Ammo = 25
-Type = 3
-ItemId = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(20, 100)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(183, 0)
-script = ExtResource("3_2xk8s")
-Weapon1Id = "0003"
-Weapon1Ammo = 25
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(20, 100)
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(88, -48)
-script = ExtResource("3_2xk8s")
-Weapon1Id = "0002"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(150, 10)
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(90, 49)
-script = ExtResource("3_2xk8s")
-Weapon1Id = "0002"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(150, 10)
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn
deleted file mode 100644
index 7a06fff..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn
+++ /dev/null
@@ -1,66 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://bual5tyxahj1u"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_u22xh"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_tgvyr"]
-[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_x0odx"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room2" type="TileMap"]
-tile_set = ExtResource("1_u22xh")
-format = 2
-layer_0/tile_data = PackedInt32Array(589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, -131056, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, -131057, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 0, 8, -131058, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 0, 8, 393227, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, -65528, 0, 8, -131064, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 0, 8, -131065, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 393222, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, -131066, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, -131068, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 0, 8, -131069, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 0, 8, -131070, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, -65535, 0, 8, -131071, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, -131072, 0, 8, 655359, 0, 8, 589823, 0, 8, 524287, 0, 8, 458751, 0, 8, 393215, 0, 8, 327679, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, 655358, 0, 8, 589822, 0, 8, 524286, 0, 8, 458750, 0, 8, 393214, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, 655357, 0, 8, 589821, 0, 8, 524285, 0, 8, 458749, 0, 8, 393213, 0, 8, 327677, 0, 8, 262141, 0, 8, 196605, 0, 8, 131069, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, 655356, 0, 8, 589820, 0, 8, 524284, 0, 8, 458748, 0, 8, 393212, 0, 8, 327676, 0, 8, 262140, 0, 8, 196604, 0, 8, 131068, 0, 8, 65532, 0, 8, -4, 0, 8, -65540, 0, 8, -5, 196608, 3, -65541, 196608, 3, -131077, 196608, 4, -131076, 131072, 7, -131075, 131072, 7, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458747, 196608, 3, 524283, 196608, 3, 589819, 196608, 3, 655355, 196608, 3, 720893, 131072, 2, 720892, 131072, 2, 720891, 720896, 2, -131074, 131072, 7, 720894, 131072, 2, -131073, 131072, 7, 720895, 131072, 2, -196608, 131072, 7, -196607, 131072, 7, -196606, 131072, 7, -196605, 131072, 7, -196604, 131072, 7, 655364, 131072, 2, -196603, 131072, 7, 655365, 131072, 2, -196602, 131072, 7, 655366, 131072, 2, -196601, 131072, 7, 655367, 131072, 2, -196600, 131072, 7, 655368, 131072, 2, 655369, 131072, 2, 655370, 131072, 2, 655371, 131072, 2, 655372, 131072, 2, -196595, 131072, 7, 655373, 131072, 2, -196594, 131072, 7, 655374, 131072, 2, -196593, 131072, 7, 655375, 131072, 2, -196592, 131072, 7, 655376, 131072, 2, -131055, 65536, 3, -65519, 65536, 3, -196591, 65536, 4, 17, 65536, 3, 65553, 65536, 3, 131089, 65536, 3, 196625, 65536, 3, 262161, 65536, 3, 327697, 65536, 3, 393233, 65536, 3, 458769, 65536, 3, 524305, 65536, 3, 589841, 65536, 3, 655377, 851968, 2, 327691, 0, 8, 327692, 0, 8, 327690, 0, 8, 327689, 0, 8, 262153, 65536, 7, 262154, 131072, 7, 262155, 131072, 7, 262156, 196608, 7, -131063, 65536, 3, -65527, 65536, 3, -196599, 65536, 4, 9, 65536, 3, 65545, 65536, 3, 131081, 65536, 3, 196617, 65536, 3, -65524, 196608, 3, -131060, 196608, 3, -196596, 196608, 4, 12, 196608, 3, 65548, 196608, 3, 131084, 196608, 3, 196620, 196608, 3, 196608, 65536, 2, 196609, 131072, 2, 196610, 131072, 2, 196611, 196608, 2, 262147, 196608, 3, 327683, 196608, 3, 393219, 196608, 3, 458755, 196608, 3, 524291, 196608, 3, 589827, 196608, 3, 655363, 720896, 2, 262144, 65536, 3, 327680, 65536, 3, 393216, 65536, 3, 458752, 65536, 3, 524288, 65536, 3, 589824, 65536, 3, 655360, 851968, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(-23, 7)
-script = ExtResource("3_tgvyr")
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(50, 50)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(232, 119)
-script = ExtResource("3_tgvyr")
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(50, 50)
-
-[node name="WeaponMark" type="Node2D" parent="."]
-position = Vector2(105, 45)
-script = ExtResource("4_x0odx")
-CurrAmmon = 30
-Type = 4
-ItemId = "0001"
-DelayTime = 1.0
-Altitude = 8
-
-[node name="WeaponMark2" type="Node2D" parent="."]
-position = Vector2(106, 103)
-script = ExtResource("4_x0odx")
-CurrAmmon = 15
-Type = 4
-ItemId = "0002"
-DelayTime = 1.0
-Altitude = 8
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(102, 8)
-script = ExtResource("3_tgvyr")
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(103, 121)
-script = ExtResource("3_tgvyr")
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn
deleted file mode 100644
index 3907e22..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn
+++ /dev/null
@@ -1,59 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://c83qc7utiy3pd"]
-
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_n5qca"]
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_ngr66"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_jwvnp"]
-[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_6je2e"]
-
-[node name="Room3" type="TileMap"]
-tile_set = ExtResource("1_ngr66")
-format = 2
-layer_0/tile_data = PackedInt32Array(196613, 196608, 4, 262149, 196608, 3, 524293, 196608, 3, 589829, 196608, 3, 655365, 196608, 3, 720901, 196608, 3, 786437, 196608, 3, 1048581, 196608, 3, 1114117, 196608, 3, 1179653, 196608, 3, 1245189, 196608, 3, 1310725, 196608, 3, 196614, 131072, 7, 262150, 0, 8, 524294, 0, 8, 589830, 0, 8, 655366, 0, 8, 720902, 0, 8, 786438, 0, 8, 1048582, 0, 8, 1114118, 0, 8, 1179654, 0, 8, 1245190, 0, 8, 1310726, 0, 8, 196615, 131072, 7, 262151, 0, 8, 524295, 0, 8, 589831, 0, 8, 655367, 0, 8, 720903, 0, 8, 786439, 0, 8, 1048583, 0, 8, 1114119, 0, 8, 1179655, 0, 8, 1245191, 0, 8, 1310727, 0, 8, 196616, 131072, 7, 262152, 0, 8, 327688, 0, 8, 393224, 0, 8, 458760, 0, 8, 524296, 0, 8, 589832, 0, 8, 655368, 0, 8, 720904, 0, 8, 786440, 0, 8, 851976, 0, 8, 917512, 0, 8, 983048, 0, 8, 1048584, 0, 8, 1114120, 0, 8, 1179656, 0, 8, 1245192, 0, 8, 1310728, 0, 8, 196617, 131072, 7, 262153, 0, 8, 327689, 0, 8, 393225, 0, 8, 458761, 65536, 2, 524297, 65536, 3, 589833, 65536, 3, 655369, 65536, 3, 720905, 65536, 7, 786441, 0, 8, 851977, 0, 8, 917513, 0, 8, 983049, 65536, 2, 1048585, 65536, 3, 1114121, 65536, 3, 1179657, 65536, 3, 1245193, 65536, 7, 1310729, 0, 8, 196618, 131072, 7, 262154, 0, 8, 327690, 0, 8, 393226, 0, 8, 458762, 131072, 2, 720906, 131072, 7, 786442, 0, 8, 851978, 0, 8, 917514, 0, 8, 983050, 131072, 2, 1245194, 131072, 7, 1310730, 0, 8, 196619, 131072, 7, 262155, 0, 8, 327691, 0, 8, 393227, 0, 8, 458763, 131072, 2, 720907, 131072, 7, 786443, 0, 8, 851979, 0, 8, 917515, 0, 8, 983051, 131072, 2, 1245195, 131072, 7, 1310731, 0, 8, 196620, 131072, 7, 262156, 0, 8, 327692, 0, 8, 393228, 0, 8, 458764, 131072, 2, 720908, 131072, 7, 786444, 0, 8, 851980, 0, 8, 917516, 0, 8, 983052, 131072, 2, 1245196, 131072, 7, 1310732, 0, 8, 196621, 131072, 7, 262157, 0, 8, 524301, 196608, 3, 589837, 196608, 3, 655373, 196608, 3, 720909, 196608, 7, 786445, 0, 8, 1048589, 196608, 3, 1114125, 196608, 3, 1179661, 196608, 3, 1245197, 196608, 7, 1310733, 0, 8, 196622, 131072, 7, 262158, 0, 8, 524302, 0, 8, 589838, 0, 8, 655374, 0, 8, 720910, 0, 8, 786446, 0, 8, 1048590, 0, 8, 1114126, 0, 8, 1179662, 0, 8, 1245198, 0, 8, 1310734, 0, 8, 196623, 131072, 7, 262159, 0, 8, 524303, 0, 8, 589839, 0, 8, 655375, 0, 8, 720911, 0, 8, 786447, 0, 8, 1048591, 0, 8, 1114127, 0, 8, 1179663, 0, 8, 1245199, 0, 8, 1310735, 0, 8, 196624, 131072, 7, 262160, 0, 8, 327696, 0, 8, 393232, 0, 8, 458768, 0, 8, 524304, 0, 8, 589840, 0, 8, 655376, 0, 8, 720912, 0, 8, 786448, 0, 8, 851984, 0, 8, 917520, 0, 8, 983056, 0, 8, 1048592, 0, 8, 1114128, 0, 8, 1179664, 0, 8, 1245200, 0, 8, 1310736, 0, 8, 196625, 131072, 7, 262161, 0, 8, 327697, 0, 8, 393233, 0, 8, 458769, 65536, 2, 524305, 65536, 3, 589841, 65536, 3, 655377, 65536, 3, 720913, 65536, 7, 786449, 0, 8, 851985, 0, 8, 917521, 0, 8, 983057, 65536, 2, 1048593, 65536, 3, 1114129, 65536, 3, 1179665, 65536, 3, 1245201, 65536, 7, 1310737, 0, 8, 196626, 131072, 7, 262162, 0, 8, 327698, 0, 8, 393234, 0, 8, 458770, 131072, 2, 720914, 131072, 7, 786450, 0, 8, 851986, 0, 8, 917522, 0, 8, 983058, 131072, 2, 1245202, 131072, 7, 1310738, 0, 8, 196627, 131072, 7, 262163, 0, 8, 327699, 0, 8, 393235, 0, 8, 458771, 131072, 2, 720915, 131072, 7, 786451, 0, 8, 851987, 0, 8, 917523, 0, 8, 983059, 131072, 2, 1245203, 131072, 7, 1310739, 0, 8, 196628, 131072, 7, 262164, 0, 8, 327700, 0, 8, 393236, 0, 8, 458772, 131072, 2, 720916, 131072, 7, 786452, 0, 8, 851988, 0, 8, 917524, 0, 8, 983060, 131072, 2, 1245204, 131072, 7, 1310740, 0, 8, 327685, 196608, 3, 393221, 196608, 3, 458757, 196608, 3, 851973, 196608, 3, 917509, 196608, 3, 983045, 196608, 3, 1376261, 196608, 3, 1441797, 196608, 3, 1507333, 720896, 2, 327686, 0, 8, 393222, 0, 8, 458758, 0, 8, 851974, 0, 8, 917510, 0, 8, 983046, 0, 8, 1376262, 0, 8, 1441798, 0, 8, 1507334, 131072, 2, 327687, 0, 8, 393223, 0, 8, 458759, 0, 8, 851975, 0, 8, 917511, 0, 8, 983047, 0, 8, 1376263, 0, 8, 1441799, 0, 8, 1507335, 131072, 2, 1376264, 0, 8, 1441800, 0, 8, 1507336, 131072, 2, 1376265, 0, 8, 1441801, 0, 8, 1507337, 131072, 2, 1376266, 0, 8, 1441802, 0, 8, 1507338, 131072, 2, 1376267, 0, 8, 1441803, 0, 8, 1507339, 131072, 2, 1376268, 0, 8, 1441804, 0, 8, 1507340, 131072, 2, 327693, 0, 8, 393229, 0, 8, 458765, 196608, 2, 851981, 0, 8, 917517, 0, 8, 983053, 196608, 2, 1376269, 0, 8, 1441805, 0, 8, 1507341, 131072, 2, 327694, 0, 8, 393230, 0, 8, 458766, 0, 8, 851982, 0, 8, 917518, 0, 8, 983054, 0, 8, 1376270, 0, 8, 1441806, 0, 8, 1507342, 131072, 2, 327695, 0, 8, 393231, 0, 8, 458767, 0, 8, 851983, 0, 8, 917519, 0, 8, 983055, 0, 8, 1376271, 0, 8, 1441807, 0, 8, 1507343, 131072, 2, 1376272, 0, 8, 1441808, 0, 8, 1507344, 131072, 2, 1376273, 0, 8, 1441809, 0, 8, 1507345, 131072, 2, 1376274, 0, 8, 1441810, 0, 8, 1507346, 131072, 2, 1376275, 0, 8, 1441811, 0, 8, 1507347, 131072, 2, 1376276, 0, 8, 1441812, 0, 8, 1507348, 131072, 2, 196629, 131072, 7, 262165, 0, 8, 327701, 0, 8, 393237, 0, 8, 458773, 196608, 2, 524309, 196608, 3, 589845, 196608, 3, 655381, 196608, 3, 720917, 196608, 7, 786453, 0, 8, 851989, 0, 8, 917525, 0, 8, 983061, 196608, 2, 1048597, 196608, 3, 1114133, 196608, 3, 1179669, 196608, 3, 1245205, 196608, 7, 1310741, 0, 8, 1376277, 0, 8, 1441813, 0, 8, 1507349, 131072, 2, 196630, 131072, 7, 262166, 0, 8, 327702, 0, 8, 393238, 0, 8, 458774, 0, 8, 524310, 0, 8, 589846, 0, 8, 655382, 0, 8, 720918, 0, 8, 786454, 0, 8, 851990, 0, 8, 917526, 0, 8, 983062, 0, 8, 1048598, 0, 8, 1114134, 0, 8, 1179670, 0, 8, 1245206, 0, 8, 1310742, 0, 8, 1376278, 0, 8, 1441814, 0, 8, 1507350, 131072, 2, 196631, 131072, 7, 262167, 0, 8, 327703, 0, 8, 393239, 0, 8, 458775, 0, 8, 524311, 0, 8, 589847, 0, 8, 655383, 0, 8, 720919, 0, 8, 786455, 0, 8, 851991, 0, 8, 917527, 0, 8, 983063, 0, 8, 1048599, 0, 8, 1114135, 0, 8, 1179671, 0, 8, 1245207, 0, 8, 1310743, 0, 8, 1376279, 0, 8, 1441815, 0, 8, 1507351, 131072, 2, 196632, 131072, 7, 262168, 0, 8, 327704, 0, 8, 393240, 0, 8, 458776, 0, 8, 524312, 0, 8, 589848, 0, 8, 655384, 0, 8, 720920, 0, 8, 786456, 0, 8, 851992, 0, 8, 917528, 0, 8, 983064, 0, 8, 1048600, 0, 8, 1114136, 0, 8, 1179672, 0, 8, 1245208, 0, 8, 1310744, 0, 8, 1376280, 0, 8, 1441816, 0, 8, 1507352, 131072, 2, 196633, 65536, 4, 262169, 65536, 3, 327705, 65536, 3, 393241, 65536, 3, 458777, 65536, 3, 524313, 65536, 3, 589849, 65536, 3, 655385, 65536, 3, 720921, 65536, 3, 786457, 65536, 3, 851993, 65536, 3, 917529, 65536, 3, 983065, 65536, 3, 1048601, 65536, 3, 1114137, 65536, 3, 1179673, 65536, 3, 1245209, 65536, 3, 1310745, 65536, 3, 1376281, 65536, 3, 1441817, 65536, 3, 1507353, 851968, 2)
-script = ExtResource("1_n5qca")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(230, 215)
-script = ExtResource("3_jwvnp")
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(200, 20)
-DrawColor = Color(1, 0, 0, 1)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(261, 217)
-script = ExtResource("3_jwvnp")
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(200, 20)
-
-[node name="WeaponMark" type="Node2D" parent="."]
-position = Vector2(248, 160)
-script = ExtResource("4_6je2e")
-ResidueAmmo = 12
-Type = 4
-ItemId = "0002"
-DrawColor = Color(0, 0, 1, 1)
-Altitude = 16
-
-[node name="WeaponMark2" type="Node2D" parent="."]
-position = Vector2(249, 268)
-script = ExtResource("4_6je2e")
-ResidueAmmo = 7
-Type = 4
-ItemId = "0003"
-DrawColor = Color(0, 0, 1, 1)
-Altitude = 16
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(246, 215)
-script = ExtResource("3_jwvnp")
-Weapon1Id = "0001"
-Weapon1Ammo = 30
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(200, 20)
-DrawColor = Color(1, 0, 0, 1)
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
deleted file mode 100644
index 91518c2..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
+++ /dev/null
@@ -1,82 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://b8wy4ni1nkrvp"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_pxj2g"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_k574h"]
-[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_5hiyo"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room4" type="TileMap"]
-tile_set = ExtResource("1_pxj2g")
-format = 2
-layer_0/tile_data = PackedInt32Array(1179686, 0, 8, 1114150, 0, 8, 1048614, 0, 8, 983078, 0, 8, 917542, 0, 8, 852006, 0, 8, 786470, 0, 8, 720934, 0, 8, 655398, 0, 8, 589862, 0, 8, 524326, 0, 8, 458790, 0, 8, 1179685, 0, 8, 1114149, 0, 8, 1048613, 0, 8, 983077, 0, 8, 917541, 0, 8, 852005, 0, 8, 786469, 0, 8, 720933, 0, 8, 655397, 0, 8, 589861, 0, 8, 524325, 0, 8, 458789, 0, 8, 1179684, 0, 8, 1114148, 0, 8, 1048612, 0, 8, 983076, 0, 8, 917540, 0, 8, 852004, 0, 8, 786468, 0, 8, 720932, 0, 8, 655396, 0, 8, 589860, 0, 8, 524324, 0, 8, 458788, 0, 8, 1179683, 0, 8, 1114147, 0, 8, 1048611, 0, 8, 983075, 0, 8, 917539, 0, 8, 852003, 0, 8, 786467, 0, 8, 720931, 0, 8, 655395, 0, 8, 589859, 0, 8, 524323, 0, 8, 458787, 0, 8, 1179682, 0, 8, 1114146, 0, 8, 1048610, 0, 8, 983074, 0, 8, 786466, 0, 8, 720930, 0, 8, 655394, 0, 8, 589858, 0, 8, 524322, 0, 8, 458786, 0, 8, 1507361, 0, 8, 1441825, 0, 8, 1376289, 0, 8, 1310753, 0, 8, 1245217, 0, 8, 1179681, 0, 8, 1114145, 0, 8, 1048609, 0, 8, 983073, 0, 8, 786465, 0, 8, 720929, 0, 8, 655393, 0, 8, 589857, 0, 8, 524321, 0, 8, 458785, 0, 8, 393249, 0, 8, 327713, 0, 8, 262177, 0, 8, 196641, 0, 8, 131105, 0, 8, 1507360, 0, 8, 1441824, 0, 8, 1376288, 0, 8, 1310752, 0, 8, 1245216, 0, 8, 1179680, 0, 8, 1114144, 0, 8, 1048608, 0, 8, 983072, 0, 8, 786464, 0, 8, 720928, 0, 8, 655392, 0, 8, 589856, 0, 8, 524320, 0, 8, 458784, 0, 8, 393248, 0, 8, 327712, 0, 8, 262176, 0, 8, 196640, 0, 8, 131104, 0, 8, 1507359, 0, 8, 1441823, 0, 8, 1376287, 0, 8, 1310751, 0, 8, 1245215, 0, 8, 1179679, 0, 8, 1114143, 0, 8, 1048607, 0, 8, 983071, 0, 8, 786463, 0, 8, 720927, 0, 8, 655391, 0, 8, 589855, 0, 8, 524319, 0, 8, 458783, 0, 8, 393247, 0, 8, 327711, 0, 8, 262175, 0, 8, 196639, 0, 8, 131103, 0, 8, 1507358, 0, 8, 1441822, 0, 8, 1376286, 0, 8, 1310750, 0, 8, 1245214, 0, 8, 1179678, 0, 8, 655390, 0, 8, 589854, 0, 8, 524318, 0, 8, 458782, 0, 8, 393246, 0, 8, 327710, 0, 8, 262174, 0, 8, 196638, 0, 8, 131102, 0, 8, 1507357, 0, 8, 1441821, 0, 8, 1376285, 0, 8, 1310749, 0, 8, 1245213, 0, 8, 1179677, 0, 8, 655389, 0, 8, 589853, 0, 8, 524317, 0, 8, 458781, 0, 8, 393245, 0, 8, 327709, 0, 8, 262173, 0, 8, 196637, 0, 8, 131101, 0, 8, 1507356, 0, 8, 1441820, 0, 8, 1376284, 0, 8, 1310748, 0, 8, 1245212, 0, 8, 1179676, 0, 8, 1114140, 0, 8, 1048604, 0, 8, 851996, 0, 8, 786460, 0, 8, 720924, 0, 8, 655388, 0, 8, 589852, 0, 8, 524316, 0, 8, 458780, 0, 8, 393244, 0, 8, 327708, 0, 8, 262172, 0, 8, 196636, 0, 8, 131100, 0, 8, 1507355, 0, 8, 1441819, 0, 8, 1376283, 0, 8, 1310747, 0, 8, 1245211, 0, 8, 1179675, 0, 8, 1114139, 0, 8, 1048603, 0, 8, 983067, 0, 8, 917531, 0, 8, 851995, 0, 8, 786459, 0, 8, 720923, 0, 8, 655387, 0, 8, 589851, 0, 8, 524315, 0, 8, 458779, 0, 8, 393243, 0, 8, 327707, 0, 8, 262171, 0, 8, 196635, 0, 8, 131099, 0, 8, 1507354, 0, 8, 1441818, 0, 8, 1376282, 0, 8, 1310746, 0, 8, 1245210, 0, 8, 1179674, 0, 8, 1114138, 0, 8, 1048602, 0, 8, 983066, 0, 8, 917530, 0, 8, 851994, 0, 8, 786458, 0, 8, 720922, 0, 8, 655386, 0, 8, 589850, 0, 8, 524314, 0, 8, 458778, 0, 8, 393242, 0, 8, 327706, 0, 8, 262170, 0, 8, 196634, 0, 8, 131098, 0, 8, 1507353, 0, 8, 1441817, 0, 8, 1376281, 0, 8, 1310745, 0, 8, 1245209, 0, 8, 1179673, 0, 8, 1114137, 0, 8, 1048601, 0, 8, 983065, 0, 8, 917529, 0, 8, 851993, 0, 8, 786457, 0, 8, 720921, 0, 8, 655385, 0, 8, 589849, 0, 8, 524313, 0, 8, 458777, 0, 8, 393241, 0, 8, 327705, 0, 8, 262169, 0, 8, 196633, 0, 8, 131097, 0, 8, 917528, 0, 8, 851992, 0, 8, 786456, 0, 8, 720920, 0, 8, 655384, 0, 8, 917527, 0, 8, 851991, 0, 8, 786455, 0, 8, 720919, 0, 8, 655383, 0, 8, 917526, 0, 8, 851990, 0, 8, 786454, 0, 8, 720918, 0, 8, 655382, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 917523, 0, 8, 851987, 0, 8, 786451, 0, 8, 720915, 0, 8, 655379, 0, 8, 917522, 0, 8, 851986, 0, 8, 786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 917521, 0, 8, 851985, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 917520, 0, 8, 851984, 0, 8, 786448, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 1507343, 0, 8, 1441807, 0, 8, 1376271, 0, 8, 1310735, 0, 8, 1245199, 0, 8, 1179663, 0, 8, 1114127, 0, 8, 1048591, 0, 8, 983055, 0, 8, 917519, 0, 8, 851983, 0, 8, 786447, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 1507342, 0, 8, 1441806, 0, 8, 1376270, 0, 8, 1310734, 0, 8, 1245198, 0, 8, 1179662, 0, 8, 1114126, 0, 8, 1048590, 0, 8, 983054, 0, 8, 917518, 0, 8, 720910, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 1507341, 0, 8, 1441805, 0, 8, 1376269, 0, 8, 1310733, 0, 8, 1245197, 0, 8, 1179661, 0, 8, 1114125, 0, 8, 1048589, 0, 8, 983053, 0, 8, 917517, 0, 8, 720909, 0, 8, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 1507340, 0, 8, 1441804, 0, 8, 1376268, 0, 8, 1310732, 0, 8, 1245196, 0, 8, 1179660, 0, 8, 1114124, 0, 8, 1048588, 0, 8, 983052, 0, 8, 917516, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 262156, 0, 8, 196620, 0, 8, 131084, 0, 8, 1507339, 0, 8, 1441803, 0, 8, 1376267, 0, 8, 1310731, 0, 8, 1245195, 0, 8, 1179659, 0, 8, 1114123, 0, 8, 1048587, 0, 8, 983051, 0, 8, 917515, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 262155, 0, 8, 196619, 0, 8, 131083, 0, 8, 1507338, 0, 8, 1441802, 0, 8, 1376266, 0, 8, 1310730, 0, 8, 1245194, 0, 8, 1179658, 0, 8, 1114122, 0, 8, 1048586, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 262154, 0, 8, 196618, 0, 8, 131082, 0, 8, 1507337, 0, 8, 1441801, 0, 8, 1376265, 0, 8, 1310729, 0, 8, 1245193, 0, 8, 1179657, 0, 8, 1114121, 0, 8, 1048585, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 1507336, 0, 8, 1441800, 0, 8, 1376264, 0, 8, 1310728, 0, 8, 1245192, 0, 8, 1179656, 0, 8, 1114120, 0, 8, 1048584, 0, 8, 983048, 0, 8, 917512, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 1179655, 0, 8, 1114119, 0, 8, 1048583, 0, 8, 983047, 0, 8, 917511, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 1179654, 0, 8, 1114118, 0, 8, 1048582, 0, 8, 983046, 0, 8, 917510, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 1179653, 0, 8, 1114117, 0, 8, 1048581, 0, 8, 983045, 0, 8, 917509, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 1179652, 0, 8, 1114116, 0, 8, 1048580, 0, 8, 983044, 0, 8, 917508, 0, 8, 851972, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 1179651, 0, 8, 1114115, 0, 8, 1048579, 0, 8, 983043, 0, 8, 917507, 0, 8, 851971, 0, 8, 786435, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 65543, 131072, 7, 65544, 131072, 7, 1572872, 131072, 2, 65545, 131072, 7, 1572873, 131072, 2, 65546, 131072, 7, 1572874, 131072, 2, 65547, 131072, 7, 1572875, 131072, 2, 65548, 131072, 7, 1572876, 131072, 2, 65549, 131072, 7, 1572877, 131072, 2, 65550, 131072, 7, 1572878, 131072, 2, 65551, 131072, 7, 1572879, 131072, 2, 65552, 131072, 7, 65561, 131072, 7, 1572889, 131072, 2, 65562, 131072, 7, 1572890, 131072, 2, 65563, 131072, 7, 1572891, 131072, 2, 65564, 131072, 7, 1572892, 131072, 2, 65565, 131072, 7, 1572893, 131072, 2, 65566, 131072, 7, 1572894, 131072, 2, 65567, 131072, 7, 1572895, 131072, 2, 65568, 131072, 7, 1572896, 131072, 2, 65569, 131072, 7, 1572897, 131072, 2, 458791, 65536, 3, 524327, 65536, 3, 589863, 65536, 3, 655399, 65536, 3, 720935, 65536, 3, 786471, 65536, 3, 852007, 65536, 3, 917543, 65536, 3, 983079, 65536, 3, 1048615, 65536, 3, 1114151, 65536, 3, 1179687, 65536, 3, 983064, 0, 8, 983063, 0, 8, 983062, 0, 8, 983061, 0, 8, 983060, 0, 8, 983059, 0, 8, 983058, 0, 8, 983057, 0, 8, 1572880, 131072, 2, 1507344, 0, 8, 1441808, 0, 8, 1376272, 0, 8, 1310736, 0, 8, 1245200, 0, 8, 1179664, 0, 8, 1114128, 0, 8, 1048592, 0, 8, 983056, 0, 8, 1048593, 65536, 2, 1048594, 131072, 2, 1048595, 131072, 2, 1048596, 131072, 2, 1048597, 131072, 2, 1048598, 131072, 2, 1048599, 131072, 2, 1048600, 196608, 2, 1114136, 196608, 3, 1179672, 196608, 3, 1245208, 196608, 3, 1310744, 196608, 3, 1376280, 196608, 3, 1441816, 196608, 3, 1507352, 196608, 3, 1572888, 720896, 2, 1114129, 65536, 3, 1179665, 65536, 3, 1245201, 65536, 3, 1310737, 65536, 3, 1376273, 65536, 3, 1441809, 65536, 3, 1507345, 65536, 3, 1572881, 851968, 2, 589841, 65536, 7, 524305, 65536, 3, 458769, 65536, 3, 393233, 65536, 3, 196625, 65536, 3, 131089, 65536, 3, 589842, 131072, 7, 589843, 131072, 7, 589844, 131072, 7, 589845, 131072, 7, 589846, 131072, 7, 589847, 131072, 7, 196632, 196608, 3, 131096, 196608, 3, 65560, 196608, 4, 65553, 65536, 4, 131106, 65536, 3, 196642, 65536, 3, 65570, 65536, 4, 262178, 65536, 3, 327714, 65536, 3, 393250, 65536, 7, 393252, 131072, 7, 393253, 131072, 7, 393254, 131072, 7, 393255, 65536, 4, 393251, 131072, 7, 1245223, 851968, 2, 1245222, 131072, 2, 1245221, 131072, 2, 1245220, 131072, 2, 1245219, 131072, 2, 1245218, 65536, 2, 1310754, 65536, 3, 1376290, 65536, 3, 1441826, 65536, 3, 1507362, 65536, 3, 1572898, 851968, 2, 458754, 196608, 3, 196615, 0, 8, 131079, 0, 8, 262151, 0, 8, 327687, 0, 8, 393223, 0, 8, 393222, 0, 8, 393221, 0, 8, 393220, 0, 8, 393219, 0, 8, 524290, 196608, 3, 393218, 196608, 3, 589826, 196608, 3, 655362, 196608, 3, 720898, 196608, 3, 786434, 196608, 3, 851970, 196608, 3, 917506, 196608, 3, 983042, 196608, 3, 1048578, 196608, 3, 1114114, 196608, 3, 1179650, 196608, 3, 1245188, 131072, 2, 1245187, 131072, 2, 1245186, 720896, 2, 1245189, 131072, 2, 1245190, 131072, 2, 1245191, 196608, 2, 1310727, 196608, 3, 1376263, 196608, 3, 1441799, 196608, 3, 1507335, 196608, 3, 1572871, 720896, 2, 131075, 0, 8, 196611, 0, 8, 262147, 0, 8, 327683, 0, 8, 327682, 196608, 3, 327684, 0, 8, 262146, 196608, 3, 262148, 0, 8, 196610, 196608, 3, 196612, 0, 8, 131074, 196608, 3, 131076, 0, 8, 65538, 196608, 4, 65539, 131072, 7, 65540, 131072, 7, 131078, 0, 8, 131077, 0, 8, 196613, 0, 8, 65541, 131072, 7, 196614, 0, 8, 65542, 131072, 7, 262149, 0, 8, 262150, 0, 8, 327686, 0, 8, 327685, 0, 8, 262161, 65536, 3, 327697, 65536, 3, 589848, 196608, 7, 524312, 196608, 3, 458776, 196608, 3, 393240, 196608, 3, 327704, 196608, 3, 262168, 196608, 3, 720907, 0, 8, 655371, 0, 8, 655370, 0, 8, 720905, 0, 8, 851976, 0, 8, 851974, 0, 8, 851973, 0, 8, 851975, 0, 8, 720906, 0, 8, 786441, 0, 8, 786437, 0, 8, 786438, 0, 8, 786439, 0, 8, 786440, 0, 8, 786461, 0, 8, 851997, 0, 8, 720925, 0, 8, 786462, 0, 8, 917535, 0, 8, 917536, 0, 8, 917537, 0, 8, 917538, 0, 8, 852002, 0, 8, 852001, 0, 8, 852000, 0, 8, 851999, 0, 8, 851998, 0, 8, 720926, 0, 8, 917534, 0, 8, 917533, 0, 8, 1048605, 0, 8, 983069, 0, 8, 917532, 0, 8, 983068, 0, 8, 1114141, 0, 8, 1114142, 0, 8, 1048606, 0, 8, 983070, 0, 8, 786445, 0, 8, 786444, 0, 8, 786443, 0, 8, 786446, 0, 8, 851982, 0, 8, 851981, 0, 8, 851980, 0, 8, 851979, 0, 8, 983050, 0, 8, 917514, 0, 8, 851978, 0, 8, 983049, 0, 8, 917513, 0, 8, 851977, 0, 8, 786442, 0, 8)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="Level1" type="Node" parent="."]
-
-[node name="EnemyMark" type="Node2D" parent="Level1"]
-position = Vector2(198, 94)
-script = ExtResource("3_k574h")
-Weapon1Id = "0003"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-
-[node name="EnemyMark2" type="Node2D" parent="Level1"]
-position = Vector2(195, 331)
-script = ExtResource("3_k574h")
-Weapon1Id = "0003"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-
-[node name="EnemyMark3" type="Node2D" parent="Level1"]
-position = Vector2(480, 334)
-script = ExtResource("3_k574h")
-Weapon1Id = "0003"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-
-[node name="EnemyMark4" type="Node2D" parent="Level1"]
-position = Vector2(470, 98)
-script = ExtResource("3_k574h")
-Weapon1Id = "0003"
-Weapon1Ammo = 20
-Type = 3
-ItemId = "0001"
-Layer = 1
-
-[node name="Level2" type="Node" parent="."]
-
-[node name="EnemyMark" type="Node2D" parent="Level2"]
-position = Vector2(120, 204)
-script = ExtResource("3_k574h")
-Weapon1Id = "0001"
-Weapon1Ammo = 45
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.5
-
-[node name="EnemyMark2" type="Node2D" parent="Level2"]
-position = Vector2(561, 207)
-script = ExtResource("3_k574h")
-Weapon1Id = "0001"
-Weapon1Ammo = 45
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.5
-
-[node name="WeaponMark" type="Node2D" parent="."]
-position = Vector2(331, 208)
-script = ExtResource("4_5hiyo")
-Type = 4
-ItemId = "0001"
-WaveNumber = 3
-DelayTime = 1.0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn
deleted file mode 100644
index 5a9d421..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn
+++ /dev/null
@@ -1,56 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://ctbfg0p66xirw"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_mx0vc"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_7acs8"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room5" type="TileMap"]
-tile_set = ExtResource("1_mx0vc")
-format = 2
-layer_0/tile_data = PackedInt32Array(65533, 0, 8, 131069, 0, 8, 196605, 0, 8, 262141, 0, 8, 327677, 131072, 2, 65534, 0, 8, 131070, 0, 8, 196606, 0, 8, 262142, 0, 8, 327678, 196608, 2, 393214, 720896, 2, -1, 0, 8, 65535, 0, 8, 131071, 0, 8, 196607, 0, 8, 262143, 0, 8, 327679, 0, 8, 393215, 196608, 2, 458751, 196608, 3, -196608, 0, 8, -131072, 0, 8, -65536, 0, 8, 0, 0, 8, 65536, 0, 8, 131072, 0, 8, 196608, 0, 8, 262144, 0, 8, 327680, 0, 8, 393216, 0, 8, 458752, 131072, 2, -196607, 0, 8, -131071, 0, 8, -65535, 0, 8, 1, 0, 8, 65537, 65536, 2, 131073, 65536, 7, 196609, 0, 8, 262145, 0, 8, 327681, 0, 8, 393217, 0, 8, 458753, 131072, 2, -196606, 0, 8, -131070, 0, 8, -65534, 0, 8, 2, 0, 8, 65538, 196608, 2, 131074, 196608, 7, 196610, 0, 8, 262146, 0, 8, 327682, 0, 8, 393218, 0, 8, 458754, 131072, 2, -196605, 0, 8, -131069, 0, 8, -65533, 0, 8, 3, 0, 8, 65539, 0, 8, 131075, 0, 8, 196611, 0, 8, 262147, 0, 8, 327683, 0, 8, 393219, 0, 8, 458755, 131072, 2, -196604, 65536, 3, -131068, 65536, 7, -65532, 0, 8, 4, 0, 8, 65540, 0, 8, 131076, 0, 8, 196612, 0, 8, 262148, 0, 8, 327684, 65536, 2, 393220, 65536, 3, 458756, 851968, 2, -131067, 65536, 4, -65531, 65536, 7, 5, 0, 8, 65541, 0, 8, 131077, 0, 8, 196613, 0, 8, 262149, 65536, 2, 327685, 851968, 2, -65530, 131072, 7, 6, 0, 8, 65542, 0, 8, 131078, 0, 8, 196614, 0, 8, 262150, 131072, 2, 7, 65536, 3, 65543, 65536, 3, 131079, 65536, 3, 196615, 65536, 3, 262151, 851968, 2, -4, 196608, 4, 65532, 196608, 3, 131068, 196608, 3, 196604, 196608, 3, 262140, 196608, 3, 327676, 720896, 2, -3, 131072, 7, -65538, 196608, 4, -2, 196608, 7, -196609, 196608, 4, -131073, 196608, 3, -65537, 196608, 7, 524287, 720896, 2, -262144, 131072, 7, -262143, 131072, 7, -262142, 131072, 7, -262141, 131072, 7, -262140, 65536, 4, -65529, 65536, 4)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(-15, 36)
-script = ExtResource("3_7acs8")
-Weapon1Id = "0002"
-Weapon1Ammo = 10
-Type = 3
-ItemId = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(30, 30)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(81, 36)
-script = ExtResource("3_7acs8")
-Weapon1Id = "0002"
-Weapon1Ammo = 10
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(30, 30)
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(32, -19)
-script = ExtResource("3_7acs8")
-Weapon1Id = "0002"
-Weapon1Ammo = 10
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 0.5
-BirthRect = Vector2i(30, 30)
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(32, 89)
-script = ExtResource("3_7acs8")
-Weapon1Id = "0002"
-Weapon1Ammo = 10
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.5
-BirthRect = Vector2i(30, 30)
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn
deleted file mode 100644
index 3c52dac..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn
+++ /dev/null
@@ -1,42 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://enbdu7o247o2"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_0o1o2"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_mis0j"]
-[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="4_cu8vs"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room6" type="TileMap"]
-tile_set = ExtResource("1_0o1o2")
-format = 2
-layer_0/tile_data = PackedInt32Array(196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, -131068, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 0, 8, -131069, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 0, 8, -131070, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, -65535, 0, 8, -131071, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, -131072, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -3, 196608, 3, -65539, 196608, 3, -131075, 196608, 4, -131074, 131072, 7, -131073, 131072, 7, 65533, 196608, 3, 131069, 196608, 3, 196605, 196608, 3, 262141, 196608, 3, 327679, 131072, 2, 327678, 131072, 2, 327677, 720896, 2, -196608, 131072, 7, 262144, 131072, 2, -196607, 131072, 7, 262145, 131072, 2, -196606, 131072, 7, 262146, 131072, 2, -196605, 131072, 7, 262147, 196608, 2, -196604, 131072, 7, 262148, 0, 8, -196603, 131072, 7, 262149, 0, 8, -131066, 65536, 3, -65530, 65536, 3, -196602, 65536, 4, 6, 65536, 3, 65542, 65536, 7, 131078, 0, 8, 196614, 0, 8, 262150, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 458758, 0, 8, 393222, 0, 8, 327686, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 327683, 196608, 3, 393219, 196608, 3, 458755, 196608, 3, 524293, 131072, 2, 524292, 131072, 2, 524291, 720896, 2, 524294, 131072, 2, 65543, 131072, 7, 524295, 131072, 2, 65544, 131072, 7, 524296, 131072, 2, 65545, 131072, 7, 524297, 131072, 2, 131082, 65536, 3, 196618, 65536, 3, 65546, 65536, 4, 262154, 65536, 3, 327690, 65536, 3, 393226, 65536, 3, 458762, 65536, 3, 524298, 851968, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(20, 12)
-script = ExtResource("3_mis0j")
-Weapon1Id = "0003"
-Weapon1Ammo = 25
-Type = 3
-ItemId = "0001"
-Layer = 1
-BirthRect = Vector2i(40, 40)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(113, 79)
-script = ExtResource("3_mis0j")
-Weapon1Id = "0003"
-Weapon1Ammo = 25
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(40, 40)
-
-[node name="WeaponMark" type="Node2D" parent="."]
-position = Vector2(63, 14)
-script = ExtResource("4_cu8vs")
-Type = 4
-ItemId = "0001"
-WaveNumber = 3
-DrawColor = Color(0.0196078, 0.627451, 0.768627, 1)
-Altitude = 8
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room7.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room7.tscn
deleted file mode 100644
index a2fdb0d..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room7.tscn
+++ /dev/null
@@ -1,50 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://bgygwfm4wwuyo"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_phigy"]
-[ext_resource type="Script" path="res://src/framework/map/mark/WeaponMark.cs" id="3_lq0g0"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="4_eg4mt"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room7" type="TileMap"]
-tile_set = ExtResource("1_phigy")
-format = 2
-layer_0/tile_data = PackedInt32Array(196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, -65528, 0, 8, -131064, 0, 8, -196600, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 0, 8, -131065, 0, 8, -196601, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, -131066, 0, 8, -196602, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, -196603, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, -131068, 0, 8, -196604, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 0, 8, -131069, 0, 8, -196605, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 0, 8, -131070, 0, 8, -196606, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, -65535, 0, 8, -131071, 0, 8, -196607, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, -131072, 0, 8, -196608, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, -131073, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -131074, 0, 8, -65539, 196608, 3, -131075, 196608, 3, -196611, 196608, 4, -196610, 131072, 7, -196609, 131072, 7, -3, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 196608, 3, 262141, 196608, 3, 327679, 131072, 2, 327678, 131072, 2, 327677, 720896, 2, -262144, 131072, 7, 262144, 131072, 2, -262143, 131072, 7, 262145, 131072, 2, -262142, 131072, 7, 262146, 131072, 2, -262141, 131072, 7, 262147, 131072, 2, -262140, 131072, 7, 262148, 131072, 2, -262139, 131072, 7, 262149, 131072, 2, -262138, 131072, 7, 262150, 131072, 2, -262137, 131072, 7, 262151, 131072, 2, -262136, 131072, 7, 262152, 131072, 2, -262135, 131072, 7, 262153, 131072, 2, -196598, 65536, 3, -131062, 65536, 3, -262134, 65536, 4, -65526, 65536, 3, 10, 65536, 3, 65546, 65536, 3, 131082, 65536, 3, 196618, 65536, 3, 262154, 851968, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="WeaponMark" type="Node2D" parent="."]
-position = Vector2(66, 11)
-script = ExtResource("3_lq0g0")
-CurrAmmon = 1
-ResidueAmmo = 45
-Type = 4
-ItemId = "0001"
-BirthRect = Vector2i(120, 80)
-Altitude = 8
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(-1, 9)
-script = ExtResource("4_eg4mt")
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(30, 80)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(83, -15)
-script = ExtResource("4_eg4mt")
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.5
-BirthRect = Vector2i(120, 40)
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(86, 27)
-script = ExtResource("4_eg4mt")
-Type = 3
-ItemId = "0001"
-Layer = 1
-WaveNumber = 3
-BirthRect = Vector2i(100, 60)
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn
new file mode 100644
index 0000000..08c2130
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn
@@ -0,0 +1,18 @@
+[gd_scene load_steps=4 format=3 uid="uid://da8uytgy0hroo"]
+
+[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_n27nn"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_y6it6"]
+[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
+
+[node name="Room8" type="TileMap"]
+tile_set = ExtResource("1_n27nn")
+format = 2
+layer_0/tile_data = PackedInt32Array(720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 458770, 0, 8, 393234, 0, 8, 327698, 0, 8, 262162, 0, 8, 196626, 0, 8, 131090, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 458769, 0, 8, 393233, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 131089, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, -131056, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, -131057, 0, 8, 720910, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 0, 8, -131058, 0, 8, 720909, 0, 8, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 262156, 0, 8, 196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, 720907, 0, 8, 655371, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 262155, 0, 8, 196619, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, -65525, 0, 8, -131061, 0, 8, 720906, 0, 8, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 262154, 0, 8, 196618, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, -65526, 0, 8, -131062, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, -65528, 0, 8, -131064, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 0, 8, -131065, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 393222, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, -131066, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, -131068, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 393219, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 0, 8, -131069, 0, 8, 720898, 0, 8, 655362, 0, 8, 589826, 0, 8, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 0, 8, -131070, 0, 8, 720897, 0, 8, 655361, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 393217, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, -65535, 0, 8, -131071, 0, 8, 720896, 0, 8, 655360, 0, 8, 589824, 0, 8, 524288, 0, 8, 458752, 0, 8, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, -131072, 0, 8, 786431, 0, 8, 720895, 0, 8, 655359, 0, 8, 589823, 0, 8, 524287, 0, 8, 458751, 0, 8, 393215, 0, 8, 327679, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, 786430, 0, 8, 720894, 0, 8, 655358, 0, 8, 589822, 0, 8, 524286, 0, 8, 458750, 0, 8, 393214, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, 786429, 0, 8, 720893, 0, 8, 655357, 0, 8, 589821, 0, 8, 524285, 0, 8, 458749, 0, 8, 393213, 0, 8, 327677, 0, 8, 262141, 0, 8, 196605, 0, 8, 131069, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, 786428, 0, 8, 720892, 0, 8, 655356, 0, 8, 589820, 0, 8, 524284, 0, 8, 458748, 0, 8, 393212, 0, 8, 327676, 0, 8, 262140, 0, 8, 196604, 0, 8, 131068, 0, 8, 65532, 0, 8, -4, 0, 8, -65540, 0, 8, -5, 196608, 3, -65541, 196608, 3, -131077, 196608, 4, -131076, 131072, 7, -131075, 131072, 7, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458747, 196608, 3, 524283, 196608, 3, 589819, 196608, 3, 655355, 196608, 3, 720891, 196608, 3, 786427, 196608, 3, 851965, 131072, 2, 851964, 131072, 2, 851963, 720896, 2, -131074, 131072, 7, 851966, 131072, 2, -131073, 131072, 7, 851967, 131072, 2, -196608, 131072, 7, 786432, 131072, 2, -196607, 131072, 7, 786433, 131072, 2, -196606, 131072, 7, 786434, 131072, 2, -196605, 131072, 7, 786435, 131072, 2, -196604, 131072, 7, 786436, 131072, 2, -196603, 131072, 7, 786437, 131072, 2, -196602, 131072, 7, 786438, 131072, 2, -196601, 131072, 7, 786439, 131072, 2, -196600, 131072, 7, 786440, 131072, 2, -196599, 131072, 7, 786441, 131072, 2, -196598, 131072, 7, 786442, 131072, 2, -196597, 131072, 7, 786443, 131072, 2, -196596, 131072, 7, 786444, 131072, 2, -196595, 131072, 7, 786445, 131072, 2, -196594, 131072, 7, 786446, 131072, 2, -196593, 131072, 7, 786447, 131072, 2, -196592, 131072, 7, 786448, 131072, 2, -196591, 131072, 7, 786449, 131072, 2, -196590, 131072, 7, 786450, 131072, 2, -131053, 65536, 3, -65517, 65536, 3, -196589, 65536, 4, 19, 65536, 3, 65555, 65536, 3, 131091, 65536, 3, 196627, 65536, 3, 262163, 65536, 3, 327699, 65536, 3, 393235, 65536, 3, 458771, 65536, 3, 524307, 65536, 3, 589843, 65536, 3, 655379, 65536, 3, 720915, 65536, 3, 786451, 851968, 2)
+script = ExtResource("dungeonRoomTemplate")
+
+[node name="EnemyMark" type="Node2D" parent="."]
+script = ExtResource("3_y6it6")
+Weapon1Id = "0001"
+Type = 3
+ItemExpression = "0001"
+Layer = 1
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
index 87a5beb..0791d49 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://dmeb88jotqro6"]
[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_gh7sf"]
-[ext_resource type="Script" path="res://src/framework/map/mark/PlayerBirthMark.cs" id="3_3iyr5"]
+[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_pf56w"]
[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
[node name="Room1" type="TileMap"]
@@ -10,6 +10,7 @@
layer_0/tile_data = PackedInt32Array(327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, 131071, 196608, 3, 65535, 196608, 3, -1, 196608, 4, -65536, 131072, 7, -65535, 131072, 7, 196607, 196608, 3, 262143, 196608, 3, 327679, 196608, 3, 393215, 196608, 3, 393217, 131072, 2, 393216, 131072, 2, 458751, 720896, 2, -65534, 131072, 7, 393218, 131072, 2, -65533, 131072, 7, 393219, 131072, 2, -65532, 131072, 7, 393220, 131072, 2, -65531, 131072, 7, 393221, 131072, 2, -65530, 131072, 7, 393222, 131072, 2, -65529, 131072, 7, 393223, 131072, 2, -65528, 131072, 7, 393224, 131072, 2, -65527, 131072, 7, 393225, 131072, 2, 10, 65536, 3, 65546, 65536, 3, -65526, 65536, 4, 131082, 65536, 3, 196618, 65536, 3, 262154, 65536, 3, 327690, 65536, 3, 393226, 851968, 2)
script = ExtResource("dungeonRoomTemplate")
-[node name="PlayerBirthMark" type="Node2D" parent="."]
-position = Vector2(80, 48)
-script = ExtResource("3_3iyr5")
+[node name="Player" type="Node2D" parent="."]
+position = Vector2(80, 47)
+script = ExtResource("3_pf56w")
+Type = 1
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json
deleted file mode 100644
index c10e37c..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Position": {
- "X": -3,
- "Y": -5
- },
- "Size": {
- "X": 17,
- "Y": 10
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -24,
- "Y": -56
- },
- {
- "X": 200,
- "Y": -56
- },
- {
- "X": 200,
- "Y": 64
- },
- {
- "X": -24,
- "Y": 64
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 8,
- "Y": -32
- },
- {
- "X": 168,
- "Y": -32
- },
- {
- "X": 168,
- "Y": 40
- },
- {
- "X": 8,
- "Y": 40
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room1",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json
deleted file mode 100644
index 8869705..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "Position": {
- "X": -5,
- "Y": -3
- },
- "Size": {
- "X": 23,
- "Y": 14
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 224
- },
- {
- "Direction": 3,
- "Start": 288,
- "End": 352
- },
- {
- "Direction": 0,
- "Start": 16,
- "End": 208
- },
- {
- "Direction": 2,
- "Start": 144,
- "End": 352
- },
- {
- "Direction": 2,
- "Start": 16,
- "End": 80
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 208
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -56,
- "Y": -24
- },
- {
- "X": 136,
- "Y": -24
- },
- {
- "X": 136,
- "Y": 88
- },
- {
- "X": 216,
- "Y": 88
- },
- {
- "X": 216,
- "Y": -24
- },
- {
- "X": 264,
- "Y": -24
- },
- {
- "X": 264,
- "Y": 160
- },
- {
- "X": 72,
- "Y": 160
- },
- {
- "X": 72,
- "Y": 48
- },
- {
- "X": -8,
- "Y": 48
- },
- {
- "X": -8,
- "Y": 160
- },
- {
- "X": -56,
- "Y": 160
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room2",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json
deleted file mode 100644
index ad806d5..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "Position": {
- "X": 5,
- "Y": 3
- },
- "Size": {
- "X": 21,
- "Y": 21
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 104,
- "Y": 72
- },
- {
- "X": 392,
- "Y": 72
- },
- {
- "X": 392,
- "Y": 368
- },
- {
- "X": 104,
- "Y": 368
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 136,
- "Y": 112
- },
- {
- "X": 232,
- "Y": 112
- },
- {
- "X": 232,
- "Y": 200
- },
- {
- "X": 136,
- "Y": 200
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 264,
- "Y": 112
- },
- {
- "X": 360,
- "Y": 112
- },
- {
- "X": 360,
- "Y": 200
- },
- {
- "X": 264,
- "Y": 200
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 136,
- "Y": 240
- },
- {
- "X": 232,
- "Y": 240
- },
- {
- "X": 232,
- "Y": 328
- },
- {
- "X": 136,
- "Y": 328
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 264,
- "Y": 240
- },
- {
- "X": 360,
- "Y": 240
- },
- {
- "X": 360,
- "Y": 328
- },
- {
- "X": 264,
- "Y": 328
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room3",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json
deleted file mode 100644
index 70e0b46..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "Position": {
- "X": 2,
- "Y": 1
- },
- "Size": {
- "X": 38,
- "Y": 24
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 240
- },
- {
- "Direction": 3,
- "Start": 368,
- "End": 512
- },
- {
- "Direction": 0,
- "Start": 96,
- "End": 288
- },
- {
- "Direction": 2,
- "Start": 368,
- "End": 512
- },
- {
- "Direction": 2,
- "Start": 96,
- "End": 240
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 288
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 56,
- "Y": 40
- },
- {
- "X": 264,
- "Y": 40
- },
- {
- "X": 264,
- "Y": 168
- },
- {
- "X": 408,
- "Y": 168
- },
- {
- "X": 408,
- "Y": 40
- },
- {
- "X": 536,
- "Y": 40
- },
- {
- "X": 536,
- "Y": 120
- },
- {
- "X": 616,
- "Y": 120
- },
- {
- "X": 616,
- "Y": 304
- },
- {
- "X": 536,
- "Y": 304
- },
- {
- "X": 536,
- "Y": 384
- },
- {
- "X": 408,
- "Y": 384
- },
- {
- "X": 408,
- "Y": 256
- },
- {
- "X": 264,
- "Y": 256
- },
- {
- "X": 264,
- "Y": 384
- },
- {
- "X": 136,
- "Y": 384
- },
- {
- "X": 136,
- "Y": 304
- },
- {
- "X": 56,
- "Y": 304
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room4",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json
deleted file mode 100644
index 46c027e..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- "Position": {
- "X": -4,
- "Y": -4
- },
- "Size": {
- "X": 12,
- "Y": 12
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 64,
- "End": 128
- },
- {
- "Direction": 0,
- "Start": 64,
- "End": 128
- },
- {
- "Direction": 2,
- "Start": 64,
- "End": 128
- },
- {
- "Direction": 1,
- "Start": 64,
- "End": 128
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 8,
- "Y": -40
- },
- {
- "X": 56,
- "Y": -40
- },
- {
- "X": 56,
- "Y": -8
- },
- {
- "X": 72,
- "Y": -8
- },
- {
- "X": 72,
- "Y": 8
- },
- {
- "X": 104,
- "Y": 8
- },
- {
- "X": 104,
- "Y": 64
- },
- {
- "X": 72,
- "Y": 64
- },
- {
- "X": 72,
- "Y": 80
- },
- {
- "X": 56,
- "Y": 80
- },
- {
- "X": 56,
- "Y": 112
- },
- {
- "X": 8,
- "Y": 112
- },
- {
- "X": 8,
- "Y": 80
- },
- {
- "X": -8,
- "Y": 80
- },
- {
- "X": -8,
- "Y": 64
- },
- {
- "X": -40,
- "Y": 64
- },
- {
- "X": -40,
- "Y": 8
- },
- {
- "X": -8,
- "Y": 8
- },
- {
- "X": -8,
- "Y": -8
- },
- {
- "X": 8,
- "Y": -8
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 8,
- "Y": 16
- },
- {
- "X": 56,
- "Y": 16
- },
- {
- "X": 56,
- "Y": 56
- },
- {
- "X": 8,
- "Y": 56
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room5",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json
deleted file mode 100644
index 2dce54f..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "Position": {
- "X": -3,
- "Y": -3
- },
- "Size": {
- "X": 14,
- "Y": 12
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 144
- },
- {
- "Direction": 0,
- "Start": 80,
- "End": 176
- },
- {
- "Direction": 2,
- "Start": 112,
- "End": 208
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 112
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -24,
- "Y": -24
- },
- {
- "X": 88,
- "Y": -24
- },
- {
- "X": 88,
- "Y": 40
- },
- {
- "X": 152,
- "Y": 40
- },
- {
- "X": 152,
- "Y": 128
- },
- {
- "X": 72,
- "Y": 128
- },
- {
- "X": 72,
- "Y": 64
- },
- {
- "X": -24,
- "Y": 64
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room6",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room7.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room7.json
deleted file mode 100644
index 70a6b05..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room7.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "Position": {
- "X": -3,
- "Y": -4
- },
- "Size": {
- "X": 14,
- "Y": 9
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -24,
- "Y": -40
- },
- {
- "X": 152,
- "Y": -40
- },
- {
- "X": 152,
- "Y": 64
- },
- {
- "X": -24,
- "Y": 64
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room7",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room8.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room8.json
new file mode 100644
index 0000000..6cd97e7
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room8.json
@@ -0,0 +1,38 @@
+{
+ "Position": {
+ "X": -5,
+ "Y": -3
+ },
+ "Size": {
+ "X": 25,
+ "Y": 16
+ },
+ "DoorAreaInfos": [],
+ "NavigationList": [
+ {
+ "Type": 0,
+ "Points": [
+ {
+ "X": -56,
+ "Y": -24
+ },
+ {
+ "X": 296,
+ "Y": -24
+ },
+ {
+ "X": 296,
+ "Y": 192
+ },
+ {
+ "X": -56,
+ "Y": 192
+ }
+ ]
+ }
+ ],
+ "GroupName": "testGroup",
+ "RoomType": 0,
+ "FileName": "Room8",
+ "Weight": 100
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
index d314496..a8fe7bb 100644
--- a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
+++ b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
@@ -41,9 +41,6 @@
11:0/0 = 0
11:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
11:0/0/physics_layer_0/angular_velocity = 0.0
-11:0/1 = 1
-11:0/1/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:0/1/physics_layer_0/angular_velocity = 0.0
12:0/0 = 0
12:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
12:0/0/physics_layer_0/angular_velocity = 0.0
@@ -51,9 +48,6 @@
13:0/0 = 0
13:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
13:0/0/physics_layer_0/angular_velocity = 0.0
-13:0/1 = 1
-13:0/1/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:0/1/physics_layer_0/angular_velocity = 0.0
14:0/0 = 0
14:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
14:0/0/physics_layer_0/angular_velocity = 0.0
@@ -115,6 +109,7 @@
1:2/0/terrain_set = 0
1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:2/0/physics_layer_0/angular_velocity = 0.0
+1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
1:2/0/terrains_peering_bit/bottom_left_corner = 0
1:2/0/terrains_peering_bit/top_left_corner = 0
1:2/0/terrains_peering_bit/top_right_corner = 0
@@ -122,12 +117,14 @@
2:2/0/terrain_set = 0
2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:2/0/physics_layer_0/angular_velocity = 0.0
+2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
2:2/0/terrains_peering_bit/top_left_corner = 0
2:2/0/terrains_peering_bit/top_right_corner = 0
3:2/0 = 0
3:2/0/terrain_set = 0
3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:2/0/physics_layer_0/angular_velocity = 0.0
+3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
3:2/0/terrains_peering_bit/bottom_right_corner = 0
3:2/0/terrains_peering_bit/top_left_corner = 0
3:2/0/terrains_peering_bit/top_right_corner = 0
@@ -156,6 +153,7 @@
11:2/0/terrain_set = 0
11:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
11:2/0/physics_layer_0/angular_velocity = 0.0
+11:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
11:2/0/terrains_peering_bit/top_right_corner = 0
12:2/0 = 0
12:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@@ -164,6 +162,7 @@
13:2/0/terrain_set = 0
13:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
13:2/0/physics_layer_0/angular_velocity = 0.0
+13:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
13:2/0/terrains_peering_bit/top_left_corner = 0
14:2/0 = 0
14:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@@ -178,15 +177,18 @@
1:3/0/terrain_set = 0
1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:3/0/physics_layer_0/angular_velocity = 0.0
+1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:3/0/terrains_peering_bit/bottom_left_corner = 0
1:3/0/terrains_peering_bit/top_left_corner = 0
2:3/0 = 0
2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:3/0/physics_layer_0/angular_velocity = 0.0
+2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:3/0 = 0
3:3/0/terrain_set = 0
3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:3/0/physics_layer_0/angular_velocity = 0.0
+3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:3/0/terrains_peering_bit/bottom_right_corner = 0
3:3/0/terrains_peering_bit/top_right_corner = 0
4:3/0 = 0
@@ -232,14 +234,17 @@
1:4/0/terrain_set = 0
1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:4/0/physics_layer_0/angular_velocity = 0.0
+1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:4/0/terrains_peering_bit/bottom_left_corner = 0
2:4/0 = 0
2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:4/0/physics_layer_0/angular_velocity = 0.0
+2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:4/0 = 0
3:4/0/terrain_set = 0
3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:4/0/physics_layer_0/angular_velocity = 0.0
+3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:4/0/terrains_peering_bit/bottom_right_corner = 0
4:4/0 = 0
4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@@ -283,12 +288,15 @@
1:5/0 = 0
1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:5/0/physics_layer_0/angular_velocity = 0.0
+1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:5/0 = 0
2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:5/0/physics_layer_0/angular_velocity = 0.0
+2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:5/0 = 0
3:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:5/0/physics_layer_0/angular_velocity = 0.0
+3:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:5/0 = 0
4:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:5/0/physics_layer_0/angular_velocity = 0.0
@@ -332,23 +340,17 @@
1:6/0 = 0
1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:6/0/physics_layer_0/angular_velocity = 0.0
-1:6/2 = 2
-1:6/2/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:6/2/physics_layer_0/angular_velocity = 0.0
+1:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:6/next_alternative_id = 3
2:6/0 = 0
2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:6/0/physics_layer_0/angular_velocity = 0.0
-2:6/2 = 2
-2:6/2/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:6/2/physics_layer_0/angular_velocity = 0.0
+2:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:6/next_alternative_id = 3
3:6/0 = 0
3:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:6/0/physics_layer_0/angular_velocity = 0.0
-3:6/2 = 2
-3:6/2/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:6/2/physics_layer_0/angular_velocity = 0.0
+3:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:6/0 = 0
4:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:6/0/physics_layer_0/angular_velocity = 0.0
@@ -392,6 +394,7 @@
1:7/0/terrain_set = 0
1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:7/0/physics_layer_0/angular_velocity = 0.0
+1:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:7/0/terrains_peering_bit/bottom_right_corner = 0
1:7/0/terrains_peering_bit/bottom_left_corner = 0
1:7/0/terrains_peering_bit/top_left_corner = 0
@@ -399,12 +402,14 @@
2:7/0/terrain_set = 0
2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:7/0/physics_layer_0/angular_velocity = 0.0
+2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:7/0/terrains_peering_bit/bottom_right_corner = 0
2:7/0/terrains_peering_bit/bottom_left_corner = 0
3:7/0 = 0
3:7/0/terrain_set = 0
3:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:7/0/physics_layer_0/angular_velocity = 0.0
+3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:7/0/terrains_peering_bit/bottom_right_corner = 0
3:7/0/terrains_peering_bit/bottom_left_corner = 0
3:7/0/terrains_peering_bit/top_right_corner = 0
diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres
new file mode 100644
index 0000000..8f15fc4
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileset/TileSet_old.tres
@@ -0,0 +1,559 @@
+[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://bn21mn0gu6jel"]
+
+[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1_vqd0o"]
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rkmbu"]
+texture = ExtResource("1_vqd0o")
+0:0/0 = 0
+0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:0/0/physics_layer_0/angular_velocity = 0.0
+1:0/0 = 0
+1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:0/0/physics_layer_0/angular_velocity = 0.0
+2:0/0 = 0
+2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:0/0/physics_layer_0/angular_velocity = 0.0
+3:0/0 = 0
+3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:0/0/physics_layer_0/angular_velocity = 0.0
+4:0/0 = 0
+4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:0/0/physics_layer_0/angular_velocity = 0.0
+5:0/0 = 0
+5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:0/0/physics_layer_0/angular_velocity = 0.0
+6:0/0 = 0
+6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:0/0/physics_layer_0/angular_velocity = 0.0
+7:0/0 = 0
+7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:0/0/physics_layer_0/angular_velocity = 0.0
+8:0/0 = 0
+8:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:0/0/physics_layer_0/angular_velocity = 0.0
+9:0/0 = 0
+9:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:0/0/physics_layer_0/angular_velocity = 0.0
+10:0/0 = 0
+10:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:0/0/physics_layer_0/angular_velocity = 0.0
+11:0/0 = 0
+11:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:0/0/physics_layer_0/angular_velocity = 0.0
+12:0/0 = 0
+12:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:0/0/physics_layer_0/angular_velocity = 0.0
+13:0/0 = 0
+13:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:0/0/physics_layer_0/angular_velocity = 0.0
+14:0/0 = 0
+14:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:0/0/physics_layer_0/angular_velocity = 0.0
+15:0/0 = 0
+15:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:0/0/physics_layer_0/angular_velocity = 0.0
+0:1/0 = 0
+0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:1/0/physics_layer_0/angular_velocity = 0.0
+1:1/0 = 0
+1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:1/0/physics_layer_0/angular_velocity = 0.0
+2:1/0 = 0
+2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:1/0/physics_layer_0/angular_velocity = 0.0
+3:1/0 = 0
+3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:1/0/physics_layer_0/angular_velocity = 0.0
+4:1/0 = 0
+4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:1/0/physics_layer_0/angular_velocity = 0.0
+5:1/0 = 0
+5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:1/0/physics_layer_0/angular_velocity = 0.0
+6:1/0 = 0
+6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:1/0/physics_layer_0/angular_velocity = 0.0
+7:1/0 = 0
+7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:1/0/physics_layer_0/angular_velocity = 0.0
+8:1/0 = 0
+8:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:1/0/physics_layer_0/angular_velocity = 0.0
+9:1/0 = 0
+9:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:1/0/physics_layer_0/angular_velocity = 0.0
+10:1/0 = 0
+10:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:1/0/physics_layer_0/angular_velocity = 0.0
+11:1/0 = 0
+11:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:1/0/physics_layer_0/angular_velocity = 0.0
+12:1/0 = 0
+12:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:1/0/physics_layer_0/angular_velocity = 0.0
+13:1/0 = 0
+13:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:1/0/physics_layer_0/angular_velocity = 0.0
+14:1/0 = 0
+14:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:1/0/physics_layer_0/angular_velocity = 0.0
+15:1/0 = 0
+15:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:1/0/physics_layer_0/angular_velocity = 0.0
+0:2/0 = 0
+0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:2/0/physics_layer_0/angular_velocity = 0.0
+1:2/0 = 0
+1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:2/0/physics_layer_0/angular_velocity = 0.0
+1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
+2:2/0 = 0
+2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:2/0/physics_layer_0/angular_velocity = 0.0
+2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
+3:2/0 = 0
+3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:2/0/physics_layer_0/angular_velocity = 0.0
+3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
+4:2/0 = 0
+4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:2/0/physics_layer_0/angular_velocity = 0.0
+5:2/0 = 0
+5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:2/0/physics_layer_0/angular_velocity = 0.0
+6:2/0 = 0
+6:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:2/0/physics_layer_0/angular_velocity = 0.0
+7:2/0 = 0
+7:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:2/0/physics_layer_0/angular_velocity = 0.0
+8:2/0 = 0
+8:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:2/0/physics_layer_0/angular_velocity = 0.0
+9:2/0 = 0
+9:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:2/0/physics_layer_0/angular_velocity = 0.0
+10:2/0 = 0
+10:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:2/0/physics_layer_0/angular_velocity = 0.0
+11:2/0 = 0
+11:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:2/0/physics_layer_0/angular_velocity = 0.0
+11:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+12:2/0 = 0
+12:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:2/0/physics_layer_0/angular_velocity = 0.0
+13:2/0 = 0
+13:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:2/0/physics_layer_0/angular_velocity = 0.0
+13:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+14:2/0 = 0
+14:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:2/0/physics_layer_0/angular_velocity = 0.0
+15:2/0 = 0
+15:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:2/0/physics_layer_0/angular_velocity = 0.0
+0:3/0 = 0
+0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:3/0/physics_layer_0/angular_velocity = 0.0
+1:3/0 = 0
+1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:3/0/physics_layer_0/angular_velocity = 0.0
+1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:3/0 = 0
+2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:3/0/physics_layer_0/angular_velocity = 0.0
+2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:3/0 = 0
+3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:3/0/physics_layer_0/angular_velocity = 0.0
+3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:3/0 = 0
+4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:3/0/physics_layer_0/angular_velocity = 0.0
+5:3/0 = 0
+5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:3/0/physics_layer_0/angular_velocity = 0.0
+6:3/0 = 0
+6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:3/0/physics_layer_0/angular_velocity = 0.0
+7:3/0 = 0
+7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:3/0/physics_layer_0/angular_velocity = 0.0
+8:3/0 = 0
+8:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:3/0/physics_layer_0/angular_velocity = 0.0
+9:3/0 = 0
+9:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:3/0/physics_layer_0/angular_velocity = 0.0
+10:3/0 = 0
+10:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:3/0/physics_layer_0/angular_velocity = 0.0
+11:3/0 = 0
+11:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:3/0/physics_layer_0/angular_velocity = 0.0
+12:3/0 = 0
+12:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:3/0/physics_layer_0/angular_velocity = 0.0
+13:3/0 = 0
+13:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:3/0/physics_layer_0/angular_velocity = 0.0
+14:3/0 = 0
+14:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:3/0/physics_layer_0/angular_velocity = 0.0
+15:3/0 = 0
+15:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:3/0/physics_layer_0/angular_velocity = 0.0
+0:4/0 = 0
+0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:4/0/physics_layer_0/angular_velocity = 0.0
+1:4/0 = 0
+1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:4/0/physics_layer_0/angular_velocity = 0.0
+1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:4/0 = 0
+2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:4/0/physics_layer_0/angular_velocity = 0.0
+2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:4/0 = 0
+3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:4/0/physics_layer_0/angular_velocity = 0.0
+3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:4/0 = 0
+4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:4/0/physics_layer_0/angular_velocity = 0.0
+5:4/0 = 0
+5:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:4/0/physics_layer_0/angular_velocity = 0.0
+6:4/0 = 0
+6:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:4/0/physics_layer_0/angular_velocity = 0.0
+7:4/0 = 0
+7:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:4/0/physics_layer_0/angular_velocity = 0.0
+8:4/0 = 0
+8:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:4/0/physics_layer_0/angular_velocity = 0.0
+9:4/0 = 0
+9:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:4/0/physics_layer_0/angular_velocity = 0.0
+10:4/0 = 0
+10:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:4/0/physics_layer_0/angular_velocity = 0.0
+11:4/0 = 0
+11:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:4/0/physics_layer_0/angular_velocity = 0.0
+12:4/0 = 0
+12:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:4/0/physics_layer_0/angular_velocity = 0.0
+13:4/0 = 0
+13:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:4/0/physics_layer_0/angular_velocity = 0.0
+14:4/0 = 0
+14:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:4/0/physics_layer_0/angular_velocity = 0.0
+15:4/0 = 0
+15:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:4/0/physics_layer_0/angular_velocity = 0.0
+0:5/0 = 0
+0:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:5/0/physics_layer_0/angular_velocity = 0.0
+1:5/0 = 0
+1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:5/0/physics_layer_0/angular_velocity = 0.0
+1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:5/0 = 0
+2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:5/0/physics_layer_0/angular_velocity = 0.0
+2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:5/0 = 0
+3:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:5/0/physics_layer_0/angular_velocity = 0.0
+3:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:5/0 = 0
+4:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:5/0/physics_layer_0/angular_velocity = 0.0
+5:5/0 = 0
+5:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:5/0/physics_layer_0/angular_velocity = 0.0
+6:5/0 = 0
+6:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:5/0/physics_layer_0/angular_velocity = 0.0
+7:5/0 = 0
+7:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:5/0/physics_layer_0/angular_velocity = 0.0
+8:5/0 = 0
+8:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:5/0/physics_layer_0/angular_velocity = 0.0
+9:5/0 = 0
+9:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:5/0/physics_layer_0/angular_velocity = 0.0
+10:5/0 = 0
+10:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:5/0/physics_layer_0/angular_velocity = 0.0
+11:5/0 = 0
+11:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:5/0/physics_layer_0/angular_velocity = 0.0
+12:5/0 = 0
+12:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:5/0/physics_layer_0/angular_velocity = 0.0
+13:5/0 = 0
+13:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:5/0/physics_layer_0/angular_velocity = 0.0
+14:5/0 = 0
+14:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:5/0/physics_layer_0/angular_velocity = 0.0
+15:5/0 = 0
+15:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:5/0/physics_layer_0/angular_velocity = 0.0
+0:6/0 = 0
+0:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:6/0/physics_layer_0/angular_velocity = 0.0
+1:6/0 = 0
+1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:6/0/physics_layer_0/angular_velocity = 0.0
+1:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:6/0 = 0
+2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:6/0/physics_layer_0/angular_velocity = 0.0
+2:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:6/0 = 0
+3:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:6/0/physics_layer_0/angular_velocity = 0.0
+3:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:6/0 = 0
+4:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:6/0/physics_layer_0/angular_velocity = 0.0
+5:6/0 = 0
+5:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:6/0/physics_layer_0/angular_velocity = 0.0
+6:6/0 = 0
+6:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:6/0/physics_layer_0/angular_velocity = 0.0
+7:6/0 = 0
+7:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:6/0/physics_layer_0/angular_velocity = 0.0
+8:6/0 = 0
+8:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:6/0/physics_layer_0/angular_velocity = 0.0
+9:6/0 = 0
+9:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:6/0/physics_layer_0/angular_velocity = 0.0
+10:6/0 = 0
+10:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:6/0/physics_layer_0/angular_velocity = 0.0
+11:6/0 = 0
+11:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:6/0/physics_layer_0/angular_velocity = 0.0
+12:6/0 = 0
+12:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:6/0/physics_layer_0/angular_velocity = 0.0
+13:6/0 = 0
+13:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:6/0/physics_layer_0/angular_velocity = 0.0
+14:6/0 = 0
+14:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:6/0/physics_layer_0/angular_velocity = 0.0
+15:6/0 = 0
+15:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:6/0/physics_layer_0/angular_velocity = 0.0
+0:7/0 = 0
+0:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:7/0/physics_layer_0/angular_velocity = 0.0
+1:7/0 = 0
+1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:7/0/physics_layer_0/angular_velocity = 0.0
+1:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:7/0 = 0
+2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:7/0/physics_layer_0/angular_velocity = 0.0
+2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:7/0 = 0
+3:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:7/0/physics_layer_0/angular_velocity = 0.0
+3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:7/0 = 0
+4:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:7/0/physics_layer_0/angular_velocity = 0.0
+5:7/0 = 0
+5:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:7/0/physics_layer_0/angular_velocity = 0.0
+6:7/0 = 0
+6:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:7/0/physics_layer_0/angular_velocity = 0.0
+7:7/0 = 0
+7:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:7/0/physics_layer_0/angular_velocity = 0.0
+8:7/0 = 0
+8:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:7/0/physics_layer_0/angular_velocity = 0.0
+9:7/0 = 0
+9:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:7/0/physics_layer_0/angular_velocity = 0.0
+10:7/0 = 0
+10:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:7/0/physics_layer_0/angular_velocity = 0.0
+11:7/0 = 0
+11:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:7/0/physics_layer_0/angular_velocity = 0.0
+12:7/0 = 0
+12:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:7/0/physics_layer_0/angular_velocity = 0.0
+13:7/0 = 0
+13:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:7/0/physics_layer_0/angular_velocity = 0.0
+14:7/0 = 0
+14:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:7/0/physics_layer_0/angular_velocity = 0.0
+15:7/0 = 0
+15:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:7/0/physics_layer_0/angular_velocity = 0.0
+0:8/0 = 0
+0:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:8/0/physics_layer_0/angular_velocity = 0.0
+1:8/0 = 0
+1:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:8/0/physics_layer_0/angular_velocity = 0.0
+2:8/0 = 0
+2:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:8/0/physics_layer_0/angular_velocity = 0.0
+3:8/0 = 0
+3:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:8/0/physics_layer_0/angular_velocity = 0.0
+4:8/0 = 0
+4:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:8/0/physics_layer_0/angular_velocity = 0.0
+5:8/0 = 0
+5:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:8/0/physics_layer_0/angular_velocity = 0.0
+6:8/0 = 0
+6:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:8/0/physics_layer_0/angular_velocity = 0.0
+7:8/0 = 0
+7:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:8/0/physics_layer_0/angular_velocity = 0.0
+8:8/0 = 0
+8:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+8:8/0/physics_layer_0/angular_velocity = 0.0
+9:8/0 = 0
+9:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+9:8/0/physics_layer_0/angular_velocity = 0.0
+10:8/0 = 0
+10:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:8/0/physics_layer_0/angular_velocity = 0.0
+11:8/0 = 0
+11:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:8/0/physics_layer_0/angular_velocity = 0.0
+12:8/0 = 0
+12:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:8/0/physics_layer_0/angular_velocity = 0.0
+13:8/0 = 0
+13:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:8/0/physics_layer_0/angular_velocity = 0.0
+14:8/0 = 0
+14:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:8/0/physics_layer_0/angular_velocity = 0.0
+15:8/0 = 0
+15:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:8/0/physics_layer_0/angular_velocity = 0.0
+0:9/0 = 0
+0:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:9/0/physics_layer_0/angular_velocity = 0.0
+1:9/0 = 0
+1:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:9/0/physics_layer_0/angular_velocity = 0.0
+2:9/0 = 0
+2:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:9/0/physics_layer_0/angular_velocity = 0.0
+3:9/0 = 0
+3:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:9/0/physics_layer_0/angular_velocity = 0.0
+4:9/0 = 0
+4:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:9/0/physics_layer_0/angular_velocity = 0.0
+5:9/0 = 0
+5:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:9/0/physics_layer_0/angular_velocity = 0.0
+6:9/0 = 0
+6:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:9/0/physics_layer_0/angular_velocity = 0.0
+7:9/0 = 0
+7:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:9/0/physics_layer_0/angular_velocity = 0.0
+10:9/0 = 0
+10:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+10:9/0/physics_layer_0/angular_velocity = 0.0
+11:9/0 = 0
+11:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+11:9/0/physics_layer_0/angular_velocity = 0.0
+12:9/0 = 0
+12:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+12:9/0/physics_layer_0/angular_velocity = 0.0
+13:9/0 = 0
+13:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:9/0/physics_layer_0/angular_velocity = 0.0
+14:9/0 = 0
+14:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:9/0/physics_layer_0/angular_velocity = 0.0
+15:9/0 = 0
+15:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:9/0/physics_layer_0/angular_velocity = 0.0
+0:10/0 = 0
+0:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:10/0/physics_layer_0/angular_velocity = 0.0
+1:10/0 = 0
+1:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:10/0/physics_layer_0/angular_velocity = 0.0
+2:10/0 = 0
+2:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:10/0/physics_layer_0/angular_velocity = 0.0
+3:10/0 = 0
+3:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:10/0/physics_layer_0/angular_velocity = 0.0
+5:10/0 = 0
+5:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+5:10/0/physics_layer_0/angular_velocity = 0.0
+6:10/0 = 0
+6:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:10/0/physics_layer_0/angular_velocity = 0.0
+7:10/0 = 0
+7:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+7:10/0/physics_layer_0/angular_velocity = 0.0
+13:10/0 = 0
+13:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:10/0/physics_layer_0/angular_velocity = 0.0
+14:10/0 = 0
+14:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:10/0/physics_layer_0/angular_velocity = 0.0
+15:10/0 = 0
+15:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:10/0/physics_layer_0/angular_velocity = 0.0
+0:11/0 = 0
+0:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+0:11/0/physics_layer_0/angular_velocity = 0.0
+1:11/0 = 0
+1:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+1:11/0/physics_layer_0/angular_velocity = 0.0
+2:11/0 = 0
+2:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+2:11/0/physics_layer_0/angular_velocity = 0.0
+3:11/0 = 0
+3:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+3:11/0/physics_layer_0/angular_velocity = 0.0
+4:11/0 = 0
+4:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:11/0/physics_layer_0/angular_velocity = 0.0
+13:11/0 = 0
+13:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+13:11/0/physics_layer_0/angular_velocity = 0.0
+14:11/0 = 0
+14:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+14:11/0/physics_layer_0/angular_velocity = 0.0
+15:11/0 = 0
+15:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
+15:11/0/physics_layer_0/angular_velocity = 0.0
+
+[resource]
+physics_layer_0/collision_layer = 1
+physics_layer_0/collision_mask = 0
+sources/1 = SubResource("TileSetAtlasSource_rkmbu")
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index 6b9cbcc..d80988d 100644
--- a/DungeonShooting_Godot/resource/theme/mainTheme.tres
+++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres
@@ -352,7 +352,7 @@
[sub_resource type="ImageTexture" id="58"]
-[sub_resource type="Image" id="Image_ufcfn"]
+[sub_resource type="Image" id="Image_al7yt"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -362,7 +362,7 @@
}
[sub_resource type="ImageTexture" id="60"]
-image = SubResource("Image_ufcfn")
+image = SubResource("Image_al7yt")
[sub_resource type="StyleBoxTexture" id="61"]
content_margin_left = 2.0
@@ -372,7 +372,7 @@
texture = SubResource("60")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_v4ldn"]
+[sub_resource type="Image" id="Image_aa1v5"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -382,7 +382,7 @@
}
[sub_resource type="ImageTexture" id="63"]
-image = SubResource("Image_v4ldn")
+image = SubResource("Image_aa1v5")
[sub_resource type="StyleBoxTexture" id="64"]
content_margin_left = 2.0
@@ -392,7 +392,7 @@
texture = SubResource("63")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_6hrrx"]
+[sub_resource type="Image" id="Image_c6sif"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -402,7 +402,7 @@
}
[sub_resource type="ImageTexture" id="66"]
-image = SubResource("Image_6hrrx")
+image = SubResource("Image_c6sif")
[sub_resource type="StyleBoxTexture" id="67"]
content_margin_left = 2.0
@@ -412,7 +412,7 @@
texture = SubResource("66")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_dp5mo"]
+[sub_resource type="Image" id="Image_vytak"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -422,7 +422,7 @@
}
[sub_resource type="ImageTexture" id="69"]
-image = SubResource("Image_dp5mo")
+image = SubResource("Image_vytak")
[sub_resource type="StyleBoxTexture" id="70"]
content_margin_left = 0.0
@@ -446,7 +446,7 @@
content_margin_right = 4.0
content_margin_bottom = 4.0
-[sub_resource type="Image" id="Image_r3hg0"]
+[sub_resource type="Image" id="Image_khjjs"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -456,7 +456,7 @@
}
[sub_resource type="ImageTexture" id="56"]
-image = SubResource("Image_r3hg0")
+image = SubResource("Image_khjjs")
[sub_resource type="StyleBoxFlat" id="57"]
content_margin_left = 6.0
diff --git a/DungeonShooting_Godot/scene/Room.tscn b/DungeonShooting_Godot/scene/Room.tscn
index 6cb6293..cfa9de3 100644
--- a/DungeonShooting_Godot/scene/Room.tscn
+++ b/DungeonShooting_Godot/scene/Room.tscn
@@ -1,569 +1,13 @@
-[gd_scene load_steps=6 format=3 uid="uid://bqf2vks5ggnsp"]
+[gd_scene load_steps=4 format=3 uid="uid://bqf2vks5ggnsp"]
-[ext_resource type="Texture2D" uid="uid://dj8nrd5od4fcl" path="res://resource/sprite/environment/itch-io-DungeonTileset4/16x16 dungeon ii wall reconfig v04 spritesheet.png" id="1"]
[ext_resource type="Script" path="res://src/game/room/RoomManager.cs" id="1_3w1c7"]
+[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="2_30rar"]
[sub_resource type="Environment" id="Environment_ji6mi"]
background_mode = 3
glow_enabled = true
glow_intensity = 4.74
-[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rkmbu"]
-texture = ExtResource("1")
-0:0/0 = 0
-0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:0/0/physics_layer_0/angular_velocity = 0.0
-1:0/0 = 0
-1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:0/0/physics_layer_0/angular_velocity = 0.0
-2:0/0 = 0
-2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:0/0/physics_layer_0/angular_velocity = 0.0
-3:0/0 = 0
-3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:0/0/physics_layer_0/angular_velocity = 0.0
-4:0/0 = 0
-4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:0/0/physics_layer_0/angular_velocity = 0.0
-5:0/0 = 0
-5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:0/0/physics_layer_0/angular_velocity = 0.0
-6:0/0 = 0
-6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:0/0/physics_layer_0/angular_velocity = 0.0
-7:0/0 = 0
-7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:0/0/physics_layer_0/angular_velocity = 0.0
-8:0/0 = 0
-8:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:0/0/physics_layer_0/angular_velocity = 0.0
-9:0/0 = 0
-9:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:0/0/physics_layer_0/angular_velocity = 0.0
-10:0/0 = 0
-10:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:0/0/physics_layer_0/angular_velocity = 0.0
-11:0/0 = 0
-11:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:0/0/physics_layer_0/angular_velocity = 0.0
-12:0/0 = 0
-12:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:0/0/physics_layer_0/angular_velocity = 0.0
-13:0/0 = 0
-13:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:0/0/physics_layer_0/angular_velocity = 0.0
-14:0/0 = 0
-14:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:0/0/physics_layer_0/angular_velocity = 0.0
-15:0/0 = 0
-15:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:0/0/physics_layer_0/angular_velocity = 0.0
-0:1/0 = 0
-0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:1/0/physics_layer_0/angular_velocity = 0.0
-1:1/0 = 0
-1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:1/0/physics_layer_0/angular_velocity = 0.0
-2:1/0 = 0
-2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:1/0/physics_layer_0/angular_velocity = 0.0
-3:1/0 = 0
-3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:1/0/physics_layer_0/angular_velocity = 0.0
-4:1/0 = 0
-4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:1/0/physics_layer_0/angular_velocity = 0.0
-5:1/0 = 0
-5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:1/0/physics_layer_0/angular_velocity = 0.0
-6:1/0 = 0
-6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:1/0/physics_layer_0/angular_velocity = 0.0
-7:1/0 = 0
-7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:1/0/physics_layer_0/angular_velocity = 0.0
-8:1/0 = 0
-8:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:1/0/physics_layer_0/angular_velocity = 0.0
-9:1/0 = 0
-9:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:1/0/physics_layer_0/angular_velocity = 0.0
-10:1/0 = 0
-10:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:1/0/physics_layer_0/angular_velocity = 0.0
-11:1/0 = 0
-11:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:1/0/physics_layer_0/angular_velocity = 0.0
-12:1/0 = 0
-12:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:1/0/physics_layer_0/angular_velocity = 0.0
-13:1/0 = 0
-13:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:1/0/physics_layer_0/angular_velocity = 0.0
-14:1/0 = 0
-14:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:1/0/physics_layer_0/angular_velocity = 0.0
-15:1/0 = 0
-15:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:1/0/physics_layer_0/angular_velocity = 0.0
-0:2/0 = 0
-0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:2/0/physics_layer_0/angular_velocity = 0.0
-1:2/0 = 0
-1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:2/0/physics_layer_0/angular_velocity = 0.0
-1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
-2:2/0 = 0
-2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:2/0/physics_layer_0/angular_velocity = 0.0
-2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
-3:2/0 = 0
-3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:2/0/physics_layer_0/angular_velocity = 0.0
-3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 8, 0, 8, 8, -8, 8)
-4:2/0 = 0
-4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:2/0/physics_layer_0/angular_velocity = 0.0
-5:2/0 = 0
-5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:2/0/physics_layer_0/angular_velocity = 0.0
-6:2/0 = 0
-6:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:2/0/physics_layer_0/angular_velocity = 0.0
-7:2/0 = 0
-7:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:2/0/physics_layer_0/angular_velocity = 0.0
-8:2/0 = 0
-8:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:2/0/physics_layer_0/angular_velocity = 0.0
-9:2/0 = 0
-9:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:2/0/physics_layer_0/angular_velocity = 0.0
-10:2/0 = 0
-10:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:2/0/physics_layer_0/angular_velocity = 0.0
-11:2/0 = 0
-11:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:2/0/physics_layer_0/angular_velocity = 0.0
-11:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-12:2/0 = 0
-12:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:2/0/physics_layer_0/angular_velocity = 0.0
-13:2/0 = 0
-13:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:2/0/physics_layer_0/angular_velocity = 0.0
-13:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-14:2/0 = 0
-14:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:2/0/physics_layer_0/angular_velocity = 0.0
-15:2/0 = 0
-15:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:2/0/physics_layer_0/angular_velocity = 0.0
-0:3/0 = 0
-0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:3/0/physics_layer_0/angular_velocity = 0.0
-1:3/0 = 0
-1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:3/0/physics_layer_0/angular_velocity = 0.0
-1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-2:3/0 = 0
-2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:3/0/physics_layer_0/angular_velocity = 0.0
-2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-3:3/0 = 0
-3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:3/0/physics_layer_0/angular_velocity = 0.0
-3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-4:3/0 = 0
-4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:3/0/physics_layer_0/angular_velocity = 0.0
-5:3/0 = 0
-5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:3/0/physics_layer_0/angular_velocity = 0.0
-6:3/0 = 0
-6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:3/0/physics_layer_0/angular_velocity = 0.0
-7:3/0 = 0
-7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:3/0/physics_layer_0/angular_velocity = 0.0
-8:3/0 = 0
-8:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:3/0/physics_layer_0/angular_velocity = 0.0
-9:3/0 = 0
-9:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:3/0/physics_layer_0/angular_velocity = 0.0
-10:3/0 = 0
-10:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:3/0/physics_layer_0/angular_velocity = 0.0
-11:3/0 = 0
-11:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:3/0/physics_layer_0/angular_velocity = 0.0
-12:3/0 = 0
-12:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:3/0/physics_layer_0/angular_velocity = 0.0
-13:3/0 = 0
-13:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:3/0/physics_layer_0/angular_velocity = 0.0
-14:3/0 = 0
-14:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:3/0/physics_layer_0/angular_velocity = 0.0
-15:3/0 = 0
-15:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:3/0/physics_layer_0/angular_velocity = 0.0
-0:4/0 = 0
-0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:4/0/physics_layer_0/angular_velocity = 0.0
-1:4/0 = 0
-1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:4/0/physics_layer_0/angular_velocity = 0.0
-1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-2:4/0 = 0
-2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:4/0/physics_layer_0/angular_velocity = 0.0
-2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-3:4/0 = 0
-3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:4/0/physics_layer_0/angular_velocity = 0.0
-3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-4:4/0 = 0
-4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:4/0/physics_layer_0/angular_velocity = 0.0
-5:4/0 = 0
-5:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:4/0/physics_layer_0/angular_velocity = 0.0
-6:4/0 = 0
-6:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:4/0/physics_layer_0/angular_velocity = 0.0
-7:4/0 = 0
-7:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:4/0/physics_layer_0/angular_velocity = 0.0
-8:4/0 = 0
-8:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:4/0/physics_layer_0/angular_velocity = 0.0
-9:4/0 = 0
-9:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:4/0/physics_layer_0/angular_velocity = 0.0
-10:4/0 = 0
-10:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:4/0/physics_layer_0/angular_velocity = 0.0
-11:4/0 = 0
-11:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:4/0/physics_layer_0/angular_velocity = 0.0
-12:4/0 = 0
-12:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:4/0/physics_layer_0/angular_velocity = 0.0
-13:4/0 = 0
-13:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:4/0/physics_layer_0/angular_velocity = 0.0
-14:4/0 = 0
-14:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:4/0/physics_layer_0/angular_velocity = 0.0
-15:4/0 = 0
-15:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:4/0/physics_layer_0/angular_velocity = 0.0
-0:5/0 = 0
-0:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:5/0/physics_layer_0/angular_velocity = 0.0
-1:5/0 = 0
-1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:5/0/physics_layer_0/angular_velocity = 0.0
-1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-2:5/0 = 0
-2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:5/0/physics_layer_0/angular_velocity = 0.0
-2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-3:5/0 = 0
-3:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:5/0/physics_layer_0/angular_velocity = 0.0
-3:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-4:5/0 = 0
-4:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:5/0/physics_layer_0/angular_velocity = 0.0
-5:5/0 = 0
-5:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:5/0/physics_layer_0/angular_velocity = 0.0
-6:5/0 = 0
-6:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:5/0/physics_layer_0/angular_velocity = 0.0
-7:5/0 = 0
-7:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:5/0/physics_layer_0/angular_velocity = 0.0
-8:5/0 = 0
-8:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:5/0/physics_layer_0/angular_velocity = 0.0
-9:5/0 = 0
-9:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:5/0/physics_layer_0/angular_velocity = 0.0
-10:5/0 = 0
-10:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:5/0/physics_layer_0/angular_velocity = 0.0
-11:5/0 = 0
-11:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:5/0/physics_layer_0/angular_velocity = 0.0
-12:5/0 = 0
-12:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:5/0/physics_layer_0/angular_velocity = 0.0
-13:5/0 = 0
-13:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:5/0/physics_layer_0/angular_velocity = 0.0
-14:5/0 = 0
-14:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:5/0/physics_layer_0/angular_velocity = 0.0
-15:5/0 = 0
-15:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:5/0/physics_layer_0/angular_velocity = 0.0
-0:6/0 = 0
-0:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:6/0/physics_layer_0/angular_velocity = 0.0
-1:6/0 = 0
-1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:6/0/physics_layer_0/angular_velocity = 0.0
-1:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-2:6/0 = 0
-2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:6/0/physics_layer_0/angular_velocity = 0.0
-2:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-3:6/0 = 0
-3:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:6/0/physics_layer_0/angular_velocity = 0.0
-3:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-4:6/0 = 0
-4:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:6/0/physics_layer_0/angular_velocity = 0.0
-5:6/0 = 0
-5:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:6/0/physics_layer_0/angular_velocity = 0.0
-6:6/0 = 0
-6:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:6/0/physics_layer_0/angular_velocity = 0.0
-7:6/0 = 0
-7:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:6/0/physics_layer_0/angular_velocity = 0.0
-8:6/0 = 0
-8:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:6/0/physics_layer_0/angular_velocity = 0.0
-9:6/0 = 0
-9:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:6/0/physics_layer_0/angular_velocity = 0.0
-10:6/0 = 0
-10:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:6/0/physics_layer_0/angular_velocity = 0.0
-11:6/0 = 0
-11:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:6/0/physics_layer_0/angular_velocity = 0.0
-12:6/0 = 0
-12:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:6/0/physics_layer_0/angular_velocity = 0.0
-13:6/0 = 0
-13:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:6/0/physics_layer_0/angular_velocity = 0.0
-14:6/0 = 0
-14:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:6/0/physics_layer_0/angular_velocity = 0.0
-15:6/0 = 0
-15:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:6/0/physics_layer_0/angular_velocity = 0.0
-0:7/0 = 0
-0:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:7/0/physics_layer_0/angular_velocity = 0.0
-1:7/0 = 0
-1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:7/0/physics_layer_0/angular_velocity = 0.0
-1:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-2:7/0 = 0
-2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:7/0/physics_layer_0/angular_velocity = 0.0
-2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-3:7/0 = 0
-3:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:7/0/physics_layer_0/angular_velocity = 0.0
-3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
-4:7/0 = 0
-4:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:7/0/physics_layer_0/angular_velocity = 0.0
-5:7/0 = 0
-5:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:7/0/physics_layer_0/angular_velocity = 0.0
-6:7/0 = 0
-6:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:7/0/physics_layer_0/angular_velocity = 0.0
-7:7/0 = 0
-7:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:7/0/physics_layer_0/angular_velocity = 0.0
-8:7/0 = 0
-8:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:7/0/physics_layer_0/angular_velocity = 0.0
-9:7/0 = 0
-9:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:7/0/physics_layer_0/angular_velocity = 0.0
-10:7/0 = 0
-10:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:7/0/physics_layer_0/angular_velocity = 0.0
-11:7/0 = 0
-11:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:7/0/physics_layer_0/angular_velocity = 0.0
-12:7/0 = 0
-12:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:7/0/physics_layer_0/angular_velocity = 0.0
-13:7/0 = 0
-13:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:7/0/physics_layer_0/angular_velocity = 0.0
-14:7/0 = 0
-14:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:7/0/physics_layer_0/angular_velocity = 0.0
-15:7/0 = 0
-15:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:7/0/physics_layer_0/angular_velocity = 0.0
-0:8/0 = 0
-0:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:8/0/physics_layer_0/angular_velocity = 0.0
-1:8/0 = 0
-1:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:8/0/physics_layer_0/angular_velocity = 0.0
-2:8/0 = 0
-2:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:8/0/physics_layer_0/angular_velocity = 0.0
-3:8/0 = 0
-3:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:8/0/physics_layer_0/angular_velocity = 0.0
-4:8/0 = 0
-4:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:8/0/physics_layer_0/angular_velocity = 0.0
-5:8/0 = 0
-5:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:8/0/physics_layer_0/angular_velocity = 0.0
-6:8/0 = 0
-6:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:8/0/physics_layer_0/angular_velocity = 0.0
-7:8/0 = 0
-7:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:8/0/physics_layer_0/angular_velocity = 0.0
-8:8/0 = 0
-8:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-8:8/0/physics_layer_0/angular_velocity = 0.0
-9:8/0 = 0
-9:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-9:8/0/physics_layer_0/angular_velocity = 0.0
-10:8/0 = 0
-10:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:8/0/physics_layer_0/angular_velocity = 0.0
-11:8/0 = 0
-11:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:8/0/physics_layer_0/angular_velocity = 0.0
-12:8/0 = 0
-12:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:8/0/physics_layer_0/angular_velocity = 0.0
-13:8/0 = 0
-13:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:8/0/physics_layer_0/angular_velocity = 0.0
-14:8/0 = 0
-14:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:8/0/physics_layer_0/angular_velocity = 0.0
-15:8/0 = 0
-15:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:8/0/physics_layer_0/angular_velocity = 0.0
-0:9/0 = 0
-0:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:9/0/physics_layer_0/angular_velocity = 0.0
-1:9/0 = 0
-1:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:9/0/physics_layer_0/angular_velocity = 0.0
-2:9/0 = 0
-2:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:9/0/physics_layer_0/angular_velocity = 0.0
-3:9/0 = 0
-3:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:9/0/physics_layer_0/angular_velocity = 0.0
-4:9/0 = 0
-4:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:9/0/physics_layer_0/angular_velocity = 0.0
-5:9/0 = 0
-5:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:9/0/physics_layer_0/angular_velocity = 0.0
-6:9/0 = 0
-6:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:9/0/physics_layer_0/angular_velocity = 0.0
-7:9/0 = 0
-7:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:9/0/physics_layer_0/angular_velocity = 0.0
-10:9/0 = 0
-10:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-10:9/0/physics_layer_0/angular_velocity = 0.0
-11:9/0 = 0
-11:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-11:9/0/physics_layer_0/angular_velocity = 0.0
-12:9/0 = 0
-12:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-12:9/0/physics_layer_0/angular_velocity = 0.0
-13:9/0 = 0
-13:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:9/0/physics_layer_0/angular_velocity = 0.0
-14:9/0 = 0
-14:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:9/0/physics_layer_0/angular_velocity = 0.0
-15:9/0 = 0
-15:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:9/0/physics_layer_0/angular_velocity = 0.0
-0:10/0 = 0
-0:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:10/0/physics_layer_0/angular_velocity = 0.0
-1:10/0 = 0
-1:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:10/0/physics_layer_0/angular_velocity = 0.0
-2:10/0 = 0
-2:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:10/0/physics_layer_0/angular_velocity = 0.0
-3:10/0 = 0
-3:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:10/0/physics_layer_0/angular_velocity = 0.0
-5:10/0 = 0
-5:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-5:10/0/physics_layer_0/angular_velocity = 0.0
-6:10/0 = 0
-6:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-6:10/0/physics_layer_0/angular_velocity = 0.0
-7:10/0 = 0
-7:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-7:10/0/physics_layer_0/angular_velocity = 0.0
-13:10/0 = 0
-13:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:10/0/physics_layer_0/angular_velocity = 0.0
-14:10/0 = 0
-14:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:10/0/physics_layer_0/angular_velocity = 0.0
-15:10/0 = 0
-15:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:10/0/physics_layer_0/angular_velocity = 0.0
-0:11/0 = 0
-0:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:11/0/physics_layer_0/angular_velocity = 0.0
-1:11/0 = 0
-1:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:11/0/physics_layer_0/angular_velocity = 0.0
-2:11/0 = 0
-2:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:11/0/physics_layer_0/angular_velocity = 0.0
-3:11/0 = 0
-3:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:11/0/physics_layer_0/angular_velocity = 0.0
-4:11/0 = 0
-4:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:11/0/physics_layer_0/angular_velocity = 0.0
-13:11/0 = 0
-13:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-13:11/0/physics_layer_0/angular_velocity = 0.0
-14:11/0 = 0
-14:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-14:11/0/physics_layer_0/angular_velocity = 0.0
-15:11/0 = 0
-15:11/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-15:11/0/physics_layer_0/angular_velocity = 0.0
-
-[sub_resource type="TileSet" id="TileSet_bspf4"]
-physics_layer_0/collision_layer = 1
-physics_layer_0/collision_mask = 0
-sources/1 = SubResource("TileSetAtlasSource_rkmbu")
-
[node name="Room" type="Node2D" node_paths=PackedStringArray("NormalLayer", "YSortLayer", "TileRoot")]
script = ExtResource("1_3w1c7")
NormalLayer = NodePath("NormalLayer")
@@ -576,7 +20,7 @@
[node name="TileRoot" type="TileMap" parent="."]
y_sort_enabled = true
-tile_set = SubResource("TileSet_bspf4")
+tile_set = ExtResource("2_30rar")
format = 2
layer_0/name = "Floor"
layer_0/z_index = -10
diff --git a/DungeonShooting_Godot/scene/test/TestExpression.tscn b/DungeonShooting_Godot/scene/test/TestExpression.tscn
new file mode 100644
index 0000000..13731e2
--- /dev/null
+++ b/DungeonShooting_Godot/scene/test/TestExpression.tscn
@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://blp7bo6tyoqlr"]
+
+[ext_resource type="Script" path="res://src/test/TestExpression.cs" id="1_qmchi"]
+
+[node name="TestExpression" type="Node2D"]
+script = ExtResource("1_qmchi")
+Str = "0003;
+0001(w:100,ca:15,ra:30);
+0002(w:120,ca:10,ra:20);"
diff --git a/DungeonShooting_Godot/src/framework/common/Utils.cs b/DungeonShooting_Godot/src/framework/common/Utils.cs
index 4b27f8e..36abea1 100644
--- a/DungeonShooting_Godot/src/framework/common/Utils.cs
+++ b/DungeonShooting_Godot/src/framework/common/Utils.cs
@@ -95,6 +95,33 @@
list.RemoveAt(index);
return result;
}
+
+ ///
+ /// 从权重列表中随机抽取下标值
+ ///
+ public static int RandomWeight(List weightList)
+ {
+ // 计算总权重
+ var totalWeight = 0;
+ foreach (var weight in weightList)
+ {
+ totalWeight += weight;
+ }
+
+ var randomNumber = _random.Next(totalWeight);
+ var currentWeight = 0;
+ for (var i = 0; i < weightList.Count; i++)
+ {
+ var value = weightList[i];
+ currentWeight += value;
+ if (randomNumber < currentWeight)
+ {
+ return i;
+ }
+ }
+
+ return RandomRangeInt(0, weightList.Count - 1);
+ }
///
/// 根据四个点计算出矩形
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
index 0c28ee4..b37dd62 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
@@ -87,6 +87,8 @@
//_tileRoot.AddChild(activityMark);
activityMark.Position = roomInfo.GetWorldPosition() + pos;
activityMark.TileRoot = _tileRoot;
+ //执行预处理操作
+ activityMark.Pretreatment();
}
roomInfo.ActivityMarks.AddRange(activityMarks);
@@ -116,7 +118,7 @@
}
_tileRoot.SetCell(layer, new Vector2I(roomInfo.Position.X + i, roomInfo.Position.Y + j),
- 1, atlasCoords);
+ 0, atlasCoords);
}
}
}
@@ -396,7 +398,7 @@
{
for (int j = 0; j < size.Y; j++)
{
- _tileRoot.SetCell(layer, new Vector2I((int)pos.X + i, (int)pos.Y + j), 1, info.AutotileCoord);
+ _tileRoot.SetCell(layer, new Vector2I((int)pos.X + i, (int)pos.Y + j), 0, info.AutotileCoord);
}
}
}
@@ -408,7 +410,7 @@
{
for (int j = 0; j < size.Y; j++)
{
- _tileRoot.SetCell(layer, new Vector2I((int)pos.X + i, (int)pos.Y + j), -1);
+ _tileRoot.SetCell(layer, new Vector2I((int)pos.X + i, (int)pos.Y + j), 0);
}
}
}
diff --git a/DungeonShooting_Godot/src/framework/map/mark/ActivityExpression.cs b/DungeonShooting_Godot/src/framework/map/mark/ActivityExpression.cs
new file mode 100644
index 0000000..040dd1d
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/map/mark/ActivityExpression.cs
@@ -0,0 +1,10 @@
+using System;
+
+///
+/// 用于 ActivityMark 字段上, 表示当前字段是一个表达式字段
+///
+[AttributeUsage(AttributeTargets.Field)]
+public class ActivityExpression : Attribute
+{
+
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/ActivityExpressionData.cs b/DungeonShooting_Godot/src/framework/map/mark/ActivityExpressionData.cs
new file mode 100644
index 0000000..9fc30b9
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/map/mark/ActivityExpressionData.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+///
+///
+///
+public class ActivityExpressionData
+{
+ ///
+ /// 物体名称
+ ///
+ public string Id;
+
+ ///
+ /// 传入参数
+ ///
+ public Dictionary Args = new Dictionary();
+
+ public ActivityExpressionData(string id)
+ {
+ Id = id;
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs b/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
index 3d7870d..3977b54 100644
--- a/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
+++ b/DungeonShooting_Godot/src/framework/map/mark/ActivityMark.cs
@@ -1,5 +1,9 @@
+using System;
using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
using Godot;
///
@@ -15,10 +19,11 @@
public ActivityIdPrefix.ActivityPrefixType Type = ActivityIdPrefix.ActivityPrefixType.NonePrefix;
///
- /// 物体id
+ /// 创建物体的表达式, 该表达式计算出的id会自动加上 Type 前缀
+ /// 例如: 0001(w:100,ca:15,ra:30);0002(w:120,ca:10,ra:20)
///
- [Export]
- public string ItemId;
+ [Export(PropertyHint.Expression), ActivityExpression]
+ public string ItemExpression;
///
/// 所在层级
@@ -77,15 +82,41 @@
//绘制的字体
private static Font _drawFont;
-
+
+ //已经计算好要生成的物体
+ private Dictionary _currentExpression = new Dictionary();
+
+ //存储所有 ActivityMark 和子类中被 [ActivityExpression] 标记的字段名称
+ private static Dictionary> _activityExpressionMap = new Dictionary>();
+
///
- /// 获取物体Id
+ /// 对生成的物体执行后续操作
///
- public string GetItemId()
+ public virtual void Doing(ActivityObject activityObject, ActivityExpressionData expressionData, RoomInfo roomInfo)
{
- return ActivityIdPrefix.GetNameByPrefixType(Type) + ItemId;
}
+ public ActivityMark()
+ {
+ //扫描所有 ActivityExpression
+ var type = GetType();
+ if (!_activityExpressionMap.ContainsKey(type))
+ {
+ // 获取类型信息
+ var fieldInfos = new List();
+ var tempList = type.GetFields(BindingFlags.Instance | BindingFlags.Public);
+ foreach (var s in tempList)
+ {
+ if (s.GetCustomAttribute() != null)
+ {
+ fieldInfos.Add(s.Name);
+ }
+ }
+
+ _activityExpressionMap.Add(type, fieldInfos);
+ }
+ }
+
public override void _Process(double delta)
{
#if TOOLS
@@ -123,6 +154,10 @@
///
public void BeReady(RoomInfo roomInfo)
{
+ if (_currentExpression == null)
+ {
+ return;
+ }
_isOver = false;
_overTimer = 0;
SetActive(true);
@@ -146,43 +181,56 @@
return _isOver && _overTimer >= 1;
}
- ///
- /// 调用该函数表示该标记可以生成物体了
- ///
- public virtual void Doing(RoomInfo roomInfo)
+ private void Doing(RoomInfo roomInfo)
{
- CreateActivityObject().PutDown(Layer);
- }
+ var activityObject = CreateActivityObjectFromExpression(Type, nameof(ItemExpression));
- ///
- /// 实例化ItemId指定的物体, 并返回对象实例, 函数会自动设置位置
- ///
- protected ActivityObject CreateActivityObject()
- {
- var instance = ActivityObject.Create(GetItemId());
+ if (activityObject == null)
+ {
+ return;
+ }
+
+ activityObject.VerticalSpeed = VerticalSpeed;
+ activityObject.Altitude = Altitude;
var pos = Position;
if (BirthRect != Vector2I.Zero)
{
- instance.Position = new Vector2(
+ activityObject.Position = new Vector2(
Utils.RandomRangeInt((int)pos.X - BirthRect.X / 2, (int)pos.X + BirthRect.X / 2),
Utils.RandomRangeInt((int)pos.Y - BirthRect.Y / 2, (int)pos.Y + BirthRect.Y / 2)
);
}
else
{
- instance.Position = pos;
+ activityObject.Position = pos;
}
+
+ activityObject.StartCoroutine(OnActivityObjectBirth(activityObject));
+ activityObject.PutDown(Layer);
- instance.VerticalSpeed = VerticalSpeed;
- instance.Altitude = Altitude;
- instance.StartCoroutine(OnActivityObjectBirth(instance));
- return instance;
+ Doing(activityObject, _currentExpression[nameof(ItemExpression)], roomInfo);
+ }
+
+ ///
+ /// 根据预制表达式创建物体并返回
+ ///
+ /// 物体类型
+ /// 预制表达式字段名称, 注意是字段名称, 而不是内容
+ public ActivityObject CreateActivityObjectFromExpression(ActivityIdPrefix.ActivityPrefixType type, string expressionFieldName)
+ {
+ if (_currentExpression.TryGetValue(expressionFieldName, out var expressionData))
+ {
+ var id = ActivityIdPrefix.GetNameByPrefixType(type) + expressionData.Id;
+ return ActivityObject.Create(id);
+ }
+
+ return null;
}
///
/// 生成 ActivityObject 时调用, 用于出生时的动画效果
///
- protected virtual IEnumerator OnActivityObjectBirth(ActivityObject instance)
+ private IEnumerator OnActivityObjectBirth(ActivityObject instance)
{
var a = 1.0f;
instance.SetBlendColor(Colors.White);
@@ -248,7 +296,7 @@
///
/// 设置当前节点是否是活动状态
///
- public void SetActive(bool flag)
+ private void SetActive(bool flag)
{
// SetProcess(flag);
// SetPhysicsProcess(flag);
@@ -278,4 +326,98 @@
}
}
}
+
+ //-----------------------------------------------------------------------------------------------------
+
+ ///
+ /// 执行预处理操作
+ ///
+ public void Pretreatment()
+ {
+ if (_activityExpressionMap.TryGetValue(GetType(), out var list))
+ {
+ foreach (var field in list)
+ {
+ Pretreatment(field);
+ }
+ }
+ }
+
+ private void Pretreatment(string field)
+ {
+ var expressionStr = GetType().GetField(field)?.GetValue(this) as string;
+ if (string.IsNullOrEmpty(expressionStr))
+ {
+ return;
+ }
+ var activityExpression = Parse(expressionStr);
+ if (activityExpression.Count > 0)
+ {
+ //权重列表
+ var list = new List();
+ for (var i = 0; i < activityExpression.Count; i++)
+ {
+ var item = activityExpression[i];
+ if (item.Args.TryGetValue("weight", out var weight)) //获取自定义权重值
+ {
+ list.Add(int.Parse(weight));
+ }
+ else //默认权重100
+ {
+ item.Args.Add("weight", "100");
+ list.Add(100);
+ }
+ }
+ //根据权重随机值
+ var index = Utils.RandomWeight(list);
+ _currentExpression.Add(field, activityExpression[index]);
+ }
+ }
+
+ private List Parse(string str)
+ {
+ var list = new List();
+ var exps = str.Split(';');
+
+ for (var i = 0; i < exps.Length; i++)
+ {
+ var exp = exps[i];
+ //去除空格
+ exp = Regex.Replace(exp, "\\s", "");
+ if (string.IsNullOrEmpty(exp))
+ {
+ continue;
+ }
+
+ //验证语法
+ if (Regex.IsMatch(exp, "^\\w+(\\((\\w+:\\w+)*(,\\w+:\\w+)*\\))?$"))
+ {
+ if (!exp.Contains('(')) //没有参数
+ {
+ list.Add(new ActivityExpressionData(exp));
+ }
+ else
+ {
+ var name = Regex.Match(exp, "^\\w+").Value;
+ var activityExpression = new ActivityExpressionData(name);
+ var paramsResult = Regex.Matches(exp, "\\w+:\\w+");
+ if (paramsResult.Count > 0)
+ {
+ foreach (Match result in paramsResult)
+ {
+ var valSplit = result.Value.Split(':');
+ activityExpression.Args.Add(valSplit[0], valSplit[1]);
+ }
+ }
+ list.Add(activityExpression);
+ }
+ }
+ else //语法异常
+ {
+ throw new Exception("表达式语法错误: " + exp);
+ }
+ }
+
+ return list;
+ }
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs
index 9c2a9d1..19954cd 100644
--- a/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs
+++ b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs
@@ -29,44 +29,24 @@
///
/// 武器1 id, id会自动加上武器前缀
///
- [Export]
+ [Export(PropertyHint.Expression), ActivityExpression]
public string Weapon1Id;
///
- /// 武器1弹药量, 如果值小于0, 则使用默认弹药量
- ///
- [Export]
- public int Weapon1Ammo = -1;
- ///
/// 武器2 id, id会自动加上武器前缀
///
- [Export]
+ [Export(PropertyHint.Expression), ActivityExpression]
public string Weapon2Id;
///
- /// 武器2弹药量, 如果值小于0, 则使用默认弹药量
- ///
- [Export]
- public int Weapon2Ammo = -1;
- ///
/// 武器3 id, id会自动加上武器前缀
///
- [Export]
+ [Export(PropertyHint.Expression), ActivityExpression]
public string Weapon3Id;
///
- /// 武器3弹药量, 如果值小于0, 则使用默认弹药量
- ///
- [Export]
- public int Weapon3Ammo = -1;
- ///
/// 武器4 id, id会自动加上武器前缀
///
- [Export]
+ [Export(PropertyHint.Expression), ActivityExpression]
public string Weapon4Id;
///
- /// 武器4弹药量, 如果值小于0, 则使用默认弹药量
- ///
- [Export]
- public int Weapon4Ammo = -1;
- ///
/// 脸默认的朝向
///
[Export]
@@ -78,11 +58,11 @@
Layer = RoomLayerEnum.YSortLayer;
}
- public override void Doing(RoomInfo roomInfo)
+ public override void Doing(ActivityObject activityObject, ActivityExpressionData expressionData, RoomInfo roomInfo)
{
- var pos = Position;
//创建敌人
- var instance = (Enemy)CreateActivityObject();
+ var instance = (Enemy)activityObject;
+ var pos = instance.Position;
//脸的朝向
if (FaceDirection == FaceDirectionValueEnum.Random)
@@ -97,17 +77,15 @@
{
instance.Face = global::FaceDirection.Right;
}
-
- instance.PutDown(Layer);
if (!string.IsNullOrWhiteSpace(Weapon1Id))
- CreateWeapon(instance, pos, Weapon1Id, Weapon1Ammo);
+ CreateWeapon(instance, pos, nameof(Weapon1Id), -1);
if (!string.IsNullOrWhiteSpace(Weapon2Id))
- CreateWeapon(instance, pos, Weapon2Id, Weapon2Ammo);
+ CreateWeapon(instance, pos, nameof(Weapon2Id), -1);
if (!string.IsNullOrWhiteSpace(Weapon3Id))
- CreateWeapon(instance, pos, Weapon3Id, Weapon3Ammo);
+ CreateWeapon(instance, pos, nameof(Weapon3Id), -1);
if (!string.IsNullOrWhiteSpace(Weapon4Id))
- CreateWeapon(instance, pos, Weapon4Id, Weapon4Ammo);
+ CreateWeapon(instance, pos, nameof(Weapon4Id), -1);
var effect1 = ResourceManager.LoadAndInstantiate(ResourcePath.prefab_effect_Effect1_tscn);
effect1.Position = instance.Position;
@@ -115,10 +93,9 @@
}
//生成武器
- private void CreateWeapon(Enemy instance, Vector2 pos, string id, int ammon)
+ private void CreateWeapon(Enemy instance, Vector2 pos, string fieldName, int ammon)
{
- var weaponId = ActivityIdPrefix.GetNameByPrefixType(ActivityIdPrefix.ActivityPrefixType.Weapon) + id;
- var weapon = ActivityObject.Create(weaponId);
+ var weapon = (Weapon)CreateActivityObjectFromExpression(ActivityIdPrefix.ActivityPrefixType.Weapon, fieldName);
//设置弹药量
if (ammon >= 0)
{
diff --git a/DungeonShooting_Godot/src/framework/map/mark/PlayerBirthMark.cs b/DungeonShooting_Godot/src/framework/map/mark/PlayerBirthMark.cs
deleted file mode 100644
index b654732..0000000
--- a/DungeonShooting_Godot/src/framework/map/mark/PlayerBirthMark.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-
-using Godot;
-
-///
-/// 玩家生成标记
-///
-[Tool]
-public partial class PlayerBirthMark : ActivityMark
-{
- public override void _Ready()
- {
- }
-
- public override void Doing(RoomInfo roomInfo)
- {
- }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs b/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs
index d3af028..01dd68a 100644
--- a/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs
+++ b/DungeonShooting_Godot/src/framework/map/mark/WeaponMark.cs
@@ -26,10 +26,10 @@
Altitude = 8;
}
- public override void Doing(RoomInfo roomInfo)
+ public override void Doing(ActivityObject activityObject, ActivityExpressionData expressionData, RoomInfo roomInfo)
{
+ var instance = (Weapon)activityObject;
//创建武器
- var instance = (Weapon)CreateActivityObject();
if (CurrAmmon >= 0)
{
instance.SetCurrAmmo(CurrAmmon);
@@ -39,9 +39,6 @@
{
instance.SetResidueAmmo(ResidueAmmo);
}
-
-
- instance.PutDown(Layer);
var effect1 = ResourceManager.LoadAndInstantiate(ResourcePath.prefab_effect_Effect1_tscn);
effect1.Position = instance.Position + new Vector2(0, -Altitude);
diff --git a/DungeonShooting_Godot/src/game/manager/ActivityIdPrefix.cs b/DungeonShooting_Godot/src/game/manager/ActivityIdPrefix.cs
index e62bbd1..677fd4c 100644
--- a/DungeonShooting_Godot/src/game/manager/ActivityIdPrefix.cs
+++ b/DungeonShooting_Godot/src/game/manager/ActivityIdPrefix.cs
@@ -4,13 +4,41 @@
{
public enum ActivityPrefixType
{
+ ///
+ /// 无前缀
+ ///
NonePrefix,
+ ///
+ /// 玩家
+ ///
+ Player,
+ ///
+ /// 测试对象
+ ///
Test,
+ ///
+ /// 角色
+ ///
Role,
+ ///
+ /// 敌人
+ ///
Enemy,
+ ///
+ /// 武器
+ ///
Weapon,
+ ///
+ /// 子弹
+ ///
Bullet,
+ ///
+ /// 弹壳
+ ///
Shell,
+ ///
+ /// 其它类型
+ ///
Other,
}
@@ -56,6 +84,7 @@
case ActivityPrefixType.Test:
return Test;
case ActivityPrefixType.Role:
+ case ActivityPrefixType.Player:
return Role;
case ActivityPrefixType.Enemy:
return Enemy;
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index cfa3ba7..03c9c63 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -93,7 +93,7 @@
//SoundManager.PlayMusic(ResourcePath.resource_sound_bgm_Intro_ogg, -17f);
//初始房间创建玩家标记
- var playerBirthMark = StartRoom.ActivityMarks.FirstOrDefault(mark => mark is PlayerBirthMark);
+ var playerBirthMark = StartRoom.ActivityMarks.FirstOrDefault(mark => mark.Type == ActivityIdPrefix.ActivityPrefixType.Player);
//创建玩家
Player = ActivityObject.Create(ActivityIdPrefix.Role + "0001");
if (playerBirthMark != null)
diff --git a/DungeonShooting_Godot/src/test/TestExpression.cs b/DungeonShooting_Godot/src/test/TestExpression.cs
new file mode 100644
index 0000000..94614a0
--- /dev/null
+++ b/DungeonShooting_Godot/src/test/TestExpression.cs
@@ -0,0 +1,18 @@
+using Godot;
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+public partial class TestExpression : Node2D
+{
+ [Export(PropertyHint.Expression)]
+ public string Str;
+
+ public override void _Ready()
+ {
+ //var expressions = Pretreatment(Str);
+
+ }
+
+
+}