diff --git a/DungeonShooting_Godot/prefab/ui/MapEditor.tscn b/DungeonShooting_Godot/prefab/ui/MapEditor.tscn
index 0d36e86..a747bd1 100644
--- a/DungeonShooting_Godot/prefab/ui/MapEditor.tscn
+++ b/DungeonShooting_Godot/prefab/ui/MapEditor.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=3 uid="uid://csbxfkdupsckv"]
[ext_resource type="Script" path="res://src/game/ui/mapEditor/MapEditorPanel.cs" id="1_5s7a0"]
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="2_vrg60"]
+[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="2_vrg60"]
[ext_resource type="Script" path="res://src/game/ui/mapEditor/TileView/EditorTileMap.cs" id="2_waq8f"]
[ext_resource type="Texture2D" uid="uid://0878uloew5jo" path="res://resource/sprite/ui/mapEditor/ErrorCell.png" id="4_465u2"]
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 b5bdad6..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room1.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "Position": {
- "X": -5,
- "Y": -6
- },
- "Size": {
- "X": 24,
- "Y": 15
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "PointList": [
- -56,
- -72,
- 280,
- -72,
- 280,
- 128,
- -56,
- 128
- ],
- "Type": 0
- },
- {
- "PointList": [
- -24,
- -32,
- 56,
- -32,
- 56,
- 8,
- 24,
- 8,
- 24,
- 24,
- -24,
- 24
- ],
- "Type": 1
- },
- {
- "PointList": [
- 200,
- 32,
- 248,
- 32,
- 248,
- 88,
- 168,
- 88,
- 168,
- 48,
- 200,
- 48
- ],
- "Type": 1
- }
- ],
- "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 ea48daf..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room2.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "Position": {
- "X": -5,
- "Y": -6
- },
- "Size": {
- "X": 31,
- "Y": 24
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 144,
- "End": 432
- },
- {
- "Direction": 1,
- "Start": 48,
- "End": 176
- },
- {
- "Direction": 1,
- "Start": 256,
- "End": 368
- },
- {
- "Direction": 2,
- "Start": 16,
- "End": 128
- },
- {
- "Direction": 2,
- "Start": 256,
- "End": 480
- },
- {
- "Direction": 0,
- "Start": 272,
- "End": 368
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 72,
- "Y": -72
- },
- {
- "X": 344,
- "Y": -72
- },
- {
- "X": 344,
- "Y": 32
- },
- {
- "X": 248,
- "Y": 32
- },
- {
- "X": 248,
- "Y": 120
- },
- {
- "X": 344,
- "Y": 120
- },
- {
- "X": 344,
- "Y": 200
- },
- {
- "X": 392,
- "Y": 200
- },
- {
- "X": 392,
- "Y": 272
- },
- {
- "X": 184,
- "Y": 272
- },
- {
- "X": 184,
- "Y": 208
- },
- {
- "X": 40,
- "Y": 208
- },
- {
- "X": 40,
- "Y": 272
- },
- {
- "X": -56,
- "Y": 272
- },
- {
- "X": -56,
- "Y": 184
- },
- {
- "X": -8,
- "Y": 184
- },
- {
- "X": -8,
- "Y": 80
- },
- {
- "X": -56,
- "Y": 80
- },
- {
- "X": -56,
- "Y": -24
- },
- {
- "X": 72,
- "Y": -24
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 56,
- "Y": 48
- },
- {
- "X": 168,
- "Y": 48
- },
- {
- "X": 168,
- "Y": 136
- },
- {
- "X": 56,
- "Y": 136
- }
- ]
- }
- ],
- "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 c8f0091..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room3.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "Position": {
- "X": -1,
- "Y": -1
- },
- "Size": {
- "X": 26,
- "Y": 20
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 128
- },
- {
- "Direction": 3,
- "Start": 208,
- "End": 320
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 224
- },
- {
- "Direction": 2,
- "Start": 96,
- "End": 192
- },
- {
- "Direction": 2,
- "Start": 288,
- "End": 400
- },
- {
- "Direction": 0,
- "Start": 96,
- "End": 304
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 8,
- "Y": 8
- },
- {
- "X": 104,
- "Y": 8
- },
- {
- "X": 104,
- "Y": 88
- },
- {
- "X": 200,
- "Y": 88
- },
- {
- "X": 200,
- "Y": 8
- },
- {
- "X": 296,
- "Y": 8
- },
- {
- "X": 296,
- "Y": 88
- },
- {
- "X": 376,
- "Y": 88
- },
- {
- "X": 376,
- "Y": 288
- },
- {
- "X": 280,
- "Y": 288
- },
- {
- "X": 280,
- "Y": 208
- },
- {
- "X": 168,
- "Y": 208
- },
- {
- "X": 168,
- "Y": 288
- },
- {
- "X": 88,
- "Y": 288
- },
- {
- "X": 88,
- "Y": 208
- },
- {
- "X": 8,
- "Y": 208
- }
- ]
- }
- ],
- "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 464869f..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room4.json
+++ /dev/null
@@ -1,259 +0,0 @@
-{
- "Position": {
- "X": -5,
- "Y": -5
- },
- "Size": {
- "X": 32,
- "Y": 29
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 176
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 176
- },
- {
- "Direction": 1,
- "Start": 304,
- "End": 448
- },
- {
- "Direction": 2,
- "Start": 16,
- "End": 144
- },
- {
- "Direction": 2,
- "Start": 352,
- "End": 496
- },
- {
- "Direction": 0,
- "Start": 304,
- "End": 448
- },
- {
- "Direction": 0,
- "Start": 16,
- "End": 176
- },
- {
- "Direction": 3,
- "Start": 336,
- "End": 496
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -56,
- "Y": -56
- },
- {
- "X": 88,
- "Y": -56
- },
- {
- "X": 88,
- "Y": 8
- },
- {
- "X": 264,
- "Y": 8
- },
- {
- "X": 264,
- "Y": -56
- },
- {
- "X": 408,
- "Y": -56
- },
- {
- "X": 408,
- "Y": 96
- },
- {
- "X": 344,
- "Y": 96
- },
- {
- "X": 344,
- "Y": 232
- },
- {
- "X": 408,
- "Y": 232
- },
- {
- "X": 408,
- "Y": 368
- },
- {
- "X": 264,
- "Y": 368
- },
- {
- "X": 264,
- "Y": 304
- },
- {
- "X": 88,
- "Y": 304
- },
- {
- "X": 88,
- "Y": 368
- },
- {
- "X": -56,
- "Y": 368
- },
- {
- "X": -56,
- "Y": 232
- },
- {
- "X": 8,
- "Y": 232
- },
- {
- "X": 8,
- "Y": 96
- },
- {
- "X": -56,
- "Y": 96
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 88,
- "Y": 32
- },
- {
- "X": 136,
- "Y": 32
- },
- {
- "X": 136,
- "Y": 136
- },
- {
- "X": 24,
- "Y": 136
- },
- {
- "X": 24,
- "Y": 96
- },
- {
- "X": 88,
- "Y": 96
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 216,
- "Y": 32
- },
- {
- "X": 264,
- "Y": 32
- },
- {
- "X": 264,
- "Y": 96
- },
- {
- "X": 328,
- "Y": 96
- },
- {
- "X": 328,
- "Y": 136
- },
- {
- "X": 216,
- "Y": 136
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 24,
- "Y": 192
- },
- {
- "X": 136,
- "Y": 192
- },
- {
- "X": 136,
- "Y": 280
- },
- {
- "X": 88,
- "Y": 280
- },
- {
- "X": 88,
- "Y": 232
- },
- {
- "X": 24,
- "Y": 232
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 216,
- "Y": 192
- },
- {
- "X": 328,
- "Y": 192
- },
- {
- "X": 328,
- "Y": 232
- },
- {
- "X": 264,
- "Y": 232
- },
- {
- "X": 264,
- "Y": 280
- },
- {
- "X": 216,
- "Y": 280
- }
- ]
- }
- ],
- "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 5e6371c..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room5.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "Position": {
- "X": -3,
- "Y": -6
- },
- "Size": {
- "X": 21,
- "Y": 18
- },
- "DoorAreaInfos": [
- {
- "Direction": 0,
- "Start": 16,
- "End": 192
- },
- {
- "Direction": 3,
- "Start": 80,
- "End": 320
- },
- {
- "Direction": 1,
- "Start": 64,
- "End": 240
- },
- {
- "Direction": 2,
- "Start": 96,
- "End": 240
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 40,
- "Y": -72
- },
- {
- "X": 264,
- "Y": -72
- },
- {
- "X": 264,
- "Y": 96
- },
- {
- "X": 232,
- "Y": 96
- },
- {
- "X": 232,
- "Y": 144
- },
- {
- "X": 184,
- "Y": 144
- },
- {
- "X": 184,
- "Y": 176
- },
- {
- "X": 56,
- "Y": 176
- },
- {
- "X": 56,
- "Y": 144
- },
- {
- "X": -24,
- "Y": 144
- },
- {
- "X": -24,
- "Y": -24
- },
- {
- "X": 40,
- "Y": -24
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 72,
- "Y": -48
- },
- {
- "X": 200,
- "Y": -48
- },
- {
- "X": 200,
- "Y": 8
- },
- {
- "X": 72,
- "Y": 8
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": -8,
- "Y": 32
- },
- {
- "X": 72,
- "Y": 32
- },
- {
- "X": 72,
- "Y": 88
- },
- {
- "X": -8,
- "Y": 88
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 136,
- "Y": 48
- },
- {
- "X": 216,
- "Y": 48
- },
- {
- "X": 216,
- "Y": 104
- },
- {
- "X": 136,
- "Y": 104
- }
- ]
- }
- ],
- "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 7d83388..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room6.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
- "Position": {
- "X": -3,
- "Y": -6
- },
- "Size": {
- "X": 24,
- "Y": 14
- },
- "DoorAreaInfos": [
- {
- "Direction": 3,
- "Start": 16,
- "End": 368
- },
- {
- "Direction": 0,
- "Start": 16,
- "End": 128
- },
- {
- "Direction": 2,
- "Start": 32,
- "End": 272
- },
- {
- "Direction": 1,
- "Start": 16,
- "End": 128
- }
- ],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -24,
- "Y": -72
- },
- {
- "X": 312,
- "Y": -72
- },
- {
- "X": 312,
- "Y": 32
- },
- {
- "X": 280,
- "Y": 32
- },
- {
- "X": 280,
- "Y": 80
- },
- {
- "X": 248,
- "Y": 80
- },
- {
- "X": 248,
- "Y": 112
- },
- {
- "X": -8,
- "Y": 112
- },
- {
- "X": -8,
- "Y": 32
- },
- {
- "X": -24,
- "Y": 32
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 56,
- "Y": -48
- },
- {
- "X": 136,
- "Y": -48
- },
- {
- "X": 136,
- "Y": -32
- },
- {
- "X": 184,
- "Y": -32
- },
- {
- "X": 184,
- "Y": 8
- },
- {
- "X": 88,
- "Y": 8
- },
- {
- "X": 88,
- "Y": 40
- },
- {
- "X": 24,
- "Y": 40
- },
- {
- "X": 24,
- "Y": -32
- },
- {
- "X": 56,
- "Y": -32
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 216,
- "Y": -48
- },
- {
- "X": 280,
- "Y": -48
- },
- {
- "X": 280,
- "Y": 8
- },
- {
- "X": 216,
- "Y": 8
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 104,
- "Y": 32
- },
- {
- "X": 216,
- "Y": 32
- },
- {
- "X": 216,
- "Y": 72
- },
- {
- "X": 184,
- "Y": 72
- },
- {
- "X": 184,
- "Y": 88
- },
- {
- "X": 136,
- "Y": 88
- },
- {
- "X": 136,
- "Y": 72
- },
- {
- "X": 104,
- "Y": 72
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 0,
- "FileName": "Room6",
- "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
deleted file mode 100644
index 6cd97e7..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/battle/Room8.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "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/tileData/testGroup/boss/Room1.json b/DungeonShooting_Godot/resource/map/tileData/testGroup/boss/Room1.json
deleted file mode 100644
index d2d0c0e..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/boss/Room1.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
- "Position": {
- "X": -5,
- "Y": -6
- },
- "Size": {
- "X": 39,
- "Y": 25
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -56,
- "Y": -72
- },
- {
- "X": 520,
- "Y": -72
- },
- {
- "X": 520,
- "Y": 288
- },
- {
- "X": -56,
- "Y": 288
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": 200,
- "Y": 0
- },
- {
- "X": 280,
- "Y": 0
- },
- {
- "X": 280,
- "Y": 64
- },
- {
- "X": 344,
- "Y": 64
- },
- {
- "X": 344,
- "Y": 136
- },
- {
- "X": 280,
- "Y": 136
- },
- {
- "X": 280,
- "Y": 200
- },
- {
- "X": 200,
- "Y": 200
- },
- {
- "X": 200,
- "Y": 136
- },
- {
- "X": 136,
- "Y": 136
- },
- {
- "X": 136,
- "Y": 64
- },
- {
- "X": 200,
- "Y": 64
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 3,
- "FileName": "Room1",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileData/testGroup/inlet/Room1.json b/DungeonShooting_Godot/resource/map/tileData/testGroup/inlet/Room1.json
deleted file mode 100644
index 6c3fba1..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/inlet/Room1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "Position": {
- "X": -1,
- "Y": -1
- },
- "Size": {
- "X": 12,
- "Y": 8
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": 8,
- "Y": 8
- },
- {
- "X": 152,
- "Y": 8
- },
- {
- "X": 152,
- "Y": 96
- },
- {
- "X": 8,
- "Y": 96
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 1,
- "FileName": "Room1",
- "Weight": 100
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileData/testGroup/outlet/Room1.json b/DungeonShooting_Godot/resource/map/tileData/testGroup/outlet/Room1.json
deleted file mode 100644
index d69b1f8..0000000
--- a/DungeonShooting_Godot/resource/map/tileData/testGroup/outlet/Room1.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "Position": {
- "X": -4,
- "Y": -4
- },
- "Size": {
- "X": 15,
- "Y": 12
- },
- "DoorAreaInfos": [],
- "NavigationList": [
- {
- "Type": 0,
- "Points": [
- {
- "X": -40,
- "Y": -40
- },
- {
- "X": 152,
- "Y": -40
- },
- {
- "X": 152,
- "Y": 112
- },
- {
- "X": -40,
- "Y": 112
- }
- ]
- },
- {
- "Type": 1,
- "Points": [
- {
- "X": -8,
- "Y": 0
- },
- {
- "X": 120,
- "Y": 0
- },
- {
- "X": 120,
- "Y": 72
- },
- {
- "X": 72,
- "Y": 72
- },
- {
- "X": 72,
- "Y": 40
- },
- {
- "X": 40,
- "Y": 40
- },
- {
- "X": 40,
- "Y": 72
- },
- {
- "X": -8,
- "Y": 72
- }
- ]
- }
- ],
- "GroupName": "testGroup",
- "RoomType": 2,
- "FileName": "Room1",
- "Weight": 100
-}
\ No newline at end of file
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 6c22abc..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn
+++ /dev/null
@@ -1,190 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://bltvbn3urhy1q"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_qn8qv"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_68nmn"]
-[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="4_vkqhy"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_qn8qv")
-format = 2
-layer_0/tile_data = PackedInt32Array(65543, 0, 8, 7, 0, 8, -65529, 0, 8, -131065, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, -131066, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 327679, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, 327677, 0, 8, 262141, 0, 8, 196605, 0, 8, 131069, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, -4, 0, 8, -65540, 0, 8, -131076, 0, 8, -131075, 0, 8, -131074, 0, 8, 65532, 0, 8, 131068, 0, 8, 196604, 0, 8, 262140, 0, 8, 327676, 0, 8, 393214, 0, 8, 393213, 0, 8, 393212, 0, 8, 393215, 0, 8, 327680, 0, 8, 327681, 0, 8, 327682, 0, 8, 327683, 0, 8, 327684, 0, 8, -196603, 0, 8, -196602, 0, 8, -196601, 0, 8, -131064, 0, 8, -65528, 0, 8, -196600, 0, 8, 8, 0, 8, 65544, 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, -196591, 0, 8, -262127, 0, 8, -327663, 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, -196592, 0, 8, -262128, 0, 8, -327664, 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, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 14, 0, 8, -65522, 0, 8, -131058, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 11, 0, 8, -65525, 0, 8, -131061, 0, 8, -196597, 0, 8, -262133, 0, 8, -327669, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 10, 0, 8, -65526, 0, 8, -131062, 0, 8, -196598, 0, 8, -262134, 0, 8, -327670, 0, 8, 458761, 0, 8, 393225, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, -262135, 0, 8, -327671, 0, 8, 458760, 0, 8, 393224, 0, 8, -262136, 0, 8, -327672, 0, 8, 458759, 0, 8, 393223, 0, 8, -262137, 0, 8, -327673, 0, 8, 458758, 0, 8, 393222, 0, 8, -262138, 0, 8, -327674, 0, 8, 458757, 0, 8, 393221, 0, 8, -262139, 0, 8, -327675, 0, 8, 458756, 0, 8, 393220, 0, 8, -262140, 0, 8, -327676, 0, 8, 458755, 0, 8, 393219, 0, 8, -262141, 0, 8, -327677, 0, 8, 458754, 0, 8, 393218, 0, 8, -262142, 0, 8, -327678, 0, 8, 458753, 0, 8, 393217, 0, 8, -262143, 0, 8, -327679, 0, 8, 458752, 0, 8, 393216, 0, 8, -262144, 0, 8, -327680, 0, 8, 524287, 0, 8, 458751, 0, 8, -196609, 0, 8, -262145, 0, 8, 524286, 0, 8, 458750, 0, 8, -196610, 0, 8, -262146, 0, 8, 524285, 0, 8, 458749, 0, 8, -196611, 0, 8, -262147, 0, 8, 524284, 0, 8, 458748, 0, 8, -196612, 0, 8, -262148, 0, 8, -196613, 196608, 3, -262149, 196608, 3, -327685, 196608, 4, -327684, 131072, 7, -327683, 131072, 7, -131077, 196608, 3, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458747, 196608, 3, 524283, 196608, 3, 589821, 131072, 2, 589820, 131072, 2, 589819, 720896, 2, -327682, 131072, 7, 589822, 131072, 2, -327681, 131072, 7, 589823, 131072, 2, -393216, 131072, 7, 524288, 131072, 2, -393215, 131072, 7, 524289, 131072, 2, -393214, 131072, 7, 524290, 131072, 2, -393213, 131072, 7, 524291, 131072, 2, -393212, 131072, 7, 524292, 131072, 2, -393211, 131072, 7, 524293, 131072, 2, -393210, 131072, 7, 524294, 131072, 2, -393209, 131072, 7, 524295, 131072, 2, -393208, 131072, 7, 524296, 131072, 2, -393207, 131072, 7, 524297, 131072, 2, -393206, 131072, 7, 524298, 131072, 2, -393205, 131072, 7, 524299, 131072, 2, -393204, 131072, 7, 524300, 131072, 2, -393203, 131072, 7, 524301, 131072, 2, -393202, 131072, 7, 524302, 131072, 2, -393201, 131072, 7, 524303, 131072, 2, -393200, 131072, 7, 524304, 131072, 2, -393199, 131072, 7, 524305, 131072, 2, -327662, 65536, 3, -262126, 65536, 3, -393198, 65536, 4, -196590, 65536, 3, -131054, 65536, 3, -65518, 65536, 3, 18, 65536, 3, 65554, 65536, 3, 131090, 65536, 3, 196626, 65536, 3, 262162, 65536, 3, 327698, 65536, 3, 393234, 65536, 3, 458770, 65536, 3, 524306, 851968, 2, -196604, 0, 8, -196605, 0, 8, -196606, 0, 8, -196607, 0, 8, -196608, 0, 8, -131073, 0, 8, -65537, 65536, 2, -131072, 131072, 2, -131071, 131072, 2, -131070, 196608, 2, -131069, 0, 8, -131068, 0, 8, -1, 65536, 3, 65535, 65536, 7, 0, 196608, 7, 1, 0, 8, 2, 0, 8, 3, 0, 8, 4, 0, 8, -65536, 196608, 4, -65535, 131072, 7, -65534, 196608, 7, -65533, 0, 8, -65532, 0, 8, 262154, 0, 8, 262155, 65536, 7, 262156, 131072, 7, 262157, 131072, 7, 262158, 196608, 7, 65550, 0, 8, 131086, 196608, 2, 196622, 196608, 3, 65549, 0, 8, 65548, 0, 8, 65547, 0, 8, 65546, 0, 8, 65545, 0, 8, 131082, 0, 8, 131083, 0, 8, 131084, 0, 8, 131085, 65536, 2, 196618, 0, 8, 196619, 65536, 2, 196620, 131072, 2, 196621, 851968, 2, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(1, 75)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(90, 90)
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(226, -22)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 0.5
-BirthRect = Vector2i(90, 90)
-Altitude = 0
-
-[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(115, 24)
-script = ExtResource("4_vkqhy")
-Type = 5
-ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:12)"
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
-
-[node name="ActivityMark3" type="Node2D" parent="."]
-position = Vector2(116, -39)
-script = ExtResource("4_vkqhy")
-Type = 5
-ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:12)"
-WaveNumber = 2
-BirthRect = Vector2i(50, 50)
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(126, 77)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(90, 90)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(117, -23)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(90, 90)
-Altitude = 0
-
-[node name="ActivityMark4" type="Node2D" parent="."]
-position = Vector2(117, 70)
-script = ExtResource("4_vkqhy")
-Type = 5
-ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)"
-WaveNumber = 3
-BirthRect = Vector2i(50, 50)
-
-[node name="ActivityMark5" type="Node2D" parent="."]
-position = Vector2(221, -27)
-script = ExtResource("4_vkqhy")
-Type = 5
-ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)"
-WaveNumber = 3
-BirthRect = Vector2i(50, 50)
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(16, -53)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(208, 107)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.5
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(11, 80)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(118, 16)
-script = ExtResource("3_68nmn")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.5
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(167, -33)
-script = ExtResource("3_68nmn")
-Weapon1Id = "0003(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(52, 58)
-script = ExtResource("3_68nmn")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.5
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark11" type="Node2D" parent="."]
-position = Vector2(96, 8)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 2.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark12" type="Node2D" parent="."]
-position = Vector2(163, 8)
-script = ExtResource("3_68nmn")
-Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 2.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark13" type="Node2D" parent="."]
-position = Vector2(82, 94)
-script = ExtResource("3_68nmn")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 2.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
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 5a98f2c..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn
+++ /dev/null
@@ -1,164 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bnlsfk3dahtos"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_ar45p"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_v71xh"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-
-[node name="Room2" type="TileMap"]
-tile_set = ExtResource("1_ar45p")
-format = 2
-layer_0/tile_data = PackedInt32Array(131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 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, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 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, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 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, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, -65538, 0, 8, -65537, 0, 8, 131069, 0, 8, 196605, 0, 8, 262141, 0, 8, 327677, 0, 8, 524287, 0, 8, -131072, 0, 8, 458752, 0, 8, -131071, 0, 8, -131070, 0, 8, -131069, 0, 8, -131068, 0, 8, -131067, 0, 8, -131066, 0, 8, -131065, 0, 8, -65528, 0, 8, 8, 0, 8, -131064, 0, 8, 65544, 0, 8, 131080, 0, 8, 1048600, 0, 8, 983064, 0, 8, 917528, 0, 8, 851992, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 851991, 0, 8, 1048598, 0, 8, 983062, 0, 8, 917526, 0, 8, 851990, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 65557, 0, 8, 21, 0, 8, -65515, 0, 8, -131051, 0, 8, -196587, 0, 8, -262123, 0, 8, -327659, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 65556, 0, 8, 20, 0, 8, -65516, 0, 8, -131052, 0, 8, -196588, 0, 8, -262124, 0, 8, -327660, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 851987, 0, 8, 786451, 0, 8, 720915, 0, 8, 655379, 0, 8, 589843, 0, 8, 524307, 0, 8, 458771, 0, 8, 65555, 0, 8, 19, 0, 8, -65517, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -327661, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 458770, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -327662, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 458769, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 1048592, 0, 8, 983056, 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, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, -131056, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 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, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, -131057, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, 1048590, 0, 8, 983054, 0, 8, 917518, 0, 8, 851982, 0, 8, 786446, 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, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, 1048589, 0, 8, 983053, 0, 8, 917517, 0, 8, 851981, 0, 8, 786445, 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, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 1048588, 0, 8, 983052, 0, 8, 917516, 0, 8, 851980, 0, 8, 786444, 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, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, 1048587, 0, 8, 983051, 0, 8, 917515, 0, 8, 851979, 0, 8, 786443, 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, -196597, 0, 8, -262133, 0, 8, -327669, 0, 8, 786442, 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, -196598, 0, 8, -262134, 0, 8, -327670, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, -262135, 0, 8, -327671, 0, 8, 786440, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, -196600, 0, 8, -262136, 0, 8, -327672, 0, 8, 786439, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 524295, 0, 8, -196601, 0, 8, -262137, 0, 8, -327673, 0, 8, 786438, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, -196602, 0, 8, -262138, 0, 8, -327674, 0, 8, -196603, 0, 8, -262139, 0, 8, -327675, 0, 8, -196604, 0, 8, -262140, 0, 8, -327676, 0, 8, 1048576, 0, 8, 983040, 0, 8, 917504, 0, 8, 851968, 0, 8, 786432, 0, 8, 720896, 0, 8, 655360, 0, 8, 589824, 0, 8, 524288, 0, 8, 1114111, 0, 8, 1048575, 0, 8, 983039, 0, 8, 917503, 0, 8, 851967, 0, 8, 786431, 0, 8, 720895, 0, 8, 655359, 0, 8, 589823, 0, 8, 1114110, 0, 8, 1048574, 0, 8, 983038, 0, 8, 917502, 0, 8, 851966, 0, 8, 786430, 0, 8, 1114109, 0, 8, 1048573, 0, 8, 983037, 0, 8, 917501, 0, 8, 851965, 0, 8, 786429, 0, 8, 1114108, 0, 8, 1048572, 0, 8, 983036, 0, 8, 917500, 0, 8, 851964, 0, 8, 786428, 0, 8, 327676, 0, 8, 262140, 0, 8, 196604, 0, 8, 131068, 0, 8, 65532, 0, 8, -4, 0, 8, -65540, 0, 8, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 786427, 196608, 3, 851963, 196608, 3, 917499, 196608, 3, 983035, 196608, 3, 1048571, 196608, 3, 1114107, 196608, 3, 1179645, 131072, 2, 1179644, 131072, 2, 1179643, 720896, 2, 1179646, 131072, 2, 1179647, 131072, 2, 1114112, 131072, 2, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, 1114123, 131072, 2, -393204, 131072, 7, 1114124, 131072, 2, -393203, 131072, 7, 1114125, 131072, 2, -393202, 131072, 7, 1114126, 131072, 2, -393201, 131072, 7, 1114127, 131072, 2, -393200, 131072, 7, 1114128, 131072, 2, -393199, 131072, 7, 1114129, 131072, 2, -393198, 131072, 7, 1114130, 131072, 2, -393197, 131072, 7, 1114131, 131072, 2, -393196, 131072, 7, 1114132, 131072, 2, -393195, 131072, 7, 1114133, 131072, 2, 1114134, 131072, 2, 1114135, 131072, 2, 1114136, 131072, 2, 851993, 65536, 3, 917529, 65536, 3, 983065, 65536, 3, 1048601, 65536, 3, 1114137, 851968, 2, 786437, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 786435, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 1114114, 131072, 2, 1048578, 0, 8, 983042, 0, 8, 917506, 0, 8, 851970, 0, 8, 786434, 0, 8, 720898, 0, 8, 655362, 0, 8, 589826, 0, 8, 524290, 0, 8, 458754, 0, 8, 1114113, 131072, 2, 1048577, 0, 8, 983041, 0, 8, 917505, 0, 8, 851969, 0, 8, 786433, 0, 8, 720897, 0, 8, 655361, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 65558, 65536, 3, 458774, 65536, 3, 131088, 65536, 2, 131089, 131072, 2, 131090, 131072, 2, 131091, 131072, 2, 131092, 131072, 2, 131093, 131072, 2, -65514, 65536, 3, 22, 65536, 3, -131050, 65536, 3, 131094, 851968, 2, -327658, 65536, 3, -262122, 65536, 3, -393194, 65536, 4, -196586, 65536, 3, 196624, 65536, 3, 262160, 65536, 3, 327696, 65536, 3, 393232, 65536, 7, 393233, 131072, 7, 393234, 131072, 7, 393235, 131072, 7, 393236, 131072, 7, 393237, 131072, 7, 524310, 65536, 3, 393238, 65536, 4, 589846, 65536, 3, 655382, 65536, 3, 720918, 65536, 7, 786454, 0, 8, 786456, 0, 8, 786455, 0, 8, 720919, 131072, 7, 720920, 131072, 7, 786457, 65536, 3, 720921, 65536, 4, 851971, 65536, 2, 851972, 131072, 2, 851973, 131072, 2, 851974, 131072, 2, 851975, 131072, 2, 851976, 131072, 2, 851977, 131072, 2, 851978, 196608, 2, 917514, 196608, 3, 983050, 196608, 3, 1048586, 196608, 3, 1114122, 720896, 2, 917507, 65536, 3, 983043, 65536, 3, 1048579, 65536, 3, 1114115, 851968, 2, -131077, 196608, 4, -131076, 131072, 7, -131075, 131072, 7, -131074, 131072, 7, -131073, 131072, 7, -196608, 131072, 7, -196607, 131072, 7, -196606, 131072, 7, -196605, 196608, 7, -262141, 196608, 3, -327677, 196608, 3, -393213, 196608, 4, 393213, 131072, 2, 393212, 131072, 2, 393211, 720896, 2, 393214, 196608, 2, 458750, 196608, 3, 524286, 196608, 3, 589822, 196608, 3, 655358, 196608, 3, 720894, 196608, 7, 720891, 196608, 4, 720892, 131072, 7, 720893, 131072, 7, 196612, 65536, 2, 196613, 131072, 2, 196614, 131072, 2, 196615, 131072, 2, 196616, 131072, 2, 196617, 196608, 2, 262148, 65536, 3, 327684, 65536, 3, 393220, 65536, 3, 458756, 65536, 7, 458757, 131072, 7, 458758, 131072, 7, 458759, 131072, 7, 458760, 131072, 7, 458761, 196608, 7, 262153, 196608, 3, 327689, 196608, 3, 393225, 196608, 3)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(2, 26)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(-10, 226)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(267, 197)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 3.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(188, -13)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 4.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(23, 114)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(30, 30)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(123, 172)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 3.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(284, 233)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 4.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(175, -30)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 5.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(91, 9)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(259, 153)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark11" type="Node2D" parent="."]
-position = Vector2(253, -12)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 3.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark12" type="Node2D" parent="."]
-position = Vector2(86, 176)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 4.0
-BirthRect = Vector2i(150, 50)
-Altitude = 0
-
-[node name="EnemyMark13" type="Node2D" parent="."]
-position = Vector2(211, 79)
-script = ExtResource("3_v71xh")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 5.0
-BirthRect = Vector2i(30, 50)
-Altitude = 0
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 a01dd51..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn
+++ /dev/null
@@ -1,221 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://wvv4lbvlarod"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_jjauj"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_u8a04"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-
-[node name="Room3" type="TileMap"]
-tile_set = ExtResource("1_jjauj")
-format = 2
-layer_0/tile_data = PackedInt32Array(786450, 0, 8, 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, 786449, 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, 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, 65552, 0, 8, 16, 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, 65551, 0, 8, 15, 0, 8, 786446, 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, 786445, 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, 786444, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 786443, 0, 8, 720907, 0, 8, 655371, 0, 8, 589835, 0, 8, 524299, 0, 8, 786442, 0, 8, 720906, 0, 8, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 786440, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 786439, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 786438, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 786437, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 786435, 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, 786434, 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, 786433, 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, 786432, 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, 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, 458751, 196608, 3, 524287, 196608, 3, 589823, 196608, 3, 655359, 196608, 3, 720895, 196608, 3, 786431, 196608, 3, 851967, 196608, 3, 851969, 131072, 2, 851968, 131072, 2, 917503, 720896, 2, -65534, 131072, 7, 851970, 131072, 2, -65533, 131072, 7, 851971, 131072, 2, 851972, 196608, 2, 851973, 0, 8, 851974, 0, 8, 851975, 0, 8, 851976, 0, 8, 851977, 0, 8, 851978, 0, 8, -65523, 131072, 7, -65522, 131072, 7, -65521, 131072, 7, -65520, 131072, 7, -65519, 131072, 7, -65518, 131072, 7, 19, 65536, 3, 65555, 65536, 3, -65517, 65536, 4, 131091, 65536, 3, 196627, 65536, 3, 262163, 65536, 7, 327699, 0, 8, 393235, 0, 8, 458771, 0, 8, 524307, 0, 8, 589843, 0, 8, 655379, 0, 8, 720915, 0, 8, 786451, 0, 8, 851987, 0, 8, 1114135, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 851991, 0, 8, 786455, 0, 8, 720919, 0, 8, 655383, 0, 8, 589847, 0, 8, 524311, 0, 8, 458775, 0, 8, 393239, 0, 8, 327703, 0, 8, 1114134, 0, 8, 1048598, 0, 8, 983062, 0, 8, 917526, 0, 8, 851990, 0, 8, 786454, 0, 8, 720918, 0, 8, 655382, 0, 8, 589846, 0, 8, 524310, 0, 8, 458774, 0, 8, 393238, 0, 8, 327702, 0, 8, 1114133, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 327701, 0, 8, 1114132, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 393236, 0, 8, 327700, 0, 8, 1114122, 0, 8, 1048586, 0, 8, 983050, 0, 8, 917514, 0, 8, 1114121, 0, 8, 1048585, 0, 8, 983049, 0, 8, 917513, 0, 8, 1114120, 0, 8, 1048584, 0, 8, 983048, 0, 8, 917512, 0, 8, 1114119, 0, 8, 1048583, 0, 8, 983047, 0, 8, 917511, 0, 8, 1114118, 0, 8, 1048582, 0, 8, 983046, 0, 8, 917510, 0, 8, 1114117, 0, 8, 1048581, 0, 8, 983045, 0, 8, 917509, 0, 8, 917508, 196608, 3, 983044, 196608, 3, 1048580, 196608, 3, 1114116, 196608, 3, 1179654, 131072, 2, 1179653, 131072, 2, 1179652, 720896, 2, 1179655, 131072, 2, 1179656, 131072, 2, 1179657, 131072, 2, 1179658, 131072, 2, 262164, 131072, 7, 1179668, 131072, 2, 262165, 131072, 7, 1179669, 131072, 2, 262166, 131072, 7, 1179670, 131072, 2, 262167, 131072, 7, 1179671, 131072, 2, 327704, 65536, 3, 393240, 65536, 3, 262168, 65536, 4, 458776, 65536, 3, 524312, 65536, 3, 589848, 65536, 3, 655384, 65536, 3, 720920, 65536, 3, 786456, 65536, 3, 851992, 65536, 3, 917528, 65536, 3, 983064, 65536, 3, 1048600, 65536, 3, 1114136, 65536, 3, 1179672, 851968, 2, 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, 131072, 7, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 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, 131072, 7, 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, 131072, 7, 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, 131072, 7, 1179667, 131072, 2, 1114131, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 1179666, 131072, 2, 1114130, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 1179665, 131072, 2, 1114129, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 7, 65536, 3, 65543, 65536, 3, -65529, 65536, 4, 131079, 65536, 3, 196615, 65536, 3, 262151, 65536, 7, 262152, 131072, 7, 262153, 131072, 7, 262154, 131072, 7, 262155, 196608, 7, 65547, 196608, 3, 11, 196608, 3, -65525, 196608, 4, 131083, 196608, 3, 196619, 196608, 3, 851979, 65536, 2, 917515, 65536, 3, 983051, 65536, 3, 1048587, 65536, 3, 1114123, 65536, 3, 1179659, 851968, 2, 851980, 131072, 2, 851981, 131072, 2, 851982, 131072, 2, 851983, 131072, 2, 851984, 196608, 2, 917520, 196608, 3, 983056, 196608, 3, 1048592, 196608, 3, 1114128, 196608, 3, 1179664, 720896, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(192, 146)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(111, 146)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(274, 148)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 3.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(328, 241)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(129, 251)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(56, 56)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 3.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(248, 55)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 4.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(324, 151)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark12" type="Node2D" parent="."]
-position = Vector2(80, 151)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(56, 67)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 3.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(248, 71)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 4.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark11" type="Node2D" parent="."]
-position = Vector2(64, 160)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark13" type="Node2D" parent="."]
-position = Vector2(307, 138)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 2.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark14" type="Node2D" parent="."]
-position = Vector2(156, 139)
-script = ExtResource("3_u8a04")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 3.0
-BirthRect = Vector2i(80, 80)
-Altitude = 0
-
-[node name="EnemyMark15" type="Node2D" parent="."]
-position = Vector2(43, 43)
-script = ExtResource("3_u8a04")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 5.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark16" type="Node2D" parent="."]
-position = Vector2(239, 44)
-script = ExtResource("3_u8a04")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 6.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark17" type="Node2D" parent="."]
-position = Vector2(122, 237)
-script = ExtResource("3_u8a04")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 7.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark18" type="Node2D" parent="."]
-position = Vector2(326, 219)
-script = ExtResource("3_u8a04")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 8.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
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 30ee565..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
+++ /dev/null
@@ -1,188 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bunl6nluxu3qn"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_k1pu4"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_tkueb"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room4" type="TileMap"]
-tile_set = ExtResource("1_k1pu4")
-format = 2
-layer_0/tile_data = PackedInt32Array(1179669, 0, 8, 1114133, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 327701, 0, 8, 262165, 0, 8, 196629, 0, 8, 131093, 0, 8, 65557, 0, 8, 21, 0, 8, 1179668, 0, 8, 1114132, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 393236, 0, 8, 327700, 0, 8, 262164, 0, 8, 196628, 0, 8, 131092, 0, 8, 65556, 0, 8, 20, 0, 8, 1179667, 0, 8, 1114131, 0, 8, 65555, 0, 8, 19, 0, 8, 1179666, 0, 8, 1114130, 0, 8, 65554, 0, 8, 18, 0, 8, 1179665, 0, 8, 1114129, 0, 8, 65553, 0, 8, 17, 0, 8, 1179664, 0, 8, 1114128, 0, 8, 65552, 0, 8, 16, 0, 8, 1179663, 0, 8, 1114127, 0, 8, 65551, 0, 8, 15, 0, 8, 1179662, 0, 8, 1114126, 0, 8, 65550, 0, 8, 14, 0, 8, 1179661, 0, 8, 1114125, 0, 8, 65549, 0, 8, 13, 0, 8, 1179660, 0, 8, 1114124, 0, 8, 65548, 0, 8, 12, 0, 8, 1179659, 0, 8, 1114123, 0, 8, 65547, 0, 8, 11, 0, 8, 1179658, 0, 8, 1114122, 0, 8, 65546, 0, 8, 10, 0, 8, 1179657, 0, 8, 1114121, 0, 8, 65545, 0, 8, 9, 0, 8, 1179656, 0, 8, 1114120, 0, 8, 65544, 0, 8, 8, 0, 8, 1179655, 0, 8, 1114119, 0, 8, 65543, 0, 8, 7, 0, 8, 1179654, 0, 8, 1114118, 0, 8, 65542, 0, 8, 6, 0, 8, 1179653, 0, 8, 1114117, 0, 8, 65541, 0, 8, 5, 0, 8, 1179652, 0, 8, 1114116, 0, 8, 65540, 0, 8, 4, 0, 8, 1179651, 0, 8, 1114115, 0, 8, 65539, 0, 8, 3, 0, 8, 1179650, 0, 8, 1114114, 0, 8, 65538, 0, 8, 2, 0, 8, 1179649, 0, 8, 1114113, 0, 8, 1048577, 0, 8, 983041, 0, 8, 917505, 0, 8, 851969, 0, 8, 786433, 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, 1179648, 0, 8, 1114112, 0, 8, 1048576, 0, 8, 983040, 0, 8, 917504, 0, 8, 851968, 0, 8, 786432, 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, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65536, 0, 8, -65535, 0, 8, 196607, 0, 8, 262143, 0, 8, 327679, 0, 8, 393215, 0, 8, 458751, 196608, 2, 524287, 196608, 3, 589823, 196608, 3, 655359, 196608, 3, 720895, 196608, 3, 786431, 196608, 3, 851967, 196608, 3, 917503, 196608, 7, 983039, 0, 8, 1048575, 0, 8, 1114111, 0, 8, 1179647, 0, 8, 1245183, 0, 8, 1245185, 0, 8, 1245184, 0, 8, 1310719, 0, 8, -65534, 0, 8, 1245186, 0, 8, -65533, 0, 8, 1245187, 0, 8, -65532, 0, 8, 1245188, 0, 8, -65531, 0, 8, 1245189, 0, 8, -65530, 65536, 7, 1245190, 65536, 2, -65529, 131072, 7, 1245191, 131072, 2, -65528, 131072, 7, 1245192, 131072, 2, -65527, 131072, 7, 1245193, 131072, 2, -65526, 131072, 7, 1245194, 131072, 2, -65525, 131072, 7, 1245195, 131072, 2, -65524, 131072, 7, 1245196, 131072, 2, -65523, 131072, 7, 1245197, 131072, 2, -65522, 131072, 7, 1245198, 131072, 2, -65521, 196608, 7, 1245199, 196608, 2, -65520, 0, 8, 1245200, 0, 8, -65519, 0, 8, 1245201, 0, 8, -65518, 0, 8, 1245202, 0, 8, -65517, 0, 8, 1245203, 0, 8, -65516, 0, 8, 1245204, 0, 8, -65515, 0, 8, 1245205, 0, 8, 22, 0, 8, 65558, 0, 8, -65514, 0, 8, 131094, 0, 8, 196630, 0, 8, 262166, 0, 8, 327702, 0, 8, 393238, 65536, 2, 458774, 65536, 3, 524310, 65536, 3, 589846, 65536, 3, 655382, 65536, 3, 720918, 65536, 3, 786454, 65536, 3, 851990, 65536, 7, 917526, 0, 8, 983062, 0, 8, 1048598, 0, 8, 1114134, 0, 8, 1179670, 0, 8, 1245206, 0, 8, -131067, 0, 8, -196603, 0, 8, -262139, 0, 8, -131068, 0, 8, -196604, 0, 8, -262140, 0, 8, -131069, 0, 8, -196605, 0, 8, -262141, 0, 8, -131070, 0, 8, -196606, 0, 8, -262142, 0, 8, -131071, 0, 8, -196607, 0, 8, -262143, 0, 8, -131072, 0, 8, -196608, 0, 8, -262144, 0, 8, -65537, 0, 8, -131073, 0, 8, -196609, 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, -131074, 0, 8, -196610, 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, -131075, 0, 8, -196611, 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, -131076, 0, 8, -196612, 0, 8, -131077, 196608, 3, -196613, 196608, 3, -262149, 196608, 4, -262148, 131072, 7, -262147, 131072, 7, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458749, 131072, 2, 458748, 131072, 2, 458747, 720896, 2, -262146, 131072, 7, 458750, 131072, 2, -262145, 131072, 7, -327680, 131072, 7, -327679, 131072, 7, -327678, 131072, 7, -327677, 131072, 7, -327676, 131072, 7, -327675, 131072, 7, -262138, 65536, 3, -196602, 65536, 3, -327674, 65536, 4, -131066, 65536, 3, 262169, 0, 8, 196633, 0, 8, 131097, 0, 8, 65561, 0, 8, 25, 0, 8, -65511, 0, 8, -131047, 0, 8, -196583, 0, 8, -262119, 0, 8, 262168, 0, 8, 196632, 0, 8, 131096, 0, 8, 65560, 0, 8, 24, 0, 8, -65512, 0, 8, -131048, 0, 8, -196584, 0, 8, -262120, 0, 8, 262167, 0, 8, 196631, 0, 8, 131095, 0, 8, 65559, 0, 8, 23, 0, 8, -65513, 0, 8, -131049, 0, 8, -196585, 0, 8, -262121, 0, 8, -131050, 0, 8, -196586, 0, 8, -262122, 0, 8, -131051, 0, 8, -196587, 0, 8, -262123, 0, 8, -131052, 0, 8, -196588, 0, 8, -262124, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 131072, 7, -327663, 131072, 7, -327662, 131072, 7, -131056, 0, 8, -327661, 131072, 7, -327660, 131072, 7, -327659, 131072, 7, -327658, 131072, 7, -327657, 131072, 7, 327703, 0, 8, -327656, 131072, 7, 327704, 0, 8, -327655, 131072, 7, 327705, 0, 8, -262118, 65536, 3, -196582, 65536, 3, -327654, 65536, 4, -131046, 65536, 3, -65510, 65536, 3, 26, 65536, 3, 65562, 65536, 3, 131098, 65536, 3, 196634, 65536, 3, 262170, 65536, 3, 327706, 65536, 3, 393239, 131072, 2, 393240, 131072, 2, 393241, 131072, 2, 393242, 851968, 2, -196593, 196608, 3, -262129, 196608, 3, -327665, 196608, 4, -131057, 196608, 3, 1441796, 0, 8, 1376260, 0, 8, 1310724, 0, 8, 1441795, 0, 8, 1376259, 0, 8, 1310723, 0, 8, 1441794, 0, 8, 1376258, 0, 8, 1310722, 0, 8, 1441793, 0, 8, 1376257, 0, 8, 1310721, 0, 8, 1441792, 0, 8, 1376256, 0, 8, 1310720, 0, 8, 1507327, 0, 8, 1441791, 0, 8, 1376255, 0, 8, 1507326, 0, 8, 1441790, 0, 8, 1376254, 0, 8, 1310718, 0, 8, 1245182, 0, 8, 1179646, 0, 8, 1114110, 0, 8, 1048574, 0, 8, 983038, 0, 8, 1507325, 0, 8, 1441789, 0, 8, 1376253, 0, 8, 1310717, 0, 8, 1245181, 0, 8, 1179645, 0, 8, 1114109, 0, 8, 1048573, 0, 8, 983037, 0, 8, 1507324, 0, 8, 1441788, 0, 8, 1376252, 0, 8, 1310716, 0, 8, 1245180, 0, 8, 1179644, 0, 8, 1114108, 0, 8, 1048572, 0, 8, 983036, 0, 8, 1048571, 196608, 3, 983035, 196608, 3, 917499, 196608, 4, 917500, 131072, 7, 917501, 131072, 7, 1114107, 196608, 3, 1179643, 196608, 3, 1245179, 196608, 3, 1310715, 196608, 3, 1376251, 196608, 3, 1441787, 196608, 3, 1507323, 196608, 3, 1572861, 131072, 2, 1572860, 131072, 2, 1572859, 720896, 2, 917502, 131072, 7, 1572862, 131072, 2, 1572863, 131072, 2, 1507328, 131072, 2, 1507329, 131072, 2, 1507330, 131072, 2, 1507331, 131072, 2, 1507332, 131072, 2, 1310725, 0, 8, 1376261, 0, 8, 1441797, 0, 8, 1507333, 131072, 2, 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, 1441816, 0, 8, 1376280, 0, 8, 1310744, 0, 8, 1245208, 0, 8, 1179672, 0, 8, 1114136, 0, 8, 1048600, 0, 8, 983064, 0, 8, 917528, 0, 8, 1441815, 0, 8, 1376279, 0, 8, 1310743, 0, 8, 1245207, 0, 8, 1179671, 0, 8, 1114135, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 1441814, 0, 8, 1376278, 0, 8, 1310742, 0, 8, 1441813, 0, 8, 1376277, 0, 8, 1310741, 0, 8, 1441812, 0, 8, 1376276, 0, 8, 1310740, 0, 8, 1441811, 0, 8, 1376275, 0, 8, 1310739, 0, 8, 1441810, 0, 8, 1376274, 0, 8, 1310738, 0, 8, 1441809, 0, 8, 1376273, 0, 8, 1310737, 0, 8, 1310736, 0, 8, 1376272, 0, 8, 1441808, 0, 8, 1507346, 131072, 2, 1507345, 131072, 2, 1507344, 131072, 2, 1507347, 131072, 2, 1507348, 131072, 2, 1507349, 131072, 2, 1507350, 131072, 2, 851991, 131072, 7, 1507351, 131072, 2, 851992, 131072, 7, 1507352, 131072, 2, 851993, 131072, 7, 1507353, 131072, 2, 917530, 65536, 3, 983066, 65536, 3, 851994, 65536, 4, 1048602, 65536, 3, 1114138, 65536, 3, 1179674, 65536, 3, 1245210, 65536, 3, 1310746, 65536, 3, 1376282, 65536, 3, 1441818, 65536, 3, 1507354, 851968, 2, 458754, 65536, 7, 131088, 0, 8, 851970, 65536, 7, 131075, 0, 8, 131074, 0, 8, 131076, 0, 8, 131077, 0, 8, 131078, 65536, 2, 131079, 196608, 2, 131080, 0, 8, 131081, 0, 8, 131082, 0, 8, 131083, 0, 8, 131084, 0, 8, 131085, 0, 8, 131086, 65536, 2, 131087, 196608, 2, 131089, 0, 8, 131090, 0, 8, 131091, 0, 8, 196627, 0, 8, 262163, 0, 8, 327699, 0, 8, 393235, 196608, 2, 458771, 196608, 7, 524307, 0, 8, 589843, 0, 8, 655379, 0, 8, 720915, 0, 8, 786451, 196608, 2, 851987, 196608, 7, 917523, 0, 8, 983059, 0, 8, 1048595, 0, 8, 1048578, 0, 8, 1048579, 0, 8, 1048580, 0, 8, 1048581, 0, 8, 1048582, 65536, 7, 1048583, 196608, 7, 1048584, 0, 8, 1048585, 0, 8, 1048586, 0, 8, 1048587, 0, 8, 1048588, 0, 8, 1048589, 0, 8, 1048590, 65536, 7, 1048591, 196608, 7, 1048592, 0, 8, 1048593, 0, 8, 1048594, 0, 8, 196610, 0, 8, 262146, 0, 8, 327682, 0, 8, 393218, 65536, 2, 524290, 0, 8, 589826, 0, 8, 655362, 0, 8, 720898, 0, 8, 786434, 65536, 2, 917506, 0, 8, 983042, 0, 8, 983045, 0, 8, 917509, 0, 8, 983044, 0, 8, 917508, 0, 8, 983043, 0, 8, 917507, 0, 8, 851971, 131072, 7, 851972, 131072, 7, 851973, 131072, 7, 917510, 65536, 3, 983046, 65536, 3, 851974, 65536, 4, 1310726, 65536, 3, 1376262, 65536, 3, 1441798, 65536, 3, 1507334, 851968, 2, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 393219, 131072, 2, 393220, 131072, 2, 393221, 131072, 2, 196614, 65536, 3, 262150, 65536, 3, 327686, 65536, 3, 393222, 851968, 2, 327698, 0, 8, 262162, 0, 8, 196626, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 196623, 196608, 3, 262159, 196608, 3, 327695, 196608, 3, 393233, 131072, 2, 393232, 131072, 2, 393231, 720896, 2, 393234, 131072, 2, 983058, 0, 8, 917522, 0, 8, 983057, 0, 8, 917521, 0, 8, 983056, 0, 8, 917520, 0, 8, 983055, 196608, 3, 917519, 196608, 3, 851983, 196608, 4, 851984, 131072, 7, 851985, 131072, 7, 1310735, 196608, 3, 851986, 131072, 7, 1376271, 196608, 3, 1441807, 196608, 3, 1507343, 720896, 2, 983053, 0, 8, 917517, 0, 8, 851981, 0, 8, 786445, 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, 983052, 0, 8, 917516, 0, 8, 851980, 0, 8, 786444, 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, 983051, 0, 8, 917515, 0, 8, 851979, 0, 8, 786443, 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, 983050, 0, 8, 917514, 0, 8, 851978, 0, 8, 786442, 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, 983049, 0, 8, 917513, 0, 8, 851977, 0, 8, 786441, 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, 983048, 0, 8, 917512, 0, 8, 851976, 0, 8, 786440, 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, 196615, 196608, 3, 262151, 196608, 3, 327687, 196608, 3, 393223, 196608, 3, 458759, 196608, 7, 524295, 0, 8, 589831, 0, 8, 655367, 0, 8, 720903, 0, 8, 786439, 196608, 2, 851975, 196608, 3, 917511, 196608, 3, 983047, 196608, 3, 196622, 65536, 3, 262158, 65536, 3, 327694, 65536, 3, 393230, 65536, 3, 458766, 65536, 7, 524302, 0, 8, 589838, 0, 8, 655374, 0, 8, 720910, 0, 8, 786446, 65536, 2, 851982, 65536, 3, 917518, 65536, 3, 983054, 65536, 3, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 131072, 7, 786435, 131072, 2, 458756, 131072, 7, 786436, 131072, 2, 458757, 131072, 7, 786437, 131072, 2, 458758, 131072, 7, 786438, 131072, 2, 458767, 131072, 7, 786447, 131072, 2, 458768, 131072, 7, 786448, 131072, 2, 458769, 131072, 7, 786449, 131072, 2, 458770, 131072, 7, 786450, 131072, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-script = ExtResource("3_tkueb")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(346, -8)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(359, 312)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(-8, 311)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark17" type="Node2D" parent="."]
-position = Vector2(176, 165)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-script = ExtResource("3_tkueb")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(346, -8)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark11" type="Node2D" parent="."]
-position = Vector2(359, 312)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark12" type="Node2D" parent="."]
-position = Vector2(-8, 311)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark18" type="Node2D" parent="."]
-position = Vector2(175, 166)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark13" type="Node2D" parent="."]
-script = ExtResource("3_tkueb")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark14" type="Node2D" parent="."]
-position = Vector2(346, -8)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark15" type="Node2D" parent="."]
-position = Vector2(359, 312)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark16" type="Node2D" parent="."]
-position = Vector2(-8, 311)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark19" type="Node2D" parent="."]
-position = Vector2(175, 164)
-script = ExtResource("3_tkueb")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(50, 50)
-Altitude = 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 6e521fa..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn
+++ /dev/null
@@ -1,124 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://cllr044e4g3cg"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_657ry"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_epa54"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room5" type="TileMap"]
-tile_set = ExtResource("1_657ry")
-format = 2
-layer_0/tile_data = PackedInt32Array(65538, 0, 8, 2, 0, 8, -65534, 0, 8, -65535, 0, 8, -65536, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -65537, 0, 8, -131072, 0, 8, 131070, 0, 8, 196607, 0, 8, 196606, 0, 8, -131071, 0, 8, -131070, 0, 8, -65533, 0, 8, 3, 0, 8, -131069, 0, 8, 65539, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 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, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 393222, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 393219, 0, 8, 327683, 0, 8, 327682, 0, 8, 393215, 0, 8, 327679, 0, 8, 262143, 0, 8, 262142, 0, 8, 327678, 0, 8, 393214, 0, 8, 655363, 0, 8, -131068, 0, 8, 655364, 0, 8, 655365, 0, 8, 655366, 0, 8, 655367, 0, 8, 655368, 0, 8, 655369, 0, 8, 655370, 0, 8, 655371, 0, 8, -131060, 0, 8, -131059, 0, 8, -131058, 0, 8, -131057, 0, 8, -131056, 0, 8, -65519, 65536, 3, 17, 65536, 3, -131055, 65536, 3, 65553, 65536, 3, 131089, 65536, 3, 196625, 65536, 3, 262161, 65536, 3, 327697, 65536, 3, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 589837, 131072, 2, 589836, 65536, 2, 589838, 131072, 2, 393231, 65536, 2, 458767, 65536, 3, 524303, 65536, 3, 589839, 851968, 2, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 524289, 0, 8, 458753, 0, 8, 524288, 0, 8, 458752, 0, 8, 589823, 0, 8, 524287, 0, 8, 458751, 0, 8, 524286, 0, 8, 458750, 0, 8, 589822, 0, 8, 589824, 131072, 2, 655359, 131072, 2, 655358, 131072, 2, 589825, 131072, 2, 589826, 196608, 2, -196592, 0, 8, -262128, 0, 8, -327664, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, -262133, 0, 8, -327669, 0, 8, -262134, 0, 8, -327670, 0, 8, -262135, 0, 8, -327671, 0, 8, -262136, 0, 8, -327672, 0, 8, -262137, 0, 8, -327673, 0, 8, -262138, 0, 8, -327674, 0, 8, -262139, 0, 8, -327675, 0, 8, -196604, 0, 8, -262140, 0, 8, -327676, 0, 8, -196605, 0, 8, -262141, 0, 8, -327677, 0, 8, -196606, 0, 8, -262142, 0, 8, -327678, 0, 8, -65539, 196608, 3, -3, 196608, 3, -393214, 131072, 7, -393213, 131072, 7, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, -393204, 131072, 7, -393203, 131072, 7, -393202, 131072, 7, -393201, 131072, 7, -393200, 131072, 7, -327663, 65536, 3, -262127, 65536, 3, -393199, 65536, 4, -196591, 65536, 3, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, 9, 0, 8, 8, 0, 8, 7, 0, 8, 6, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, 131081, 0, 8, 65545, 0, 8, 131080, 0, 8, 65544, 0, 8, 131079, 0, 8, 65543, 0, 8, 131078, 0, 8, 65542, 0, 8, 196614, 0, 8, 196615, 0, 8, -196603, 65536, 2, -196602, 131072, 2, -196601, 131072, 2, -196600, 131072, 2, -196599, 131072, 2, -196598, 131072, 2, -196597, 196608, 2, -131061, 196608, 3, -65525, 196608, 7, -65531, 65536, 7, -65530, 131072, 7, -65529, 131072, 7, -65528, 131072, 7, -65527, 131072, 7, -65526, 131072, 7, -131067, 65536, 3, 327686, 0, 8, 327687, 0, 8, 262150, 0, 8, 393232, 131072, 2, 393233, 851968, 2, 655372, 65536, 3, 655362, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 196608, 3, 262141, 196608, 3, 327677, 196608, 3, 393213, 196608, 3, 458749, 196608, 3, 524285, 196608, 3, 589821, 196608, 3, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 262151, 0, 8, 196617, 65536, 2, 262153, 65536, 3, 327689, 65536, 7, 196618, 131072, 2, 196619, 131072, 2, 196620, 196608, 2, 262156, 196608, 3, 327692, 196608, 7, 327690, 131072, 7, 327691, 131072, 7, 393217, 0, 8, 327681, 0, 8, 65537, 0, 8, 1, 0, 8, 393216, 0, 8, 327680, 0, 8, 65536, 0, 8, 0, 0, 8, 131072, 65536, 2, 131073, 131072, 2, 131074, 131072, 2, 131075, 196608, 2, 196611, 196608, 3, 262147, 196608, 7, 262144, 65536, 7, 262145, 131072, 7, 262146, 131072, 7, 196608, 65536, 3, 655357, 720896, 2, -262143, 196608, 3, -327679, 196608, 3, -393215, 196608, 4, -196607, 196608, 7, -131075, 196608, 4, -131074, 131072, 7, -131073, 131072, 7, -196608, 131072, 7, 720900, 131072, 2, 720899, 131072, 2, 720898, 720896, 2, 720901, 131072, 2, 720902, 131072, 2, 720903, 131072, 2, 720904, 131072, 2, 720905, 131072, 2, 720906, 131072, 2, 720907, 131072, 2, 720908, 851968, 2)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(105, 107)
-script = ExtResource("3_epa54")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-BirthRect = Vector2i(50, 100)
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(232, -12)
-script = ExtResource("3_epa54")
-Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(50, 100)
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(17, 3)
-script = ExtResource("3_epa54")
-Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:0)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 2.0
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(100, 48)
-script = ExtResource("3_epa54")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(50, 50)
-Altitude = 0
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(33, 116)
-script = ExtResource("3_epa54")
-Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(100, 50)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(123, 143)
-script = ExtResource("3_epa54")
-Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(100, 50)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(189, 28)
-script = ExtResource("3_epa54")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-BirthRect = Vector2i(100, 30)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(189, 28)
-script = ExtResource("3_epa54")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-BirthRect = Vector2i(100, 30)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(25, -3)
-script = ExtResource("3_epa54")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(70, 30)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(155, -61)
-script = ExtResource("3_epa54")
-Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.0
-BirthRect = Vector2i(200, 15)
-Altitude = 0
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 7bb1aff..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn
+++ /dev/null
@@ -1,130 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://d1os2i60rnd0i"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_83m2u"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_g5jtq"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room6" type="TileMap"]
-tile_set = ExtResource("1_83m2u")
-format = 2
-layer_0/tile_data = PackedInt32Array(393226, 0, 8, 327690, 0, 8, 10, 0, 8, 393225, 0, 8, 327689, 0, 8, 65545, 0, 8, 9, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 65544, 0, 8, 8, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 393222, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 393219, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 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, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 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, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -65537, 0, 8, -131072, 0, 8, 131070, 0, 8, 196606, 196608, 2, 262142, 196608, 3, 327678, 196608, 3, 393214, 196608, 3, 458750, 196608, 3, 458752, 131072, 2, 524287, 131072, 2, 524286, 720896, 2, -131071, 0, 8, 458753, 131072, 2, 458754, 131072, 2, 458755, 131072, 2, 458756, 131072, 2, 458757, 131072, 2, 458758, 131072, 2, 458759, 131072, 2, 458760, 131072, 2, 458761, 131072, 2, 458762, 131072, 2, -65525, 0, 8, 11, 0, 8, 327691, 0, 8, 393227, 0, 8, 458763, 131072, 2, 65555, 0, 8, 19, 0, 8, -65517, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -327661, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -327662, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 65552, 0, 8, 16, 0, 8, -327664, 0, 8, 65551, 0, 8, 15, 0, 8, -327665, 0, 8, 14, 0, 8, -327666, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, -262133, 0, 8, -327669, 0, 8, -262134, 0, 8, -327670, 0, 8, -262135, 0, 8, -327671, 0, 8, -262136, 0, 8, -327672, 0, 8, -262137, 0, 8, -327673, 0, 8, -262138, 0, 8, -327674, 0, 8, -262139, 0, 8, -327675, 0, 8, -262140, 0, 8, -327676, 0, 8, -262141, 0, 8, -327677, 0, 8, -262142, 0, 8, -327678, 0, 8, -196607, 0, 8, -262143, 0, 8, -327679, 0, 8, -196608, 0, 8, -262144, 0, 8, -327680, 0, 8, -131073, 0, 8, -196609, 0, 8, -262145, 0, 8, -131074, 0, 8, -196610, 0, 8, -262146, 0, 8, -196611, 196608, 3, -262147, 196608, 3, -327683, 196608, 4, -327682, 131072, 7, -327681, 131072, 7, -131075, 196608, 3, -65539, 196608, 3, -3, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 720896, 2, -393216, 131072, 7, -393215, 131072, 7, -393214, 131072, 7, -393213, 131072, 7, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, -393204, 131072, 7, -393203, 131072, 7, -393202, 131072, 7, -393201, 131072, 7, 131087, 0, 8, -393200, 131072, 7, 131088, 0, 8, -393199, 131072, 7, 131089, 0, 8, -393198, 131072, 7, 131090, 65536, 2, -393197, 131072, 7, 131091, 131072, 2, -327660, 65536, 3, -262124, 65536, 3, -393196, 65536, 4, -196588, 65536, 3, -131052, 65536, 3, -65516, 65536, 3, 20, 65536, 3, 65556, 65536, 3, 131092, 851968, 2, 65543, 0, 8, 7, 0, 8, 65542, 0, 8, 6, 0, 8, -131061, 0, 8, -196597, 0, 8, -196598, 0, 8, -196599, 0, 8, -196600, 0, 8, -196605, 0, 8, -196606, 0, 8, -131070, 65536, 2, 131086, 0, 8, 65550, 0, 8, 131085, 0, 8, 65549, 0, 8, 65548, 0, 8, 262155, 0, 8, 65547, 0, 8, 65546, 0, 8, 196623, 0, 8, 196622, 0, 8, 196621, 0, 8, 262156, 0, 8, 327692, 0, 8, 196624, 0, 8, -65530, 131072, 7, -65529, 131072, 7, 131079, 65536, 2, -65528, 131072, 7, -65527, 131072, 7, 196615, 65536, 7, 65539, 131072, 7, -65526, 196608, 7, -131062, 196608, 2, -131069, 131072, 2, -131064, 131072, 2, -131063, 131072, 2, -65534, 65536, 3, 2, 65536, 3, 65538, 65536, 7, 131080, 131072, 2, 131081, 131072, 2, 196616, 131072, 7, 393228, 0, 8, 458764, 131072, 2, 458765, 131072, 2, -262128, 0, 8, -262129, 0, 8, -262130, 0, 8, -196594, 65536, 2, -131058, 65536, 3, -65522, 65536, 7, -196593, 131072, 2, -196592, 196608, 2, -131056, 196608, 3, -65520, 196608, 7, -65521, 131072, 7, 196625, 0, 8, 196626, 65536, 3, 262162, 65536, 3, 262153, 65536, 7, 196617, 65536, 4, 262154, 196608, 7, 196618, 196608, 4, 196619, 131072, 7, 196620, 196608, 7, 131084, 196608, 2, 131082, 131072, 2, 131083, 131072, 2, -196603, 131072, 2, -196602, 131072, 2, -196601, 196608, 2, -131065, 720896, 2, -196604, 65536, 2, -131068, 851968, 2, 65540, 196608, 7, 65541, 0, 8, 5, 0, 8, -65531, 131072, 7, 4, 196608, 3, -65532, 196608, 4, 262161, 0, 8, 262160, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 458766, 131072, 2, 458767, 131072, 2, 458768, 851968, 2, 327698, 851968, 2, 327696, 65536, 2, 327697, 131072, 2, 393232, 65536, 3)
-script = ExtResource("dungeonRoomTemplate")
-EnableEdit = true
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(51, 77)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
-0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-BirthRect = Vector2i(100, 60)
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(-1, -23)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
-0002(ResidueAmmo:7,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(30, 60)
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(200, -27)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
-0002(ResidueAmmo:7,CurrAmmon:7);
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 3.0
-BirthRect = Vector2i(20, 60)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(261, 43)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
-0002(ResidueAmmo:7,CurrAmmon:7);
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 3.0
-BirthRect = Vector2i(20, 60)
-Altitude = 0
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(233, 61)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
-0006(ResidueAmmo:20,CurrAmmon:20);
-0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-BirthRect = Vector2i(20, 90)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(155, 19)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
-0006(ResidueAmmo:20,CurrAmmon:20);
-0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(100, 10)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(75, -61)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
-0006(ResidueAmmo:20,CurrAmmon:20);
-0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(100, 10)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(47, 69)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
-0006(ResidueAmmo:20,CurrAmmon:20);
-0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 3.0
-BirthRect = Vector2i(100, 50)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(178, -54)
-script = ExtResource("3_g5jtq")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
-0006(ResidueAmmo:20,CurrAmmon:20);
-0007(ResidueAmmo:30,CurrAmmon:30)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 2
-DelayTime = 4.0
-BirthRect = Vector2i(70, 20)
-Altitude = 0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn
deleted file mode 100644
index 97c3076..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn
+++ /dev/null
@@ -1,215 +0,0 @@
-[gd_scene load_steps=5 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/mark/ActivityMark.cs" id="4_5ha7k"]
-[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="."]
-position = Vector2(17, 38)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-DelayTime = 1.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(198, 129)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(116, 80)
-script = ExtResource("4_5ha7k")
-Type = 5
-ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)"
-WaveNumber = 2
-DelayTime = 1.0
-BirthRect = Vector2i(150, 150)
-
-[node name="ActivityMark2" type="Node2D" parent="."]
-position = Vector2(208, 101)
-script = ExtResource("4_5ha7k")
-Type = 5
-ItemExpression = "0001(ResidueAmmo:15,CurrAmmon:15)"
-WaveNumber = 2
-DelayTime = 1.5
-BirthRect = Vector2i(150, 150)
-
-[node name="ActivityMark3" type="Node2D" parent="."]
-position = Vector2(115, 64)
-script = ExtResource("4_5ha7k")
-Type = 5
-ItemExpression = "0003(ResidueAmmo:12,CurrAmmon:12)"
-WaveNumber = 2
-DelayTime = 2.0
-BirthRect = Vector2i(150, 150)
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(52, 123)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:7)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark13" type="Node2D" parent="."]
-position = Vector2(69, 35)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 1.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark14" type="Node2D" parent="."]
-position = Vector2(224, 41)
-script = ExtResource("3_y6it6")
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 2.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark15" type="Node2D" parent="."]
-position = Vector2(218, 114)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 3
-DelayTime = 4.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(138, 89)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark5" type="Node2D" parent="."]
-position = Vector2(27, 108)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 1.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark6" type="Node2D" parent="."]
-position = Vector2(175, 110)
-script = ExtResource("3_y6it6")
-Weapon1Id = "
-"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 2.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark7" type="Node2D" parent="."]
-position = Vector2(35, 47)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 3.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark8" type="Node2D" parent="."]
-position = Vector2(157, 38)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 4
-DelayTime = 5.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark9" type="Node2D" parent="."]
-position = Vector2(5, 79)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 5
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark10" type="Node2D" parent="."]
-position = Vector2(66, 125)
-script = ExtResource("3_y6it6")
-Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 5
-DelayTime = 2.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark11" type="Node2D" parent="."]
-position = Vector2(190, 104)
-script = ExtResource("3_y6it6")
-Weapon1Id = "
-"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 5
-DelayTime = 3.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
-
-[node name="EnemyMark12" type="Node2D" parent="."]
-position = Vector2(145, 43)
-script = ExtResource("3_y6it6")
-Weapon1Id = "
-"
-Type = 4
-ItemExpression = "0001"
-Layer = 1
-WaveNumber = 5
-DelayTime = 4.0
-BirthRect = Vector2i(100, 100)
-Altitude = 0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/boss/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/boss/Room1.tscn
deleted file mode 100644
index a99b278..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/boss/Room1.tscn
+++ /dev/null
@@ -1,60 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bm1820vfwqf52"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_k0vyv"]
-[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_enrje"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_k0vyv")
-format = 2
-layer_0/tile_data = PackedInt32Array(1114144, 0, 8, 1048608, 0, 8, 983072, 0, 8, 917536, 0, 8, 852000, 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, 65568, 0, 8, 32, 0, 8, -65504, 0, 8, -131040, 0, 8, -196576, 0, 8, -262112, 0, 8, -327648, 0, 8, 1114143, 0, 8, 1048607, 0, 8, 983071, 0, 8, 917535, 0, 8, 851999, 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, 65567, 0, 8, 31, 0, 8, -65505, 0, 8, -131041, 0, 8, -196577, 0, 8, -262113, 0, 8, -327649, 0, 8, 1114142, 0, 8, 1048606, 0, 8, 983070, 0, 8, 917534, 0, 8, 851998, 0, 8, 786462, 0, 8, 720926, 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, 65566, 0, 8, 30, 0, 8, -65506, 0, 8, -131042, 0, 8, -196578, 0, 8, -262114, 0, 8, -327650, 0, 8, 1114141, 0, 8, 1048605, 0, 8, 983069, 0, 8, 917533, 0, 8, 851997, 0, 8, 786461, 0, 8, 720925, 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, 65565, 0, 8, 29, 0, 8, -65507, 0, 8, -131043, 0, 8, -196579, 0, 8, -262115, 0, 8, -327651, 0, 8, 1114140, 0, 8, 1048604, 0, 8, 983068, 0, 8, 917532, 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, 65564, 0, 8, 28, 0, 8, -65508, 0, 8, -131044, 0, 8, -196580, 0, 8, -262116, 0, 8, -327652, 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, 65563, 0, 8, 27, 0, 8, -65509, 0, 8, -131045, 0, 8, -196581, 0, 8, -262117, 0, 8, -327653, 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, 65562, 0, 8, 26, 0, 8, -65510, 0, 8, -131046, 0, 8, -196582, 0, 8, -262118, 0, 8, -327654, 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, 65561, 0, 8, 25, 0, 8, -65511, 0, 8, -131047, 0, 8, -196583, 0, 8, -262119, 0, 8, -327655, 0, 8, 1114136, 0, 8, 1048600, 0, 8, 983064, 0, 8, 917528, 0, 8, 851992, 0, 8, 786456, 0, 8, 720920, 0, 8, 655384, 0, 8, 589848, 0, 8, 524312, 0, 8, 458776, 0, 8, 393240, 0, 8, 327704, 0, 8, 262168, 0, 8, 196632, 0, 8, 131096, 0, 8, 65560, 0, 8, 24, 0, 8, -65512, 0, 8, -131048, 0, 8, -196584, 0, 8, -262120, 0, 8, -327656, 0, 8, 1114135, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 851991, 0, 8, 786455, 0, 8, 720919, 0, 8, 655383, 0, 8, 589847, 0, 8, 524311, 0, 8, 458775, 0, 8, 393239, 0, 8, 327703, 0, 8, 262167, 0, 8, 196631, 0, 8, 131095, 0, 8, 65559, 0, 8, 23, 0, 8, -65513, 0, 8, -131049, 0, 8, -196585, 0, 8, -262121, 0, 8, -327657, 0, 8, 1114134, 0, 8, 1048598, 0, 8, 983062, 0, 8, 917526, 0, 8, 851990, 0, 8, 786454, 0, 8, 720918, 0, 8, 655382, 0, 8, 589846, 0, 8, 524310, 0, 8, 458774, 0, 8, 393238, 0, 8, 327702, 0, 8, 262166, 0, 8, 196630, 0, 8, 131094, 0, 8, 65558, 0, 8, 22, 0, 8, -65514, 0, 8, -131050, 0, 8, -196586, 0, 8, -262122, 0, 8, -327658, 0, 8, 1114133, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 327701, 0, 8, 262165, 0, 8, 196629, 0, 8, 131093, 0, 8, 65557, 0, 8, 21, 0, 8, -65515, 0, 8, -131051, 0, 8, -196587, 0, 8, -262123, 0, 8, -327659, 0, 8, 1114132, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 196628, 0, 8, 131092, 0, 8, 65556, 0, 8, 20, 0, 8, -65516, 0, 8, -131052, 0, 8, -196588, 0, 8, -262124, 0, 8, -327660, 0, 8, 1114131, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 851987, 0, 8, 786451, 0, 8, 720915, 0, 8, 655379, 0, 8, 589843, 0, 8, 524307, 0, 8, 196627, 0, 8, 131091, 0, 8, 65555, 0, 8, 19, 0, 8, -65517, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -327661, 0, 8, 1114130, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 196626, 0, 8, 131090, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -327662, 0, 8, 1114129, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 196625, 0, 8, 131089, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 1114128, 0, 8, 1048592, 0, 8, 983056, 0, 8, 917520, 0, 8, 851984, 0, 8, 786448, 0, 8, -65520, 0, 8, -131056, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 0, 8, 1114127, 0, 8, 1048591, 0, 8, 983055, 0, 8, 917519, 0, 8, 851983, 0, 8, 786447, 0, 8, -65521, 0, 8, -131057, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, 1114126, 0, 8, 1048590, 0, 8, 983054, 0, 8, 917518, 0, 8, 851982, 0, 8, 786446, 0, 8, -65522, 0, 8, -131058, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, 1114125, 0, 8, 1048589, 0, 8, 983053, 0, 8, 917517, 0, 8, 851981, 0, 8, 786445, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 1114124, 0, 8, 1048588, 0, 8, 983052, 0, 8, 917516, 0, 8, 851980, 0, 8, 786444, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, 1114123, 0, 8, 1048587, 0, 8, 983051, 0, 8, 917515, 0, 8, 851979, 0, 8, 786443, 0, 8, 720907, 0, 8, 655371, 0, 8, 589835, 0, 8, 524299, 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, -327669, 0, 8, 1114122, 0, 8, 1048586, 0, 8, 983050, 0, 8, 917514, 0, 8, 851978, 0, 8, 786442, 0, 8, 720906, 0, 8, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 196618, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, -65526, 0, 8, -131062, 0, 8, -196598, 0, 8, -262134, 0, 8, -327670, 0, 8, 1114121, 0, 8, 1048585, 0, 8, 983049, 0, 8, 917513, 0, 8, 851977, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 196617, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, -262135, 0, 8, -327671, 0, 8, 1114120, 0, 8, 1048584, 0, 8, 983048, 0, 8, 917512, 0, 8, 851976, 0, 8, 786440, 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, -196600, 0, 8, -262136, 0, 8, -327672, 0, 8, 1114119, 0, 8, 1048583, 0, 8, 983047, 0, 8, 917511, 0, 8, 851975, 0, 8, 786439, 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, -196601, 0, 8, -262137, 0, 8, -327673, 0, 8, 1114118, 0, 8, 1048582, 0, 8, 983046, 0, 8, 917510, 0, 8, 851974, 0, 8, 786438, 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, -196602, 0, 8, -262138, 0, 8, -327674, 0, 8, 1114117, 0, 8, 1048581, 0, 8, 983045, 0, 8, 917509, 0, 8, 851973, 0, 8, 786437, 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, -196603, 0, 8, -262139, 0, 8, -327675, 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, 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, -196604, 0, 8, -262140, 0, 8, -327676, 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, 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, -196605, 0, 8, -262141, 0, 8, -327677, 0, 8, 1114114, 0, 8, 1048578, 0, 8, 983042, 0, 8, 917506, 0, 8, 851970, 0, 8, 786434, 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, -196606, 0, 8, -262142, 0, 8, -327678, 0, 8, 1114113, 0, 8, 1048577, 0, 8, 983041, 0, 8, 917505, 0, 8, 851969, 0, 8, 786433, 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, -196607, 0, 8, -262143, 0, 8, -327679, 0, 8, 1114112, 0, 8, 1048576, 0, 8, 983040, 0, 8, 917504, 0, 8, 851968, 0, 8, 786432, 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, -196608, 0, 8, -262144, 0, 8, -327680, 0, 8, 1179647, 0, 8, 1114111, 0, 8, 1048575, 0, 8, 983039, 0, 8, 917503, 0, 8, 851967, 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, -131073, 0, 8, -196609, 0, 8, -262145, 0, 8, 1179646, 0, 8, 1114110, 0, 8, 1048574, 0, 8, 983038, 0, 8, 917502, 0, 8, 851966, 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, -131074, 0, 8, -196610, 0, 8, -262146, 0, 8, 1179645, 0, 8, 1114109, 0, 8, 1048573, 0, 8, 983037, 0, 8, 917501, 0, 8, 851965, 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, -131075, 0, 8, -196611, 0, 8, -262147, 0, 8, 1179644, 0, 8, 1114108, 0, 8, 1048572, 0, 8, 983036, 0, 8, 917500, 0, 8, 851964, 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, -131076, 0, 8, -196612, 0, 8, -262148, 0, 8, -196613, 196608, 3, -262149, 196608, 3, -327685, 196608, 4, -327684, 131072, 7, -327683, 131072, 7, -131077, 196608, 3, -65541, 196608, 3, -5, 196608, 3, 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, 851963, 196608, 3, 917499, 196608, 3, 983035, 196608, 3, 1048571, 196608, 3, 1114107, 196608, 3, 1179643, 196608, 3, 1245181, 131072, 2, 1245180, 131072, 2, 1245179, 720896, 2, -327682, 131072, 7, 1245182, 131072, 2, -327681, 131072, 7, 1245183, 131072, 2, -393216, 131072, 7, 1179648, 131072, 2, -393215, 131072, 7, 1179649, 131072, 2, -393214, 131072, 7, 1179650, 131072, 2, -393213, 131072, 7, 1179651, 131072, 2, -393212, 131072, 7, 1179652, 131072, 2, -393211, 131072, 7, 1179653, 131072, 2, -393210, 131072, 7, 1179654, 131072, 2, -393209, 131072, 7, 1179655, 131072, 2, -393208, 131072, 7, 1179656, 131072, 2, -393207, 131072, 7, 1179657, 131072, 2, -393206, 131072, 7, 1179658, 131072, 2, -393205, 131072, 7, 1179659, 131072, 2, -393204, 131072, 7, 1179660, 131072, 2, -393203, 131072, 7, 1179661, 131072, 2, -393202, 131072, 7, 1179662, 131072, 2, -393201, 131072, 7, 1179663, 131072, 2, -393200, 131072, 7, 1179664, 131072, 2, -393199, 131072, 7, 1179665, 131072, 2, -393198, 131072, 7, 1179666, 131072, 2, -393197, 131072, 7, 1179667, 131072, 2, -393196, 131072, 7, 1179668, 131072, 2, -393195, 131072, 7, 1179669, 131072, 2, -393194, 131072, 7, 1179670, 131072, 2, -393193, 131072, 7, 1179671, 131072, 2, -393192, 131072, 7, 1179672, 131072, 2, -393191, 131072, 7, 1179673, 131072, 2, -393190, 131072, 7, 1179674, 131072, 2, -393189, 131072, 7, 1179675, 131072, 2, -393188, 131072, 7, 1179676, 131072, 2, -393187, 131072, 7, 1179677, 131072, 2, -393186, 131072, 7, 1179678, 131072, 2, -393185, 131072, 7, 1179679, 131072, 2, -393184, 131072, 7, 1179680, 131072, 2, -327647, 65536, 3, -262111, 65536, 3, -393183, 65536, 4, -196575, 65536, 3, -131039, 65536, 3, -65503, 65536, 3, 33, 65536, 3, 65569, 65536, 3, 131105, 65536, 3, 196641, 65536, 3, 262177, 65536, 3, 327713, 65536, 3, 393249, 65536, 3, 458785, 65536, 3, 524321, 65536, 3, 589857, 65536, 3, 655393, 65536, 3, 720929, 65536, 3, 786465, 65536, 3, 852001, 65536, 3, 917537, 65536, 3, 983073, 65536, 3, 1048609, 65536, 3, 1114145, 65536, 3, 1179681, 851968, 2, 196621, 65536, 3, 524301, 65536, 3, 262155, 131072, 2, 458763, 131072, 7, 262162, 131072, 2, 65552, 196608, 3, 16, 196608, 2, 131088, 196608, 3, 196624, 196608, 3, 262161, 131072, 2, 262160, 720896, 2, 262163, 131072, 2, 262164, 196608, 2, 13, 65536, 2, 14, 131072, 2, 15, 131072, 2, 262153, 65536, 2, 262154, 131072, 2, 262156, 131072, 2, 65549, 65536, 3, 131085, 65536, 3, 262157, 851968, 2, 327689, 65536, 3, 393225, 65536, 3, 458761, 65536, 7, 458762, 131072, 7, 458764, 131072, 7, 589837, 65536, 3, 458765, 65536, 4, 655373, 65536, 3, 720909, 65536, 7, 720910, 131072, 7, 720911, 131072, 7, 720912, 196608, 7, 589840, 196608, 3, 524304, 196608, 3, 458768, 196608, 4, 458769, 131072, 7, 458770, 131072, 7, 655376, 196608, 3, 458771, 131072, 7, 458772, 196608, 7, 327700, 196608, 3, 393236, 196608, 3)
-script = ExtResource("dungeonRoomTemplate")
-
-[node name="EnemyMark" type="Node2D" parent="."]
-position = Vector2(152, 15)
-script = ExtResource("3_enrje")
-Weapon1Id = "0001(ResidueAmmo:30,CurrAmmon:10)"
-Weapon2Id = "null;
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001;
-null"
-Layer = 1
-Altitude = 0
-
-[node name="EnemyMark2" type="Node2D" parent="."]
-position = Vector2(148, 175)
-script = ExtResource("3_enrje")
-Weapon1Id = "0001(ResidueAmmo:30,CurrAmmon:10)"
-Weapon2Id = "null;
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001;
-null"
-Layer = 1
-Altitude = 0
-
-[node name="EnemyMark3" type="Node2D" parent="."]
-position = Vector2(317, 171)
-script = ExtResource("3_enrje")
-Weapon1Id = "0001(ResidueAmmo:30,CurrAmmon:10)"
-Weapon2Id = "null;
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001;
-null"
-Layer = 1
-Altitude = 0
-
-[node name="EnemyMark4" type="Node2D" parent="."]
-position = Vector2(321, 22)
-script = ExtResource("3_enrje")
-Weapon1Id = "0001(ResidueAmmo:30,CurrAmmon:10)"
-Weapon2Id = "null;
-0003(ResidueAmmo:12,CurrAmmon:12)"
-Type = 4
-ItemExpression = "0001;
-null"
-Layer = 1
-Altitude = 0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
deleted file mode 100644
index c37e50b..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
+++ /dev/null
@@ -1,122 +0,0 @@
-[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_osa3n"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_erhdx"]
-[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_m4jrh"]
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_osa3n")
-format = 2
-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("2_erhdx")
-
-[node name="Player" type="Node2D" parent="."]
-position = Vector2(80, 47)
-script = ExtResource("3_m4jrh")
-Type = 1
-Altitude = 0
-
-[node name="ActivityMark7" type="Node2D" parent="."]
-position = Vector2(79, 76)
-script = ExtResource("3_m4jrh")
-Type = 5
-ItemExpression = "0003"
-WaveNumber = 2
-
-[node name="ActivityMark8" type="Node2D" parent="."]
-position = Vector2(126, 41)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0001"
-WaveNumber = 2
-
-[node name="ActivityMark9" type="Node2D" parent="."]
-position = Vector2(125, 68)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0002"
-WaveNumber = 2
-
-[node name="ActivityMark10" type="Node2D" parent="."]
-position = Vector2(124, 18)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0003"
-WaveNumber = 2
-
-[node name="ActivityMark11" type="Node2D" parent="."]
-position = Vector2(34, 19)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0004"
-WaveNumber = 2
-
-[node name="ActivityMark12" type="Node2D" parent="."]
-position = Vector2(64, 21)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0005"
-WaveNumber = 2
-
-[node name="ActivityMark13" type="Node2D" parent="."]
-position = Vector2(93, 22)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0006"
-WaveNumber = 2
-
-[node name="ActivityMark14" type="Node2D" parent="."]
-position = Vector2(32, 46)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0007"
-WaveNumber = 2
-
-[node name="ActivityMark15" type="Node2D" parent="."]
-position = Vector2(56, 55)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0008"
-WaveNumber = 2
-
-[node name="ActivityMark16" type="Node2D" parent="."]
-position = Vector2(27, 76)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0009"
-WaveNumber = 2
-
-[node name="ActivityMark17" type="Node2D" parent="."]
-position = Vector2(49, 79)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "0010"
-WaveNumber = 2
-
-[node name="ActivityMark18" type="Node2D" parent="."]
-position = Vector2(103, 65)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "5000"
-WaveNumber = 3
-
-[node name="ActivityMark19" type="Node2D" parent="."]
-position = Vector2(106, 31)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "5000"
-WaveNumber = 3
-
-[node name="ActivityMark20" type="Node2D" parent="."]
-position = Vector2(139, 26)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "5001"
-WaveNumber = 3
-
-[node name="ActivityMark21" type="Node2D" parent="."]
-position = Vector2(140, 50)
-script = ExtResource("3_m4jrh")
-Type = 9
-ItemExpression = "5001"
-WaveNumber = 3
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/outlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/outlet/Room1.tscn
deleted file mode 100644
index 4fbd0c4..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/outlet/Room1.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://d0klitsroayqh"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileSet/TileSet1.tres" id="1_fhl21"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_fhl21")
-format = 2
-layer_0/tile_data = PackedInt32Array(327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, -65528, 0, 8, -131064, 0, 8, -196600, 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, -196601, 0, 8, 327686, 0, 8, 262150, 0, 8, -65530, 0, 8, -131066, 0, 8, -196602, 0, 8, 327685, 0, 8, 262149, 0, 8, -65531, 0, 8, -131067, 0, 8, -196603, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, -65532, 0, 8, -131068, 0, 8, -196604, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, -131069, 0, 8, -196605, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, -131070, 0, 8, -196606, 0, 8, 327681, 0, 8, 262145, 0, 8, -131071, 0, 8, -196607, 0, 8, 327680, 0, 8, 262144, 0, 8, -131072, 0, 8, -196608, 0, 8, 393215, 0, 8, 327679, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65537, 0, 8, -131073, 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, -131074, 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, -131075, 0, 8, -65540, 196608, 3, -131076, 196608, 3, -196612, 196608, 4, -196611, 131072, 7, -196610, 131072, 7, -4, 196608, 3, 65532, 196608, 3, 131068, 196608, 3, 196604, 196608, 3, 262140, 196608, 3, 327676, 196608, 3, 393212, 196608, 3, 458750, 0, 8, 458749, 0, 8, 458748, 196608, 3, -196609, 131072, 7, 458751, 0, 8, -262144, 131072, 7, 393216, 0, 8, -262143, 131072, 7, 393217, 0, 8, -262142, 131072, 7, 393218, 0, 8, -262141, 131072, 7, 393219, 0, 8, -262140, 131072, 7, 393220, 0, 8, -262139, 131072, 7, 393221, 0, 8, -262138, 131072, 7, 393222, 0, 8, -262137, 131072, 7, 393223, 0, 8, -262136, 131072, 7, 393224, 0, 8, -196599, 0, 8, -131063, 0, 8, -262135, 131072, 7, -65527, 0, 8, 9, 0, 8, 65545, 0, 8, 131081, 0, 8, 196617, 0, 8, 262153, 0, 8, 327689, 0, 8, 393225, 0, 8, -65533, 0, 8, -65534, 0, 8, -65535, 0, 8, -65536, 0, 8, 1, 131072, 2, 4, 131072, 2, 262143, 0, 8, 196607, 0, 8, 65536, 65536, 3, 131072, 65536, 3, 0, 65536, 2, 196608, 65536, 7, 196609, 196608, 7, 196613, 65536, 7, 196614, 196608, 7, 131073, 196608, 3, 65537, 196608, 4, 65538, 131072, 7, 65539, 131072, 7, 65540, 131072, 7, 131077, 65536, 3, 65541, 65536, 4, 2, 131072, 2, 3, 131072, 2, 5, 131072, 2, 6, 196608, 2, 65542, 196608, 3, 131078, 196608, 3, -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, 65536, 3, 327690, 65536, 3, 393226, 65536, 3, 524286, 131072, 2, 524285, 131072, 2, 524284, 720896, 2, 524287, 131072, 2, 458752, 131072, 2, 458753, 131072, 2, 458754, 131072, 2, 458755, 131072, 2, 458756, 131072, 2, 458757, 131072, 2, 458758, 131072, 2, 458759, 131072, 2, 458760, 131072, 2, 458761, 131072, 2, 458762, 851968, 2)
-script = ExtResource("dungeonRoomTemplate")
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_roomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_roomInfo.json
new file mode 100644
index 0000000..ebc9d7b
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_roomInfo.json
@@ -0,0 +1 @@
+{"Position":{"X":-11,"Y":-2},"Size":{"X":42,"Y":42},"DoorAreaInfos":[],"GroupName":"testGroup1","RoomType":0,"FileName":"Room2","Weight":100}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_tileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_tileInfo.json
new file mode 100644
index 0000000..edfbaac
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup1/battle/Room2/Room2_tileInfo.json
@@ -0,0 +1 @@
+{"NavigationList":[{"Type":0,"Points":[-152,-8,-104,-8,-104,184,-8,184,-8,152,40,152,40,40,216,40,216,72,392,72,392,192,360,192,360,328,424,328,424,368,408,368,408,488,472,488,472,624,-88,624,-88,568,-72,568,-72,336,-104,336,-104,240,-120,240,-120,32,-136,32,-136,16,-152,16]},{"Type":1,"Points":[56,64,120,64,120,96,200,96,200,136,120,136,120,152,56,152]},{"Type":1,"Points":[248,112,344,112,344,152,248,152]},{"Type":1,"Points":[216,176,296,176,296,248,216,248]},{"Type":1,"Points":[72,224,152,224,152,312,104,312,104,464,136,464,136,496,184,496,184,568,-40,568,-40,336,24,336,24,240,72,240]},{"Type":1,"Points":[-72,240,-24,240,-24,296,-72,296]},{"Type":1,"Points":[264,288,312,288,312,352,328,352,328,368,360,368,360,440,232,440,232,424,152,424,152,336,264,336]},{"Type":0,"Points":[24,424,40,424,40,496,24,496]}],"Floor":[-10,-1,0,0,8,-10,0,0,0,8,-9,-1,0,0,8,-9,0,0,0,8,-9,1,0,0,8,-8,14,0,0,8,-8,13,0,0,8,-8,12,0,0,8,-8,11,0,0,8,-8,10,0,0,8,-8,9,0,0,8,-8,8,0,0,8,-8,7,0,0,8,-8,6,0,0,8,-8,5,0,0,8,-8,4,0,0,8,-8,3,0,0,8,-8,2,0,0,8,-8,0,0,0,8,-8,-1,0,0,8,-8,1,0,0,8,29,38,0,0,8,29,37,0,0,8,29,36,0,0,8,29,35,0,0,8,29,34,0,0,8,29,33,0,0,8,29,32,0,0,8,29,31,0,0,8,29,30,0,0,8,28,38,0,0,8,28,37,0,0,8,28,36,0,0,8,28,35,0,0,8,28,34,0,0,8,28,33,0,0,8,28,32,0,0,8,28,31,0,0,8,28,30,0,0,8,27,38,0,0,8,27,37,0,0,8,27,36,0,0,8,27,35,0,0,8,27,34,0,0,8,27,33,0,0,8,27,32,0,0,8,27,31,0,0,8,27,30,0,0,8,26,38,0,0,8,26,37,0,0,8,26,36,0,0,8,26,35,0,0,8,26,34,0,0,8,26,33,0,0,8,26,32,0,0,8,26,31,0,0,8,26,30,0,0,8,26,20,0,0,8,26,21,0,0,8,26,22,0,0,8,25,29,0,0,8,25,28,0,0,8,25,27,0,0,8,25,26,0,0,8,25,25,0,0,8,25,24,0,0,8,25,23,0,0,8,25,38,0,0,8,25,37,0,0,8,25,36,0,0,8,25,35,0,0,8,25,34,0,0,8,25,33,0,0,8,25,32,0,0,8,25,31,0,0,8,25,30,0,0,8,25,20,0,0,8,25,21,0,0,8,25,22,0,0,8,1,26,0,0,8,1,28,0,0,8,1,27,0,0,8,1,30,0,0,8,1,29,0,0,8,1,38,0,0,8,1,37,0,0,8,1,36,0,0,8,1,35,0,0,8,1,10,0,0,8,1,9,0,0,8,1,20,0,0,8,1,19,0,0,8,1,18,0,0,8,1,17,0,0,8,1,16,0,0,8,1,15,0,0,8,1,14,0,0,8,1,13,0,0,8,1,12,0,0,8,1,11,0,0,8,0,38,0,0,8,0,37,0,0,8,0,36,0,0,8,0,35,0,0,8,0,9,0,0,8,0,10,0,0,8,0,20,0,0,8,0,19,0,0,8,0,18,0,0,8,0,17,0,0,8,0,16,0,0,8,0,15,0,0,8,0,14,0,0,8,0,13,0,0,8,0,12,0,0,8,0,11,0,0,8,-1,38,0,0,8,-1,37,0,0,8,-1,36,0,0,8,-1,35,0,0,8,-1,10,0,0,8,-1,9,0,0,8,-1,20,0,0,8,-1,19,0,0,8,-1,18,0,0,8,-1,17,0,0,8,-1,16,0,0,8,-1,15,0,0,8,-1,14,0,0,8,-1,13,0,0,8,-1,12,0,0,8,-1,11,0,0,8,-2,38,0,0,8,-2,37,0,0,8,-2,36,0,0,8,-2,35,0,0,8,-2,20,0,0,8,-2,19,0,0,8,-2,18,0,0,8,-2,17,0,0,8,-2,16,0,0,8,-2,15,0,0,8,-2,14,0,0,8,-2,13,0,0,8,-2,12,0,0,8,-2,11,0,0,8,-3,38,0,0,8,-3,37,0,0,8,-3,36,0,0,8,-3,35,0,0,8,-3,34,0,0,8,-3,33,0,0,8,-3,32,0,0,8,-3,31,0,0,8,-3,30,0,0,8,-3,29,0,0,8,-3,28,0,0,8,-3,27,0,0,8,-3,26,0,0,8,-3,25,0,0,8,-3,24,0,0,8,-3,20,0,0,8,-3,19,0,0,8,-3,18,0,0,8,-3,21,0,0,8,-3,22,0,0,8,-3,23,0,0,8,-3,14,0,0,8,-3,13,0,0,8,-3,12,0,0,8,-3,11,0,0,8,-4,38,0,0,8,-4,37,0,0,8,-4,36,0,0,8,-4,35,0,0,8,-4,34,0,0,8,-4,33,0,0,8,-4,32,0,0,8,-4,31,0,0,8,-4,30,0,0,8,-4,29,0,0,8,-4,28,0,0,8,-4,27,0,0,8,-4,26,0,0,8,-4,25,0,0,8,-4,24,0,0,8,-4,20,0,0,8,-4,19,0,0,8,-4,18,0,0,8,-4,21,0,0,8,-4,22,0,0,8,-4,23,0,0,8,-4,14,0,0,8,-4,13,0,0,8,-4,12,0,0,8,-4,11,0,0,8,-5,38,0,0,8,-5,37,0,0,8,-5,36,0,0,8,-5,35,0,0,8,-5,34,0,0,8,-5,33,0,0,8,-5,32,0,0,8,-5,31,0,0,8,-5,30,0,0,8,-5,29,0,0,8,-5,28,0,0,8,-5,27,0,0,8,-5,26,0,0,8,-5,25,0,0,8,-5,24,0,0,8,-5,23,0,0,8,-5,22,0,0,8,-5,21,0,0,8,-5,20,0,0,8,-5,19,0,0,8,-5,18,0,0,8,-5,17,0,0,8,-5,16,0,0,8,-5,15,0,0,8,-5,14,0,0,8,-5,13,0,0,8,-5,12,0,0,8,-5,11,0,0,8,-6,38,0,0,8,-6,37,0,0,8,-6,36,0,0,8,-6,35,0,0,8,-6,20,0,0,8,-6,19,0,0,8,-6,18,0,0,8,-6,17,0,0,8,-6,16,0,0,8,-6,15,0,0,8,-6,14,0,0,8,-6,13,0,0,8,-6,12,0,0,8,-6,11,0,0,8,-7,10,0,0,8,-7,9,0,0,8,-7,8,0,0,8,-7,7,0,0,8,-7,6,0,0,8,-7,5,0,0,8,-7,4,0,0,8,-7,3,0,0,8,-7,2,0,0,8,-7,0,0,0,8,-7,-1,0,0,8,-7,1,0,0,8,-7,20,0,0,8,-7,19,0,0,8,-7,18,0,0,8,-7,17,0,0,8,-7,16,0,0,8,-7,15,0,0,8,-7,14,0,0,8,-7,13,0,0,8,-7,12,0,0,8,-7,11,0,0,8,24,29,0,0,8,24,28,0,0,8,24,27,0,0,8,24,26,0,0,8,24,25,0,0,8,24,24,0,0,8,24,23,0,0,8,24,38,0,0,8,24,37,0,0,8,24,36,0,0,8,24,35,0,0,8,24,34,0,0,8,24,33,0,0,8,24,32,0,0,8,24,31,0,0,8,24,30,0,0,8,24,20,0,0,8,24,21,0,0,8,24,22,0,0,8,24,11,0,0,8,24,10,0,0,8,24,9,0,0,8,24,8,0,0,8,24,7,0,0,8,24,6,0,0,8,24,5,0,0,8,24,4,0,0,8,23,29,0,0,8,23,28,0,0,8,23,27,0,0,8,23,26,0,0,8,23,25,0,0,8,23,24,0,0,8,23,23,0,0,8,23,38,0,0,8,23,37,0,0,8,23,36,0,0,8,23,35,0,0,8,23,34,0,0,8,23,33,0,0,8,23,32,0,0,8,23,31,0,0,8,23,30,0,0,8,23,22,0,0,8,23,20,0,0,8,23,21,0,0,8,23,11,0,0,8,23,10,0,0,8,23,9,0,0,8,23,8,0,0,8,23,7,0,0,8,23,6,0,0,8,23,5,0,0,8,23,4,0,0,8,22,26,0,0,8,22,25,0,0,8,22,24,0,0,8,22,23,0,0,8,22,29,0,0,8,22,28,0,0,8,22,27,0,0,8,22,38,0,0,8,22,37,0,0,8,22,36,0,0,8,22,35,0,0,8,22,34,0,0,8,22,33,0,0,8,22,32,0,0,8,22,31,0,0,8,22,30,0,0,8,22,19,0,0,8,22,18,0,0,8,22,17,0,0,8,22,16,0,0,8,22,15,0,0,8,22,14,0,0,8,22,13,0,0,8,22,12,0,0,8,22,22,0,0,8,22,21,0,0,8,22,20,0,0,8,22,11,0,0,8,22,10,0,0,8,22,9,0,0,8,22,8,0,0,8,22,7,0,0,8,22,6,0,0,8,22,5,0,0,8,22,4,0,0,8,21,29,0,0,8,21,28,0,0,8,21,27,0,0,8,21,38,0,0,8,21,37,0,0,8,21,36,0,0,8,21,35,0,0,8,21,34,0,0,8,21,33,0,0,8,21,32,0,0,8,21,31,0,0,8,21,30,0,0,8,21,19,0,0,8,21,18,0,0,8,21,22,0,0,8,21,21,0,0,8,21,20,0,0,8,21,17,0,0,8,21,16,0,0,8,21,15,0,0,8,21,14,0,0,8,21,13,0,0,8,21,12,0,0,8,21,11,0,0,8,21,10,0,0,8,21,9,0,0,8,21,8,0,0,8,21,7,0,0,8,21,6,0,0,8,21,5,0,0,8,21,4,0,0,8,20,29,0,0,8,20,28,0,0,8,20,27,0,0,8,20,38,0,0,8,20,37,0,0,8,20,36,0,0,8,20,35,0,0,8,20,34,0,0,8,20,33,0,0,8,20,32,0,0,8,20,21,0,0,8,20,20,0,0,8,20,19,0,0,8,20,18,0,0,8,20,22,0,0,8,20,17,0,0,8,20,16,0,0,8,20,15,0,0,8,20,14,0,0,8,20,13,0,0,8,20,12,0,0,8,20,11,0,0,8,20,10,0,0,8,20,9,0,0,8,20,30,0,0,8,20,31,0,0,8,20,6,0,0,8,20,5,0,0,8,20,4,0,0,8,19,29,0,0,8,19,28,0,0,8,19,27,0,0,8,19,38,0,0,8,19,37,0,0,8,19,36,0,0,8,19,35,0,0,8,19,34,0,0,8,19,33,0,0,8,19,32,0,0,8,19,21,0,0,8,19,20,0,0,8,19,19,0,0,8,19,18,0,0,8,19,17,0,0,8,19,16,0,0,8,19,15,0,0,8,19,14,0,0,8,19,13,0,0,8,19,12,0,0,8,19,11,0,0,8,19,10,0,0,8,19,9,0,0,8,19,30,0,0,8,19,31,0,0,8,19,6,0,0,8,19,5,0,0,8,19,4,0,0,8,18,29,0,0,8,18,28,0,0,8,18,27,0,0,8,18,38,0,0,8,18,37,0,0,8,18,36,0,0,8,18,35,0,0,8,18,34,0,0,8,18,33,0,0,8,18,32,0,0,8,18,17,0,0,8,18,16,0,0,8,18,15,0,0,8,18,14,0,0,8,18,13,0,0,8,18,12,0,0,8,18,11,0,0,8,18,10,0,0,8,18,9,0,0,8,18,30,0,0,8,18,31,0,0,8,18,6,0,0,8,18,5,0,0,8,18,4,0,0,8,17,29,0,0,8,17,28,0,0,8,17,27,0,0,8,17,38,0,0,8,17,37,0,0,8,17,36,0,0,8,17,17,0,0,8,17,16,0,0,8,17,15,0,0,8,17,32,0,0,8,17,33,0,0,8,17,34,0,0,8,17,35,0,0,8,17,10,0,0,8,17,9,0,0,8,17,30,0,0,8,17,31,0,0,8,17,6,0,0,8,17,5,0,0,8,17,4,0,0,8,16,29,0,0,8,16,28,0,0,8,16,27,0,0,8,16,38,0,0,8,16,37,0,0,8,16,36,0,0,8,16,9,0,0,8,16,30,0,0,8,16,31,0,0,8,16,6,0,0,8,16,5,0,0,8,16,4,0,0,8,16,20,0,0,8,16,19,0,0,8,16,18,0,0,8,16,17,0,0,8,16,16,0,0,8,16,15,0,0,8,16,32,0,0,8,16,33,0,0,8,16,34,0,0,8,16,35,0,0,8,16,10,0,0,8,15,29,0,0,8,15,28,0,0,8,15,27,0,0,8,15,38,0,0,8,15,37,0,0,8,15,36,0,0,8,15,35,0,0,8,15,34,0,0,8,15,9,0,0,8,15,8,0,0,8,15,7,0,0,8,15,6,0,0,8,15,5,0,0,8,15,4,0,0,8,15,20,0,0,8,15,19,0,0,8,15,18,0,0,8,15,17,0,0,8,15,16,0,0,8,15,15,0,0,8,15,30,0,0,8,15,31,0,0,8,15,32,0,0,8,15,33,0,0,8,15,10,0,0,8,14,38,0,0,8,14,37,0,0,8,14,36,0,0,8,14,26,0,0,8,14,35,0,0,8,14,34,0,0,8,14,33,0,0,8,14,32,0,0,8,14,31,0,0,8,14,9,0,0,8,14,8,0,0,8,14,7,0,0,8,14,6,0,0,8,14,5,0,0,8,14,4,0,0,8,14,20,0,0,8,14,19,0,0,8,14,18,0,0,8,14,17,0,0,8,14,16,0,0,8,14,15,0,0,8,14,27,0,0,8,14,28,0,0,8,14,29,0,0,8,14,30,0,0,8,14,10,0,0,8,13,38,0,0,8,13,37,0,0,8,13,36,0,0,8,13,26,0,0,8,13,35,0,0,8,13,34,0,0,8,13,33,0,0,8,13,32,0,0,8,13,31,0,0,8,13,30,0,0,8,13,29,0,0,8,13,28,0,0,8,13,27,0,0,8,13,20,0,0,8,13,19,0,0,8,13,18,0,0,8,13,17,0,0,8,13,16,0,0,8,13,15,0,0,8,13,14,0,0,8,13,13,0,0,8,13,12,0,0,8,13,11,0,0,8,13,10,0,0,8,13,9,0,0,8,13,8,0,0,8,13,7,0,0,8,13,6,0,0,8,13,5,0,0,8,13,4,0,0,8,13,3,0,0,8,13,2,0,0,8,12,38,0,0,8,12,37,0,0,8,12,36,0,0,8,12,26,0,0,8,12,35,0,0,8,12,34,0,0,8,12,33,0,0,8,12,32,0,0,8,12,31,0,0,8,12,30,0,0,8,12,29,0,0,8,12,28,0,0,8,12,27,0,0,8,12,20,0,0,8,12,19,0,0,8,12,18,0,0,8,12,17,0,0,8,12,16,0,0,8,12,15,0,0,8,12,14,0,0,8,12,13,0,0,8,12,12,0,0,8,12,11,0,0,8,12,10,0,0,8,12,9,0,0,8,12,8,0,0,8,12,7,0,0,8,12,6,0,0,8,12,5,0,0,8,12,4,0,0,8,12,3,0,0,8,12,2,0,0,8,11,38,0,0,8,11,37,0,0,8,11,36,0,0,8,11,26,0,0,8,11,35,0,0,8,11,34,0,0,8,11,33,0,0,8,11,32,0,0,8,11,31,0,0,8,11,30,0,0,8,11,29,0,0,8,11,28,0,0,8,11,27,0,0,8,11,20,0,0,8,11,19,0,0,8,11,18,0,0,8,11,17,0,0,8,11,16,0,0,8,11,15,0,0,8,11,14,0,0,8,11,11,0,0,8,11,10,0,0,8,11,9,0,0,8,11,8,0,0,8,11,12,0,0,8,11,13,0,0,8,11,5,0,0,8,11,4,0,0,8,11,3,0,0,8,11,2,0,0,8,10,38,0,0,8,10,37,0,0,8,10,36,0,0,8,10,35,0,0,8,10,30,0,0,8,10,29,0,0,8,10,28,0,0,8,10,27,0,0,8,10,26,0,0,8,10,20,0,0,8,10,19,0,0,8,10,18,0,0,8,10,17,0,0,8,10,16,0,0,8,10,15,0,0,8,10,14,0,0,8,10,11,0,0,8,10,10,0,0,8,10,9,0,0,8,10,8,0,0,8,10,12,0,0,8,10,13,0,0,8,10,5,0,0,8,10,4,0,0,8,10,3,0,0,8,10,2,0,0,8,9,38,0,0,8,9,37,0,0,8,9,36,0,0,8,9,35,0,0,8,9,25,0,0,8,9,24,0,0,8,9,23,0,0,8,9,22,0,0,8,9,21,0,0,8,9,30,0,0,8,9,29,0,0,8,9,28,0,0,8,9,27,0,0,8,9,26,0,0,8,9,20,0,0,8,9,19,0,0,8,9,18,0,0,8,9,17,0,0,8,9,16,0,0,8,9,15,0,0,8,9,14,0,0,8,9,11,0,0,8,9,10,0,0,8,9,9,0,0,8,9,8,0,0,8,9,12,0,0,8,9,13,0,0,8,9,5,0,0,8,9,4,0,0,8,9,3,0,0,8,9,2,0,0,8,8,38,0,0,8,8,37,0,0,8,8,36,0,0,8,8,35,0,0,8,8,25,0,0,8,8,24,0,0,8,8,23,0,0,8,8,22,0,0,8,8,21,0,0,8,8,20,0,0,8,8,19,0,0,8,8,30,0,0,8,8,29,0,0,8,8,28,0,0,8,8,27,0,0,8,8,26,0,0,8,8,11,0,0,8,8,10,0,0,8,8,9,0,0,8,8,8,0,0,8,8,12,0,0,8,8,13,0,0,8,8,5,0,0,8,8,4,0,0,8,8,3,0,0,8,8,2,0,0,8,7,38,0,0,8,7,37,0,0,8,7,36,0,0,8,7,35,0,0,8,7,28,0,0,8,7,27,0,0,8,7,26,0,0,8,7,25,0,0,8,7,24,0,0,8,7,23,0,0,8,7,22,0,0,8,7,21,0,0,8,7,20,0,0,8,7,19,0,0,8,7,11,0,0,8,7,10,0,0,8,7,9,0,0,8,7,8,0,0,8,7,12,0,0,8,7,13,0,0,8,7,5,0,0,8,7,4,0,0,8,7,3,0,0,8,7,2,0,0,8,6,38,0,0,8,6,37,0,0,8,6,36,0,0,8,6,35,0,0,8,6,28,0,0,8,6,27,0,0,8,6,26,0,0,8,6,25,0,0,8,6,24,0,0,8,6,23,0,0,8,6,22,0,0,8,6,11,0,0,8,6,10,0,0,8,6,9,0,0,8,6,12,0,0,8,6,13,0,0,8,6,19,0,0,8,6,20,0,0,8,6,21,0,0,8,6,3,0,0,8,6,2,0,0,8,5,38,0,0,8,5,11,0,0,8,5,10,0,0,8,5,9,0,0,8,5,12,0,0,8,5,13,0,0,8,5,35,0,0,8,5,36,0,0,8,5,37,0,0,8,5,3,0,0,8,5,2,0,0,8,4,38,0,0,8,4,37,0,0,8,4,11,0,0,8,4,10,0,0,8,4,9,0,0,8,4,13,0,0,8,4,14,0,0,8,4,12,0,0,8,4,35,0,0,8,4,36,0,0,8,4,3,0,0,8,4,2,0,0,8,3,38,0,0,8,3,37,0,0,8,3,36,0,0,8,3,35,0,0,8,3,14,0,0,8,3,12,0,0,8,3,13,0,0,8,3,11,0,0,8,3,10,0,0,8,3,9,0,0,8,3,8,0,0,8,3,7,0,0,8,3,6,0,0,8,3,5,0,0,8,3,4,0,0,8,3,3,0,0,8,3,2,0,0,8,2,26,0,0,8,2,27,0,0,8,2,28,0,0,8,2,29,0,0,8,2,30,0,0,8,2,38,0,0,8,2,37,0,0,8,2,36,0,0,8,2,35,0,0,8,2,14,0,0,8,2,13,0,0,8,2,12,0,0,8,2,11,0,0,8,2,10,0,0,8,2,9,0,0,8,2,8,0,0,8,2,7,0,0,8,2,6,0,0,8,2,5,0,0,8,2,4,0,0,8,2,3,0,0,8,2,2,0,0,8],"Middle":[-10,-2,0,2,7,-9,-2,0,2,7,-8,-2,0,2,7,-7,-2,0,2,7,-6,10,0,1,7,-6,34,0,3,7,-5,10,0,2,7,-4,10,0,2,7,-4,17,0,1,7,-3,10,0,2,7,-3,17,0,3,7,-2,10,0,3,7,-2,34,0,1,7,-1,8,0,2,7,-1,34,0,2,7,0,8,0,2,7,0,34,0,2,7,1,8,0,3,7,1,25,0,2,7,1,34,0,2,7,2,1,0,2,7,2,25,0,2,7,2,34,0,2,7,3,1,0,2,7,3,34,0,2,7,4,1,0,2,7,4,8,0,1,7,4,34,0,2,7,5,1,0,2,7,5,8,0,2,7,5,34,0,2,7,6,1,0,2,7,6,8,0,3,7,6,18,0,2,7,6,34,0,2,7,7,1,0,2,7,7,7,0,2,7,7,18,0,2,7,7,34,0,2,7,8,1,0,2,7,8,7,0,2,7,8,18,0,3,7,8,34,0,2,7,9,1,0,2,7,9,7,0,2,7,9,34,0,2,7,10,1,0,2,7,10,7,0,2,7,10,25,0,1,7,10,34,0,3,7,11,1,0,2,7,11,7,0,3,7,11,25,0,2,7,12,1,0,2,7,12,25,0,2,7,13,1,0,2,7,13,25,0,2,7,14,3,0,1,7,14,14,0,1,7,14,25,0,2,7,15,3,0,2,7,15,14,0,2,7,15,26,0,1,7,16,3,0,2,7,16,8,0,1,7,16,14,0,2,7,16,26,0,2,7,17,3,0,2,7,17,8,0,2,7,17,14,0,3,7,17,26,0,2,7,18,3,0,2,7,18,8,0,2,7,18,26,0,2,7,19,3,0,2,7,19,8,0,2,7,19,26,0,2,7,20,3,0,2,7,20,8,0,3,7,20,26,0,2,7,21,3,0,2,7,21,26,0,3,7,22,3,0,2,7,23,3,0,2,7,23,19,0,1,7,24,3,0,2,7,24,19,0,2,7,25,19,0,2,7,26,19,0,2,7,26,29,0,1,7,27,29,0,2,7,28,29,0,2,7,29,29,0,2,7],"Top":[-11,-2,0,3,4,-11,-1,0,3,3,-11,0,0,3,3,-11,1,0,11,2,-10,1,0,3,2,-10,2,0,11,2,-9,2,0,3,2,-9,3,0,3,3,-9,4,0,3,3,-9,5,0,3,3,-9,6,0,3,3,-9,7,0,3,3,-9,8,0,3,3,-9,9,0,3,3,-9,10,0,3,3,-9,11,0,3,3,-9,12,0,3,3,-9,13,0,3,3,-9,14,0,3,3,-9,15,0,11,2,-8,15,0,3,2,-8,16,0,3,3,-8,17,0,3,3,-8,18,0,3,3,-8,19,0,3,3,-8,20,0,3,3,-8,21,0,11,2,-7,21,0,2,2,-7,34,0,3,4,-7,35,0,3,3,-7,36,0,3,3,-7,37,0,3,3,-7,38,0,3,3,-7,39,0,11,2,-6,-2,0,1,4,-6,-1,0,1,3,-6,0,0,1,3,-6,1,0,1,3,-6,2,0,1,3,-6,3,0,1,3,-6,4,0,1,3,-6,5,0,1,3,-6,6,0,1,3,-6,7,0,1,3,-6,8,0,1,3,-6,9,0,1,3,-6,21,0,3,2,-6,22,0,3,3,-6,23,0,3,3,-6,24,0,3,3,-6,25,0,3,3,-6,26,0,3,3,-6,27,0,3,3,-6,28,0,3,3,-6,29,0,3,3,-6,30,0,3,3,-6,31,0,3,3,-6,32,0,3,3,-6,33,0,3,3,-6,39,0,2,2,-5,39,0,2,2,-4,15,0,1,2,-4,16,0,1,3,-4,39,0,2,2,-3,15,0,3,2,-3,16,0,3,3,-3,39,0,2,2,-2,8,0,3,4,-2,9,0,3,3,-2,21,0,1,2,-2,22,0,1,3,-2,23,0,1,3,-2,24,0,1,3,-2,25,0,1,3,-2,26,0,1,3,-2,27,0,1,3,-2,28,0,1,3,-2,29,0,1,3,-2,30,0,1,3,-2,31,0,1,3,-2,32,0,1,3,-2,33,0,1,3,-2,39,0,2,2,-1,21,0,2,2,-1,39,0,2,2,0,21,0,2,2,0,25,0,3,4,0,26,0,3,3,0,27,0,3,3,0,28,0,3,3,0,29,0,3,3,0,30,0,3,3,0,31,0,11,2,0,39,0,2,2,1,1,0,3,4,1,2,0,3,3,1,3,0,3,3,1,4,0,3,3,1,5,0,3,3,1,6,0,3,3,1,7,0,3,3,1,21,0,2,2,1,31,0,2,2,1,39,0,2,2,2,15,0,1,2,2,16,0,1,3,2,17,0,1,3,2,18,0,1,3,2,19,0,1,3,2,20,0,1,3,2,21,0,13,2,2,31,0,2,2,2,39,0,2,2,3,15,0,2,2,3,25,0,1,4,3,26,0,1,3,3,27,0,1,3,3,28,0,1,3,3,29,0,1,3,3,30,0,1,3,3,31,0,13,2,3,39,0,2,2,4,4,0,1,2,4,5,0,1,3,4,6,0,1,3,4,7,0,1,3,4,15,0,2,2,4,39,0,2,2,5,4,0,2,2,5,14,0,1,2,5,15,0,13,2,5,18,0,3,4,5,19,0,3,3,5,20,0,3,3,5,21,0,3,3,5,22,0,3,3,5,23,0,3,3,5,24,0,3,3,5,25,0,3,3,5,26,0,3,3,5,27,0,3,3,5,28,0,3,3,5,29,0,11,2,5,39,0,2,2,6,4,0,3,2,6,5,0,3,3,6,6,0,11,2,6,7,0,3,4,6,14,0,2,2,6,29,0,2,2,6,39,0,2,2,7,6,0,2,2,7,14,0,2,2,7,29,0,3,2,7,30,0,3,3,7,31,0,11,2,7,39,0,2,2,8,6,0,2,2,8,14,0,3,2,8,15,0,3,3,8,16,0,3,3,8,17,0,3,3,8,31,0,2,2,8,39,0,2,2,9,6,0,2,2,9,31,0,2,2,9,39,0,2,2,10,6,0,2,2,10,21,0,1,2,10,22,0,1,3,10,23,0,1,3,10,24,0,1,3,10,31,0,3,2,10,32,0,3,3,10,33,0,3,3,10,39,0,2,2,11,6,0,3,2,11,21,0,2,2,11,39,0,2,2,12,21,0,2,2,12,39,0,2,2,13,21,0,2,2,13,39,0,2,2,14,1,0,1,4,14,2,0,1,3,14,11,0,1,2,14,12,0,1,3,14,13,0,1,3,14,21,0,2,2,14,39,0,2,2,15,11,0,2,2,15,21,0,2,2,15,25,0,1,4,15,39,0,2,2,16,7,0,1,2,16,11,0,2,2,16,21,0,2,2,16,39,0,2,2,17,7,0,2,2,17,11,0,3,2,17,12,0,3,3,17,13,0,3,3,17,18,0,1,2,17,19,0,1,3,17,20,0,1,3,17,21,0,13,2,17,39,0,2,2,18,7,0,2,2,18,18,0,3,2,18,19,0,3,3,18,20,0,3,3,18,21,0,3,3,18,22,0,11,2,18,39,0,2,2,19,7,0,2,2,19,22,0,3,2,19,23,0,11,2,19,39,0,2,2,20,7,0,3,2,20,23,0,2,2,20,39,0,2,2,21,23,0,3,2,21,24,0,3,3,21,25,0,3,3,21,39,0,2,2,22,39,0,2,2,23,12,0,1,2,23,13,0,1,3,23,14,0,1,3,23,15,0,1,3,23,16,0,1,3,23,17,0,1,3,23,18,0,1,3,23,39,0,2,2,24,12,0,2,2,24,39,0,2,2,25,3,0,1,4,25,4,0,1,3,25,5,0,1,3,25,6,0,1,3,25,7,0,1,3,25,8,0,1,3,25,9,0,1,3,25,10,0,1,3,25,11,0,1,3,25,12,0,13,2,25,39,0,2,2,26,23,0,1,2,26,24,0,1,3,26,25,0,1,3,26,26,0,1,3,26,27,0,1,3,26,28,0,1,3,26,39,0,2,2,27,19,0,1,4,27,20,0,1,3,27,21,0,1,3,27,22,0,1,3,27,23,0,13,2,27,39,0,2,2,28,39,0,2,2,29,39,0,2,2,30,29,0,1,4,30,30,0,1,3,30,31,0,1,3,30,32,0,1,3,30,33,0,1,3,30,34,0,1,3,30,35,0,1,3,30,36,0,1,3,30,37,0,1,3,30,38,0,1,3,30,39,0,13,2]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_roomInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_roomInfo.json
new file mode 100644
index 0000000..d961ca6
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_roomInfo.json
@@ -0,0 +1 @@
+{"Position":{"X":-8,"Y":-6},"Size":{"X":18,"Y":16},"DoorAreaInfos":[],"GroupName":"testGroup2","RoomType":0,"FileName":"Room1","Weight":100}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_tileInfo.json b/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_tileInfo.json
new file mode 100644
index 0000000..155b1e9
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup2/battle/Room1/Room1_tileInfo.json
@@ -0,0 +1 @@
+{"NavigationList":[{"Type":0,"Points":[-104,-72,136,-72,136,144,-104,144]},{"Type":1,"Points":[-72,-32,-8,-32,-8,24,-72,24]},{"Type":1,"Points":[40,-32,104,-32,104,24,40,24]},{"Type":1,"Points":[-72,48,-8,48,-8,104,-72,104]},{"Type":1,"Points":[40,48,104,48,104,104,40,104]}],"Floor":[-7,-5,0,0,8,-7,-4,0,0,8,-7,-3,0,0,8,-7,-2,0,0,8,-7,-1,0,0,8,-7,0,0,0,8,-7,1,0,0,8,-7,2,0,0,8,-7,3,0,0,8,-7,4,0,0,8,-7,5,0,0,8,-7,6,0,0,8,-7,7,0,0,8,-7,8,0,0,8,8,8,0,0,8,8,7,0,0,8,8,6,0,0,8,8,5,0,0,8,8,4,0,0,8,8,3,0,0,8,8,2,0,0,8,8,1,0,0,8,8,0,0,0,8,8,-1,0,0,8,8,-2,0,0,8,8,-3,0,0,8,8,-4,0,0,8,8,-5,0,0,8,-5,8,0,0,8,-5,-5,0,0,8,-5,-3,0,0,8,-5,-2,0,0,8,-5,-1,0,0,8,-5,0,0,0,8,-5,1,0,0,8,-5,2,0,0,8,-5,3,0,0,8,-5,4,0,0,8,-5,-4,0,0,8,-5,5,0,0,8,-5,6,0,0,8,-5,7,0,0,8,-4,8,0,0,8,-4,-5,0,0,8,-4,-3,0,0,8,-4,1,0,0,8,-4,2,0,0,8,-4,-4,0,0,8,-4,7,0,0,8,-4,6,0,0,8,-3,8,0,0,8,-3,-5,0,0,8,-3,-3,0,0,8,-3,1,0,0,8,-3,2,0,0,8,-3,-4,0,0,8,-3,7,0,0,8,-3,6,0,0,8,-2,8,0,0,8,-2,-5,0,0,8,-2,-3,0,0,8,-2,1,0,0,8,-2,2,0,0,8,-2,-4,0,0,8,-2,7,0,0,8,-2,6,0,0,8,-1,8,0,0,8,-1,-5,0,0,8,-1,-3,0,0,8,-1,-2,0,0,8,-1,-1,0,0,8,-1,0,0,0,8,-1,1,0,0,8,-1,2,0,0,8,-1,3,0,0,8,-1,4,0,0,8,-1,-4,0,0,8,-1,5,0,0,8,-1,6,0,0,8,-1,7,0,0,8,0,8,0,0,8,0,-5,0,0,8,0,-3,0,0,8,0,-2,0,0,8,0,-1,0,0,8,0,0,0,0,8,0,1,0,0,8,0,2,0,0,8,0,3,0,0,8,0,4,0,0,8,0,-4,0,0,8,0,5,0,0,8,0,6,0,0,8,0,7,0,0,8,1,-5,0,0,8,1,-3,0,0,8,1,0,0,0,8,1,-1,0,0,8,1,-2,0,0,8,1,1,0,0,8,1,2,0,0,8,1,3,0,0,8,1,4,0,0,8,1,-4,0,0,8,1,5,0,0,8,1,6,0,0,8,1,7,0,0,8,1,8,0,0,8,2,-5,0,0,8,2,-3,0,0,8,2,-2,0,0,8,2,0,0,0,8,2,-1,0,0,8,2,1,0,0,8,2,2,0,0,8,2,3,0,0,8,2,4,0,0,8,2,-4,0,0,8,2,5,0,0,8,2,6,0,0,8,2,7,0,0,8,2,8,0,0,8,3,-5,0,0,8,3,-3,0,0,8,3,1,0,0,8,3,2,0,0,8,3,-4,0,0,8,3,7,0,0,8,3,6,0,0,8,3,8,0,0,8,4,-5,0,0,8,4,-3,0,0,8,4,1,0,0,8,4,2,0,0,8,4,-4,0,0,8,4,7,0,0,8,4,6,0,0,8,4,8,0,0,8,5,-5,0,0,8,5,-3,0,0,8,5,1,0,0,8,5,2,0,0,8,5,-4,0,0,8,5,7,0,0,8,5,6,0,0,8,5,8,0,0,8,-6,8,0,0,8,-6,-5,0,0,8,-6,-4,0,0,8,-6,-3,0,0,8,-6,-2,0,0,8,-6,-1,0,0,8,-6,0,0,0,8,-6,1,0,0,8,-6,2,0,0,8,-6,3,0,0,8,-6,4,0,0,8,-6,5,0,0,8,-6,6,0,0,8,-6,7,0,0,8,6,-5,0,0,8,6,-4,0,0,8,6,-3,0,0,8,6,-2,0,0,8,6,-1,0,0,8,6,0,0,0,8,6,1,0,0,8,6,2,0,0,8,6,3,0,0,8,6,4,0,0,8,6,5,0,0,8,6,6,0,0,8,6,7,0,0,8,6,8,0,0,8,7,-5,0,0,8,7,-4,0,0,8,7,-3,0,0,8,7,-2,0,0,8,7,-1,0,0,8,7,0,0,0,8,7,1,0,0,8,7,2,0,0,8,7,3,0,0,8,7,4,0,0,8,7,5,0,0,8,7,6,0,0,8,7,7,0,0,8,7,8,0,0,8],"Middle":[-7,-6,0,2,7,-6,-6,0,2,7,-5,-6,0,2,7,-4,-6,0,2,7,-4,0,0,1,7,-4,5,0,1,7,-3,-6,0,2,7,-3,0,0,2,7,-3,5,0,2,7,-2,-6,0,2,7,-2,0,0,3,7,-2,5,0,3,7,-1,-6,0,2,7,0,-6,0,2,7,1,-6,0,2,7,2,-6,0,2,7,3,-6,0,2,7,3,0,0,1,7,3,5,0,1,7,4,-6,0,2,7,4,0,0,2,7,4,5,0,2,7,5,-6,0,2,7,5,0,0,3,7,5,5,0,3,7,6,-6,0,2,7,7,-6,0,2,7,8,-6,0,2,7],"Top":[-8,-6,0,3,4,-8,-5,0,3,3,-8,-4,0,3,3,-8,-3,0,3,3,-8,-2,0,3,3,-8,-1,0,3,3,-8,0,0,3,3,-8,1,0,3,3,-8,2,0,3,3,-8,3,0,3,3,-8,4,0,3,3,-8,5,0,3,3,-8,6,0,3,3,-8,7,0,3,3,-8,8,0,3,3,-8,9,0,11,2,-7,9,0,2,2,-6,9,0,2,2,-5,9,0,2,2,-4,-2,0,1,2,-4,-1,0,1,3,-4,3,0,1,2,-4,4,0,1,3,-4,9,0,2,2,-3,-2,0,2,2,-3,3,0,2,2,-3,9,0,2,2,-2,-2,0,3,2,-2,-1,0,3,3,-2,3,0,3,2,-2,4,0,3,3,-2,9,0,2,2,-1,9,0,2,2,0,9,0,2,2,1,9,0,2,2,2,9,0,2,2,3,-2,0,1,2,3,-1,0,1,3,3,3,0,1,2,3,4,0,1,3,3,9,0,2,2,4,-2,0,2,2,4,3,0,2,2,4,9,0,2,2,5,-2,0,3,2,5,-1,0,3,3,5,3,0,3,2,5,4,0,3,3,5,9,0,2,2,6,9,0,2,2,7,9,0,2,2,8,9,0,2,2,9,-6,0,1,4,9,-5,0,1,3,9,-4,0,1,3,9,-3,0,1,3,9,-2,0,1,3,9,-1,0,1,3,9,0,0,1,3,9,1,0,1,3,9,2,0,1,3,9,3,0,1,3,9,4,0,1,3,9,5,0,1,3,9,6,0,1,3,9,7,0,1,3,9,8,0,1,3,9,9,0,13,2]}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index b72afea..95d8fe3 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_bp6sj"]
+[sub_resource type="Image" id="Image_sxvqs"]
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_bp6sj")
+image = SubResource("Image_sxvqs")
[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_g1pk5"]
+[sub_resource type="Image" id="Image_l78h8"]
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_g1pk5")
+image = SubResource("Image_l78h8")
[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_83s5x"]
+[sub_resource type="Image" id="Image_78d3c"]
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_83s5x")
+image = SubResource("Image_78d3c")
[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_3ox3y"]
+[sub_resource type="Image" id="Image_ohl0t"]
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_3ox3y")
+image = SubResource("Image_ohl0t")
[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_lnaup"]
+[sub_resource type="Image" id="Image_crpni"]
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_lnaup")
+image = SubResource("Image_crpni")
[sub_resource type="StyleBoxFlat" id="57"]
content_margin_left = 6.0
diff --git a/DungeonShooting_Godot/src/framework/common/Utils.cs b/DungeonShooting_Godot/src/framework/common/Utils.cs
index b9a16b7..7aa9760 100644
--- a/DungeonShooting_Godot/src/framework/common/Utils.cs
+++ b/DungeonShooting_Godot/src/framework/common/Utils.cs
@@ -39,7 +39,7 @@
///
/// 使用定的 canvasItem 绘制导航区域, 注意, 该函数只能在 draw 函数中调用
///
- public static void DrawNavigationPolygon(CanvasItem canvasItem, NavigationPolygonData[] polygonData, int width = 1)
+ public static void DrawNavigationPolygon(CanvasItem canvasItem, NavigationPolygonData[] polygonData, float width = 1)
{
for (var i = 0; i < polygonData.Length; i++)
{
@@ -56,11 +56,11 @@
array[array.Length - 1] = points[0];
if (item.Type == NavigationPolygonType.In)
{
- canvasItem.DrawPolyline(array, Colors.Yellow, width);
+ canvasItem.DrawPolyline(array, Colors.Orange, width);
}
else
{
- canvasItem.DrawPolyline(array, Colors.Red, width);
+ canvasItem.DrawPolyline(array, Colors.Orange, width);
}
}
}
diff --git a/DungeonShooting_Godot/src/framework/generator/DungeonRoomGenerator.cs b/DungeonShooting_Godot/src/framework/generator/DungeonRoomGenerator.cs
index 55ec247..e7d8da2 100644
--- a/DungeonShooting_Godot/src/framework/generator/DungeonRoomGenerator.cs
+++ b/DungeonShooting_Godot/src/framework/generator/DungeonRoomGenerator.cs
@@ -86,145 +86,145 @@
///
public static bool GenerateRoomConfig()
{
- try
- {
- //地图路径
- var tileDir = GameConfig.RoomTileDir;
- //地图描述数据路径
- var tileDataDir = GameConfig.RoomTileDataDir;
-
- var tileGroup = new DirectoryInfo(tileDir).GetDirectories();
- var tileDataGroup = new DirectoryInfo(tileDataDir).GetDirectories();
-
- //所有地图列表
- var map = new Dictionary();
-
- //地图场景
- foreach (var groupDir in tileGroup)
- {
- var groupName = groupDir.Name;
- var typeDirArray = groupDir.GetDirectories();
- //遍历枚举, 获取指定路径文件
- foreach (DungeonRoomType roomType in Enum.GetValues(typeof(DungeonRoomType)))
- {
- var typeName = DungeonRoomTemplate.DungeonRoomTypeToString(roomType);
-
- //收集所有文件名称
- var tempFileDataInfos = typeDirArray.FirstOrDefault(dirInfo => dirInfo.Name == typeName);
- if (tempFileDataInfos != null)
- {
- foreach (var fileInfo in tempFileDataInfos.GetFiles())
- {
- if (fileInfo.Extension == ".tscn")
- {
- var pathInfo = new FileInfo(groupName, roomType, typeName, RemoveExtension(fileInfo.Name));
- map.TryAdd(pathInfo.GetPath(), pathInfo);
- }
- }
- }
- }
- }
-
- //地图配置数据
- foreach (var groupDir in tileDataGroup)
- {
- var groupName = groupDir.Name;
- var typeDirArray = groupDir.GetDirectories();
- //遍历枚举, 获取指定路径文件
- foreach (DungeonRoomType roomType in Enum.GetValues(typeof(DungeonRoomType)))
- {
- var typeName = DungeonRoomTemplate.DungeonRoomTypeToString(roomType);
-
- //收集所有文件名称
- var tempFileDataInfos = typeDirArray.FirstOrDefault(dirInfo => dirInfo.Name == typeName);
- if (tempFileDataInfos != null)
- {
- foreach (var fileInfo in tempFileDataInfos.GetFiles())
- {
- if (fileInfo.Extension == ".json")
- {
- var pathInfo = new FileInfo(groupName, roomType, typeName, RemoveExtension(fileInfo.Name));
- map.TryAdd(pathInfo.GetPath(), pathInfo);
- }
- }
- }
- }
- }
-
- //剔除多余的 tile.json
- foreach (var item in map)
- {
- var path = item.Key;
- if (!File.Exists(tileDir + path + ".tscn"))
- {
- map.Remove(path);
- var filePath = tileDataDir + path + ".json";
- if (File.Exists(filePath))
- {
- GD.Print($"未找到'{tileDir + path}.tscn', 删除配置文件: {filePath}");
- File.Delete(filePath);
- }
- }
- }
-
- //手动生成缺失的 tile.json
- foreach (var item in map)
- {
- if (!File.Exists(tileDataDir + item.Key + ".json"))
- {
- var tscnName = tileDir + item.Key + ".tscn";
- var packedScene = ResourceManager.Load(tscnName, false);
- if (packedScene != null)
- {
- var dungeonRoomTemplate = packedScene.Instantiate();
- var usedRect = dungeonRoomTemplate.GetUsedRect();
- var dungeonTile = new DungeonTileMap(dungeonRoomTemplate);
- dungeonTile.SetFloorAtlasCoords(new List() { new Vector2I(0, 8) });
- //计算导航网格
- dungeonTile.GenerateNavigationPolygon(0);
- var polygonData = dungeonTile.GetPolygonData();
-
- DungeonRoomTemplate.SaveConfig(new List(), usedRect.Position, usedRect.Size, polygonData.ToList(),
- item.Value.GroupName, item.Value.RoomType, item.Value.FileName, dungeonRoomTemplate.Weight);
- dungeonRoomTemplate.QueueFree();
- }
- }
- }
-
- var roomGroupMap = new Dictionary();
- //var list = new List();
- //整合操作
- foreach (var item in map)
- {
- var path = item.Key;
- var configPath = tileDataDir + path + ".json";
- var split = new DungeonRoomSplit();
- split.ScenePath = ToResPath(tileDir + path + ".tscn");
- split.RoomPath = ToResPath(configPath);
-
- if (!roomGroupMap.TryGetValue(item.Value.GroupName, out var group))
- {
- group = new DungeonRoomGroup();
- group.GroupName = item.Value.GroupName;
- roomGroupMap.Add(group.GroupName, group);
- }
-
- group.GetRoomList(item.Value.RoomType).Add(split);
- }
-
- //写出配置
- var config = new JsonSerializerOptions();
- config.WriteIndented = true;
- var text = JsonSerializer.Serialize(roomGroupMap, config);
- File.WriteAllText(GameConfig.RoomTileConfigFile, text);
-
- GD.Print("地牢房间配置, 重新打包完成!");
- }
- catch (Exception e)
- {
- GD.PrintErr(e.ToString());
- return false;
- }
+ GD.Print("生成RoomConfig.json流程得改");
+ // try
+ // {
+ // //地图路径
+ // var tileDir = GameConfig.RoomTileDir;
+ // //地图描述数据路径
+ // var tileDataDir = GameConfig.RoomTileDataDir;
+ //
+ // var tileGroup = new DirectoryInfo(tileDir).GetDirectories();
+ // var tileDataGroup = new DirectoryInfo(tileDataDir).GetDirectories();
+ //
+ // //所有地图列表
+ // var map = new Dictionary();
+ //
+ // //地图场景
+ // foreach (var groupDir in tileGroup)
+ // {
+ // var groupName = groupDir.Name;
+ // var typeDirArray = groupDir.GetDirectories();
+ // //遍历枚举, 获取指定路径文件
+ // foreach (DungeonRoomType roomType in Enum.GetValues(typeof(DungeonRoomType)))
+ // {
+ // var typeName = DungeonManager.DungeonRoomTypeToString(roomType);
+ //
+ // //收集所有文件名称
+ // var tempFileDataInfos = typeDirArray.FirstOrDefault(dirInfo => dirInfo.Name == typeName);
+ // if (tempFileDataInfos != null)
+ // {
+ // foreach (var fileInfo in tempFileDataInfos.GetFiles())
+ // {
+ // if (fileInfo.Extension == ".tscn")
+ // {
+ // var pathInfo = new FileInfo(groupName, roomType, typeName, ResourceManager.RemoveExtension(fileInfo.Name));
+ // map.TryAdd(pathInfo.GetPath(), pathInfo);
+ // }
+ // }
+ // }
+ // }
+ // }
+ //
+ // //地图配置数据
+ // foreach (var groupDir in tileDataGroup)
+ // {
+ // var groupName = groupDir.Name;
+ // var typeDirArray = groupDir.GetDirectories();
+ // //遍历枚举, 获取指定路径文件
+ // foreach (DungeonRoomType roomType in Enum.GetValues(typeof(DungeonRoomType)))
+ // {
+ // var typeName = DungeonManager.DungeonRoomTypeToString(roomType);
+ //
+ // //收集所有文件名称
+ // var tempFileDataInfos = typeDirArray.FirstOrDefault(dirInfo => dirInfo.Name == typeName);
+ // if (tempFileDataInfos != null)
+ // {
+ // foreach (var fileInfo in tempFileDataInfos.GetFiles())
+ // {
+ // if (fileInfo.Extension == ".json")
+ // {
+ // var pathInfo = new FileInfo(groupName, roomType, typeName, ResourceManager.RemoveExtension(fileInfo.Name));
+ // map.TryAdd(pathInfo.GetPath(), pathInfo);
+ // }
+ // }
+ // }
+ // }
+ // }
+ //
+ // //剔除多余的 tile.json
+ // foreach (var item in map)
+ // {
+ // var path = item.Key;
+ // if (!File.Exists(tileDir + path + ".tscn"))
+ // {
+ // map.Remove(path);
+ // var filePath = tileDataDir + path + ".json";
+ // if (File.Exists(filePath))
+ // {
+ // GD.Print($"未找到'{tileDir + path}.tscn', 删除配置文件: {filePath}");
+ // File.Delete(filePath);
+ // }
+ // }
+ // }
+ //
+ // //手动生成缺失的 tile.json
+ // foreach (var item in map)
+ // {
+ // if (!File.Exists(tileDataDir + item.Key + ".json"))
+ // {
+ // var tscnName = tileDir + item.Key + ".tscn";
+ // var packedScene = ResourceManager.Load(tscnName, false);
+ // if (packedScene != null)
+ // {
+ // var dungeonRoomTemplate = packedScene.Instantiate();
+ // var usedRect = dungeonRoomTemplate.GetUsedRect();
+ // var dungeonTile = new DungeonTileMap(dungeonRoomTemplate);
+ // dungeonTile.SetFloorAtlasCoords(new List() { new Vector2I(0, 8) });
+ // //计算导航网格
+ // dungeonTile.GenerateNavigationPolygon(0);
+ //
+ // DungeonRoomInfo.SaveConfig(new List(), usedRect.Position, usedRect.Size,
+ // item.Value.GroupName, item.Value.RoomType, item.Value.FileName, dungeonRoomTemplate.Weight);
+ // dungeonRoomTemplate.QueueFree();
+ // }
+ // }
+ // }
+ //
+ // var roomGroupMap = new Dictionary();
+ // //var list = new List();
+ // //整合操作
+ // foreach (var item in map)
+ // {
+ // var path = item.Key;
+ // var configPath = tileDataDir + path + ".json";
+ // var split = new DungeonRoomSplit();
+ // split.ScenePath = ResourceManager.ToResPath(tileDir + path + ".tscn");
+ // split.RoomPath = ResourceManager.ToResPath(configPath);
+ //
+ // if (!roomGroupMap.TryGetValue(item.Value.GroupName, out var group))
+ // {
+ // group = new DungeonRoomGroup();
+ // group.GroupName = item.Value.GroupName;
+ // roomGroupMap.Add(group.GroupName, group);
+ // }
+ //
+ // group.GetRoomList(item.Value.RoomType).Add(split);
+ // }
+ //
+ // //写出配置
+ // var config = new JsonSerializerOptions();
+ // config.WriteIndented = true;
+ // var text = JsonSerializer.Serialize(roomGroupMap, config);
+ // File.WriteAllText(GameConfig.RoomTileConfigFile, text);
+ //
+ // GD.Print("地牢房间配置, 重新打包完成!");
+ // }
+ // catch (Exception e)
+ // {
+ // GD.PrintErr(e.ToString());
+ // return false;
+ // }
return true;
}
@@ -249,23 +249,6 @@
return GroupName + "/" + TypeName + "/" + FileName;
}
}
-
- private static string ToResPath(string path)
- {
- var field = path.Replace("\\", "/");
- return "res://" + field;
- }
-
- private static string RemoveExtension(string name)
- {
- var index = name.LastIndexOf(".", StringComparison.Ordinal);
- if (index >= 0)
- {
- return name.Substring(0, index);
- }
-
- return name;
- }
}
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
index 4acc9a9..456324b 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
@@ -1,19 +1,15 @@
-
+/*
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
+using Generator;
using Godot;
[Tool]
public partial class DungeonRoomTemplate : TileMap
-{
- ///
- /// 默认权重值
- ///
- public const int DefaultWeight = 100;
-
+{
///
/// 是否启用编辑模式
///
@@ -802,16 +798,15 @@
private void TriggerSave()
{
//如果没有找到对应的场景文件，则不保存
- var path = _dungeonRoomInfo.GroupName + "/" + DungeonRoomTypeToString(_dungeonRoomInfo.RoomType) + "/" + _dungeonRoomInfo.FileName;
+ var path = _dungeonRoomInfo.GroupName + "/" + DungeonManager.DungeonRoomTypeToString(_dungeonRoomInfo.RoomType) + "/" + _dungeonRoomInfo.FileName;
if (!File.Exists(GameConfig.RoomTileDir + path + ".tscn"))
{
return;
}
//计算导航网格
_dungeonTileMap.GenerateNavigationPolygon(0);
- var polygonData = _dungeonTileMap.GetPolygonData();
var rect = GetUsedRect();
- SaveConfig(_dungeonRoomInfo.DoorAreaInfos, rect.Position, rect.Size, polygonData.ToList(),
+ DungeonRoomInfo.SaveConfig(_dungeonRoomInfo.DoorAreaInfos, rect.Position, rect.Size,
_dungeonRoomInfo.GroupName, _dungeonRoomInfo.RoomType, Name, Weight);
}
@@ -826,38 +821,6 @@
var size = usedRect.Size * tileMap.TileSet.TileSize;
return new Rect2(tileMap.ToLocal(pos), size);
}
-
- ///
- /// 保存房间配置
- ///
- public static void SaveConfig(List doorConfigs, Vector2I position, Vector2I size, List polygonData,
- string groupName, DungeonRoomType roomType, string fileName, int weight)
- {
- //存入本地
- var path = GameConfig.RoomTileDataDir + groupName + "/" + DungeonRoomTypeToString(roomType);
- if (!Directory.Exists(path))
- {
- Directory.CreateDirectory(path);
- }
-
- var roomInfo = new DungeonRoomInfo();
- roomInfo.Position = new SerializeVector2(position);
- roomInfo.Size = new SerializeVector2(size);
- roomInfo.DoorAreaInfos = doorConfigs;
- roomInfo.NavigationList = polygonData;
- roomInfo.RoomType = roomType;
- roomInfo.GroupName = groupName;
- roomInfo.FileName = fileName;
- roomInfo.Weight = weight;
-
- var config = new JsonSerializerOptions();
- config.WriteIndented = true;
-
- path += "/" + fileName + ".json";
- var jsonStr = JsonSerializer.Serialize(roomInfo, config);
- File.WriteAllText(path, jsonStr);
- GD.Print("保存房间配置成功！路径为：" + path);
- }
///
/// 读取房间配置
@@ -946,70 +909,8 @@
}
}
- if (obj.ContainsKey("NavigationList"))
- {
- var navigationArray = obj["NavigationList"].AsGodotArray();
- roomInfo.NavigationList = new List();
- for (var i = 0; i < navigationArray.Count; i++)
- {
- var navigation = navigationArray[i].AsGodotDictionary();
- var polygonData = new NavigationPolygonData();
-
- polygonData.Type = (NavigationPolygonType)navigation["Type"].AsInt32();
- var points = new List();
- var pointArray = navigation["Points"].AsGodotArray();
- for (var j = 0; j < pointArray.Count; j++)
- {
- var point = pointArray[j].AsGodotDictionary();
- points.Add(new Vector2(point["X"].AsInt32(), point["Y"].AsInt32()));
- }
- polygonData.SetPoints(points.ToArray());
-
- roomInfo.NavigationList.Add(polygonData);
- }
- }
-
return roomInfo;
}
-
- ///
- /// 将房间类型枚举转为字符串
- ///
- public static string DungeonRoomTypeToString(DungeonRoomType roomType)
- {
- switch (roomType)
- {
- case DungeonRoomType.Battle: return "battle";
- case DungeonRoomType.Inlet: return "inlet";
- case DungeonRoomType.Outlet: return "outlet";
- case DungeonRoomType.Boss: return "boss";
- case DungeonRoomType.Reward: return "reward";
- case DungeonRoomType.Shop: return "shop";
- case DungeonRoomType.Event: return "event";
- }
-
- return "battle";
- }
-
-
- ///
- /// 将房间类型枚举转为描述字符串
- ///
- public static string DungeonRoomTypeToDescribeString(DungeonRoomType roomType)
- {
- switch (roomType)
- {
- case DungeonRoomType.Battle: return "战斗房间";
- case DungeonRoomType.Inlet: return "起始房间";
- case DungeonRoomType.Outlet: return "结束房间";
- case DungeonRoomType.Boss: return "boss战房间";
- case DungeonRoomType.Reward: return "奖励房间";
- case DungeonRoomType.Shop: return "商店房间";
- case DungeonRoomType.Event: return "事件房间";
- }
-
- return "战斗房间";
- }
#endif
///
@@ -1038,3 +939,4 @@
}
}
}
+*/
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs b/DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs
index 95ccca7..34a938f 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs
@@ -72,70 +72,71 @@
}
else
{
- var rectSize = roomInfo.RoomSplit.RoomInfo.Size;
- var rectPos = roomInfo.RoomSplit.RoomInfo.Position;
- var template = ResourceManager.Load(roomInfo.RoomSplit.ScenePath);
- var tileInstance = template.Instantiate();
- var offset = roomInfo.GetOffsetPosition();
-
- //其它物体
- var childCount = tileInstance.GetChildCount();
- for (var i = 0; i < childCount; i++)
- {
- var item = tileInstance.GetChild(i);
- if (!(item is ActivityMark))
- {
- item.GetParent().RemoveChild(item);
- item.Owner = null;
- _tileRoot.AddChild(item);
- if (item is Node2D node)
- {
- node.Position = roomInfo.GetWorldPosition() + (node.GlobalPosition - offset);
- }
-
- i--;
- childCount--;
- }
- }
-
- //物体标记
- var activityMarks = tileInstance.GetMarks();
- foreach (var activityMark in activityMarks)
- {
- var pos = activityMark.Position;
- activityMark.GetParent().RemoveChild(activityMark);
- activityMark.Owner = null;
- //_tileRoot.AddChild(activityMark);
- activityMark.Position = roomInfo.GetWorldPosition() + (pos - offset);
- activityMark.TileRoot = _tileRoot;
- //执行预处理操作
- activityMark.Pretreatment(random);
- }
- roomInfo.ActivityMarks.AddRange(activityMarks);
-
- //填充tile操作
- for (int i = 0; i < rectSize.X; i++)
- {
- for (int j = 0; j < rectSize.Y; j++)
- {
- var coords = new Vector2I((int)(rectPos.X + i), (int)(rectPos.Y + j));
- var atlasCoords = tileInstance.GetCellAtlasCoords(0, coords);
- if (atlasCoords.X != -1 && atlasCoords.Y != -1)
- {
- // 在 Godot 4.0 中使用以下这段代码区分层级, 会导致游戏关闭时有概率报错卡死, 目前尚不清楚原因
- //获取自定义层级
- // var customData = tileInstance.GetCellTileData(0, coords).GetCustomData(CustomTileLayerName);
- // var layer = customData.AsInt32();
- // layer = Mathf.Clamp(layer, GameConfig.FloorMapLayer, GameConfig.TopMapLayer);
-
- var layer = config.GetLayer(atlasCoords);
- _tileRoot.SetCell(layer, new Vector2I(roomInfo.Position.X + i, roomInfo.Position.Y + j),
- 0, atlasCoords);
- }
- }
- }
-
- tileInstance.CallDeferred(Node.MethodName.QueueFree);
+ GD.PrintErr("初始化流程得改");
+ // var rectSize = roomInfo.RoomSplit.RoomInfo.Size;
+ // var rectPos = roomInfo.RoomSplit.RoomInfo.Position;
+ // var template = ResourceManager.Load(roomInfo.RoomSplit.ScenePath);
+ // var tileInstance = template.Instantiate();
+ // var offset = roomInfo.GetOffsetPosition();
+ //
+ // //其它物体
+ // var childCount = tileInstance.GetChildCount();
+ // for (var i = 0; i < childCount; i++)
+ // {
+ // var item = tileInstance.GetChild(i);
+ // if (!(item is ActivityMark))
+ // {
+ // item.GetParent().RemoveChild(item);
+ // item.Owner = null;
+ // _tileRoot.AddChild(item);
+ // if (item is Node2D node)
+ // {
+ // node.Position = roomInfo.GetWorldPosition() + (node.GlobalPosition - offset);
+ // }
+ //
+ // i--;
+ // childCount--;
+ // }
+ // }
+ //
+ // //物体标记
+ // var activityMarks = tileInstance.GetMarks();
+ // foreach (var activityMark in activityMarks)
+ // {
+ // var pos = activityMark.Position;
+ // activityMark.GetParent().RemoveChild(activityMark);
+ // activityMark.Owner = null;
+ // //_tileRoot.AddChild(activityMark);
+ // activityMark.Position = roomInfo.GetWorldPosition() + (pos - offset);
+ // activityMark.TileRoot = _tileRoot;
+ // //执行预处理操作
+ // activityMark.Pretreatment(random);
+ // }
+ // roomInfo.ActivityMarks.AddRange(activityMarks);
+ //
+ // //填充tile操作
+ // for (int i = 0; i < rectSize.X; i++)
+ // {
+ // for (int j = 0; j < rectSize.Y; j++)
+ // {
+ // var coords = new Vector2I((int)(rectPos.X + i), (int)(rectPos.Y + j));
+ // var atlasCoords = tileInstance.GetCellAtlasCoords(0, coords);
+ // if (atlasCoords.X != -1 && atlasCoords.Y != -1)
+ // {
+ // // 在 Godot 4.0 中使用以下这段代码区分层级, 会导致游戏关闭时有概率报错卡死, 目前尚不清楚原因
+ // //获取自定义层级
+ // // var customData = tileInstance.GetCellTileData(0, coords).GetCustomData(CustomTileLayerName);
+ // // var layer = customData.AsInt32();
+ // // layer = Mathf.Clamp(layer, GameConfig.FloorMapLayer, GameConfig.TopMapLayer);
+ //
+ // var layer = config.GetLayer(atlasCoords);
+ // _tileRoot.SetCell(layer, new Vector2I(roomInfo.Position.X + i, roomInfo.Position.Y + j),
+ // 0, atlasCoords);
+ // }
+ // }
+ // }
+ //
+ // tileInstance.CallDeferred(Node.MethodName.QueueFree);
}
//铺过道
@@ -733,6 +734,15 @@
_polygonDataList.AddRange(list);
_generateNavigationResult = new GenerateNavigationResult(true);
}
+
+ ///
+ /// 清除生成的导航数据
+ ///
+ public void ClearPolygonData()
+ {
+ _polygonDataList.Clear();
+ _generateNavigationResult = null;
+ }
///
/// 获取连接门导航数据, 必须要调用 AutoFillRoomTile() 函数才有数据
diff --git a/DungeonShooting_Godot/src/framework/map/data/DungeonRoomInfo.cs b/DungeonShooting_Godot/src/framework/map/data/DungeonRoomInfo.cs
index 72a8801..08bd925 100644
--- a/DungeonShooting_Godot/src/framework/map/data/DungeonRoomInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/data/DungeonRoomInfo.cs
@@ -26,12 +26,6 @@
public List DoorAreaInfos;
///
- /// 导航数据
- ///
- [JsonInclude]
- public List NavigationList;
-
- ///
/// 当前房间所属分组的名称
///
[JsonInclude]
@@ -53,5 +47,5 @@
/// 房间权重, 值越大, 生成地牢是越容易出现该房间
///
[JsonInclude]
- public int Weight = DungeonRoomTemplate.DefaultWeight;
+ public int Weight = ResourceManager.DefaultWeight;
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/data/DungeonRoomSplit.cs b/DungeonShooting_Godot/src/framework/map/data/DungeonRoomSplit.cs
index f5cdb4b..8368bb8 100644
--- a/DungeonShooting_Godot/src/framework/map/data/DungeonRoomSplit.cs
+++ b/DungeonShooting_Godot/src/framework/map/data/DungeonRoomSplit.cs
@@ -54,4 +54,24 @@
}
private DungeonRoomInfo _roomInfo;
+
+ ///
+ /// 房间地块配置数据
+ ///
+ [JsonIgnore]
+ public DungeonTileInfo TileInfo
+ {
+ get
+ {
+ if (_tileInfo == null)
+ {
+ var asText = ResourceManager.LoadText(TilePath);
+ _tileInfo = JsonSerializer.Deserialize(asText);
+ }
+
+ return _tileInfo;
+ }
+ }
+
+ private DungeonTileInfo _tileInfo;
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/GameConfig.cs b/DungeonShooting_Godot/src/game/GameConfig.cs
index a689a31..29b75bb 100644
--- a/DungeonShooting_Godot/src/game/GameConfig.cs
+++ b/DungeonShooting_Godot/src/game/GameConfig.cs
@@ -31,14 +31,10 @@
public const int RoomSpace = 4;
///
- /// 地图场景路径
+ /// 地图配置路径
///
public const string RoomTileDir = "resource/map/tileMaps/";
///
- /// 地图描述数据路径
- ///
- public const string RoomTileDataDir = "resource/map/tileData/";
- ///
/// 房间配置汇总数据路径
///
public const string RoomTileConfigFile = "resource/map/RoomConfig.json";
diff --git a/DungeonShooting_Godot/src/game/manager/ResourceManager.cs b/DungeonShooting_Godot/src/game/manager/ResourceManager.cs
index 8d39f9b..be027ba 100644
--- a/DungeonShooting_Godot/src/game/manager/ResourceManager.cs
+++ b/DungeonShooting_Godot/src/game/manager/ResourceManager.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using Godot;
@@ -7,6 +8,11 @@
public static class ResourceManager
{
///
+ /// 默认权重值
+ ///
+ public const int DefaultWeight = 100;
+
+ ///
/// 颜色混合材质
///
public static ShaderMaterial BlendMaterial
@@ -139,4 +145,27 @@
}
return text;
}
+
+ ///
+ /// 将普通路径转化为 Godot 资源路径
+ ///
+ public static string ToResPath(string path)
+ {
+ var field = path.Replace("\\", "/");
+ return "res://" + field;
+ }
+
+ ///
+ /// 移除资源后缀名
+ ///
+ public static string RemoveExtension(string name)
+ {
+ var index = name.LastIndexOf(".", StringComparison.Ordinal);
+ if (index >= 0)
+ {
+ return name.Substring(0, index);
+ }
+
+ return name;
+ }
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs
index 78f1601..414ad55 100644
--- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs
+++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs
@@ -226,10 +226,10 @@
//挂载房间导航区域
private void MountNavFromRoomInfo(RoomInfo roomInfo)
{
- var polygonArray = roomInfo.RoomSplit.RoomInfo.NavigationList.ToArray();
+ var polygonArray = roomInfo.RoomSplit.TileInfo.NavigationList;
var polygon = new NavigationPolygon();
var offset = roomInfo.GetOffsetPosition();
- for (var i = 0; i < polygonArray.Length; i++)
+ for (var i = 0; i < polygonArray.Count; i++)
{
var navigationPolygonData = polygonArray[i];
var polygonPointArray = navigationPolygonData.GetPoints();
@@ -561,4 +561,43 @@
}
}
}
+
+ ///
+ /// 将房间类型枚举转为字符串
+ ///
+ public static string DungeonRoomTypeToString(DungeonRoomType roomType)
+ {
+ switch (roomType)
+ {
+ case DungeonRoomType.Battle: return "battle";
+ case DungeonRoomType.Inlet: return "inlet";
+ case DungeonRoomType.Outlet: return "outlet";
+ case DungeonRoomType.Boss: return "boss";
+ case DungeonRoomType.Reward: return "reward";
+ case DungeonRoomType.Shop: return "shop";
+ case DungeonRoomType.Event: return "event";
+ }
+
+ return "battle";
+ }
+
+
+ ///
+ /// 将房间类型枚举转为描述字符串
+ ///
+ public static string DungeonRoomTypeToDescribeString(DungeonRoomType roomType)
+ {
+ switch (roomType)
+ {
+ case DungeonRoomType.Battle: return "战斗房间";
+ case DungeonRoomType.Inlet: return "起始房间";
+ case DungeonRoomType.Outlet: return "结束房间";
+ case DungeonRoomType.Boss: return "boss战房间";
+ case DungeonRoomType.Reward: return "奖励房间";
+ case DungeonRoomType.Shop: return "商店房间";
+ case DungeonRoomType.Event: return "事件房间";
+ }
+
+ return "战斗房间";
+ }
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs b/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
index 314c6a9..98bbdf7 100644
--- a/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
+++ b/DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
@@ -116,9 +116,9 @@
var dungeonRoomTypes = Enum.GetValues();
for (var i = 0; i < dungeonRoomTypes.Length; i++)
{
- var typeName = DungeonRoomTemplate.DungeonRoomTypeToString(dungeonRoomTypes[i]);
+ var typeName = DungeonManager.DungeonRoomTypeToString(dungeonRoomTypes[i]);
var text = typeName + " (" +
- DungeonRoomTemplate.DungeonRoomTypeToDescribeString(dungeonRoomTypes[i]) + ")";
+ DungeonManager.DungeonRoomTypeToDescribeString(dungeonRoomTypes[i]) + ")";
select2.AddItem(text, i);
_createRoomTypeValueMap.Add(i, typeName);
}
diff --git a/DungeonShooting_Godot/src/game/ui/mapEditor/TileView/EditorTileMap.cs b/DungeonShooting_Godot/src/game/ui/mapEditor/TileView/EditorTileMap.cs
index 8920dc7..f32ec6c 100644
--- a/DungeonShooting_Godot/src/game/ui/mapEditor/TileView/EditorTileMap.cs
+++ b/DungeonShooting_Godot/src/game/ui/mapEditor/TileView/EditorTileMap.cs
@@ -81,6 +81,14 @@
private int _terrainSet = 0;
private int _terrain = 0;
private AutoTileConfig _autoTileConfig = new AutoTileConfig();
+
+ private string _groupName = "testGroup1";
+ private string _fileName = "Room2";
+ private Vector2I _roomPosition;
+ private Vector2I _roomSize;
+ private List _doorConfigs = new List();
+ private DungeonRoomType _roomType = DungeonRoomType.Battle;
+ private int _weight = 100;
//-------------------------------
public override void _Ready()
@@ -142,6 +150,8 @@
_generateTimer -= newDelta;
if (_generateTimer <= 0)
{
+ //计算区域
+ CalcRect();
GD.Print("开始检测是否可以生成地形...");
if (CheckTerrain())
{
@@ -170,6 +180,14 @@
canvasItem.DrawLine(new Vector2(0, 2000), new Vector2(0, -2000), Colors.Green);
canvasItem.DrawLine(new Vector2(2000, 0), new Vector2( -2000, 0), Colors.Red);
+ //绘制房间区域
+ if (_roomSize.X != 0 && _roomSize.Y != 0)
+ {
+ var size = TileSet.TileSize;
+ canvasItem.DrawRect(new Rect2((_roomPosition - Vector2I.One) * size, (_roomSize + new Vector2I(2, 2)) * size),
+ Colors.Aqua, false, 5f / Scale.X);
+ }
+
if (_checkTerrainFlag) //已经通过地形检测
{
//绘制导航网格
@@ -177,7 +195,7 @@
if (result != null && result.Success)
{
var polygonData = _dungeonTileMap.GetPolygonData();
- Utils.DrawNavigationPolygon(canvasItem, polygonData, 1);
+ Utils.DrawNavigationPolygon(canvasItem, polygonData, 3f / Scale.X);
}
}
@@ -270,7 +288,7 @@
if (eventKey.Pressed && eventKey.Keycode == Key.M)
{
GD.Print("测试保存地牢房间数据...");
- SaveTile();
+ TriggerSave();
}
}
}
@@ -306,27 +324,17 @@
}
//保存地牢
- private void SaveTile()
+ private void TriggerSave()
{
- var tileInfo = new DungeonTileInfo();
- tileInfo.NavigationList = _dungeonTileMap.GetPolygonData().ToList();
- tileInfo.Floor = new List();
- tileInfo.Middle = new List();
- tileInfo.Top = new List();
-
- PushLayerDataToList(AutoFloorLayer, _sourceId, tileInfo.Floor);
- PushLayerDataToList(AutoMiddleLayer, _sourceId, tileInfo.Middle);
- PushLayerDataToList(AutoTopLayer, _sourceId, tileInfo.Top);
-
- var jsonStr = JsonSerializer.Serialize(tileInfo);
- File.WriteAllText("D:\\test.json", jsonStr);
+ SaveRoomInfoConfig();
+ SaveTileInfoConfig();
}
//加载地牢
public void LoadTile()
{
InitLayer();
- var text = ResourceManager.LoadText("D:\\test.json");
+ var text = ResourceManager.LoadText("D:\\GameProject\\DungeonShooting\\DungeonShooting_Godot\\resource\\map\\tileMaps\\testGroup1\\battle\\Room2\\Room2_tileInfo.json");
var tileInfo = JsonSerializer.Deserialize(text);
//地块数据
@@ -481,18 +489,26 @@
{
_generateTimer = _generateInterval;
_isGenerateTerrain = false;
- SetLayerEnabled(AutoTopLayer, false);
- SetLayerEnabled(AutoMiddleLayer, false);
+ _dungeonTileMap.ClearPolygonData();
+ ClearLayer(AutoTopLayer);
+ ClearLayer(AutoMiddleLayer);
+ }
+
+ //从新计算房间区域
+ private void CalcRect()
+ {
+ var rect = GetUsedRect();
+ _roomPosition = rect.Position;
+ _roomSize = rect.Size;
}
//检测是否有不合规的图块, 返回true表示图块正常
private bool CheckTerrain()
{
- var usedRect = GetUsedRect();
- var x = usedRect.Position.X;
- var y = usedRect.Position.Y;
- var w = usedRect.Size.X;
- var h = usedRect.Size.Y;
+ var x = _roomPosition.X;
+ var y = _roomPosition.Y;
+ var w = _roomSize.X;
+ var h = _roomSize.Y;
for (var i = 0; i < w; i++)
{
@@ -542,16 +558,13 @@
//将自动生成的图块从 AutoFloorLayer 移动到指定图层中
private void MoveTerrainCell()
{
- SetLayerEnabled(AutoTopLayer, true);
- SetLayerEnabled(AutoMiddleLayer, true);
ClearLayer(AutoTopLayer);
ClearLayer(AutoMiddleLayer);
- var usedRect = GetUsedRect();
- var x = usedRect.Position.X;
- var y = usedRect.Position.Y;
- var w = usedRect.Size.X;
- var h = usedRect.Size.Y;
+ var x = _roomPosition.X;
+ var y = _roomPosition.Y;
+ var w = _roomSize.X;
+ var h = _roomSize.Y;
for (var i = 0; i < w; i++)
{
@@ -658,4 +671,55 @@
{
Position = MapEditorPanel.S_SubViewport.Instance.Size / 2;
}
+
+ //保存房间配置
+ private void SaveRoomInfoConfig()
+ {
+ //存入本地
+ var path = GameConfig.RoomTileDir + _groupName + "/" +
+ DungeonManager.DungeonRoomTypeToString(_roomType) + "/" + _fileName;
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ }
+
+ var roomInfo = new DungeonRoomInfo();
+ roomInfo.Position = new SerializeVector2(_roomPosition);
+ roomInfo.Size = new SerializeVector2(_roomSize);
+ roomInfo.DoorAreaInfos = _doorConfigs;
+ roomInfo.RoomType = _roomType;
+ roomInfo.GroupName = _groupName;
+ roomInfo.FileName = _fileName;
+ roomInfo.Weight = _weight;
+
+ path += "/" + _fileName + "_roomInfo.json";
+ var jsonStr = JsonSerializer.Serialize(roomInfo);
+ File.WriteAllText(path, jsonStr);
+ }
+
+ //保存地块数据
+ public void SaveTileInfoConfig()
+ {
+ //存入本地
+ var path = GameConfig.RoomTileDir + _groupName + "/" +
+ DungeonManager.DungeonRoomTypeToString(_roomType) + "/" + _fileName;
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ }
+
+ var tileInfo = new DungeonTileInfo();
+ tileInfo.NavigationList = _dungeonTileMap.GetPolygonData().ToList();
+ tileInfo.Floor = new List();
+ tileInfo.Middle = new List();
+ tileInfo.Top = new List();
+
+ PushLayerDataToList(AutoFloorLayer, _sourceId, tileInfo.Floor);
+ PushLayerDataToList(AutoMiddleLayer, _sourceId, tileInfo.Middle);
+ PushLayerDataToList(AutoTopLayer, _sourceId, tileInfo.Top);
+
+ path += "/" + _fileName + "_tileInfo.json";
+ var jsonStr = JsonSerializer.Serialize(tileInfo);
+ File.WriteAllText(path, jsonStr);
+ }
}
\ No newline at end of file