diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json
index 77e7d2a..4857947 100644
--- a/DungeonShooting_Godot/resource/map/RoomConfig.json
+++ b/DungeonShooting_Godot/resource/map/RoomConfig.json
@@ -4,8 +4,8 @@
"ConfigPath": "res://resource/map/tiledata/Room1.json",
"RoomInfo": {
"Position": {
- "X": -1,
- "Y": -1
+ "X": -10,
+ "Y": -6
},
"Size": {
"X": 20,
@@ -17,20 +17,20 @@
"Type": 0,
"Points": [
{
- "X": 8,
- "Y": 8
+ "X": -136,
+ "Y": -72
},
{
- "X": 280,
- "Y": 8
+ "X": 136,
+ "Y": -72
},
{
- "X": 280,
- "Y": 168
+ "X": 136,
+ "Y": 88
},
{
- "X": 8,
- "Y": 168
+ "X": -136,
+ "Y": 88
}
]
},
@@ -38,20 +38,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 40
+ "X": -104,
+ "Y": -40
},
{
- "X": 248,
- "Y": 40
+ "X": 104,
+ "Y": -40
},
{
- "X": 248,
- "Y": 136
+ "X": 104,
+ "Y": 56
},
{
- "X": 40,
- "Y": 136
+ "X": -104,
+ "Y": 56
}
]
}
@@ -154,8 +154,8 @@
"ConfigPath": "res://resource/map/tiledata/Room3.json",
"RoomInfo": {
"Position": {
- "X": -1,
- "Y": -1
+ "X": 5,
+ "Y": 3
},
"Size": {
"X": 21,
@@ -167,20 +167,20 @@
"Type": 0,
"Points": [
{
- "X": 8,
- "Y": 8
+ "X": 104,
+ "Y": 72
},
{
- "X": 296,
- "Y": 8
+ "X": 392,
+ "Y": 72
},
{
- "X": 296,
- "Y": 296
+ "X": 392,
+ "Y": 360
},
{
- "X": 8,
- "Y": 296
+ "X": 104,
+ "Y": 360
}
]
},
@@ -188,20 +188,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 40
+ "X": 136,
+ "Y": 104
+ },
+ {
+ "X": 232,
+ "Y": 104
+ },
+ {
+ "X": 232,
+ "Y": 200
},
{
"X": 136,
- "Y": 40
- },
- {
- "X": 136,
- "Y": 136
- },
- {
- "X": 40,
- "Y": 136
+ "Y": 200
}
]
},
@@ -209,20 +209,20 @@
"Type": 1,
"Points": [
{
- "X": 168,
- "Y": 40
+ "X": 264,
+ "Y": 104
+ },
+ {
+ "X": 360,
+ "Y": 104
+ },
+ {
+ "X": 360,
+ "Y": 200
},
{
"X": 264,
- "Y": 40
- },
- {
- "X": 264,
- "Y": 136
- },
- {
- "X": 168,
- "Y": 136
+ "Y": 200
}
]
},
@@ -230,20 +230,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 168
+ "X": 136,
+ "Y": 232
+ },
+ {
+ "X": 232,
+ "Y": 232
+ },
+ {
+ "X": 232,
+ "Y": 328
},
{
"X": 136,
- "Y": 168
- },
- {
- "X": 136,
- "Y": 264
- },
- {
- "X": 40,
- "Y": 264
+ "Y": 328
}
]
},
@@ -251,20 +251,20 @@
"Type": 1,
"Points": [
{
- "X": 168,
- "Y": 168
+ "X": 264,
+ "Y": 232
+ },
+ {
+ "X": 360,
+ "Y": 232
+ },
+ {
+ "X": 360,
+ "Y": 328
},
{
"X": 264,
- "Y": 168
- },
- {
- "X": 264,
- "Y": 264
- },
- {
- "X": 168,
- "Y": 264
+ "Y": 328
}
]
}
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
index d92d46d..fe05f58 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
@@ -7,32 +7,32 @@
[node name="Room1" type="TileMap"]
tile_set = ExtResource("1_luio1")
format = 2
-layer_0/tile_data = PackedInt32Array(720914, 851968, 2, 655378, 65536, 3, 589842, 65536, 3, 524306, 65536, 3, 458770, 65536, 3, 393234, 65536, 3, 327698, 65536, 3, 262162, 65536, 3, 196626, 65536, 3, 131090, 65536, 3, 65554, 65536, 3, 18, 65536, 3, -65518, 65536, 4, 720913, 131072, 2, 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, 131072, 7, 720912, 131072, 2, 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, 720911, 131072, 2, 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, 720910, 131072, 2, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 196608, 7, 393230, 196608, 3, 327694, 196608, 3, 262158, 196608, 3, 196622, 196608, 2, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 131072, 7, 720909, 131072, 2, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 131072, 7, 196621, 131072, 2, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 131072, 7, 720908, 131072, 2, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 131072, 7, 196620, 131072, 2, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 131072, 7, 720907, 131072, 2, 655371, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 131072, 7, 196619, 131072, 2, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, -65525, 131072, 7, 720906, 131072, 2, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 131072, 7, 196618, 131072, 2, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, -65526, 131072, 7, 720905, 131072, 2, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 131072, 7, 196617, 131072, 2, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 131072, 7, 720904, 131072, 2, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 131072, 7, 196616, 131072, 2, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, -65528, 131072, 7, 720903, 131072, 2, 655367, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 131072, 7, 196615, 131072, 2, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 131072, 7, 720902, 131072, 2, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 131072, 7, 196614, 131072, 2, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 131072, 7, 720901, 131072, 2, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 131072, 7, 196613, 131072, 2, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 131072, 7, 720900, 131072, 2, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 131072, 7, 196612, 131072, 2, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 131072, 7, 720899, 131072, 2, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 65536, 7, 393219, 65536, 3, 327683, 65536, 3, 262147, 65536, 3, 196611, 65536, 2, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 131072, 7, 720898, 131072, 2, 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, 131072, 7, 720897, 131072, 2, 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, 131072, 7, 720896, 131072, 2, 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, 131072, 7, 786431, 720896, 2, 720895, 196608, 3, 655359, 196608, 3, 589823, 196608, 3, 524287, 196608, 3, 458751, 196608, 3, 393215, 196608, 3, 327679, 196608, 3, 262143, 196608, 3, 196607, 196608, 3, 131071, 196608, 3, 65535, 196608, 3, -1, 196608, 4, -65521, 131072, 7, -65520, 131072, 7)
+layer_0/tile_data = PackedInt32Array(-65539, 131072, 2, 196605, 131072, 7, 262141, 0, 8, 327677, 0, 8, 393213, 0, 8, 458749, 131072, 2, -65538, 131072, 2, 196606, 131072, 7, 262142, 0, 8, 327678, 0, 8, 393214, 0, 8, 458750, 131072, 2, -65537, 131072, 2, 196607, 131072, 7, 262143, 0, 8, 327679, 0, 8, 393215, 0, 8, 458751, 131072, 2, -131072, 131072, 2, 131072, 131072, 7, 196608, 0, 8, 262144, 0, 8, 327680, 0, 8, 393216, 131072, 2, -131071, 131072, 2, 131073, 131072, 7, 196609, 0, 8, 262145, 0, 8, 327681, 0, 8, 393217, 131072, 2, -131070, 131072, 2, 131074, 131072, 7, 393218, 131072, 2, -131069, 131072, 2, 131075, 131072, 7, 393219, 131072, 2, -131068, 131072, 2, 131076, 131072, 7, 393220, 131072, 2, -131067, 196608, 2, -65531, 196608, 3, 5, 196608, 3, 65541, 196608, 3, 131077, 196608, 7, 393221, 131072, 2, -131066, 0, 8, -65530, 0, 8, 6, 0, 8, 65542, 0, 8, 131078, 0, 8, 393222, 131072, 2, -131065, 0, 8, -65529, 0, 8, 7, 0, 8, 65543, 0, 8, 131079, 0, 8, 393223, 131072, 2, -131064, 0, 8, -65528, 0, 8, 8, 0, 8, 65544, 0, 8, 131080, 0, 8, 393224, 131072, 2, -131063, 65536, 3, -65527, 65536, 3, 9, 65536, 3, 65545, 65536, 3, 131081, 65536, 3, 393225, 851968, 2, -327690, 196608, 4, -262154, 196608, 3, -196618, 196608, 3, -131082, 196608, 3, -65546, 196608, 3, -10, 196608, 3, 65526, 196608, 3, 131062, 196608, 3, 196598, 196608, 3, 262134, 196608, 3, 327670, 196608, 3, 393206, 196608, 3, 458742, 720896, 2, -327689, 131072, 7, -262153, 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, 393207, 0, 8, 458743, 131072, 2, -327688, 131072, 7, -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, 393208, 0, 8, 458744, 131072, 2, -327687, 131072, 7, -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, 393209, 0, 8, 458745, 131072, 2, -327686, 131072, 7, -262150, 0, 8, -196614, 0, 8, -131078, 0, 8, -65542, 65536, 2, -6, 65536, 3, 65530, 65536, 3, 131066, 65536, 3, 196602, 65536, 7, 262138, 0, 8, 327674, 0, 8, 393210, 0, 8, 458746, 131072, 2, -327685, 131072, 7, -262149, 0, 8, -196613, 0, 8, -131077, 0, 8, -65541, 131072, 2, 196603, 131072, 7, 262139, 0, 8, 327675, 0, 8, 393211, 0, 8, 458747, 131072, 2, -327684, 131072, 7, -262148, 0, 8, -196612, 0, 8, -131076, 0, 8, -65540, 131072, 2, 196604, 131072, 7, 262140, 0, 8, 327676, 0, 8, 393212, 0, 8, 458748, 131072, 2, -327683, 131072, 7, -262147, 0, 8, -196611, 0, 8, -131075, 0, 8, -327682, 131072, 7, -262146, 0, 8, -196610, 0, 8, -131074, 0, 8, -327681, 131072, 7, -262145, 0, 8, -196609, 0, 8, -131073, 0, 8, -393216, 131072, 7, -327680, 0, 8, -262144, 0, 8, -196608, 0, 8, -393215, 131072, 7, -327679, 0, 8, -262143, 0, 8, -196607, 0, 8, -393214, 131072, 7, -327678, 0, 8, -262142, 0, 8, -196606, 0, 8, 196610, 0, 8, 262146, 0, 8, 327682, 0, 8, -393213, 131072, 7, -327677, 0, 8, -262141, 0, 8, -196605, 0, 8, 196611, 0, 8, 262147, 0, 8, 327683, 0, 8, -393212, 131072, 7, -327676, 0, 8, -262140, 0, 8, -196604, 0, 8, 196612, 0, 8, 262148, 0, 8, 327684, 0, 8, -393211, 131072, 7, -327675, 0, 8, -262139, 0, 8, -196603, 0, 8, 196613, 0, 8, 262149, 0, 8, 327685, 0, 8, -393210, 131072, 7, -327674, 0, 8, -262138, 0, 8, -196602, 0, 8, 196614, 0, 8, 262150, 0, 8, 327686, 0, 8, -393209, 131072, 7, -327673, 0, 8, -262137, 0, 8, -196601, 0, 8, 196615, 0, 8, 262151, 0, 8, 327687, 0, 8, -393208, 131072, 7, -327672, 0, 8, -262136, 0, 8, -196600, 0, 8, 196616, 0, 8, 262152, 0, 8, 327688, 0, 8, -393207, 65536, 4, -327671, 65536, 3, -262135, 65536, 3, -196599, 65536, 3, 196617, 65536, 3, 262153, 65536, 3, 327689, 65536, 3)
script = ExtResource("1_wwejn")
[node name="ActivityMark" type="Node2D" parent="."]
-position = Vector2(29, 22)
+position = Vector2(-121, -57)
script = ExtResource("3_mgxag")
Type = 3
ItemId = "0001"
Layer = 1
[node name="ActivityMark2" type="Node2D" parent="."]
-position = Vector2(260, 29)
+position = Vector2(103, -57)
script = ExtResource("3_mgxag")
Type = 3
ItemId = "0001"
Layer = 1
[node name="ActivityMark3" type="Node2D" parent="."]
-position = Vector2(32, 148)
+position = Vector2(-122, 72)
script = ExtResource("3_mgxag")
Type = 3
ItemId = "0001"
Layer = 1
[node name="ActivityMark4" type="Node2D" parent="."]
-position = Vector2(263, 150)
+position = Vector2(102, 71)
script = ExtResource("3_mgxag")
Type = 3
ItemId = "0001"
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
index a9ce8aa..726c877 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
@@ -1,10 +1,18 @@
-[gd_scene load_steps=3 format=3 uid="uid://hbgdhf84okk6"]
+[gd_scene load_steps=4 format=3 uid="uid://hbgdhf84okk6"]
[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_hg3w8"]
[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_u22xh"]
+[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_teday"]
[node name="Room2" type="TileMap"]
tile_set = ExtResource("1_u22xh")
format = 2
layer_0/tile_data = PackedInt32Array(589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, 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, 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, 65549, 0, 8, 13, 0, 8, 65548, 0, 8, 12, 0, 8, 65547, 0, 8, 11, 0, 8, 65546, 0, 8, 10, 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, 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, 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, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 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, 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, 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, 655361, 131072, 2, 655360, 131072, 2, 720895, 720896, 2, -65534, 131072, 7, 655362, 131072, 2, 655363, 131072, 2, 655364, 131072, 2, 655365, 131072, 2, 655366, 131072, 2, -65529, 131072, 7, 655367, 131072, 2, -65528, 131072, 7, 655368, 131072, 2, -65527, 131072, 7, 655369, 131072, 2, -65526, 131072, 7, -65525, 131072, 7, -65524, 131072, 7, -65523, 131072, 7, -65522, 131072, 7, 655374, 131072, 2, -65521, 131072, 7, 655375, 131072, 2, -65520, 131072, 7, 655376, 131072, 2, 3, 65536, 3, 65539, 65536, 3, -65533, 65536, 4, 131075, 65536, 3, 196611, 65536, 3, 262147, 65536, 3, 327683, 65536, 3, 393219, 65536, 7, 393220, 131072, 7, 393221, 131072, 7, 393222, 196608, 7, 327686, 196608, 3, 262150, 196608, 3, 196614, 196608, 3, 131078, 196608, 3, 65542, 196608, 3, 6, 196608, 3, -65530, 196608, 4, 17, 65536, 3, 65553, 65536, 3, -65519, 65536, 4, 131089, 65536, 3, 196625, 65536, 3, 262161, 65536, 3, 327697, 65536, 3, 393233, 65536, 3, 458769, 65536, 3, 655377, 851968, 2, 655373, 720896, 2, 589837, 196608, 3, 524301, 196608, 3, 458765, 196608, 3, 393229, 196608, 3, 327693, 196608, 3, 262157, 196608, 3, 196621, 196608, 3, 131085, 196608, 2, 131084, 131072, 2, 131083, 131072, 2, 131082, 65536, 2, 196618, 65536, 3, 262154, 65536, 3, 327690, 65536, 3, 393226, 65536, 3, 458762, 65536, 3, 524298, 65536, 3, 589834, 65536, 3, 655370, 851968, 2, 524305, 65536, 3, 589841, 65536, 3)
script = ExtResource("1_hg3w8")
+
+[node name="ActivityMark" type="Node2D" parent="."]
+position = Vector2(137, 72)
+script = ExtResource("3_teday")
+Type = 3
+ItemId = "0001"
+Layer = 1
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
index 041e568..8826069 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/Room3.tscn
@@ -1,11 +1,18 @@
-[gd_scene load_steps=3 format=3 uid="uid://c83qc7utiy3pd"]
+[gd_scene load_steps=4 format=3 uid="uid://c83qc7utiy3pd"]
[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="1_n5qca"]
[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_ngr66"]
+[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="3_ifjg3"]
[node name="Room3" type="TileMap"]
tile_set = ExtResource("1_ngr66")
format = 2
-layer_0/tile_data = PackedInt32Array(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, 393234, 0, 8, 327698, 0, 8, 262162, 0, 8, 196626, 0, 8, 131090, 0, 8, 65554, 0, 8, 18, 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, 393233, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 131089, 0, 8, 65553, 0, 8, 17, 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, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, 1048591, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, 1048590, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, 1048589, 0, 8, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, 1048588, 0, 8, 655372, 0, 8, 589836, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, 1048587, 0, 8, 655371, 0, 8, 589835, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 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, 131082, 0, 8, 65546, 0, 8, 10, 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, 131081, 0, 8, 65545, 0, 8, 9, 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, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, 1048583, 0, 8, 655367, 0, 8, 589831, 0, 8, 65543, 0, 8, 7, 0, 8, 1048582, 0, 8, 655366, 0, 8, 589830, 0, 8, 65542, 0, 8, 6, 0, 8, 1048581, 0, 8, 655365, 0, 8, 589829, 0, 8, 65541, 0, 8, 5, 0, 8, 1048580, 0, 8, 655364, 0, 8, 589828, 0, 8, 65540, 0, 8, 4, 0, 8, 1048579, 0, 8, 655363, 0, 8, 589827, 0, 8, 65539, 0, 8, 3, 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, 131074, 0, 8, 65538, 0, 8, 2, 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, 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, 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, 917503, 196608, 3, 983039, 196608, 3, 1048575, 196608, 3, 1114111, 196608, 3, -65534, 131072, 7, -65533, 131072, 7, -65532, 131072, 7, -65531, 131072, 7, -65530, 131072, 7, -65529, 131072, 7, -65528, 131072, 7, -65527, 131072, 7, -65526, 131072, 7, -65525, 131072, 7, -65524, 131072, 7, -65523, 131072, 7, -65522, 131072, 7, -65521, 131072, 7, -65520, 131072, 7, -65519, 131072, 7, -65518, 131072, 7, -65517, 65536, 4, 524300, 0, 8, 524299, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 262154, 0, 8, 196618, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 524295, 0, 8, 524294, 0, 8, 524293, 0, 8, 524292, 0, 8, 524291, 0, 8, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131079, 0, 8, 131078, 0, 8, 131077, 0, 8, 131076, 0, 8, 131075, 0, 8, 1179666, 0, 8, 1114130, 0, 8, 1179665, 0, 8, 1114129, 0, 8, 1179664, 0, 8, 1114128, 0, 8, 1179663, 0, 8, 1114127, 0, 8, 1179662, 0, 8, 1114126, 0, 8, 1179661, 0, 8, 1114125, 0, 8, 1179660, 0, 8, 1114124, 0, 8, 1179659, 0, 8, 1114123, 0, 8, 1179658, 0, 8, 1114122, 0, 8, 1179657, 0, 8, 1114121, 0, 8, 1179656, 0, 8, 1114120, 0, 8, 1179655, 0, 8, 1114119, 0, 8, 1179654, 0, 8, 1114118, 0, 8, 1179653, 0, 8, 1114117, 0, 8, 1179652, 0, 8, 1114116, 0, 8, 1179651, 0, 8, 1114115, 0, 8, 1179650, 0, 8, 1114114, 0, 8, 1179649, 0, 8, 1114113, 0, 8, 1179648, 0, 8, 1114112, 0, 8, 1179647, 196608, 3, 1245183, 196608, 3, 983043, 65536, 7, 983044, 131072, 7, 983045, 131072, 7, 983046, 131072, 7, 983047, 196608, 7, 720899, 65536, 2, 786435, 65536, 3, 851971, 65536, 3, 917507, 65536, 3, 196611, 65536, 2, 262147, 65536, 3, 327683, 65536, 3, 393219, 65536, 3, 458755, 65536, 7, 262151, 196608, 3, 196615, 196608, 2, 327687, 196608, 3, 393223, 196608, 3, 458759, 196608, 7, 196612, 131072, 2, 196613, 131072, 2, 196614, 131072, 2, 458756, 131072, 7, 458757, 131072, 7, 458758, 131072, 7, 720900, 131072, 2, 720901, 131072, 2, 720902, 131072, 2, 720903, 196608, 2, 786439, 196608, 3, 851975, 196608, 3, 917511, 196608, 3, 1245185, 131072, 2, 1245184, 131072, 2, 1310719, 720896, 2, 1245186, 131072, 2, 1245187, 131072, 2, 1245188, 131072, 2, 1245189, 131072, 2, 1245190, 131072, 2, 1245191, 131072, 2, 1245192, 131072, 2, 1245193, 131072, 2, 1245194, 131072, 2, 1245195, 131072, 2, 1245196, 131072, 2, 1245197, 131072, 2, 1245198, 131072, 2, 1245199, 131072, 2, 1245200, 131072, 2, 1245201, 131072, 2, 1245202, 131072, 2, 1245203, 851968, 2, 720907, 65536, 2, 786443, 65536, 3, 851979, 65536, 3, 917515, 65536, 3, 983051, 65536, 7, 196619, 65536, 2, 262155, 65536, 3, 327691, 65536, 3, 393227, 65536, 3, 458763, 65536, 7, 196620, 131072, 2, 196621, 131072, 2, 196622, 131072, 2, 196623, 196608, 2, 262159, 196608, 3, 327695, 196608, 3, 393231, 196608, 3, 458767, 196608, 7, 720911, 196608, 2, 786447, 196608, 3, 851983, 196608, 3, 917519, 196608, 3, 983055, 196608, 7, 458764, 131072, 7, 720908, 131072, 2, 458765, 131072, 7, 720909, 131072, 2, 458766, 131072, 7, 720910, 131072, 2, 983052, 131072, 7, 983053, 131072, 7, 983054, 131072, 7, 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, 65536, 3, 851987, 65536, 3, 917523, 65536, 3, 983059, 65536, 3, 1048595, 65536, 3, 1114131, 65536, 3, 1179667, 65536, 3)
+layer_0/tile_data = PackedInt32Array(196613, 196608, 4, 262149, 196608, 3, 524293, 196608, 3, 589829, 196608, 3, 655365, 196608, 3, 720901, 196608, 3, 786437, 196608, 3, 1048581, 196608, 3, 1114117, 196608, 3, 1179653, 196608, 3, 1245189, 196608, 3, 1310725, 196608, 3, 196614, 131072, 7, 262150, 0, 8, 524294, 0, 8, 589830, 0, 8, 655366, 0, 8, 720902, 0, 8, 786438, 0, 8, 1048582, 0, 8, 1114118, 0, 8, 1179654, 0, 8, 1245190, 0, 8, 1310726, 0, 8, 196615, 131072, 7, 262151, 0, 8, 524295, 0, 8, 589831, 0, 8, 655367, 0, 8, 720903, 0, 8, 786439, 0, 8, 1048583, 0, 8, 1114119, 0, 8, 1179655, 0, 8, 1245191, 0, 8, 1310727, 0, 8, 196616, 131072, 7, 262152, 0, 8, 327688, 0, 8, 393224, 0, 8, 458760, 0, 8, 524296, 0, 8, 589832, 0, 8, 655368, 0, 8, 720904, 0, 8, 786440, 0, 8, 851976, 0, 8, 917512, 0, 8, 983048, 0, 8, 1048584, 0, 8, 1114120, 0, 8, 1179656, 0, 8, 1245192, 0, 8, 1310728, 0, 8, 196617, 131072, 7, 262153, 0, 8, 327689, 0, 8, 393225, 0, 8, 458761, 65536, 2, 524297, 65536, 3, 589833, 65536, 3, 655369, 65536, 3, 720905, 65536, 7, 786441, 0, 8, 851977, 0, 8, 917513, 0, 8, 983049, 65536, 2, 1048585, 65536, 3, 1114121, 65536, 3, 1179657, 65536, 3, 1245193, 65536, 7, 1310729, 0, 8, 196618, 131072, 7, 262154, 0, 8, 327690, 0, 8, 393226, 0, 8, 458762, 131072, 2, 720906, 131072, 7, 786442, 0, 8, 851978, 0, 8, 917514, 0, 8, 983050, 131072, 2, 1245194, 131072, 7, 1310730, 0, 8, 196619, 131072, 7, 262155, 0, 8, 327691, 0, 8, 393227, 0, 8, 458763, 131072, 2, 720907, 131072, 7, 786443, 0, 8, 851979, 0, 8, 917515, 0, 8, 983051, 131072, 2, 1245195, 131072, 7, 1310731, 0, 8, 196620, 131072, 7, 262156, 0, 8, 327692, 0, 8, 393228, 0, 8, 458764, 131072, 2, 720908, 131072, 7, 786444, 0, 8, 851980, 0, 8, 917516, 0, 8, 983052, 131072, 2, 1245196, 131072, 7, 1310732, 0, 8, 196621, 131072, 7, 262157, 0, 8, 524301, 196608, 3, 589837, 196608, 3, 655373, 196608, 3, 720909, 196608, 7, 786445, 0, 8, 1048589, 196608, 3, 1114125, 196608, 3, 1179661, 196608, 3, 1245197, 196608, 7, 1310733, 0, 8, 196622, 131072, 7, 262158, 0, 8, 524302, 0, 8, 589838, 0, 8, 655374, 0, 8, 720910, 0, 8, 786446, 0, 8, 1048590, 0, 8, 1114126, 0, 8, 1179662, 0, 8, 1245198, 0, 8, 1310734, 0, 8, 196623, 131072, 7, 262159, 0, 8, 524303, 0, 8, 589839, 0, 8, 655375, 0, 8, 720911, 0, 8, 786447, 0, 8, 1048591, 0, 8, 1114127, 0, 8, 1179663, 0, 8, 1245199, 0, 8, 1310735, 0, 8, 196624, 131072, 7, 262160, 0, 8, 327696, 0, 8, 393232, 0, 8, 458768, 0, 8, 524304, 0, 8, 589840, 0, 8, 655376, 0, 8, 720912, 0, 8, 786448, 0, 8, 851984, 0, 8, 917520, 0, 8, 983056, 0, 8, 1048592, 0, 8, 1114128, 0, 8, 1179664, 0, 8, 1245200, 0, 8, 1310736, 0, 8, 196625, 131072, 7, 262161, 0, 8, 327697, 0, 8, 393233, 0, 8, 458769, 65536, 2, 524305, 65536, 3, 589841, 65536, 3, 655377, 65536, 3, 720913, 65536, 7, 786449, 0, 8, 851985, 0, 8, 917521, 0, 8, 983057, 65536, 2, 1048593, 65536, 3, 1114129, 65536, 3, 1179665, 65536, 3, 1245201, 65536, 7, 1310737, 0, 8, 196626, 131072, 7, 262162, 0, 8, 327698, 0, 8, 393234, 0, 8, 458770, 131072, 2, 720914, 131072, 7, 786450, 0, 8, 851986, 0, 8, 917522, 0, 8, 983058, 131072, 2, 1245202, 131072, 7, 1310738, 0, 8, 196627, 131072, 7, 262163, 0, 8, 327699, 0, 8, 393235, 0, 8, 458771, 131072, 2, 720915, 131072, 7, 786451, 0, 8, 851987, 0, 8, 917523, 0, 8, 983059, 131072, 2, 1245203, 131072, 7, 1310739, 0, 8, 196628, 131072, 7, 262164, 0, 8, 327700, 0, 8, 393236, 0, 8, 458772, 131072, 2, 720916, 131072, 7, 786452, 0, 8, 851988, 0, 8, 917524, 0, 8, 983060, 131072, 2, 1245204, 131072, 7, 1310740, 0, 8, 327685, 196608, 3, 393221, 196608, 3, 458757, 196608, 3, 851973, 196608, 3, 917509, 196608, 3, 983045, 196608, 3, 1376261, 196608, 3, 1441797, 196608, 3, 1507333, 720896, 2, 327686, 0, 8, 393222, 0, 8, 458758, 0, 8, 851974, 0, 8, 917510, 0, 8, 983046, 0, 8, 1376262, 0, 8, 1441798, 0, 8, 1507334, 131072, 2, 327687, 0, 8, 393223, 0, 8, 458759, 0, 8, 851975, 0, 8, 917511, 0, 8, 983047, 0, 8, 1376263, 0, 8, 1441799, 0, 8, 1507335, 131072, 2, 1376264, 0, 8, 1441800, 0, 8, 1507336, 131072, 2, 1376265, 0, 8, 1441801, 0, 8, 1507337, 131072, 2, 1376266, 0, 8, 1441802, 0, 8, 1507338, 131072, 2, 1376267, 0, 8, 1441803, 0, 8, 1507339, 131072, 2, 1376268, 0, 8, 1441804, 0, 8, 1507340, 131072, 2, 327693, 0, 8, 393229, 0, 8, 458765, 196608, 2, 851981, 0, 8, 917517, 0, 8, 983053, 196608, 2, 1376269, 0, 8, 1441805, 0, 8, 1507341, 131072, 2, 327694, 0, 8, 393230, 0, 8, 458766, 0, 8, 851982, 0, 8, 917518, 0, 8, 983054, 0, 8, 1376270, 0, 8, 1441806, 0, 8, 1507342, 131072, 2, 327695, 0, 8, 393231, 0, 8, 458767, 0, 8, 851983, 0, 8, 917519, 0, 8, 983055, 0, 8, 1376271, 0, 8, 1441807, 0, 8, 1507343, 131072, 2, 1376272, 0, 8, 1441808, 0, 8, 1507344, 131072, 2, 1376273, 0, 8, 1441809, 0, 8, 1507345, 131072, 2, 1376274, 0, 8, 1441810, 0, 8, 1507346, 131072, 2, 1376275, 0, 8, 1441811, 0, 8, 1507347, 131072, 2, 1376276, 0, 8, 1441812, 0, 8, 1507348, 131072, 2, 196629, 131072, 7, 262165, 0, 8, 327701, 0, 8, 393237, 0, 8, 458773, 196608, 2, 524309, 196608, 3, 589845, 196608, 3, 655381, 196608, 3, 720917, 196608, 7, 786453, 0, 8, 851989, 0, 8, 917525, 0, 8, 983061, 196608, 2, 1048597, 196608, 3, 1114133, 196608, 3, 1179669, 196608, 3, 1245205, 196608, 7, 1310741, 0, 8, 1376277, 0, 8, 1441813, 0, 8, 1507349, 131072, 2, 196630, 131072, 7, 262166, 0, 8, 327702, 0, 8, 393238, 0, 8, 458774, 0, 8, 524310, 0, 8, 589846, 0, 8, 655382, 0, 8, 720918, 0, 8, 786454, 0, 8, 851990, 0, 8, 917526, 0, 8, 983062, 0, 8, 1048598, 0, 8, 1114134, 0, 8, 1179670, 0, 8, 1245206, 0, 8, 1310742, 0, 8, 1376278, 0, 8, 1441814, 0, 8, 1507350, 131072, 2, 196631, 131072, 7, 262167, 0, 8, 327703, 0, 8, 393239, 0, 8, 458775, 0, 8, 524311, 0, 8, 589847, 0, 8, 655383, 0, 8, 720919, 0, 8, 786455, 0, 8, 851991, 0, 8, 917527, 0, 8, 983063, 0, 8, 1048599, 0, 8, 1114135, 0, 8, 1179671, 0, 8, 1245207, 0, 8, 1310743, 0, 8, 1376279, 0, 8, 1441815, 0, 8, 1507351, 131072, 2, 196632, 131072, 7, 262168, 0, 8, 327704, 0, 8, 393240, 0, 8, 458776, 0, 8, 524312, 0, 8, 589848, 0, 8, 655384, 0, 8, 720920, 0, 8, 786456, 0, 8, 851992, 0, 8, 917528, 0, 8, 983064, 0, 8, 1048600, 0, 8, 1114136, 0, 8, 1179672, 0, 8, 1245208, 0, 8, 1310744, 0, 8, 1376280, 0, 8, 1441816, 0, 8, 1507352, 131072, 2, 196633, 65536, 4, 262169, 65536, 3, 327705, 65536, 3, 393241, 65536, 3, 458777, 65536, 3, 524313, 65536, 3, 589849, 65536, 3, 655385, 65536, 3, 720921, 65536, 3, 786457, 65536, 3, 851993, 65536, 3, 917529, 65536, 3, 983065, 65536, 3, 1048601, 65536, 3, 1114137, 65536, 3, 1179673, 65536, 3, 1245209, 65536, 3, 1310745, 65536, 3, 1376281, 65536, 3, 1441817, 65536, 3, 1507353, 851968, 2)
script = ExtResource("1_n5qca")
-metadata/_edit_vertical_guides_ = [48.0]
+
+[node name="ActivityMark" type="Node2D" parent="."]
+position = Vector2(249, 216)
+script = ExtResource("3_ifjg3")
+Type = 3
+ItemId = "0001"
+Layer = 1
diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/Room1.json
index f64b47a..cc80b8a 100644
--- a/DungeonShooting_Godot/resource/map/tiledata/Room1.json
+++ b/DungeonShooting_Godot/resource/map/tiledata/Room1.json
@@ -1,7 +1,7 @@
{
"Position": {
- "X": -1,
- "Y": -1
+ "X": -10,
+ "Y": -6
},
"Size": {
"X": 20,
@@ -13,20 +13,20 @@
"Type": 0,
"Points": [
{
- "X": 8,
- "Y": 8
+ "X": -136,
+ "Y": -72
},
{
- "X": 280,
- "Y": 8
+ "X": 136,
+ "Y": -72
},
{
- "X": 280,
- "Y": 168
+ "X": 136,
+ "Y": 88
},
{
- "X": 8,
- "Y": 168
+ "X": -136,
+ "Y": 88
}
]
},
@@ -34,20 +34,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 40
+ "X": -104,
+ "Y": -40
},
{
- "X": 248,
- "Y": 40
+ "X": 104,
+ "Y": -40
},
{
- "X": 248,
- "Y": 136
+ "X": 104,
+ "Y": 56
},
{
- "X": 40,
- "Y": 136
+ "X": -104,
+ "Y": 56
}
]
}
diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room3.json b/DungeonShooting_Godot/resource/map/tiledata/Room3.json
index 1be08dd..fb6c1e5 100644
--- a/DungeonShooting_Godot/resource/map/tiledata/Room3.json
+++ b/DungeonShooting_Godot/resource/map/tiledata/Room3.json
@@ -1,7 +1,7 @@
{
"Position": {
- "X": -1,
- "Y": -1
+ "X": 5,
+ "Y": 3
},
"Size": {
"X": 21,
@@ -13,20 +13,20 @@
"Type": 0,
"Points": [
{
- "X": 8,
- "Y": 8
+ "X": 104,
+ "Y": 72
},
{
- "X": 296,
- "Y": 8
+ "X": 392,
+ "Y": 72
},
{
- "X": 296,
- "Y": 296
+ "X": 392,
+ "Y": 360
},
{
- "X": 8,
- "Y": 296
+ "X": 104,
+ "Y": 360
}
]
},
@@ -34,20 +34,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 40
+ "X": 136,
+ "Y": 104
+ },
+ {
+ "X": 232,
+ "Y": 104
+ },
+ {
+ "X": 232,
+ "Y": 200
},
{
"X": 136,
- "Y": 40
- },
- {
- "X": 136,
- "Y": 136
- },
- {
- "X": 40,
- "Y": 136
+ "Y": 200
}
]
},
@@ -55,20 +55,20 @@
"Type": 1,
"Points": [
{
- "X": 168,
- "Y": 40
+ "X": 264,
+ "Y": 104
+ },
+ {
+ "X": 360,
+ "Y": 104
+ },
+ {
+ "X": 360,
+ "Y": 200
},
{
"X": 264,
- "Y": 40
- },
- {
- "X": 264,
- "Y": 136
- },
- {
- "X": 168,
- "Y": 136
+ "Y": 200
}
]
},
@@ -76,20 +76,20 @@
"Type": 1,
"Points": [
{
- "X": 40,
- "Y": 168
+ "X": 136,
+ "Y": 232
+ },
+ {
+ "X": 232,
+ "Y": 232
+ },
+ {
+ "X": 232,
+ "Y": 328
},
{
"X": 136,
- "Y": 168
- },
- {
- "X": 136,
- "Y": 264
- },
- {
- "X": 40,
- "Y": 264
+ "Y": 328
}
]
},
@@ -97,20 +97,20 @@
"Type": 1,
"Points": [
{
- "X": 168,
- "Y": 168
+ "X": 264,
+ "Y": 232
+ },
+ {
+ "X": 360,
+ "Y": 232
+ },
+ {
+ "X": 360,
+ "Y": 328
},
{
"X": 264,
- "Y": 168
- },
- {
- "X": 264,
- "Y": 264
- },
- {
- "X": 168,
- "Y": 264
+ "Y": 328
}
]
}
diff --git a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
index 9320a05..4ffceaa 100644
--- a/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
+++ b/DungeonShooting_Godot/resource/map/tileset/TileSet1.tres
@@ -162,7 +162,6 @@
11:2/0/terrains_peering_bit/top_right_corner = 0
11:2/0/custom_data_0 = 2
12:2/0 = 0
-12:2/0/terrain_set = 0
12:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
12:2/0/physics_layer_0/angular_velocity = 0.0
13:2/0 = 0
diff --git a/DungeonShooting_Godot/scene/Room.tscn b/DungeonShooting_Godot/scene/Room.tscn
index 666fa28..6895ccf 100644
--- a/DungeonShooting_Godot/scene/Room.tscn
+++ b/DungeonShooting_Godot/scene/Room.tscn
@@ -146,12 +146,14 @@
11:2/0 = 0
11:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
11:2/0/physics_layer_0/angular_velocity = 0.0
+11:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
12:2/0 = 0
12:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
12:2/0/physics_layer_0/angular_velocity = 0.0
13:2/0 = 0
13:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
13:2/0/physics_layer_0/angular_velocity = 0.0
+13:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
14:2/0 = 0
14:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
14:2/0/physics_layer_0/angular_velocity = 0.0
diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
index ca40666..6cfe99e 100644
--- a/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
+++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
@@ -66,6 +66,11 @@
set => MoveController.BasisVelocity = value;
}
+ ///
+ /// 当前物体归属的区域
+ ///
+ public AffiliationArea Affiliation { get; }
+
//组件集合
private List> _components = new List>();
//是否初始化阴影
diff --git a/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs b/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
new file mode 100644
index 0000000..a25e672
--- /dev/null
+++ b/DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
@@ -0,0 +1,39 @@
+
+using Godot;
+
+///
+/// 归属区域
+///
+public partial class AffiliationArea : Area2D
+{
+ private bool _init = false;
+
+ public void Init(Rect2 rect2)
+ {
+ if (_init)
+ {
+ return;
+ }
+
+ _init = true;
+ var collisionShape = new CollisionShape2D();
+ collisionShape.GlobalPosition = rect2.Position + rect2.Size / 2;
+ var shape = new RectangleShape2D();
+ shape.Size = rect2.Size;
+ collisionShape.Shape = shape;
+ AddChild(collisionShape);
+ }
+
+ public void Init(Vector2[] polygon)
+ {
+ if (_init)
+ {
+ return;
+ }
+
+ _init = true;
+ var collisionPolygon = new CollisionPolygon2D();
+ collisionPolygon.Polygon = polygon;
+ AddChild(collisionPolygon);
+ }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
index 21fe77b..b0d7553 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonTile.cs
@@ -114,12 +114,13 @@
var tileInstance = template.Instantiate();
//物体标记
var activityMarks = tileInstance.GetMarks();
+ var offset = roomInfo.GetOffsetPosition();
foreach (var activityMark in activityMarks)
{
activityMark.GetParent().RemoveChild(activityMark);
- var pos = activityMark.GlobalPosition;
+ var pos = activityMark.GlobalPosition - offset;
_tileRoot.AddChild(activityMark);
- activityMark.GlobalPosition = (roomInfo.Position + Vector2I.One) * GenerateDungeon.TileCellSize + pos;
+ activityMark.GlobalPosition = roomInfo.GetWorldPosition() + pos;
}
roomInfo.ActivityMarks.AddRange(activityMarks);
@@ -574,15 +575,15 @@
}
//报错数据
- private void TestData()
- {
- _polygonDataList.Clear();
- _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(-456, 712), new SerializeVector2(-440, 712), new SerializeVector2(-440, 792), new SerializeVector2(-456, 792) })});
- _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.In, Points = new List(new []{ new SerializeVector2(-1048, 744), new SerializeVector2(-840, 744), new SerializeVector2(-840, 840), new SerializeVector2(-1048, 840) })});
- _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(488, 920), new SerializeVector2(504, 920), new SerializeVector2(504, 1128), new SerializeVector2(488, 1128) })});
- _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(1320, 984), new SerializeVector2(1352, 984), new SerializeVector2(1352, 1096), new SerializeVector2(1432, 1096), new SerializeVector2(1432, 984), new SerializeVector2(1576, 984), new SerializeVector2(1576, 1128), new SerializeVector2(1544, 1128), new SerializeVector2(1544, 1000), new SerializeVector2(1464, 1000), new SerializeVector2(1464, 1128), new SerializeVector2(1320, 1128) })});
- _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(712, 1432), new SerializeVector2(984, 1432), new SerializeVector2(984, 1592), new SerializeVector2(712, 1592) })});
- }
+ // private void TestData()
+ // {
+ // _polygonDataList.Clear();
+ // _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(-456, 712), new SerializeVector2(-440, 712), new SerializeVector2(-440, 792), new SerializeVector2(-456, 792) })});
+ // _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.In, Points = new List(new []{ new SerializeVector2(-1048, 744), new SerializeVector2(-840, 744), new SerializeVector2(-840, 840), new SerializeVector2(-1048, 840) })});
+ // _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(488, 920), new SerializeVector2(504, 920), new SerializeVector2(504, 1128), new SerializeVector2(488, 1128) })});
+ // _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(1320, 984), new SerializeVector2(1352, 984), new SerializeVector2(1352, 1096), new SerializeVector2(1432, 1096), new SerializeVector2(1432, 984), new SerializeVector2(1576, 984), new SerializeVector2(1576, 1128), new SerializeVector2(1544, 1128), new SerializeVector2(1544, 1000), new SerializeVector2(1464, 1000), new SerializeVector2(1464, 1128), new SerializeVector2(1320, 1128) })});
+ // _polygonDataList.Add(new NavigationPolygonData(){Type = NavigationPolygonType.Out, Points = new List(new []{ new SerializeVector2(712, 1432), new SerializeVector2(984, 1432), new SerializeVector2(984, 1592), new SerializeVector2(712, 1592) })});
+ // }
///
/// 计算并动生成导航区域, layer 为需要计算的层级，如果没有设置 floorAtlasCoords，则该 layer 下不为空的地砖都将视为可行走区域
@@ -661,7 +662,7 @@
for (var i = 0; i < _polygonDataList.Count; i++)
{
var polygonData = _polygonDataList[i];
- CreateNavigationRegion(navigationRoot, polygonData);
+ var node = CreateNavigationRegion(navigationRoot, polygonData);
}
for (var i = 0; i < _connectNavigationItemList.Count; i++)
diff --git a/DungeonShooting_Godot/src/framework/map/NavigationPolygonData.cs b/DungeonShooting_Godot/src/framework/map/NavigationPolygonData.cs
index 7938cff..5273a1e 100644
--- a/DungeonShooting_Godot/src/framework/map/NavigationPolygonData.cs
+++ b/DungeonShooting_Godot/src/framework/map/NavigationPolygonData.cs
@@ -26,7 +26,7 @@
[JsonInclude] public NavigationPolygonType Type;
///
- /// 多边形的顶点
+ /// 多边形的顶点, 单位: 像素
///
[JsonInclude] public List Points = new List();
diff --git a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
index c3038a6..1d45115 100644
--- a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs
@@ -54,6 +54,31 @@
public List ActivityMarks = new List();
///
+ /// 当前房间归属区域
+ ///
+ public AffiliationArea Affiliation;
+
+ ///
+ /// 获取房间的全局坐标, 单位: 像素
+ ///
+ public Vector2 GetWorldPosition()
+ {
+ return new Vector2(
+ Position.X * GenerateDungeon.TileCellSize,
+ Position.Y * GenerateDungeon.TileCellSize
+ );
+ }
+
+ ///
+ /// 获取房间左上角的 Tile 距离全局坐标原点的偏移, 单位: 像素
+ ///
+ ///
+ public Vector2 GetOffsetPosition()
+ {
+ return RoomSplit.RoomInfo.Position.AsVector2() * GenerateDungeon.TileCellSize;
+ }
+
+ ///
/// 获取房间横轴结束位置, 单位: 格
///
public int GetHorizontalEnd()
diff --git a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
index a46747e..a76b05a 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
@@ -21,11 +21,16 @@
public partial class Enemy : Role
{
///
- /// 公共属性, 是否找到目标, 如果找到目标, 则所有敌人都会知道玩家的位置
+ /// 公共属性, 是否找到目标, 如果找到目标, 则与目标同房间的所有敌人都会知道目标的位置
///
public static bool IsFindTarget { get; private set; }
///
+ /// 公共属性, 在哪个区域找到的目标, 所有该区域下的敌人都会知道目标的位置
+ ///
+ public static AffiliationArea FindTargetAffiliation { get; private set; }
+
+ ///
/// 公共属性, 找到的目标的位置, 如果目标在视野内, 则一直更新
///
public static Vector2 FindTargetPosition { get; private set; }
@@ -183,6 +188,27 @@
}
///
+ /// 检查是否能切换到 AiStateEnum.AiLeaveFor 状态
+ ///
+ ///
+ public bool CanChangeLeaveFor()
+ {
+ if (!IsFindTarget)
+ {
+ return false;
+ }
+
+ var currState = StateController.CurrState;
+ if (currState == AiStateEnum.AiNormal || currState == AiStateEnum.AiProbe)
+ {
+ //判断是否在同一个房间内
+ return Affiliation == FindTargetAffiliation;
+ }
+
+ return false;
+ }
+
+ ///
/// 更新敌人视野
///
public static void UpdateEnemiesView()
@@ -196,6 +222,8 @@
{
IsFindTarget = true;
FindTargetPosition = Player.Current.GetCenterPosition();
+ FindTargetAffiliation = enemy.Affiliation;
+ break;
}
}
}
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
index 9e2d574..dc6faa8 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalState.cs
@@ -42,7 +42,7 @@
public override void Process(float delta)
{
//其他敌人发现玩家
- if (Enemy.IsFindTarget)
+ if (Master.CanChangeLeaveFor())
{
ChangeStateLate(AiStateEnum.AiLeaveFor);
return;
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeState.cs
index b3030ca..ddbaeb5 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeState.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeState.cs
@@ -11,7 +11,7 @@
public override void Process(float delta)
{
//其他敌人发现玩家
- if (Enemy.IsFindTarget)
+ if (Master.CanChangeLeaveFor())
{
ChangeStateLate(AiStateEnum.AiLeaveFor);
return;
diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index 7676c25..19e8dd0 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -33,6 +33,8 @@
private Font _font;
private GenerateDungeon _generateDungeon;
+ private int _affiliationIndex = 0;
+
//房间内所有静态导航网格数据
private static List _roomStaticNavigationList = new List();
@@ -66,8 +68,13 @@
_dungeonTile.GenerateNavigationPolygon(DungeonTile.AisleFloorMapLayer);
//挂载过道导航区域
_dungeonTile.MountNavigationPolygon(this);
- _roomStaticNavigationList.AddRange(_dungeonTile.GetPolygonData());
+ //过道导航区域数据
+ var aisleData = _dungeonTile.GetPolygonData();
+ _roomStaticNavigationList.AddRange(aisleData);
+ //门导航区域数据
_roomStaticNavigationList.AddRange(_dungeonTile.GetConnectDoorPolygonData());
+ //创建过道的归属区域
+ CreateAisleAffiliation(aisleData);
//初始化所有房间
_generateDungeon.EachRoom(InitRoom);
@@ -84,42 +91,6 @@
// var enemy1 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
// enemy1.PutDown(new Vector2(160, 160), RoomLayerEnum.YSortLayer);
// enemy1.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0001"));
-
- // for (int i = 0; i < 10; i++)
- // {
- // var enemyTemp = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
- // enemyTemp.PutDown(new Vector2(30 + (i + 1) * 20, 30), RoomLayerEnum.YSortLayer);
- // // enemyTemp.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
- // // enemyTemp.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0001"));
- // }
-
- // var enemy2 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
- // enemy2.Name = "Enemy2";
- // enemy2.PutDown(new Vector2(120, 100));
- // enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0002"));
- // //enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0004"));
- // //enemy2.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
- //
- // var enemy3 = ActivityObject.Create(ActivityIdPrefix.Enemy + "0001");
- // enemy3.Name = "Enemy3";
- // enemy3.PutDown(new Vector2(100, 120));
- // enemy3.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0003"));
- // enemy3.PickUpWeapon(ActivityObject.Create(ActivityIdPrefix.Weapon + "0002"));
-
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0004").PutDown(new Vector2(80, 100), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0001").PutDown(new Vector2(220, 120), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0001").PutDown(new Vector2(230, 120), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0001").PutDown(new Vector2(80, 80), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0002").PutDown(new Vector2(80, 120), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0003").PutDown(new Vector2(120, 80), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0003").PutDown(new Vector2(130, 80), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0003").PutDown(new Vector2(140, 80), RoomLayerEnum.NormalLayer);
-
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0003").PutDown(new Vector2(180, 80), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0003").PutDown(new Vector2(180, 180), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0002").PutDown(new Vector2(180, 120), RoomLayerEnum.NormalLayer);
- // ActivityObject.Create(ActivityIdPrefix.Weapon + "0002").PutDown(new Vector2(180, 130), RoomLayerEnum.NormalLayer);
-
}
///
@@ -174,12 +145,13 @@
//创建门
CreateDoor(roomInfo);
- //创建房间区域
+ //创建房间归属区域
+ CreateRoomAisleAffiliation(roomInfo);
//创建敌人
foreach (var roomInfoActivityMark in roomInfo.ActivityMarks)
{
- roomInfoActivityMark.BeReady(roomInfo);
+ //roomInfoActivityMark.BeReady(roomInfo);
}
}
@@ -188,6 +160,7 @@
{
var polygonArray = roomInfo.RoomSplit.RoomInfo.NavigationList.ToArray();
var polygon = new NavigationPolygon();
+ var offset = roomInfo.GetOffsetPosition();
for (var i = 0; i < polygonArray.Length; i++)
{
var navigationPolygonData = polygonArray[i];
@@ -195,7 +168,7 @@
//这里的位置需要加上房间位置
for (var j = 0; j < polygonPointArray.Length; j++)
{
- polygonPointArray[j] = polygonPointArray[j] + (roomInfo.Position + Vector2I.One) * GenerateDungeon.TileCellSize;
+ polygonPointArray[j] = polygonPointArray[j] + roomInfo.GetWorldPosition() - offset;
}
polygon.AddOutline(polygonPointArray);
@@ -246,6 +219,30 @@
door.PutDown(RoomLayerEnum.NormalLayer, false);
}
}
+
+ //创建房间归属区域
+ private void CreateRoomAisleAffiliation(RoomInfo roomInfo)
+ {
+ var affiliation = new AffiliationArea();
+ affiliation.Name = "AffiliationArea" + (_affiliationIndex++);
+ affiliation.Init(new Rect2(roomInfo.GetWorldPosition(), roomInfo.Size * GenerateDungeon.TileCellSize));
+
+ roomInfo.Affiliation = affiliation;
+ TileRoot.AddChild(affiliation);
+ }
+
+ //创建过道归属区域
+ private void CreateAisleAffiliation(NavigationPolygonData[] aisleData)
+ {
+ foreach (var aisle in aisleData)
+ {
+ var affiliation = new AffiliationArea();
+ affiliation.Name = "AffiliationArea" + (_affiliationIndex++);
+ affiliation.Init(aisle.ConvertPointsToVector2Array());
+
+ TileRoot.AddChild(affiliation);
+ }
+ }
//绘制房间区域, debug 用
private void DrawRoomInfo(RoomInfo room)