diff --git a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs index 1e7cd13..dbafd2a 100644 --- a/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs +++ b/DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs @@ -109,11 +109,12 @@ if (!File.Exists(tileDataDir + item + ".json")) { var tscnName = tileDir + item + ".tscn"; - var packedScene = ResourceManager.Load(tscnName); + var packedScene = ResourceManager.Load(tscnName, false); if (packedScene != null) { var dungeonRoomTemplate = packedScene.Instantiate(); - DungeonRoomTemplate.SaveConfig(new List(), DungeonRoomTemplate.CalcTileRange(dungeonRoomTemplate), item); + var usedRect = dungeonRoomTemplate.GetUsedRect(); + DungeonRoomTemplate.SaveConfig(new List(), usedRect.Position, usedRect.Size, item); dungeonRoomTemplate.QueueFree(); } } @@ -127,7 +128,7 @@ var configText = File.ReadAllText(configPath); var roomInfo = JsonSerializer.Deserialize(configText); var split = new DungeonRoomSplit(); - split.ResourcePath = ToResPath(tileDir + item + ".tscn"); + split.ScenePath = ToResPath(tileDir + item + ".tscn"); split.ConfigPath = ToResPath(configPath); split.RoomInfo = roomInfo; list.Add(split); diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json index 51c868c..c3ba169 100644 --- a/DungeonShooting_Godot/resource/map/RoomConfig.json +++ b/DungeonShooting_Godot/resource/map/RoomConfig.json @@ -1,61 +1,45 @@ [ { - "ResourcePath": "res://resource/map/tileMaps/Room1.tscn", + "ScenePath": "res://resource/map/tileMaps/Room1.tscn", "ConfigPath": "res://resource/map/tiledata/Room1.json", "RoomInfo": { "Position": { "X": 0, - "Y": -16 + "Y": -1 }, "Size": { - "X": 496, - "Y": 304 - }, - "DoorAreaInfos": [ - { - "Direction": 3, - "Start": 64, - "End": 192 - }, - { - "Direction": 2, - "Start": 320, - "End": 464 - }, - { - "Direction": 2, - "Start": 80, - "End": 224 - } - ] - } - }, - { - "ResourcePath": "res://resource/map/tileMaps/Room2.tscn", - "ConfigPath": "res://resource/map/tiledata/Room2.json", - "RoomInfo": { - "Position": { - "X": -64, - "Y": -48 - }, - "Size": { - "X": 288, - "Y": 224 + "X": 31, + "Y": 19 }, "DoorAreaInfos": [] } }, { - "ResourcePath": "res://resource/map/tileMaps/Room3.tscn", + "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": { "Position": { - "X": -16, - "Y": -16 + "X": -1, + "Y": -1 }, "Size": { - "X": 336, - "Y": 336 + "X": 21, + "Y": 21 }, "DoorAreaInfos": [] } diff --git a/DungeonShooting_Godot/resource/map/dungeon_1.tmx b/DungeonShooting_Godot/resource/map/dungeon_1.tmx deleted file mode 100644 index 263cf36..0000000 --- a/DungeonShooting_Godot/resource/map/dungeon_1.tmx +++ /dev/null @@ -1,582 +0,0 @@ - - - - - - - - - -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,12,99,99,99,99,99,99,99, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -14,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,34,35,36, -51,51,51,51,51,51,51,51,52,0,0,0,0,50,51,52, -51,51,51,51,51,51,51,51,52,0,0,0,0,50,51,52, -51,51,51,51,51,51,51,51,52,0,0,0,0,50,51,52, -51,51,51,51,51,51,51,51,52,0,0,0,0,50,51,52, -51,51,51,51,51,51,51,51,52,0,0,0,0,50,51,44 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -35,35,35,35,36,0,0,0,0,0,0,0,0,0,0,0 - - -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0 - - -51,51,51,51,51,51,51,51,52,0,0,0,0,98,99,99, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,44,35,35,35,35,35,35,35, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -99,99,99,51,100,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -50,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -46,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,19,19,19,19,19,19,19, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,18,19,19, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -19,19,19,19,20,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0 - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -0,0,0,0,0,129,129,129,129,129,129,129,129,129,129,129 - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129 - - -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,0,0,0, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -0,0,0,0,0,129,129,129,129,129,129,129,129,129,129,129, -0,0,0,0,0,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - - - - diff --git a/DungeonShooting_Godot/resource/map/dungeon_1.tmx.import b/DungeonShooting_Godot/resource/map/dungeon_1.tmx.import deleted file mode 100644 index 1319136..0000000 --- a/DungeonShooting_Godot/resource/map/dungeon_1.tmx.import +++ /dev/null @@ -1,22 +0,0 @@ -[remap] - -importer="vnen.tiled_importer" -type="PackedScene" -path="res://.import/dungeon_1.tmx-ecc46759ea1682aa9214cfce52f76627.scn" - -[deps] - -source_file="res://resource/map/dungeon_1.tmx" -dest_files=[ "res://.import/dungeon_1.tmx-ecc46759ea1682aa9214cfce52f76627.scn" ] - -[params] - -custom_properties=true -tile_metadata=false -uv_clip=true -image_flags=0 -collision_layer=1 -embed_internal_images=true -save_tiled_properties=false -add_background=true -post_import_script="" diff --git a/DungeonShooting_Godot/resource/map/dungeon_test.tmx b/DungeonShooting_Godot/resource/map/dungeon_test.tmx deleted file mode 100644 index 0a77aa8..0000000 --- a/DungeonShooting_Godot/resource/map/dungeon_test.tmx +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,39,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,14,51,12,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,41,51,51, -51,51,52,118,119,119,119,119,119,119,119,119,119,119,119,119,119,120,50,51,52,19,19,19,19,19,19,19,19,19,19,19,19,19,19,118,120,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,34,35,35,36,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,98,99,14,44,35,35,36,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,117,119,98,99,99,99,100,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,18,19,19,19,20,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,44,35,35,35,35,35,35,35,35,35,35,36,129,129,34,35,46,51,44,35,36,129,129,34,35,35,35,35,35,35,35,35,35,35,35,46,51,51, -51,51,12,99,99,99,99,99,99,99,99,99,99,100,129,129,98,99,99,99,99,99,100,129,129,98,99,99,99,99,99,99,99,99,99,99,99,14,51,51, -51,51,52,19,19,19,19,19,121,122,122,122,122,123,129,129,18,19,19,19,19,19,20,129,129,18,19,19,19,19,19,19,19,19,19,19,19,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,44,35,35,36,129,129,34,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,129,129,34,35,35,46,51,51, -51,51,12,99,99,100,129,129,98,99,99,99,99,99,99,99,99,99,41,51,39,99,99,99,99,99,99,99,99,99,99,100,129,129,98,99,99,14,51,51, -51,51,52,19,19,20,129,129,117,118,118,118,118,118,118,118,118,119,50,51,52,19,19,19,19,19,19,19,19,19,19,20,129,129,18,19,19,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,34,35,35,35,35,35,35,36,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,34,35,35,35,36,129,129,129,129,50,51,52,129,129,50,12,99,99,99,99,14,52,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,50,12,99,99,100,129,129,129,129,98,99,100,129,129,50,52,118,119,119,120,50,52,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,34,35,46,52,121,122,123,129,129,129,129,18,19,20,129,129,50,52,129,129,129,129,50,52,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,50,12,99,100,129,129,129,129,129,129,129,129,129,129,129,129,50,52,129,129,129,129,50,52,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,34,35,46,52,121,123,129,129,129,129,129,129,129,129,129,129,129,129,50,44,35,35,35,35,46,52,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,98,99,99,100,129,129,129,129,129,129,129,129,129,34,35,36,129,129,98,99,99,99,99,99,99,100,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,18,19,19,20,129,129,129,129,129,129,129,129,129,50,51,52,129,129,18,19,19,19,19,19,19,20,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,52,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,129,50,51,51, -51,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,44,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,46,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 - - - - - - - - - diff --git a/DungeonShooting_Godot/resource/map/dungeon_test.tmx.import b/DungeonShooting_Godot/resource/map/dungeon_test.tmx.import deleted file mode 100644 index 4df7810..0000000 --- a/DungeonShooting_Godot/resource/map/dungeon_test.tmx.import +++ /dev/null @@ -1,22 +0,0 @@ -[remap] - -importer="vnen.tiled_importer" -type="PackedScene" -path="res://.import/dungeon_test.tmx-238b1188e6139be0bed72a8fdf71cb3b.scn" - -[deps] - -source_file="res://resource/map/dungeon_test.tmx" -dest_files=[ "res://.import/dungeon_test.tmx-238b1188e6139be0bed72a8fdf71cb3b.scn" ] - -[params] - -custom_properties=true -tile_metadata=false -uv_clip=true -image_flags=0 -collision_layer=1 -embed_internal_images=true -save_tiled_properties=false -add_background=true -post_import_script="" diff --git a/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx b/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx deleted file mode 100644 index 2ffa4f1..0000000 --- a/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx.import b/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx.import deleted file mode 100644 index 83cec63..0000000 --- a/DungeonShooting_Godot/resource/map/itch-io-DungeonTileset4.tsx.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="vnen.tiled_tileset_importer" -type="TileSet" -path="res://.import/itch-io-DungeonTileset4.tsx-b6c599d7e258d91a298136a5a4002898.res" - -[deps] - -source_file="res://resource/map/itch-io-DungeonTileset4.tsx" -dest_files=[ "res://.import/itch-io-DungeonTileset4.tsx-b6c599d7e258d91a298136a5a4002898.res" ] - -[params] - -custom_properties=true -tile_metadata=false -image_flags=3 -embed_internal_images=false -save_tiled_properties=false -post_import_script="" diff --git a/DungeonShooting_Godot/resource/map/tiledata/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/Room1.json index 6c06345..f981b72 100644 --- a/DungeonShooting_Godot/resource/map/tiledata/Room1.json +++ b/DungeonShooting_Godot/resource/map/tiledata/Room1.json @@ -1,27 +1,11 @@ { "Position": { "X": 0, - "Y": -16 + "Y": -1 }, "Size": { - "X": 496, - "Y": 304 + "X": 31, + "Y": 19 }, - "DoorAreaInfos": [ - { - "Direction": 3, - "Start": 64, - "End": 192 - }, - { - "Direction": 2, - "Start": 320, - "End": 464 - }, - { - "Direction": 2, - "Start": 80, - "End": 224 - } - ] + "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 index 975a0ab..5058040 100644 --- a/DungeonShooting_Godot/resource/map/tiledata/Room2.json +++ b/DungeonShooting_Godot/resource/map/tiledata/Room2.json @@ -1,11 +1,11 @@ { "Position": { - "X": -64, - "Y": -48 + "X": -4, + "Y": -3 }, "Size": { - "X": 288, - "Y": 224 + "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 822a4c5..4b39de8 100644 --- a/DungeonShooting_Godot/resource/map/tiledata/Room3.json +++ b/DungeonShooting_Godot/resource/map/tiledata/Room3.json @@ -1,11 +1,11 @@ { "Position": { - "X": -16, - "Y": -16 + "X": -1, + "Y": -1 }, "Size": { - "X": 336, - "Y": 336 + "X": 21, + "Y": 21 }, "DoorAreaInfos": [] } \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres index ca79629..ac10185 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_md1vf"] +[sub_resource type="Image" id="Image_nu5ay"] 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_md1vf") +image = SubResource("Image_nu5ay") [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_dxvff"] +[sub_resource type="Image" id="Image_3s6fe"] 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_dxvff") +image = SubResource("Image_3s6fe") [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_l88rh"] +[sub_resource type="Image" id="Image_xwqdw"] 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_l88rh") +image = SubResource("Image_xwqdw") [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_cruoi"] +[sub_resource type="Image" id="Image_kspyh"] 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_cruoi") +image = SubResource("Image_kspyh") [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_ed6ti"] +[sub_resource type="Image" id="Image_i66oh"] 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_ed6ti") +image = SubResource("Image_i66oh") [sub_resource type="StyleBoxFlat" id="57"] content_margin_left = 6.0 diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs index 4f87a97..62ed75f 100644 --- a/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs +++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomInfo.cs @@ -8,13 +8,13 @@ public class DungeonRoomInfo { /// - /// 房间位置 + /// 房间位置, 在tile坐标系中的位置, 不是坐标 /// [JsonInclude] public SerializeVector2 Position; /// - /// 房间大小 + /// 房间大小, 在tile坐标系中占用的格子, 不是像素大小 /// [JsonInclude] public SerializeVector2 Size; diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs index 91eff20..aa0c847 100644 --- a/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs +++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomSplit.cs @@ -1,14 +1,26 @@  using System.Text.Json.Serialization; +/// +/// 房间配置文件相关信息, 将会在 RoomConfig.json 中汇总 +/// public class DungeonRoomSplit { + /// + /// 房间场景路径 + /// [JsonInclude] - public string ResourcePath; + public string ScenePath; + /// + /// 房间配置路径 + /// [JsonInclude] public string ConfigPath; + /// + /// 房间配置数据 + /// [JsonInclude] public DungeonRoomInfo RoomInfo; } \ No newline at end of file diff --git a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs index a7a2dc1..21d2d6f 100644 --- a/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs +++ b/DungeonShooting_Godot/src/framework/map/DungeonRoomTemplate.cs @@ -623,7 +623,8 @@ //区域数据修改 private void OnDoorAreaChange() { - SaveConfig(_doorConfigs, CalcTileRange(this), Name); + var rect = GetUsedRect(); + SaveConfig(_doorConfigs, rect.Position, rect.Size, Name); } /// @@ -641,13 +642,13 @@ /// /// 保存房间配置 /// - public static void SaveConfig(List doorConfigs, Rect2 mapRect, string name) + public static void SaveConfig(List doorConfigs, Vector2I position, Vector2I size, string name) { //存入本地 var path = RoomTileDataDir + name + ".json"; var roomInfo = new DungeonRoomInfo(); - roomInfo.Position = new SerializeVector2(mapRect.Position.X, mapRect.Position.Y); - roomInfo.Size = new SerializeVector2(mapRect.Size.X, mapRect.Size.Y); + roomInfo.Position = new SerializeVector2(position); + roomInfo.Size = new SerializeVector2(size); roomInfo.DoorAreaInfos = doorConfigs; var config = new JsonSerializerOptions(); diff --git a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs index 3b264a6..0a14499 100644 --- a/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs +++ b/DungeonShooting_Godot/src/framework/map/GenerateDungeon.cs @@ -122,18 +122,11 @@ return GenerateRoomErrorCode.RoomFull; } - var packedScene = ResourceManager.Load( - Utils.RandChoose( - ResourcePath.resource_map_Room1_tscn, - ResourcePath.resource_map_Room2_tscn - ) - ); - var template = packedScene.Instantiate(); - var room = new RoomInfo(_count, template); + var randChoose = Utils.RandChoose(GameApplication.Instance.RoomConfig); + var room = new RoomInfo(_count, randChoose); //房间大小 - var usedRect = template.GetUsedRect(); - room.Size = usedRect.Size; + room.Size = new Vector2I((int)randChoose.RoomInfo.Size.X, (int)randChoose.RoomInfo.Size.Y); //随机生成房间 (老流程) // room.Size = new Vector2(Utils.RandRangeInt(_roomMinWidth, _roomMaxWidth), diff --git a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs index 8a3771c..a0e7282 100644 --- a/DungeonShooting_Godot/src/framework/map/RoomInfo.cs +++ b/DungeonShooting_Godot/src/framework/map/RoomInfo.cs @@ -7,10 +7,10 @@ /// public class RoomInfo { - public RoomInfo(int id, TileMap tileMap) + public RoomInfo(int id, DungeonRoomSplit roomSplit) { Id = id; - Template = tileMap; + RoomSplit = roomSplit; } /// @@ -21,7 +21,7 @@ /// /// 生成该房间使用的模板 /// - public TileMap Template; + public DungeonRoomSplit RoomSplit; /// /// 房间大小 diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs index 190b5e3..f50a3c6 100644 --- a/DungeonShooting_Godot/src/game/GameApplication.cs +++ b/DungeonShooting_Godot/src/game/GameApplication.cs @@ -1,4 +1,6 @@ +using System.Collections.Generic; +using System.Text.Json; using Godot; public partial class GameApplication : Node2D @@ -53,11 +55,22 @@ /// 全局根节点 /// public Node2D GlobalNodeRoot { get; private set; } + + /// + /// 房间配置 + /// + public readonly List RoomConfig; public GameApplication() { Instance = this; - + + //加载房间配置信息 + var file = FileAccess.Open(ResourcePath.resource_map_RoomConfig_json, FileAccess.ModeFlags.Read); + var asText = file.GetAsText(); + RoomConfig = JsonSerializer.Deserialize>(asText); + file.Dispose(); + //扫描并注册当前程序集下的武器 WeaponManager.RegisterWeaponFromAssembly(GetType().Assembly); } diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index 6ec334a..ce920b3 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -34,10 +34,13 @@ 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_Room1_tscn = "res://resource/map/Room1.tscn"; - public const string resource_map_Room2_tscn = "res://resource/map/Room2.tscn"; - public const string resource_map_Room3_tscn = "res://resource/map/Room3.tscn"; + 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"; + public const string resource_map_tiledata_Room3_json = "res://resource/map/tiledata/Room3.json"; + public const string resource_map_tileMaps_Room1_tscn = "res://resource/map/tileMaps/Room1.tscn"; + public const string resource_map_tileMaps_Room2_tscn = "res://resource/map/tileMaps/Room2.tscn"; + public const string resource_map_tileMaps_Room3_tscn = "res://resource/map/tileMaps/Room3.tscn"; public const string resource_map_tileset_TileSet1_tres = "res://resource/map/tileset/TileSet1.tres"; public const string resource_materlal_Blend_gdshader = "res://resource/materlal/Blend.gdshader"; public const string resource_materlal_Blend_tres = "res://resource/materlal/Blend.tres"; diff --git a/DungeonShooting_Godot/src/game/room/DungeonTileManager.cs b/DungeonShooting_Godot/src/game/room/DungeonTileManager.cs index 9407cad..ba3b33f 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonTileManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonTileManager.cs @@ -13,7 +13,7 @@ } //铺房间 - if (roomInfo.Template == null) + if (roomInfo.RoomSplit == null) { FillRect(tileMap, floorLayer, config.Ground, roomInfo.Position + Vector2.One, roomInfo.Size - new Vector2(2, 2)); @@ -37,19 +37,22 @@ } else { - var usedRect = roomInfo.Template.GetUsedRect(); - var rectSize = usedRect.Size; - var rectPos = usedRect.Position; + var rectSize = roomInfo.RoomSplit.RoomInfo.Size; + var rectPos = roomInfo.RoomSplit.RoomInfo.Position; + var template = ResourceManager.Load(roomInfo.RoomSplit.ScenePath); + var tileInstance = template.Instantiate(); for (int i = 0; i < rectSize.X; i++) { for (int j = 0; j < rectSize.Y; j++) { - var atlasCoords = roomInfo.Template.GetCellAtlasCoords(0, new Vector2I(rectPos.X + i, rectPos.Y + j)); - tileMap.SetCell(floorLayer, new Vector2I(roomInfo.Position.X + i, roomInfo.Position.Y + j), 1, atlasCoords); + var atlasCoords = + tileInstance.GetCellAtlasCoords(0, new Vector2I((int)(rectPos.X + i), (int)(rectPos.Y + j))); + tileMap.SetCell(floorLayer, new Vector2I(roomInfo.Position.X + i, roomInfo.Position.Y + j), 1, + atlasCoords); } } - roomInfo.Template.QueueFree(); - roomInfo.Template = null; + + tileInstance.QueueFree(); } //铺过道 @@ -322,9 +325,7 @@ { for (int j = 0; j < size.Y; j++) { - //tileMap.SetCell((int)pos.X + i, (int)pos.Y + j, info.Id, false, false, false, info.AutotileCoord); tileMap.SetCell(layer, new Vector2I((int)pos.X + i, (int)pos.Y + j), 1, info.AutotileCoord); - //tileMap.SetCell(layer, new Vector2I(0, 0), 1, new Vector2I(0, 8), 0); } } }