diff --git a/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Bar.png b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Bar.png new file mode 100644 index 00000000..89294e4f Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Bar.png differ diff --git a/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box.png b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box.png new file mode 100644 index 00000000..0d2aa1ed Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box.png differ diff --git a/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box_Slot.png b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box_Slot.png new file mode 100644 index 00000000..d0394089 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/10_Heya/Center_Menu_Box_Slot.png differ diff --git a/DefaultSkinTmpFolder/Graphics/10_Heya/Side_Menu.png b/DefaultSkinTmpFolder/Graphics/10_Heya/Side_Menu.png new file mode 100644 index 00000000..e9b92942 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/10_Heya/Side_Menu.png differ diff --git a/DefaultSkinTmpFolder/Graphics/11_Characters/0/empty b/DefaultSkinTmpFolder/Graphics/11_Characters/0/empty new file mode 100644 index 00000000..e69de29b diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Arrow.png b/DefaultSkinTmpFolder/Graphics/2_Config/Arrow.png new file mode 100644 index 00000000..fa98d3e4 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Arrow.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Background.png b/DefaultSkinTmpFolder/Graphics/2_Config/Background.png new file mode 100644 index 00000000..986ff8b7 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Background.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Cursor.png b/DefaultSkinTmpFolder/Graphics/2_Config/Cursor.png new file mode 100644 index 00000000..56c8713d Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Cursor.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Enum_Song.png b/DefaultSkinTmpFolder/Graphics/2_Config/Enum_Song.png new file mode 100644 index 00000000..cdb77abe Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Enum_Song.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Font.png b/DefaultSkinTmpFolder/Graphics/2_Config/Font.png new file mode 100644 index 00000000..50163fef Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Font.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Font_Bold.png b/DefaultSkinTmpFolder/Graphics/2_Config/Font_Bold.png new file mode 100644 index 00000000..4fcb248c Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Font_Bold.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/Header.png b/DefaultSkinTmpFolder/Graphics/2_Config/Header.png new file mode 100644 index 00000000..9a8dcbf6 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/Header.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/ItemBox.png b/DefaultSkinTmpFolder/Graphics/2_Config/ItemBox.png new file mode 100644 index 00000000..5530689f Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/ItemBox.png differ diff --git a/DefaultSkinTmpFolder/Graphics/2_Config/KeyAssign.png b/DefaultSkinTmpFolder/Graphics/2_Config/KeyAssign.png new file mode 100644 index 00000000..a746f3ee Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/2_Config/KeyAssign.png differ diff --git a/DefaultSkinTmpFolder/Graphics/3_SongSelect/Background.png b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Background.png new file mode 100644 index 00000000..f6184783 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Background.png differ diff --git a/DefaultSkinTmpFolder/Graphics/3_SongSelect/Coin_Slot.png b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Coin_Slot.png new file mode 100644 index 00000000..a25efa54 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Coin_Slot.png differ diff --git a/DefaultSkinTmpFolder/Graphics/3_SongSelect/Header.png b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Header.png new file mode 100644 index 00000000..1d90ac84 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Header.png differ diff --git a/DefaultSkinTmpFolder/Graphics/3_SongSelect/High_Score.png b/DefaultSkinTmpFolder/Graphics/3_SongSelect/High_Score.png new file mode 100644 index 00000000..7fe04882 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/3_SongSelect/High_Score.png differ diff --git a/DefaultSkinTmpFolder/Graphics/3_SongSelect/Song_Number.png b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Song_Number.png new file mode 100644 index 00000000..1a0e409d Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/3_SongSelect/Song_Number.png differ diff --git a/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg.png b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg.png new file mode 100644 index 00000000..ec02e08c Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg.png differ diff --git a/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Dan.png b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Dan.png new file mode 100644 index 00000000..6cd97aca Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Dan.png differ diff --git a/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Wait.png b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Wait.png new file mode 100644 index 00000000..b4cec5de Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Bg_Wait.png differ diff --git a/DefaultSkinTmpFolder/Graphics/4_SongLoading/Fade.png b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Fade.png new file mode 100644 index 00000000..ec02e08c Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Fade.png differ diff --git a/DefaultSkinTmpFolder/Graphics/4_SongLoading/Plate.png b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Plate.png new file mode 100644 index 00000000..74278786 Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/4_SongLoading/Plate.png differ diff --git a/DefaultSkinTmpFolder/Graphics/5_Game/6_Taiko/Base.png b/DefaultSkinTmpFolder/Graphics/5_Game/6_Taiko/Base.png index 633f8157..8f7b37b4 100644 Binary files a/DefaultSkinTmpFolder/Graphics/5_Game/6_Taiko/Base.png and b/DefaultSkinTmpFolder/Graphics/5_Game/6_Taiko/Base.png differ diff --git a/DefaultSkinTmpFolder/Graphics/7_Exit/Background.png b/DefaultSkinTmpFolder/Graphics/7_Exit/Background.png new file mode 100644 index 00000000..5ab49dca Binary files /dev/null and b/DefaultSkinTmpFolder/Graphics/7_Exit/Background.png differ diff --git a/DefaultSkinTmpFolder/Progress.txt b/DefaultSkinTmpFolder/Progress.txt index 10735144..364ae2dc 100644 --- a/DefaultSkinTmpFolder/Progress.txt +++ b/DefaultSkinTmpFolder/Progress.txt @@ -2,6 +2,9 @@ Folders done : Graphics : +2_Config +4_SongLoading + 5_Game : - 1_Chara (Empty) - 2_Dancer (Empty) @@ -14,8 +17,11 @@ Graphics : - 14_GameMode - 18_PuchiChara (Blank) +7_Exit 8_TowerResult 9_NamePlateEffect +10_Heya +11_Characters (Blank) Sounds : diff --git a/DefaultSkinTmpFolder/README.txt b/DefaultSkinTmpFolder/README.txt index 951d3a01..ea0821fa 100644 --- a/DefaultSkinTmpFolder/README.txt +++ b/DefaultSkinTmpFolder/README.txt @@ -25,6 +25,6 @@ In-Game textures : - TJAPlayer3 Default skin - starline / vector_corp / Freepik (Patterns) -- cien (@CienpixeL) (Nameplates, Rainbox result screen gauge) -- Waldo - https://pressstart.vip/assets (Tower result screen background) +- cien (@CienpixeL) (Nameplates, Rainbox result screen gauge, Drum textures) +- Waldo - https://pressstart.vip/assets (Tower result screen background and skyboxes) - PNG Egg (Fireworks) (Non-commercial) \ No newline at end of file diff --git a/DefaultSkinTmpFolder/Sounds/SongDecide.ogg b/DefaultSkinTmpFolder/Sounds/SongDecide.ogg new file mode 100644 index 00000000..0ca9951b Binary files /dev/null and b/DefaultSkinTmpFolder/Sounds/SongDecide.ogg differ diff --git a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs index 27e16b65..fcf9f8f1 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs @@ -420,10 +420,6 @@ namespace TJAPlayer3 TJAPlayer3.Tx.SongSelect_Header?.t2D描画(TJAPlayer3.app.Device, 0, 0); - TJAPlayer3.Tx.SongSelect_Coin_Slot?.t2D描画(TJAPlayer3.app.Device, 0, 0, - new Rectangle(0, 0, 640 + ((TJAPlayer3.ConfigIni.nPlayerCount > 1) ? 640 : 0), 720)); - - tTimerDraw((100 - ctTimer.n現在の値).ToString()); tSongNumberDraw(1097, 167, NowSong.ToString()); @@ -912,13 +908,22 @@ namespace TJAPlayer3 : SPArrRef[currentPads[i]].CrownCount[j - 7].ToString()); } + } + + TJAPlayer3.Tx.SongSelect_Coin_Slot?.t2D描画(TJAPlayer3.app.Device, 0, 0, + new Rectangle(0, 0, 640 + ((TJAPlayer3.ConfigIni.nPlayerCount > 1) ? 640 : 0), 720)); + + for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++) + { + int p = TJAPlayer3.GetActualPlayer(i); + if (TJAPlayer3.NamePlateConfig.data.Medals[p] >= 0) tBoardNumberDraw(this.ptBoardNumber[10].X - 10 + i * 1140, this.ptBoardNumber[10].Y, TJAPlayer3.NamePlateConfig.data.Medals[p].ToString()); #region [HiScore plate] - + var song = this.r現在選択中の曲; - + if (song != null && song.eノード種別 == C曲リストノード.Eノード種別.SCORE) { var closest = this.act曲リスト.n現在のアンカ難易度レベルに最も近い難易度レベルを返す(song); @@ -929,7 +934,7 @@ namespace TJAPlayer3 int posx = (i == 1) ? 1280 - this.ptBoardNumber[11].X : this.ptBoardNumber[11].X; int displayedScore = 0; int table = 0; - + TJAPlayer3.Tx.SongSelect_High_Score.t2D中心基準描画(TJAPlayer3.app.Device, posx, this.ptBoardNumber[11].Y); if (this.n現在選択中の曲の難易度 > (int)Difficulty.Edit) @@ -942,8 +947,8 @@ namespace TJAPlayer3 displayedScore = score.GPInfo[p].nHighScore[table]; if (this.n現在選択中の曲の難易度 <= (int)Difficulty.Edit) - TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.app.Device, - posx - 78, + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.app.Device, + posx - 78, this.ptBoardNumber[11].Y + 2, new Rectangle(table * 53, 0, 53, 53)); @@ -953,7 +958,7 @@ namespace TJAPlayer3 } #endregion - } + } #endregion