diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
index 2700533..57f781f 100644
--- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
+++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
@@ -14,7 +14,7 @@
//支持后缀
private string[] suffix =
{
- ".png", ".jpg", ".txt", ".json", ".ini", ".tscn", ".tres", ".otf", ".gdshader", ".tmx", ".tsx", ".ogg", ".mp3", ".wav", ".svg"
+ ".png", ".jpg", ".txt", ".json", ".ini", ".tscn", ".tres", ".otf", ".gdshader", ".ogg", ".mp3", ".wav", ".svg"
};
//排除第一层的文件夹
private string[] exclude =
diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json
index c3ba169..07a6f0a 100644
--- a/DungeonShooting_Godot/resource/map/RoomConfig.json
+++ b/DungeonShooting_Godot/resource/map/RoomConfig.json
@@ -1,35 +1,5 @@
[
{
- "ScenePath": "res://resource/map/tileMaps/Room1.tscn",
- "ConfigPath": "res://resource/map/tiledata/Room1.json",
- "RoomInfo": {
- "Position": {
- "X": 0,
- "Y": -1
- },
- "Size": {
- "X": 31,
- "Y": 19
- },
- "DoorAreaInfos": []
- }
- },
- {
- "ScenePath": "res://resource/map/tileMaps/Room2.tscn",
- "ConfigPath": "res://resource/map/tiledata/Room2.json",
- "RoomInfo": {
- "Position": {
- "X": -4,
- "Y": -3
- },
- "Size": {
- "X": 18,
- "Y": 14
- },
- "DoorAreaInfos": []
- }
- },
- {
"ScenePath": "res://resource/map/tileMaps/Room3.tscn",
"ConfigPath": "res://resource/map/tiledata/Room3.json",
"RoomInfo": {
@@ -41,7 +11,28 @@
"X": 21,
"Y": 21
},
- "DoorAreaInfos": []
+ "DoorAreaInfos": [
+ {
+ "Direction": 3,
+ "Start": 16,
+ "End": 320
+ },
+ {
+ "Direction": 0,
+ "Start": 16,
+ "End": 320
+ },
+ {
+ "Direction": 2,
+ "Start": 16,
+ "End": 320
+ },
+ {
+ "Direction": 1,
+ "Start": 16,
+ "End": 320
+ }
+ ]
}
}
]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
deleted file mode 100644
index dbae73e..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room1.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://dogcomcoap03x"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_4enkp"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_anyqk"]
-
-[node name="Room1" type="TileMap"]
-tile_set = ExtResource("1_4enkp")
-format = 2
-layer_0/tile_data = PackedInt32Array(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, 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, 1048603, 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, 1048602, 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, 1048601, 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, 1048600, 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, 1048599, 0, 8, 65559, 0, 8, 23, 0, 8, 1048598, 0, 8, 65558, 0, 8, 22, 0, 8, 1048597, 0, 8, 65557, 0, 8, 21, 0, 8, 1048596, 0, 8, 65556, 0, 8, 20, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 851987, 0, 8, 65555, 0, 8, 19, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 65554, 0, 8, 18, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 65553, 0, 8, 17, 0, 8, 1048592, 0, 8, 983056, 0, 8, 917520, 0, 8, 851984, 0, 8, 65552, 0, 8, 16, 0, 8, 1048591, 0, 8, 983055, 0, 8, 917519, 0, 8, 851983, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, 1048590, 0, 8, 983054, 0, 8, 917518, 0, 8, 851982, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, 1048589, 0, 8, 983053, 0, 8, 917517, 0, 8, 851981, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, 1048588, 0, 8, 983052, 0, 8, 917516, 0, 8, 851980, 0, 8, 262156, 0, 8, 196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, 1048587, 0, 8, 983051, 0, 8, 917515, 0, 8, 851979, 0, 8, 262155, 0, 8, 196619, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, 1048586, 0, 8, 983050, 0, 8, 917514, 0, 8, 851978, 0, 8, 196618, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, 1048585, 0, 8, 983049, 0, 8, 917513, 0, 8, 851977, 0, 8, 196617, 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, 196616, 0, 8, 131080, 0, 8, 65544, 0, 8, 8, 0, 8, 1048583, 0, 8, 983047, 0, 8, 917511, 0, 8, 851975, 0, 8, 786439, 0, 8, 720903, 0, 8, 655367, 0, 8, 196615, 0, 8, 131079, 0, 8, 65543, 0, 8, 7, 0, 8, 1048582, 0, 8, 983046, 0, 8, 917510, 0, 8, 851974, 0, 8, 786438, 0, 8, 720902, 0, 8, 655366, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, 1048581, 0, 8, 983045, 0, 8, 917509, 0, 8, 851973, 0, 8, 786437, 0, 8, 720901, 0, 8, 655365, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, 1048580, 0, 8, 983044, 0, 8, 917508, 0, 8, 851972, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 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, 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, 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, 524311, 0, 8, 458775, 0, 8, 393239, 0, 8, 524310, 0, 8, 458774, 0, 8, 393238, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 524308, 0, 8, 458772, 0, 8, 393236, 0, 8, 786451, 0, 8, 720915, 0, 8, 655379, 0, 8, 589843, 0, 8, 524307, 0, 8, 458771, 0, 8, 393235, 0, 8, 786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 458770, 0, 8, 393234, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 458769, 0, 8, 393233, 0, 8, 786448, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 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, 786446, 0, 8, 720910, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 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, 786444, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 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, 786442, 0, 8, 720906, 0, 8, 655370, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 262149, 131072, 2, 262148, 65536, 2, 262150, 131072, 2, 262151, 131072, 2, 262152, 131072, 2, 262153, 131072, 2, 262154, 196608, 2, 327690, 196608, 3, 393226, 196608, 3, 458762, 196608, 3, 524298, 196608, 3, 589834, 196608, 7, 589833, 65536, 7, 589832, 0, 8, 589831, 0, 8, 589830, 0, 8, 524294, 0, 8, 524295, 0, 8, 524296, 0, 8, 589829, 196608, 7, 524293, 196608, 3, 589828, 65536, 7, 524292, 65536, 3, 458756, 65536, 3, 393220, 65536, 3, 327684, 65536, 3, 524297, 65536, 3, 458757, 196608, 3, 458758, 0, 8, 458759, 0, 8, 393221, 196608, 4, 393222, 131072, 7, 393223, 131072, 7, 458760, 0, 8, 393224, 131072, 7, 458761, 65536, 3, 393225, 65536, 4, 327696, 65536, 7, 327697, 131072, 7, 327698, 131072, 7, 327699, 131072, 7, 327700, 131072, 7, 327701, 131072, 7, 327702, 131072, 7, 327703, 196608, 7, 262167, 196608, 3, 196631, 196608, 3, 131095, 196608, 2, 131094, 131072, 2, 131093, 131072, 2, 131092, 131072, 2, 131091, 131072, 2, 131090, 131072, 2, 131089, 131072, 2, 131088, 65536, 2, 196624, 65536, 3, 262160, 65536, 3, 589844, 65536, 2, 655380, 65536, 3, 720916, 65536, 3, 786452, 65536, 3, 917531, 196608, 7, 851995, 196608, 3, 786459, 196608, 3, 720923, 196608, 3, 655387, 196608, 3, 589851, 196608, 2, 589850, 65536, 2, 589849, 0, 8, 589848, 0, 8, 589847, 0, 8, 589846, 0, 8, 589845, 196608, 2, 655383, 0, 8, 655382, 0, 8, 655381, 196608, 3, 720919, 0, 8, 720918, 0, 8, 720917, 196608, 3, 786455, 0, 8, 786454, 0, 8, 786453, 196608, 3, 786456, 0, 8, 720920, 0, 8, 786457, 0, 8, 720921, 0, 8, 786458, 65536, 3, 720922, 65536, 3, 655384, 0, 8, 655385, 0, 8, 655386, 65536, 3, 851993, 131072, 2, 851992, 131072, 2, 851994, 851968, 2, 851988, 65536, 3, 917524, 65536, 7, 983066, 0, 8, 983067, 0, 8, 983065, 0, 8, 983064, 0, 8, 983063, 0, 8, 983062, 0, 8, 983061, 0, 8, 983060, 0, 8, 851991, 131072, 2, 851990, 131072, 2, 851989, 720896, 2, 917525, 131072, 7, 917526, 131072, 7, 917527, 131072, 7, 917528, 131072, 7, 917529, 131072, 7, 917530, 131072, 7, 1114141, 131072, 2, 0, 196608, 3, 65536, 196608, 3, 131072, 196608, 3, 196608, 196608, 3, 262144, 196608, 3, 327680, 196608, 3, 393216, 196608, 3, 458752, 196608, 3, 524288, 196608, 3, 589824, 196608, 3, 655360, 196608, 3, 720896, 196608, 3, 786432, 196608, 3, 851968, 196608, 3, 917504, 196608, 3, 983040, 196608, 3, 1048576, 196608, 3, 1114114, 131072, 2, 1114113, 131072, 2, 1114112, 720896, 2, 30, 65536, 3, 65566, 65536, 3, 131102, 65536, 3, 196638, 65536, 3, 262174, 65536, 3, 327710, 65536, 3, 393246, 65536, 3, 458782, 65536, 3, 524318, 65536, 3, 589854, 65536, 3, 655390, 65536, 3, 720926, 65536, 3, 786462, 65536, 3, 851998, 65536, 3, 917534, 65536, 3, 983070, 65536, 3, 1048606, 65536, 3, 1114142, 851968, 2, 1114140, 131072, 2, 1114115, 131072, 2, 1114116, 131072, 2, 1114117, 131072, 2, 1114118, 131072, 2, 1114119, 131072, 2, 1114120, 131072, 2, 1114121, 131072, 2, 1114122, 131072, 2, 1114123, 131072, 2, 1114124, 131072, 2, 1114125, 131072, 2, 1114126, 131072, 2, 1114127, 131072, 2, 1114128, 131072, 2, 1114129, 131072, 2, 1114130, 131072, 2, 1114131, 131072, 2, 1114132, 131072, 2, 1114133, 131072, 2, 1114134, 131072, 2, 1114135, 131072, 2, 1114136, 131072, 2, 1114137, 131072, 2, 1114138, 131072, 2, 1114139, 131072, 2, -65536, 196608, 4, -65535, 131072, 7, -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, 131072, 7, -65516, 131072, 7, -65515, 131072, 7, -65514, 131072, 7, -65513, 131072, 7, -65512, 131072, 7, -65511, 131072, 7, -65510, 131072, 7, -65509, 131072, 7, -65508, 131072, 7, -65507, 131072, 7, -65506, 65536, 4)
-script = ExtResource("2_anyqk")
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn b/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
deleted file mode 100644
index 5a86c8f..0000000
--- a/DungeonShooting_Godot/resource/map/tileMaps/Room2.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://da2ujaw1xtq18"]
-
-[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_cli1n"]
-[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="2_gpwui"]
-
-[node name="Room2" type="TileMap"]
-tile_set = ExtResource("1_cli1n")
-format = 2
-layer_0/tile_data = PackedInt32Array(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, 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, 524298, 0, 8, -65526, 0, 8, -131062, 0, 8, 524297, 0, 8, -65527, 0, 8, -131063, 0, 8, 524296, 0, 8, -65528, 0, 8, -131064, 0, 8, 524295, 0, 8, -65529, 0, 8, -131065, 0, 8, 524294, 0, 8, -65530, 0, 8, -131066, 0, 8, 524293, 0, 8, -65531, 0, 8, -131067, 0, 8, 524292, 0, 8, -65532, 0, 8, -131068, 0, 8, 524291, 0, 8, 458755, 0, 8, -65533, 0, 8, -131069, 0, 8, 524290, 0, 8, 458754, 0, 8, -65534, 0, 8, -131070, 0, 8, 524289, 0, 8, -65535, 0, 8, -131071, 0, 8, 524288, 0, 8, -65536, 0, 8, -131072, 0, 8, 589823, 0, 8, -1, 0, 8, -65537, 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, 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, -4, 196608, 3, -65540, 196608, 3, -131076, 196608, 4, -131075, 131072, 7, -131074, 131072, 7, 65532, 196608, 3, 131068, 196608, 3, 196604, 196608, 3, 262140, 196608, 3, 327676, 196608, 3, 393212, 196608, 3, 458748, 196608, 3, 524284, 196608, 3, 589820, 196608, 3, 655358, 0, 8, 655357, 0, 8, 655356, 196608, 3, -131073, 131072, 7, 655359, 0, 8, -196608, 131072, 7, 589824, 0, 8, -196607, 131072, 7, 589825, 0, 8, -196606, 131072, 7, 589826, 0, 8, -196605, 131072, 7, 589827, 0, 8, -196604, 131072, 7, 589828, 0, 8, -196603, 131072, 7, 589829, 0, 8, -196602, 131072, 7, 589830, 0, 8, -196601, 131072, 7, 589831, 0, 8, -196600, 131072, 7, 589832, 0, 8, -196599, 131072, 7, 589833, 0, 8, -196598, 131072, 7, 589834, 0, 8, -196597, 131072, 7, 589835, 0, 8, -196596, 131072, 7, 589836, 0, 8, -131059, 65536, 3, -65523, 65536, 3, -196595, 65536, 4, 13, 65536, 3, 65549, 65536, 3, 131085, 65536, 3, 196621, 65536, 3, 262157, 65536, 3, 327693, 65536, 3, 393229, 65536, 3, 458765, 65536, 3, 524301, 65536, 3, 589837, 65536, 3, 6, 0, 8, 7, 0, 8, 65543, 0, 8, 65542, 0, 8, 65541, 196608, 3, 5, 196608, 2, 131079, 0, 8, 131078, 0, 8, 131077, 196608, 7, 196615, 0, 8, 196614, 0, 8, 196613, 0, 8, 262151, 0, 8, 262150, 0, 8, 262149, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 131072, 7, 262147, 0, 8, 196611, 0, 8, 131075, 131072, 7, 262146, 0, 8, 196610, 0, 8, 131074, 131072, 7, 262145, 196608, 3, 196609, 196608, 3, 131073, 196608, 4, 327683, 0, 8, 327682, 0, 8, 327681, 196608, 3, 393219, 0, 8, 393218, 0, 8, 393215, 65536, 3, 327679, 65536, 3, 262143, 65536, 3, 196607, 65536, 3, 131071, 65536, 3, 65535, 65536, 2, 0, 131072, 2, 1, 131072, 2, 2, 131072, 2, 3, 131072, 2, 4, 131072, 2, 8, 65536, 2, 65544, 65536, 3, 131080, 65536, 3, 196616, 65536, 3, 262152, 65536, 3, 327687, 131072, 2, 327686, 131072, 2, 327685, 131072, 2, 327684, 65536, 2, 327690, 196608, 3, 262154, 196608, 3, 196618, 196608, 3, 131082, 196608, 3, 65546, 196608, 3, 10, 196608, 2, 9, 131072, 2, 720894, 131072, 2, 720893, 131072, 2, 720892, 720896, 2, 720895, 131072, 2, 655360, 131072, 2, 655361, 131072, 2, 655362, 131072, 2, 655363, 131072, 2, 655364, 131072, 2, 655365, 131072, 2, 655366, 131072, 2, 655367, 131072, 2, 655368, 131072, 2, 655369, 131072, 2, 655370, 131072, 2, 655371, 131072, 2, 655372, 131072, 2, 655373, 851968, 2, 458751, 65536, 3, 393220, 65536, 3, 458761, 131072, 7, 458762, 196608, 7, 458760, 131072, 7, 458759, 131072, 7, 458758, 131072, 7, 458757, 131072, 7, 458756, 131072, 7, 393226, 196608, 3, 327688, 851968, 2, 458753, 196608, 7, 393217, 196608, 3, 458752, 131072, 7, 524287, 65536, 7)
-script = ExtResource("2_gpwui")
diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/Room1.json
deleted file mode 100644
index f981b72..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/Room1.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "Position": {
- "X": 0,
- "Y": -1
- },
- "Size": {
- "X": 31,
- "Y": 19
- },
- "DoorAreaInfos": []
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room2.json b/DungeonShooting_Godot/resource/map/tiledata/Room2.json
deleted file mode 100644
index 5058040..0000000
--- a/DungeonShooting_Godot/resource/map/tiledata/Room2.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "Position": {
- "X": -4,
- "Y": -3
- },
- "Size": {
- "X": 18,
- "Y": 14
- },
- "DoorAreaInfos": []
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room3.json b/DungeonShooting_Godot/resource/map/tiledata/Room3.json
index 4b39de8..5225aba 100644
--- a/DungeonShooting_Godot/resource/map/tiledata/Room3.json
+++ b/DungeonShooting_Godot/resource/map/tiledata/Room3.json
@@ -7,5 +7,26 @@
"X": 21,
"Y": 21
},
- "DoorAreaInfos": []
+ "DoorAreaInfos": [
+ {
+ "Direction": 3,
+ "Start": 48,
+ "End": 112
+ },
+ {
+ "Direction": 2,
+ "Start": 16,
+ "End": 256
+ },
+ {
+ "Direction": 1,
+ "Start": 112,
+ "End": 288
+ },
+ {
+ "Direction": 3,
+ "Start": 176,
+ "End": 304
+ }
+ ]
}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index df2bd62..49e5294 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_kw8ay"]
+[sub_resource type="Image" id="Image_78g74"]
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_kw8ay")
+image = SubResource("Image_78g74")
[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_b1ggt"]
+[sub_resource type="Image" id="Image_tvf70"]
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_b1ggt")
+image = SubResource("Image_tvf70")
[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_npo0p"]
+[sub_resource type="Image" id="Image_sp0ft"]
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_npo0p")
+image = SubResource("Image_sp0ft")
[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_uq67w"]
+[sub_resource type="Image" id="Image_flfxg"]
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_uq67w")
+image = SubResource("Image_flfxg")
[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_ebil0"]
+[sub_resource type="Image" id="Image_dilx5"]
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_ebil0")
+image = SubResource("Image_dilx5")
[sub_resource type="StyleBoxFlat" id="57"]
content_margin_left = 6.0
diff --git a/DungeonShooting_Godot/src/framework/map/DoorAreaInfo.cs b/DungeonShooting_Godot/src/framework/map/DoorAreaInfo.cs
index d3ca5e5..1ea786b 100644
--- a/DungeonShooting_Godot/src/framework/map/DoorAreaInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/DoorAreaInfo.cs
@@ -1,10 +1,12 @@
+using System;
using System.Text.Json.Serialization;
using Godot;
/// <summary>
/// 用于描述门生成区域
/// </summary>
+[Serializable]
public class DoorAreaInfo
{
/// <summary>
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs
index 62ed75f..824a2fe 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs
@@ -1,10 +1,12 @@
+using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
/// <summary>
/// 房间配置数据
/// </summary>
+[Serializable]
public class DungeonRoomInfo
{
/// <summary>
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs
index aa0c847..2893018 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs
@@ -1,9 +1,11 @@
+using System;
using System.Text.Json.Serialization;
/// <summary>
/// 房间配置文件相关信息, 将会在 RoomConfig.json 中汇总
/// </summary>
+[Serializable]
public class DungeonRoomSplit
{
/// <summary>
diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
index 21d2d6f..26b5e44 100644
--- a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
+++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs
@@ -4,6 +4,7 @@
using System.IO;
using System.Text.Json;
using Godot;
+using FileAccess = Godot.FileAccess;
[Tool]
public partial class DungeonRoomTemplate : TileMap
@@ -263,7 +264,6 @@
}
}
-
if (isClick && _canPut) //判断是否可以创建新的点
{
CreateDoorArea(mapRect);
@@ -319,6 +319,7 @@
_hasActivePoint = false;
_activeArea = null;
}
+
}
public override void _Draw()
@@ -653,6 +654,7 @@
var config = new JsonSerializerOptions();
config.WriteIndented = true;
+
var jsonStr = JsonSerializer.Serialize(roomInfo, config);
File.WriteAllText(path, jsonStr);
}
@@ -668,7 +670,29 @@
var text = File.ReadAllText(path);
try
{
- var roomInfo = JsonSerializer.Deserialize<DungeonRoomInfo>(text);
+ // 下面这句代码在 Godot4.0_rc2的编辑器模式下, 重载脚本会导致编辑器一直报错!, 所以暂时先用下面的方法
+ //var roomInfo = JsonSerializer.Deserialize<DungeonRoomInfo>(text);
+
+ //临时解决
+ var obj = Json.ParseString(text).AsGodotDictionary();
+ var roomInfo = new DungeonRoomInfo();
+ var position = obj["Position"].AsGodotDictionary();
+ roomInfo.Position = new SerializeVector2(position["X"].AsInt32(), position["Y"].AsInt32());
+ var size = obj["Size"].AsGodotDictionary();
+ roomInfo.Size = new SerializeVector2(size["X"].AsInt32(), size["Y"].AsInt32());
+ var doorAreaInfos = obj["DoorAreaInfos"].AsGodotArray<Variant>();
+ roomInfo.DoorAreaInfos = new List<DoorAreaInfo>();
+ foreach (var item in doorAreaInfos)
+ {
+ var temp = item.AsGodotDictionary();
+ var doorInfo = new DoorAreaInfo();
+ doorInfo.Direction = (DoorDirection)temp["Direction"].AsInt32();
+ doorInfo.Start = temp["Start"].AsInt32();
+ doorInfo.End = temp["End"].AsInt32();
+ roomInfo.DoorAreaInfos.Add(doorInfo);
+ }
+
+ //填充 StartPosition 和 EndPosition 数据
foreach (var doorAreaInfo in roomInfo.DoorAreaInfos)
{
switch (doorAreaInfo.Direction)
@@ -691,7 +715,6 @@
break;
}
}
-
return roomInfo.DoorAreaInfos;
}
catch (Exception e)
diff --git a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
index 0a14499..ffa5a19 100644
--- a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
+++ b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 生成的房间数量
/// </summary>
- private int _maxCount = 15;
+ private int _maxCount = 7;
//用于标记地图上的坐标是否被占用
private Grid<bool> _roomGrid { get; } = new Grid<bool>();
@@ -44,12 +44,12 @@
private int _roomMaxInterval = 10;
//房间横轴分散程度
- private float _roomHorizontalMinDispersion = 0.7f;
- private float _roomHorizontalMaxDispersion = 1.1f;
+ private float _roomHorizontalMinDispersion = 0f;
+ private float _roomHorizontalMaxDispersion = 0f;
//房间纵轴分散程度
- private float _roomVerticalMinDispersion = 0.7f;
- private float _roomVerticalMaxDispersion = 1.1f;
+ private float _roomVerticalMinDispersion = 0f;
+ private float _roomVerticalMaxDispersion = 0f;
//区域限制
private bool _enableLimitRange = true;
@@ -122,11 +122,12 @@
return GenerateRoomErrorCode.RoomFull;
}
- var randChoose = Utils.RandChoose(GameApplication.Instance.RoomConfig);
- var room = new RoomInfo(_count, randChoose);
+ //随机选择一个房间
+ var roomSplit = Utils.RandChoose(GameApplication.Instance.RoomConfig);
+ var room = new RoomInfo(_count, roomSplit);
//房间大小
- room.Size = new Vector2I((int)randChoose.RoomInfo.Size.X, (int)randChoose.RoomInfo.Size.Y);
+ room.Size = new Vector2I((int)roomSplit.RoomInfo.Size.X, (int)roomSplit.RoomInfo.Size.Y);
//随机生成房间 (老流程)
// room.Size = new Vector2(Utils.RandRangeInt(_roomMinWidth, _roomMaxWidth),
@@ -257,6 +258,7 @@
//这种情况下x轴有重叠
if (overlapX >= 6)
{
+
//找到重叠区域
var range = CalcOverlapRange(room.Position.X, room.Position.X + room.Size.X,
nextRoom.Position.X, nextRoom.Position.X + nextRoom.Size.X);
diff --git a/DungeonShooting_Godot/src/framework/map/SerializeVector2.cs b/DungeonShooting_Godot/src/framework/map/SerializeVector2.cs
index a48c54d..9ff6d80 100644
--- a/DungeonShooting_Godot/src/framework/map/SerializeVector2.cs
+++ b/DungeonShooting_Godot/src/framework/map/SerializeVector2.cs
@@ -1,10 +1,12 @@
+using System;
using System.Text.Json.Serialization;
using Godot;
/// <summary>
/// 可序列化的 Vector2 对象
/// </summary>
+[Serializable]
public class SerializeVector2
{
public SerializeVector2(float x, float y)
diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
index ce920b3..c907971 100644
--- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
+++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs
@@ -31,9 +31,6 @@
public const string resource_font_cn_font_12_tres = "res://resource/font/cn_font_12.tres";
public const string resource_font_cn_font_18_tres = "res://resource/font/cn_font_18.tres";
public const string resource_font_cn_font_36_tres = "res://resource/font/cn_font_36.tres";
- public const string resource_map_dungeon_1_tmx = "res://resource/map/dungeon_1.tmx";
- public const string resource_map_dungeon_test_tmx = "res://resource/map/dungeon_test.tmx";
- public const string resource_map_itchioDungeonTileset4_tsx = "res://resource/map/itch-io-DungeonTileset4.tsx";
public const string resource_map_RoomConfig_json = "res://resource/map/RoomConfig.json";
public const string resource_map_tiledata_Room1_json = "res://resource/map/tiledata/Room1.json";
public const string resource_map_tiledata_Room2_json = "res://resource/map/tiledata/Room2.json";
diff --git a/DungeonShooting_Godot/src/game/role/Player.cs b/DungeonShooting_Godot/src/game/role/Player.cs
index d3c7fea..7cb477f 100644
--- a/DungeonShooting_Godot/src/game/role/Player.cs
+++ b/DungeonShooting_Godot/src/game/role/Player.cs
@@ -49,9 +49,11 @@
MaxShield = 30;
Shield = 30;
- // Acceleration = 3000;
- // Friction = 3000;
- // MoveSpeed = 800;
+ Acceleration = 3000;
+ Friction = 3000;
+ MoveSpeed = 500;
+ CollisionLayer = 0;
+ CollisionMask = 0;
}
protected override void Process(float delta)