diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json index 6500bfc..79c87cc 100644 --- a/DungeonShooting_Godot/resource/map/RoomConfig.json +++ b/DungeonShooting_Godot/resource/map/RoomConfig.json @@ -3,6 +3,10 @@ "GroupName": "testGroup", "BattleList": [ { + "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room1.tscn", + "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room1.json" + }, + { "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room8.tscn", "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room8.json" } diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn new file mode 100644 index 0000000..5e87d4a --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn @@ -0,0 +1,189 @@ +[gd_scene load_steps=5 format=3 uid="uid://bltvbn3urhy1q"] + +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_qn8qv"] +[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_68nmn"] +[ext_resource type="Script" path="res://src/framework/map/mark/ActivityMark.cs" id="4_vkqhy"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"] + +[node name="Room1" type="TileMap"] +tile_set = ExtResource("1_qn8qv") +format = 2 +layer_0/tile_data = PackedInt32Array(65543, 0, 8, 7, 0, 8, -65529, 0, 8, -131065, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, -131066, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, -131067, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 327679, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, 327677, 0, 8, 262141, 0, 8, 196605, 0, 8, 131069, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, -4, 0, 8, -65540, 0, 8, -131076, 0, 8, -131075, 0, 8, -131074, 0, 8, 65532, 0, 8, 131068, 0, 8, 196604, 0, 8, 262140, 0, 8, 327676, 0, 8, 393214, 0, 8, 393213, 0, 8, 393212, 0, 8, 393215, 0, 8, 327680, 0, 8, 327681, 0, 8, 327682, 0, 8, 327683, 0, 8, 327684, 0, 8, -196603, 0, 8, -196602, 0, 8, -196601, 0, 8, -131064, 0, 8, -65528, 0, 8, -196600, 0, 8, 8, 0, 8, 65544, 0, 8, 458769, 0, 8, 393233, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 131089, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, -131056, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, -131057, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 14, 0, 8, -65522, 0, 8, -131058, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 11, 0, 8, -65525, 0, 8, -131061, 0, 8, -196597, 0, 8, -262133, 0, 8, -327669, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 10, 0, 8, -65526, 0, 8, -131062, 0, 8, -196598, 0, 8, -262134, 0, 8, -327670, 0, 8, 458761, 0, 8, 393225, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, -262135, 0, 8, -327671, 0, 8, 458760, 0, 8, 393224, 0, 8, -262136, 0, 8, -327672, 0, 8, 458759, 0, 8, 393223, 0, 8, -262137, 0, 8, -327673, 0, 8, 458758, 0, 8, 393222, 0, 8, -262138, 0, 8, -327674, 0, 8, 458757, 0, 8, 393221, 0, 8, -262139, 0, 8, -327675, 0, 8, 458756, 0, 8, 393220, 0, 8, -262140, 0, 8, -327676, 0, 8, 458755, 0, 8, 393219, 0, 8, -262141, 0, 8, -327677, 0, 8, 458754, 0, 8, 393218, 0, 8, -262142, 0, 8, -327678, 0, 8, 458753, 0, 8, 393217, 0, 8, -262143, 0, 8, -327679, 0, 8, 458752, 0, 8, 393216, 0, 8, -262144, 0, 8, -327680, 0, 8, 524287, 0, 8, 458751, 0, 8, -196609, 0, 8, -262145, 0, 8, 524286, 0, 8, 458750, 0, 8, -196610, 0, 8, -262146, 0, 8, 524285, 0, 8, 458749, 0, 8, -196611, 0, 8, -262147, 0, 8, 524284, 0, 8, 458748, 0, 8, -196612, 0, 8, -262148, 0, 8, -196613, 196608, 3, -262149, 196608, 3, -327685, 196608, 4, -327684, 131072, 7, -327683, 131072, 7, -131077, 196608, 3, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458747, 196608, 3, 524283, 196608, 3, 589821, 131072, 2, 589820, 131072, 2, 589819, 720896, 2, -327682, 131072, 7, 589822, 131072, 2, -327681, 131072, 7, 589823, 131072, 2, -393216, 131072, 7, 524288, 131072, 2, -393215, 131072, 7, 524289, 131072, 2, -393214, 131072, 7, 524290, 131072, 2, -393213, 131072, 7, 524291, 131072, 2, -393212, 131072, 7, 524292, 131072, 2, -393211, 131072, 7, 524293, 131072, 2, -393210, 131072, 7, 524294, 131072, 2, -393209, 131072, 7, 524295, 131072, 2, -393208, 131072, 7, 524296, 131072, 2, -393207, 131072, 7, 524297, 131072, 2, -393206, 131072, 7, 524298, 131072, 2, -393205, 131072, 7, 524299, 131072, 2, -393204, 131072, 7, 524300, 131072, 2, -393203, 131072, 7, 524301, 131072, 2, -393202, 131072, 7, 524302, 131072, 2, -393201, 131072, 7, 524303, 131072, 2, -393200, 131072, 7, 524304, 131072, 2, -393199, 131072, 7, 524305, 131072, 2, -327662, 65536, 3, -262126, 65536, 3, -393198, 65536, 4, -196590, 65536, 3, -131054, 65536, 3, -65518, 65536, 3, 18, 65536, 3, 65554, 65536, 3, 131090, 65536, 3, 196626, 65536, 3, 262162, 65536, 3, 327698, 65536, 3, 393234, 65536, 3, 458770, 65536, 3, 524306, 851968, 2, -196604, 0, 8, -196605, 0, 8, -196606, 0, 8, -196607, 0, 8, -196608, 0, 8, -131073, 0, 8, -65537, 65536, 2, -131072, 131072, 2, -131071, 131072, 2, -131070, 196608, 2, -131069, 0, 8, -131068, 0, 8, -1, 65536, 3, 65535, 65536, 7, 0, 196608, 7, 1, 0, 8, 2, 0, 8, 3, 0, 8, 4, 0, 8, -65536, 196608, 4, -65535, 131072, 7, -65534, 196608, 7, -65533, 0, 8, -65532, 0, 8, 262154, 0, 8, 262155, 65536, 7, 262156, 131072, 7, 262157, 131072, 7, 262158, 196608, 7, 65550, 0, 8, 131086, 196608, 2, 196622, 196608, 3, 65549, 0, 8, 65548, 0, 8, 65547, 0, 8, 65546, 0, 8, 65545, 0, 8, 131082, 0, 8, 131083, 0, 8, 131084, 0, 8, 131085, 65536, 2, 196618, 0, 8, 196619, 65536, 2, 196620, 131072, 2, 196621, 851968, 2, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 131081, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 131080, 0, 8, 327687, 0, 8, 262151, 0, 8, 196615, 0, 8, 131079, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8) +script = ExtResource("dungeonRoomTemplate") + +[node name="EnemyMark" type="Node2D" parent="."] +position = Vector2(1, 75) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(90, 90) +Altitude = 0 + +[node name="EnemyMark2" type="Node2D" parent="."] +position = Vector2(226, -22) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 0.5 +BirthRect = Vector2i(90, 90) +Altitude = 0 + +[node name="ActivityMark" type="Node2D" parent="."] +position = Vector2(115, 24) +script = ExtResource("4_vkqhy") +Type = 5 +ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:10)" +DelayTime = 2.0 +BirthRect = Vector2i(50, 50) + +[node name="ActivityMark3" type="Node2D" parent="."] +position = Vector2(116, -39) +script = ExtResource("4_vkqhy") +Type = 5 +ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:10)" +WaveNumber = 2 +BirthRect = Vector2i(50, 50) + +[node name="EnemyMark3" type="Node2D" parent="."] +position = Vector2(117, 74) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(90, 90) +Altitude = 0 + +[node name="EnemyMark4" type="Node2D" parent="."] +position = Vector2(117, -23) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 2.0 +BirthRect = Vector2i(90, 90) +Altitude = 0 + +[node name="ActivityMark4" type="Node2D" parent="."] +position = Vector2(117, 70) +script = ExtResource("4_vkqhy") +Type = 5 +ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:10)" +WaveNumber = 3 +BirthRect = Vector2i(50, 50) + +[node name="ActivityMark5" type="Node2D" parent="."] +position = Vector2(221, -27) +script = ExtResource("4_vkqhy") +Type = 5 +ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:10)" +WaveNumber = 3 +BirthRect = Vector2i(50, 50) + +[node name="EnemyMark5" type="Node2D" parent="."] +position = Vector2(16, -53) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark6" type="Node2D" parent="."] +position = Vector2(208, 107) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.5 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark7" type="Node2D" parent="."] +position = Vector2(3, 75) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 2.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark8" type="Node2D" parent="."] +position = Vector2(118, 16) +script = ExtResource("3_68nmn") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:10)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 2.5 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark9" type="Node2D" parent="."] +position = Vector2(167, -33) +script = ExtResource("3_68nmn") +Weapon1Id = "0003(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark10" type="Node2D" parent="."] +position = Vector2(52, 58) +script = ExtResource("3_68nmn") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.5 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark11" type="Node2D" parent="."] +position = Vector2(96, 8) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 2.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark12" type="Node2D" parent="."] +position = Vector2(163, 8) +script = ExtResource("3_68nmn") +Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 2.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark13" type="Node2D" parent="."] +position = Vector2(82, 94) +script = ExtResource("3_68nmn") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 2.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn index 0e0932d..5c2022c 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn @@ -33,7 +33,7 @@ position = Vector2(128, 74) script = ExtResource("3_pf56w") Type = 5 -ItemExpression = "0003(ResidueAmmo:15,CurrAmmon:0)" +ItemExpression = "0003(ResidueAmmo:12,CurrAmmon:15)" WaveNumber = 3 [node name="ActivityMark4" type="Node2D" parent="."] diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json new file mode 100644 index 0000000..1b6dd17 --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room1.json @@ -0,0 +1,96 @@ +{ + "Position": { + "X": -5, + "Y": -6 + }, + "Size": { + "X": 24, + "Y": 15 + }, + "DoorAreaInfos": [], + "NavigationList": [ + { + "Type": 0, + "Points": [ + { + "X": -56, + "Y": -72 + }, + { + "X": 280, + "Y": -72 + }, + { + "X": 280, + "Y": 128 + }, + { + "X": -56, + "Y": 128 + } + ] + }, + { + "Type": 1, + "Points": [ + { + "X": -24, + "Y": -32 + }, + { + "X": 56, + "Y": -32 + }, + { + "X": 56, + "Y": 8 + }, + { + "X": 24, + "Y": 8 + }, + { + "X": 24, + "Y": 24 + }, + { + "X": -24, + "Y": 24 + } + ] + }, + { + "Type": 1, + "Points": [ + { + "X": 200, + "Y": 32 + }, + { + "X": 248, + "Y": 32 + }, + { + "X": 248, + "Y": 88 + }, + { + "X": 168, + "Y": 88 + }, + { + "X": 168, + "Y": 48 + }, + { + "X": 200, + "Y": 48 + } + ] + } + ], + "GroupName": "testGroup", + "RoomType": 0, + "FileName": "Room1", + "Weight": 100 +} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs index 7d68aaf..475657a 100644 --- a/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs +++ b/DungeonShooting_Godot/src/framework/map/mark/EnemyMark.cs @@ -46,6 +46,7 @@ { Type = ActivityIdPrefix.ActivityPrefixType.Enemy; Layer = RoomLayerEnum.YSortLayer; + Altitude = 0; } public override void Doing(ActivityObjectResult result, RoomInfo roomInfo)