diff --git a/FDK/src/01.Framework/Core/Game.cs b/FDK/src/01.Framework/Core/Game.cs index 6fdbe985..49b9f8a2 100644 --- a/FDK/src/01.Framework/Core/Game.cs +++ b/FDK/src/01.Framework/Core/Game.cs @@ -176,7 +176,10 @@ namespace SampleFramework { using SKBitmap sKBitmap = new(ViewportWidth, ViewportHeight - 1); sKBitmap.SetPixels((IntPtr)pixels2); - action(sKBitmap); + + using SKBitmap scaledBitmap = new(GameWindowSize.Width, GameWindowSize.Height); + if (sKBitmap.ScalePixels(scaledBitmap, SKFilterQuality.High)) action(scaledBitmap); + else action(sKBitmap); } }); } diff --git a/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load.png b/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load.png index f4b58ffd..3f9ace07 100644 Binary files a/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load.png and b/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load.png differ diff --git a/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load_Clear.png b/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load_Clear.png index 56835401..a981116e 100644 Binary files a/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load_Clear.png and b/OpenTaiko/System/Open-World Memories/Graphics/1_Title/Banapas_Load_Clear.png differ diff --git a/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Song_Panel/Song_Panel_Tower.png b/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Song_Panel/Song_Panel_Tower.png index 40202932..74e2a0df 100644 Binary files a/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Song_Panel/Song_Panel_Tower.png and b/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Song_Panel/Song_Panel_Tower.png differ diff --git a/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Tower_Side.png b/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Tower_Side.png index 148011c6..7587f190 100644 Binary files a/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Tower_Side.png and b/OpenTaiko/System/Open-World Memories/Graphics/3_SongSelect/Tower_Side.png differ diff --git a/OpenTaiko/System/Open-World Memories/SkinConfig.ini b/OpenTaiko/System/Open-World Memories/SkinConfig.ini index 39351d73..83c2e191 100644 --- a/OpenTaiko/System/Open-World Memories/SkinConfig.ini +++ b/OpenTaiko/System/Open-World Memories/SkinConfig.ini @@ -1,6 +1,6 @@ ;Skin information Name=Open-World Memories -Version=0.6.0 +Version=0.6.0.1 Creator=DashyDesu Resolution=1920,1080 FontNameEN=Fonts/MPLUSRounded1c-Medium.ttf diff --git a/OpenTaiko/System/Open-World Memories/SongSelectConfig.ini b/OpenTaiko/System/Open-World Memories/SongSelectConfig.ini index 143c4058..3427cccc 100644 --- a/OpenTaiko/System/Open-World Memories/SongSelectConfig.ini +++ b/OpenTaiko/System/Open-World Memories/SongSelectConfig.ini @@ -24,7 +24,7 @@ SongSelect_Frame_Score_Y=530,587,645,703 SongSelect_Level_Number_X=1353,1353,1353,1353 SongSelect_Level_Number_Y=540,597,655,713 SongSelect_Level_Number_Tower=1337,697 -SongSelect_Tower_Side=1324,622 +SongSelect_Tower_Side=1303,587 SongSelect_Level_Number_Interval=13,0 SongSelect_Preimage=1413,292 @@ -101,8 +101,8 @@ SongSelect_Branch_Offset=6,6 ; == DONE SongSelect_FloorNum_Show=1 -SongSelect_FloorNum_X=1800 -SongSelect_FloorNum_Y=307 +SongSelect_FloorNum_X=1338 +SongSelect_FloorNum_Y=684 SongSelect_FloorNum_Interval=45,0 SongSelect_DanInfo_Show=1 SongSelect_DanInfo_Icon_X=1501,1501,1501 diff --git a/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect.ogg b/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect.ogg new file mode 100644 index 00000000..ca719aaf Binary files /dev/null and b/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect.ogg differ diff --git a/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect_Start.ogg b/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect_Start.ogg new file mode 100644 index 00000000..6bd3f3fe Binary files /dev/null and b/OpenTaiko/System/Open-World Memories/Sounds/BGM/SongSelect_Start.ogg differ diff --git a/OpenTaiko/src/Common/CSkin.cs b/OpenTaiko/src/Common/CSkin.cs index aed5e637..5aabf3ee 100644 --- a/OpenTaiko/src/Common/CSkin.cs +++ b/OpenTaiko/src/Common/CSkin.cs @@ -2455,15 +2455,25 @@ namespace OpenTaiko { } case "SongSelect_Difficulty_Number_X": { string[] strSplit = strParam.Split(','); - for (int i = 0; i < 5; i++) { + int max = Math.Min(strSplit.Length, 7); + for (int i = 0; i < max; i++) { SongSelect_Difficulty_Number_X[i] = int.Parse(strSplit[i]); + if (i == 4) { + SongSelect_Difficulty_Number_X[5] = SongSelect_Difficulty_Number_X[i]; + SongSelect_Difficulty_Number_X[6] = SongSelect_Difficulty_Number_X[i]; + } } break; } case "SongSelect_Difficulty_Number_Y": { string[] strSplit = strParam.Split(','); - for (int i = 0; i < 5; i++) { + int max = Math.Min(strSplit.Length, 7); + for (int i = 0; i < max; i++) { SongSelect_Difficulty_Number_Y[i] = int.Parse(strSplit[i]); + if (i == 4) { + SongSelect_Difficulty_Number_Y[5] = SongSelect_Difficulty_Number_Y[i]; + SongSelect_Difficulty_Number_Y[6] = SongSelect_Difficulty_Number_Y[i]; + } } break; } @@ -8098,8 +8108,8 @@ namespace OpenTaiko { public int[] SongSelect_Difficulty_Star_Y = new int[] { 459, 459, 459, 459, 459 }; public int[] SongSelect_Difficulty_Star_Interval = new int[] { 10, 0 }; - public int[] SongSelect_Difficulty_Number_X = new int[] { 498, 641, 784, 927, 927 }; - public int[] SongSelect_Difficulty_Number_Y = new int[] { 435, 435, 435, 435, 435 }; + public int[] SongSelect_Difficulty_Number_X = new int[] { 498, 641, 784, 927, 927, 927, 927 }; + public int[] SongSelect_Difficulty_Number_Y = new int[] { 435, 435, 435, 435, 435, 435, 435 }; public int[] SongSelect_Difficulty_Number_Interval = new int[] { 11, 0 }; public int[][] SongSelect_Difficulty_Crown_X = new int[][] { diff --git a/OpenTaiko/src/Common/OpenTaiko.cs b/OpenTaiko/src/Common/OpenTaiko.cs index 6c8097f6..7a437865 100755 --- a/OpenTaiko/src/Common/OpenTaiko.cs +++ b/OpenTaiko/src/Common/OpenTaiko.cs @@ -2879,7 +2879,7 @@ for (int i = 0; i < 3; i++) { GameWindowSize.Width = nWidth; GameWindowSize.Height = nHeight; - WindowSize = new Silk.NET.Maths.Vector2D(nWidth, nHeight); + //WindowSize = new Silk.NET.Maths.Vector2D(nWidth, nHeight); } public void RefreshSkin() { diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs index d8aaef1f..31ef4d46 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelectTowerInfo.cs @@ -40,7 +40,8 @@ namespace OpenTaiko { } public override int Draw() { - tFloorNumberDraw(OpenTaiko.Skin.SongSelect_FloorNum_X, OpenTaiko.Skin.SongSelect_FloorNum_Y, OpenTaiko.stageSongSelect.rNowSelectedSong.nTotalFloor); + if (OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[5] != null) + tFloorNumberDraw(OpenTaiko.Skin.SongSelect_FloorNum_X, OpenTaiko.Skin.SongSelect_FloorNum_Y, OpenTaiko.stageSongSelect.rNowSelectedSong.arスコア[5].譜面情報.nTotalFloor); return 0; } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs index 65400cd3..886ac0ef 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs @@ -48,7 +48,7 @@ namespace OpenTaiko { if (this.rVD == null || this.tx描画用 == null || !OpenTaiko.ConfigIni.eClipDispType.HasFlag(EClipDispType.ウィンドウのみ)) return; - float[] fRatio = new float[] { 640.0f - 4.0f, 360.0f - 4.0f }; //中央下表示 + float[] fRatio = new float[] { (SampleFramework.GameWindowSize.Width / 2) - 4.0f, (SampleFramework.GameWindowSize.Height / 2) - 4.0f }; //中央下表示 float ratio = Math.Min((float)(fRatio[0] / this.rVD.FrameSize.Width), (float)(fRatio[1] / this.rVD.FrameSize.Height)); this.tx描画用.vcScaleRatio.X = ratio;