diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle1/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle1/Preinstall.json index 7878b7d..d5ca4fa 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle1/Preinstall.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/battle/Battle1/Preinstall.json @@ -1 +1 @@ -[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[{"Position":{"X":31,"Y":-17},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"enemy0001","Weight":100,"Attr":{"Face":"0","Weapon":"weapon0013","CurrAmmon":"50","ResidueAmmo":"50"},"Altitude":0,"VerticalSpeed":0}]}]]}] \ No newline at end of file +[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":false,"WaveList":[[]]}] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/map/PreviewTransition3.png b/DungeonShooting_Godot/resource/sprite/map/PreviewTransition3.png index 1980ba0..8c11d7d 100644 --- a/DungeonShooting_Godot/resource/sprite/map/PreviewTransition3.png +++ b/DungeonShooting_Godot/resource/sprite/map/PreviewTransition3.png Binary files differ diff --git a/DungeonShooting_Godot/src/framework/map/fog/PreviewFogMask.cs b/DungeonShooting_Godot/src/framework/map/fog/PreviewFogMask.cs index 2c154a3..ddd1f49 100644 --- a/DungeonShooting_Godot/src/framework/map/fog/PreviewFogMask.cs +++ b/DungeonShooting_Godot/src/framework/map/fog/PreviewFogMask.cs @@ -97,13 +97,13 @@ if (fogType == PreviewFogType.Aisle) { Texture = _previewAisle; - Position = globalPosition + new Vector2(0, -GameConfig.TileCellSize * 2); + Position = globalPosition + new Vector2(0, -GameConfig.TileCellSize * 3); RotationDegrees = 0; } else { Texture = _previewRoom_n; - Position = globalPosition + new Vector2(0, GameConfig.TileCellSize * 0.5f); + Position = globalPosition; RotationDegrees = 180; } } diff --git a/DungeonShooting_Godot/src/game/GameApplication.cs b/DungeonShooting_Godot/src/game/GameApplication.cs index 343f1d7..6c143b5 100644 --- a/DungeonShooting_Godot/src/game/GameApplication.cs +++ b/DungeonShooting_Godot/src/game/GameApplication.cs @@ -108,15 +108,15 @@ DungeonConfig = new DungeonConfig(); DungeonConfig.GroupName = "Test1"; DungeonConfig.BattleRoomCount = 15; - DungeonConfig.BossRoomCount = 0; - DungeonConfig.RewardRoomCount = 0; - DungeonConfig.ShopRoomCount = 0; - DungeonConfig.OutRoomCount = 0; - DungeonConfig.RoomHorizontalMinDispersion = -1; - DungeonConfig.RoomHorizontalMaxDispersion = 1; - DungeonConfig.RoomVerticalMinDispersion = -1; - DungeonConfig.RoomVerticalMaxDispersion = 1; - DungeonConfig.EnableLimitRange = false; + // DungeonConfig.BossRoomCount = 0; + // DungeonConfig.RewardRoomCount = 0; + // DungeonConfig.ShopRoomCount = 0; + // DungeonConfig.OutRoomCount = 0; + // DungeonConfig.RoomHorizontalMinDispersion = -1; + // DungeonConfig.RoomHorizontalMaxDispersion = 1; + // DungeonConfig.RoomVerticalMinDispersion = -1; + // DungeonConfig.RoomVerticalMaxDispersion = 1; + // DungeonConfig.EnableLimitRange = false; } public override void _EnterTree() diff --git a/DungeonShooting_Godot/src/game/room/DungeonManager.cs b/DungeonShooting_Godot/src/game/room/DungeonManager.cs index db3d849..3985274 100644 --- a/DungeonShooting_Godot/src/game/room/DungeonManager.cs +++ b/DungeonShooting_Godot/src/game/room/DungeonManager.cs @@ -421,7 +421,8 @@ { var roomFog = new FogMask(); roomFog.Name = "FogMask" + roomFog.IsDestroyed; - roomFog.InitFog(roomInfo.Position + new Vector2I(1, 1), roomInfo.Size - new Vector2I(2, 2)); + roomFog.InitFog(roomInfo.Position + new Vector2I(1, 0), roomInfo.Size - new Vector2I(2, 1)); + //roomFog.InitFog(roomInfo.Position + new Vector2I(1, 1), roomInfo.Size - new Vector2I(2, 2)); World.FogMaskRoot.AddChild(roomFog); roomInfo.RoomFogMask = roomFog; @@ -446,7 +447,7 @@ else { calcRect.Position += new Vector2I(0, 2); - calcRect.Size -= new Vector2I(0, 4); + calcRect.Size -= new Vector2I(0, 5); } } else @@ -460,7 +461,7 @@ if (roomDoorInfo.ConnectDoor.Direction == DoorDirection.N) //→↑ { calcRect.Position += new Vector2I(2, 0); - calcRect.Size -= new Vector2I(2, 3); + calcRect.Size -= new Vector2I(2, 4); } else //→↓ { @@ -472,7 +473,7 @@ { if (roomDoorInfo.ConnectDoor.Direction == DoorDirection.N) //←↑ { - calcRect.Size -= new Vector2I(2, 3); + calcRect.Size -= new Vector2I(2, 4); } else //←↓ { @@ -485,12 +486,12 @@ if (roomDoorInfo.ConnectDoor.Direction == DoorDirection.E) //↑→ { calcRect.Position += new Vector2I(2, -1); - calcRect.Size -= new Vector2I(2, 1); + calcRect.Size -= new Vector2I(2, 2); } else //↑← { calcRect.Position += new Vector2I(0, -1); - calcRect.Size -= new Vector2I(2, 1); + calcRect.Size -= new Vector2I(2, 2); } } else if (roomDoorInfo.Direction == DoorDirection.S)