diff --git a/DungeonShooting_Godot/scene/Room.tscn b/DungeonShooting_Godot/scene/Room.tscn index 90246e1..d8fb321 100644 --- a/DungeonShooting_Godot/scene/Room.tscn +++ b/DungeonShooting_Godot/scene/Room.tscn @@ -567,7 +567,7 @@ script = ExtResource("1_3w1c7") NormalLayer = NodePath("NormalLayer") YSortLayer = NodePath("YSortLayer") -TileRoot = NodePath("YSortLayer/TileRoot") +TileRoot = NodePath("TileRoot") metadata/_edit_vertical_guides_ = [] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] @@ -580,13 +580,7 @@ editor_draw_drag_margin = true script = ExtResource("5") -[node name="NormalLayer" type="Node2D" parent="."] -z_index = -1 - -[node name="YSortLayer" type="Node2D" parent="."] -y_sort_enabled = true - -[node name="TileRoot" type="TileMap" parent="YSortLayer"] +[node name="TileRoot" type="TileMap" parent="."] y_sort_enabled = true tile_set = SubResource("TileSet_bspf4") format = 2 @@ -606,3 +600,9 @@ layer_2/y_sort_origin = 0 layer_2/z_index = 10 layer_2/tile_data = PackedInt32Array() + +[node name="NormalLayer" type="Node2D" parent="."] +z_index = -1 + +[node name="YSortLayer" type="Node2D" parent="."] +y_sort_enabled = true diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs index 4f20281..96c18bc 100644 --- a/DungeonShooting_Godot/src/game/room/RoomManager.cs +++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs @@ -109,14 +109,14 @@ // enemy1.PutDown(new Vector2(100, 100), RoomLayerEnum.YSortLayer); // enemy1.PickUpWeapon(WeaponManager.GetGun("1001")); - // for (int i = 0; i < 10; i++) - // { - // var enemyTemp = new Enemy(); - // enemyTemp.PutDown(new Vector2(30 + (i + 1) * 20, 30), RoomLayerEnum.YSortLayer); - // // enemyTemp.PickUpWeapon(WeaponManager.GetGun("1003")); - // // enemyTemp.PickUpWeapon(WeaponManager.GetGun("1001")); - // } - // + for (int i = 0; i < 10; i++) + { + var enemyTemp = new Enemy(); + enemyTemp.PutDown(new Vector2(30 + (i + 1) * 20, 30), RoomLayerEnum.YSortLayer); + // enemyTemp.PickUpWeapon(WeaponManager.GetGun("1003")); + // enemyTemp.PickUpWeapon(WeaponManager.GetGun("1001")); + } + // var enemy2 = new Enemy(); // enemy2.Name = "Enemy2"; // enemy2.PutDown(new Vector2(120, 100));