Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-28 01:10:53 +01:00
Code Releases Activity

Rework menus, remove (temporarly) menu placeholders and add Open Encyclopedia and Online Lounge menus on the main menu (not yet implemented but will come with the next release)

Browse Source
This commit is contained in:
0aubsq 2022-04-10 06:55:26 +02:00
parent 28f713bf17
commit bec3455678
15 changed files with 409 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
TJAPlayer3/Common/CVersionList.cs Normal file
View File

@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TJAPlayer3
{
class CVersionList
{
public static string[] VersionList = {
"0.1.0",
"0.2.0",
"0.3.0",
"0.3.1",
"0.3.2",
"0.3.3",
"0.3.4",
"0.3.4.1",
"0.3.4.2",
"0.4.0",
"0.4.1",
"0.4.2",
"0.4.3",
"0.5.0",
"0.5.1",
"0.5.2",
"0.5.2.1",
"Pre 0.5.3",
"0.5.3",
"0.5.3.1",
"0.5.3.2",
"0.5.4",
};
}
}

12
TJAPlayer3/I18N/CLang_en.cs
View File

@ -231,6 +231,12 @@ namespace TJAPlayer3
[105] = "My Room",
[106] = "Settings",
[107] = "Exit",
[108] = "Online Lounge",
[109] = "Open Encyclopedia",
[110] = "AI Battle Mode",
[111] = "Player Stats",
[112] = "Chart Editor",
[113] = "Open Toolbox",
[150] = "Play your favorite\nsongs at your own pace !",
[151] = "Play multiple charts in continuation\nfollowing challenging exams\nin order to get a PASS rank !",
@ -240,6 +246,12 @@ namespace TJAPlayer3
[155] = "Change your nameplate info\n or your character visuals !",
[156] = "Change your game style\n or general settings !",
[157] = "Quit the game.\nSee you next time !",
[158] = "Download new charts\nand content from\n the internet !",
[159] = "Learn about OpenTaiko\nrelated features and\nhow to install new content !",
[160] = "Fight a strong AI through\nmultiple sections and\naim for victory !",
[161] = "Watch and track your\nprogression !",
[162] = "Create your own .tja charts\nbased on your favorite songs !",
[163] = "Use various tools to insert\nnew custom content !",
[200] = "Return",
[201] = "Recently played songs",

14
TJAPlayer3/I18N/CLang_fr.cs
View File

@ -219,9 +219,15 @@ namespace TJAPlayer3
[102] = "Tours rhytmiques",
[103] = "Magasin",
[104] = "Aventure",
[105] = "Salon",
[105] = "Ma Pièce",
[106] = "Paramètres",
[107] = "Quitter le jeu",
[108] = "Salon 'l'En-Ligne'",
[109] = "Encyclopedie",
[110] = "Mode contre l'IA",
[111] = "Statistiques",
[112] = "Editeur de partition",
[113] = "Boîte à outils",
[150] = "Jouez vos sons favoris\nà votre propre rhythme !",
[151] = "Jouez plusieurs sons à la suite\nen suivant des règles exigentes\ndans le but de reussir le défi !",
@ -231,6 +237,12 @@ namespace TJAPlayer3
[155] = "Changez votre personnage\nou les informations de votre\nplaque nominative !",
[156] = "Changez votre style de jeu\n ou les paramètres généraux !",
[157] = "Quitter le jeu.\nÀ bientôt !",
[158] = "Telechargez de nouvelles\npartitions et du nouveau\ncontenu depuis internet !",
[159] = "Apprenez à propos des\nnouvelles fonctionalitées et\ncomment ajouter du contenu!",
[160] = "Combattez une IA puissante à\ntravers plusieurs sections et\ndécrochez la victoire !",
[161] = "Suivez votre progression en \ndirect !",
[162] = "Créez vos propres partitions\n.tja avec vos sons favoris !",
[163] = "Utilisez divers outils\nproposés afin de faciliter\nl'ajout de contenu !",
[200] = "Retour",
[201] = "Sons joués récemment",

17
TJAPlayer3/I18N/CLang_jp.cs
View File

@ -285,18 +285,29 @@ namespace TJAPlayer3
[105] = "太鼓部屋",
[106] = "設定",
[107] = "ゲーム終了",
[108] = "オンライン喫茶店",
[109] = "Open百科事典",
[110] = "AIバトル演奏",
[111] = "プレイヤースタッツ",
[112] = "譜面エディター",
[113] = "Open工具箱",
[150] = "すきな曲や、むずかしさを\nえらんであそべるよ！",
[150] = "すきな曲や、むずかしさを\nえらんであそべるよ！",
[151] = "３曲連続して演奏しながら、\nお題の合格を目指そう！\n合格すると腕前が認定されるよ！",
[152] = "有限のライフを持って、\nタワーの頂上を登って\n挑戦できるよ！",
[153] = "稼いだメダルを費やして、\n新しい曲やプチキャラを買えるよ！",
[154] = "様々な障害に挑んで、\n新しい場所を発見出来るよ！",
[155] = "キャラクタ、プチキャラ、\nネームプレートの情報を変えるよ！",
[156] = "ゲームスタイルや\n一般的な設定を設けられるよ！",
[157] = "セッションを終了できるよ。\nまた遊んでね！",
[158] = "インターネットで新しい譜面\nまたはコンテンツを\nダウンロードできるよ！",
[159] = "OpenTaikoの機能または新しい\nコンテンツを追加方法\nについて勉強できるよ！",
[160] = "「AIどん」と勝つか負けるか\nギリギリのバトルをたのしもう！",
[161] = "自分の進歩を認められるよ！",
[162] = "好きな曲を使って\n創作.tja譜面を作られるよ！",
[163] = "様々な役に立つツールを\n使って楽に新しい\nコンテンツを追加できるよ！",
[200] = "とじる",
[200] = "とじる",
[201] = "最近あそんだ曲",
[202] = "最近あそんだ曲を集めたよ！",
[203] = "おまかせ",

13
TJAPlayer3/Stages/01.StartUp/TextureLoader.cs
View File

@ -158,17 +158,20 @@ namespace TJAPlayer3
Entry_Player[1] = TxC(TITLE + @"Entry_Player_Select_Bar.png");
Entry_Player[2] = TxC(TITLE + @"Entry_Player_Select.png");
for(int i = 0; i < 8; i++)
ModeSelect_Bar = new CTexture[CMainMenuTab.__MenuCount + 1];
ModeSelect_Bar_Chara = new CTexture[CMainMenuTab.__MenuCount];
for (int i = 0; i < CMainMenuTab.__MenuCount; i++)
{
ModeSelect_Bar[i] = TxC(TITLE + @"ModeSelect_Bar_" + i.ToString() + ".png");
}
for(int i = 0; i < 8; i++)
for(int i = 0; i < CMainMenuTab.__MenuCount; i++)
{
ModeSelect_Bar_Chara[i] = TxC(TITLE + @"ModeSelect_Bar_Chara_" + i.ToString() + ".png");
}
ModeSelect_Bar[8] = TxC(TITLE + @"ModeSelect_Bar_Overlay.png");
ModeSelect_Bar[CMainMenuTab.__MenuCount] = TxC(TITLE + @"ModeSelect_Bar_Overlay.png");
#endregion
@ -1360,8 +1363,8 @@ namespace TJAPlayer3
public CTexture[] Banapas_Load_Clear = new CTexture[2];
public CTexture[] Banapas_Load_Failure = new CTexture[2];
public CTexture[] Entry_Player = new CTexture[3];
public CTexture[] ModeSelect_Bar = new CTexture[9];
public CTexture[] ModeSelect_Bar_Chara = new CTexture[8];
public CTexture[] ModeSelect_Bar;
public CTexture[] ModeSelect_Bar_Chara;
#endregion

154
TJAPlayer3/Stages/02.Title/CMainMenuTab.cs Normal file
View File

@ -0,0 +1,154 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Drawing;
using static TJAPlayer3.CActSelect曲リスト;
using FDK;
namespace TJAPlayer3
{
class CMainMenuTab
{
public static int __MenuCount = 14; // Number of existing menus
public static CMainMenuTab[] __Menus;
public static bool __BoxesProcessed = false;
public TitleTextureKey ttkTitle;
public TitleTextureKey ttkBoxText;
public bool _1pRestricted;
public bool implemented;
public CTexture barTex;
public CTexture barChara;
public CStageタイトル.E戻り値 rp;
public CMainMenuTab(int boxId, Color col, CPrivateFastFont tpf, CPrivateFastFont boxpf, CStageタイトル.E戻り値 returnPoint, bool _1Ponly, bool impl)
{
string title = CLangManager.LangInstance.GetString(100 + boxId);
ttkTitle = new TitleTextureKey(title, tpf, Color.White, col, 1280, Color.Black);
string boxText = CLangManager.LangInstance.GetString(150 + boxId);
ttkBoxText = new TitleTextureKey(boxText, boxpf, Color.White, Color.Black, 1000);
rp = returnPoint;
_1pRestricted = _1Ponly;
implemented = impl;
barTex = (TJAPlayer3.Tx.ModeSelect_Bar.Length > boxId) ? TJAPlayer3.Tx.ModeSelect_Bar[boxId] : null;
barChara = (TJAPlayer3.Tx.ModeSelect_Bar_Chara.Length > boxId) ? TJAPlayer3.Tx.ModeSelect_Bar_Chara[boxId] : null;
}
public static void tInitMenus(CPrivateFastFont tpf, CPrivateFastFont boxpf)
{
// Proceed the boxes only once
if (__BoxesProcessed == false)
{
__Menus = new CMainMenuTab[__MenuCount];
__BoxesProcessed = true;
#region [Menu Colors]
Color[] __MenuColors =
{
Color.FromArgb(233, 53, 71),
Color.FromArgb(71, 64, 135),
Color.FromArgb(255, 180, 42),
Color.FromArgb(16, 255, 255),
Color.FromArgb(128, 0, 128),
Color.FromArgb(24, 128, 24),
Color.FromArgb(128, 128, 128),
Color.FromArgb(72, 72, 72),
Color.FromArgb(199, 8, 119), // Online lounge red/pink
Color.FromArgb(181, 186, 28), // Encyclopedia yellow
Color.FromArgb(78, 166, 171), // AI battle mode blue
Color.FromArgb(230, 230, 230), // Player stars white
Color.FromArgb(40, 40, 40), // Chart editor black
Color.FromArgb(120, 104, 56), // Toolbox brown
};
#endregion
#region [Return points]
CStageタイトル.E戻り値[] __rps =
{
CStageタイトル.E戻り値.GAMESTART,
CStageタイトル.E戻り値.DANGAMESTART,
CStageタイトル.E戻り値.TAIKOTOWERSSTART,
CStageタイトル.E戻り値.SHOPSTART,
CStageタイトル.E戻り値.BOUKENSTART,
CStageタイトル.E戻り値.HEYA,
CStageタイトル.E戻り値.CONFIG,
CStageタイトル.E戻り値.EXIT,
CStageタイトル.E戻り値.ONLINELOUNGE,
CStageタイトル.E戻り値.ENCYCLOPEDIA,
CStageタイトル.E戻り値.AIBATTLEMODE,
CStageタイトル.E戻り値.PLAYERSTATS,
CStageタイトル.E戻り値.CHARTEDITOR,
CStageタイトル.E戻り値.TOOLBOX,
};
#endregion
#region [Extra bools]
bool[] _1PRestricts =
{
false,
true,
true,
false,
true,
false,
false,
false,
false,
false,
true,
false,
true,
false,
};
// To edit while new features are implemented
bool[] _implemented =
{
true,
true,
false,
false,
false,
true,
true,
true,
false,
false,
false,
false,
false,
false,
};
#endregion
for (int i = 0; i < __MenuCount; i++)
{
CStageタイトル.E戻り値 _rp = (i >= __rps.Length) ? CStageタイトル.E戻り値.GAMESTART : __rps[i];
Color _mc = (i >= __MenuColors.Length) ? Color.White :__MenuColors[i];
bool _1pr = (i >= _1PRestricts.Length) ? false : _1PRestricts[i];
bool _impl = (i >= _implemented.Length) ? false : _implemented[i];
__Menus[i] = new CMainMenuTab(i, _mc, tpf, boxpf, _rp, _1pr, _impl);
}
}
}
}
}

337
TJAPlayer3/Stages/02.Title/CStageタイトル.cs
View File

@ -41,12 +41,43 @@ namespace TJAPlayer3
SkipSaveFileStep();
for (int i = 0; i < this.nbModes; i++)
/*
this.stModeBar = new STModeBar[CMainMenuTab.__MenuCount];
for (int i = 0; i < this.stModeBar.Length; i++)
{
this.stModeBar[i].BarTexture = TJAPlayer3.Tx.ModeSelect_Bar[i];
this.stModeBar[i].n現在存在している行 = i + 1 - n現在の選択行モード選択;
}
*/
usedMenus = new int[] {
0,
1,
5,
9,
8,
6,
7,
// -- Debug
/*
10,
11,
12,
13,
*/
};
usedMenusCount = usedMenus.Length;
usedMenusPos = new int[usedMenusCount];
for (int i = 0; i < usedMenusCount; i++)
{
usedMenusPos[i] = i + 1 - n現在の選択行モード選択;
}
b音声再生 = false;
if (bSaveFileLoaded == false)
TJAPlayer3.Skin.soundEntry.t再生する();
@ -90,23 +121,8 @@ namespace TJAPlayer3
else
this.pfBoxText = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 15);
this.ttkEnsou = new TitleTextureKey(CLangManager.LangInstance.GetString(100), this.pfMenuTitle, Color.White, Color.FromArgb(233, 53, 71), 700, Color.Black);
this.ttkDan = new TitleTextureKey(CLangManager.LangInstance.GetString(101), this.pfMenuTitle, Color.White, Color.FromArgb(71, 64, 135), 700, Color.Black);
this.ttkTower = new TitleTextureKey(CLangManager.LangInstance.GetString(102), this.pfMenuTitle, Color.White, Color.FromArgb(255, 180, 42), 700, Color.Black);
this.ttkShop = new TitleTextureKey(CLangManager.LangInstance.GetString(103), this.pfMenuTitle, Color.White, Color.FromArgb(16, 255, 255), 700, Color.Black);
this.ttkBouken = new TitleTextureKey(CLangManager.LangInstance.GetString(104), this.pfMenuTitle, Color.White, Color.FromArgb(128, 0, 128), 700, Color.Black);
this.ttkSettings = new TitleTextureKey(CLangManager.LangInstance.GetString(106), this.pfMenuTitle, Color.White, Color.FromArgb(128, 128, 128), 700, Color.Black);
this.ttkExit = new TitleTextureKey(CLangManager.LangInstance.GetString(107), this.pfMenuTitle, Color.White, Color.FromArgb(72, 72, 72), 700, Color.Black);
this.ttkHeya = new TitleTextureKey(CLangManager.LangInstance.GetString(105), this.pfMenuTitle, Color.White, Color.FromArgb(24, 128, 24), 700, Color.Black);
this.ttkBoxText = new TitleTextureKey[(int)E戻り値.EXIT];
for (int i = 0; i < this.ttkBoxText.Length; i++)
{
this.ttkBoxText[i] = new TitleTextureKey(CLangManager.LangInstance.GetString(150 + i), this.pfBoxText, Color.White, Color.Black, 1000);
}
// Init Menus
CMainMenuTab.tInitMenus(this.pfMenuTitle, this.pfBoxText);
base.OnManagedリソースの作成();
}
@ -149,8 +165,6 @@ namespace TJAPlayer3
this.ctエントリーバー点滅.t進行Loop();
this.ctエントリーバー決定点滅.t進行();
this.ctどんちゃんイン.t進行();
//this.ctどんちゃんループ.t進行Loop();
//this.ctどんちゃんエントリーループ.t進行Loop();
this.ctBarMove.t進行();
if (!TJAPlayer3.Skin.bgmタイトルイン.b再生中)
@ -184,14 +198,19 @@ namespace TJAPlayer3
}
// Disable F1 keybind since menu is accessible from main menu
/*
if ((TJAPlayer3.Input管理.Keyboard.bキーが押されている((int)SlimDXKeys.Key.RightShift) || TJAPlayer3.Input管理.Keyboard.bキーが押されている((int)SlimDXKeys.Key.LeftShift)) && TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.F1))
{
TJAPlayer3.Skin.soundEntry.t停止する();
n現在の選択行モード選択 = (int)E戻り値.CONFIG - 1;
this.actFO.tフェードアウト開始();
base.eフェーズID = CStage.Eフェーズ.共通_フェードアウト;
TJAPlayer3.Skin.sound取消音.t再生する();
}
*/
// 1st step (Save file loading)
if (!bバナパス読み込み && !bバナパス読み込み失敗)
@ -249,14 +268,18 @@ namespace TJAPlayer3
if (bモード選択)
{
if (n現在の選択行モード選択 < this.nbModes - 1)
//if (n現在の選択行モード選択 < this.nbModes - 1)
if (n現在の選択行モード選択 < usedMenusCount - 1)
{
TJAPlayer3.Skin.sound変更音.t再生する();
ctBarMove.t開始(0, 250, 1.2f, TJAPlayer3.Timer);
n現在の選択行モード選択++;
this.bDownPushed = true;
for (int i = 0; i < this.nbModes; i++)
this.stModeBar[i].n現在存在している行 = i + 1 - n現在の選択行モード選択;
for (int i = 0; i < usedMenusCount; i++)
{
usedMenusPos[i] = i + 1 - n現在の選択行モード選択;
}
}
}
}
@ -280,8 +303,11 @@ namespace TJAPlayer3
ctBarMove.t開始(0, 250, 1.2f, TJAPlayer3.Timer);
n現在の選択行モード選択--;
this.bDownPushed = false;
for (int i = 0; i < this.nbModes; i++)
this.stModeBar[i].n現在存在している行 = i + 1 - n現在の選択行モード選択;
for (int i = 0; i < usedMenusCount; i++)
{
usedMenusPos[i] = i + 1 - n現在の選択行モード選択;
}
}
}
}
@ -317,17 +343,16 @@ namespace TJAPlayer3
}
if (bモード選択)
{
bool operationSucceded = false;
bool operationSucceded = false;
if (this.n現在の選択行モード選択 == (int)E戻り値.DANGAMESTART - 1)
if (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].rp == E戻り値.DANGAMESTART)
{
if (TJAPlayer3.Songs管理.list曲ルート_Dan.Count > 0 && TJAPlayer3.ConfigIni.nPlayerCount != 2)
operationSucceded = true;
}
else if (this.n現在の選択行モード選択 == (int)E戻り値.GAMESTART - 1
|| this.n現在の選択行モード選択 == (int)E戻り値.EXIT - 1
|| this.n現在の選択行モード選択 == (int)E戻り値.CONFIG - 1
|| this.n現在の選択行モード選択 == (int)E戻り値.HEYA - 1)
else if (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].implemented == true
&& (CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]]._1pRestricted == false
|| TJAPlayer3.ConfigIni.nPlayerCount == 1 ))
operationSucceded = true;
if (operationSucceded == true)
@ -604,50 +629,68 @@ namespace TJAPlayer3
{
// TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, ctBarMove.n現在の値.ToString());
for (int i = 0; i < this.nbModes; i++)
{
if(this.stModeBar[i].n現在存在している行 == 1 && ctBarMove.n現在の値 >= 150)
//for (int i = 0; i < this.nbModes; i++)
for (int i = 0; i < usedMenusCount; i++)
{
// Get Menu reference
CMainMenuTab _menu = CMainMenuTab.__Menus[usedMenus[i]];
CTexture _bar = _menu.barTex;
CTexture _chara = _menu.barChara;
#region [Disable visualy 1p specific buttons if 2p]
if ((_menu._1pRestricted == true && TJAPlayer3.ConfigIni.nPlayerCount > 1)
|| _menu.implemented == false)
{
if (_bar != null)
_bar.color4 = C変換.ColorToColor4(Color.DarkGray);
if (_chara != null)
_chara.color4 = C変換.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText).color4 = C変換.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle).color4 = C変換.ColorToColor4(Color.DarkGray);
}
else
{
if (_bar != null)
_bar.color4 = C変換.ColorToColor4(Color.White);
if (_chara != null)
_chara.color4 = C変換.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText).color4 = C変換.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle).color4 = C変換.ColorToColor4(Color.White);
}
#endregion
// if (this.stModeBar[i].n現在存在している行 == 1 && ctBarMove.n現在の値 >= 150)
if (usedMenusPos[i] == 1 && ctBarMove.n現在の値 >= 150)
{
int BarAnime = ctBarAnimeIn.n現在の値 >= (int)(26 * 16.6f) + 100 ? 0 : ctBarAnimeIn.n現在の値 >= (int)(26 * 16.6f) && ctBarAnimeIn.n現在の値 <= (int)(26 * 16.6f) + 100 ? 40 + (int)((ctBarAnimeIn.n現在の値 - (26 * 16.6)) / 100f * 71f) : ctBarAnimeIn.n現在の値 < (int)(26 * 16.6f) ? 40 : 111;
int BarAnime1 = BarAnime == 0 ? ctBarMove.n現在の値 >= 150 ? 40 + (int)((ctBarMove.n現在の値 - 150) / 100f * 71f) : ctBarMove.n現在の値 < 150 ? 40 : 111 : 0;
#region [Disable visualy 1p specific buttons if 2p]
if (restricted1p[i] == true && TJAPlayer3.ConfigIni.nPlayerCount > 1)
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = C変換.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = C変換.ColorToColor4(Color.DarkGray);
this.stModeBar[i].BarTexture.color4 = C変換.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkBoxText[i]).color4 = C変換.ColorToColor4(Color.DarkGray);
}
else
if (_bar != null)
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = C変換.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = C変換.ColorToColor4(Color.White);
this.stModeBar[i].BarTexture.color4 = C変換.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkBoxText[i]).color4 = C変換.ColorToColor4(Color.White);
_bar.Opacity = 255;
_bar.vc拡大縮小倍率.Y = 1.0f;
_bar.t2D描画(TJAPlayer3.app.Device, 320, 347 - BarAnime - BarAnime1, new Rectangle(0, 0, 641, 27));
_bar.t2D描画(TJAPlayer3.app.Device, 320, 346 + BarAnime + BarAnime1, new Rectangle(0, 76, 641, 30));
_bar.vc拡大縮小倍率.Y = BarAnime / 25.7f + BarAnime1 / 25.7f;
_bar.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360, new Rectangle(0, 27, 641, 45));
}
if (TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null)
{
CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount];
_overlap.vc拡大縮小倍率.Y = 1.0f;
_overlap.t2D描画(TJAPlayer3.app.Device, 320, 306, new Rectangle(0, 0, 641, 27));
_overlap.t2D描画(TJAPlayer3.app.Device, 320, 334 + (BarAnime + BarAnime1) / 0.95238f, new Rectangle(0, 71, 641, 35));
_overlap.vc拡大縮小倍率.Y = (BarAnime + BarAnime1) / 0.95238f;
_overlap.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 640, 333, new Rectangle(0, 27, 641, 1));
}
#endregion
// this.stModeBar[i].BarTexture.Opacity = (int)((ctBarAnimeIn.n現在の値 - (16 * 16.6f)) * 1.23f);
this.stModeBar[i].BarTexture.Opacity = 255;
this.stModeBar[i].BarTexture.vc拡大縮小倍率.Y = 1.0f;
this.stModeBar[i].BarTexture.t2D描画(TJAPlayer3.app.Device, 320, 347 - BarAnime - BarAnime1, new Rectangle(0, 0, 641, 27));
this.stModeBar[i].BarTexture.t2D描画(TJAPlayer3.app.Device, 320, 346 + BarAnime + BarAnime1, new Rectangle(0, 76, 641, 30));
this.stModeBar[i].BarTexture.vc拡大縮小倍率.Y = BarAnime / 25.7f + BarAnime1 / 25.7f;
this.stModeBar[i].BarTexture.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360, new Rectangle(0, 27, 641, 45));
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].vc拡大縮小倍率.Y = 1.0f;
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].t2D描画(TJAPlayer3.app.Device, 320, 306, new Rectangle(0, 0, 641, 27));
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].t2D描画(TJAPlayer3.app.Device, 320, 334 + (BarAnime + BarAnime1) / 0.95238f, new Rectangle(0, 71, 641, 35));
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].vc拡大縮小倍率.Y = (BarAnime + BarAnime1) / 0.95238f;
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 640, 333, new Rectangle(0, 27, 641, 1));
float anime = 0;
float BarAnimeCount = this.ctBarMove.n現在の値 - 150;
@ -656,25 +699,24 @@ namespace TJAPlayer3
else
anime = 150 - (BarAnimeCount - 45) * 0.61764705f;
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].Opacity = (int)(BarAnimeCount * 2.55f) + (int)(BarAnime * 2.5f);
//130
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].t2D中心基準描画(TJAPlayer3.app.Device, 640 - TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 4 + 114 - anime, 360,
new Rectangle(0, 0, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Height));
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].t2D中心基準描画(TJAPlayer3.app.Device, 640 + TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 4 - 114 + anime, 360,
new Rectangle(TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 2, 0, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Width / 2, TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].szテクスチャサイズ.Height));
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i))?.t2D中心基準描画(TJAPlayer3.app.Device, 631, 379 - BarAnimeCount / 1.5f);
if (i < this.ttkBoxText.Length)
if (_chara != null)
{
CTexture currentText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkBoxText[i]);
_chara.Opacity = (int)(BarAnimeCount * 2.55f) + (int)(BarAnime * 2.5f);
_chara.t2D中心基準描画(TJAPlayer3.app.Device, 640 - _chara.szテクスチャサイズ.Width / 4 + 114 - anime, 360,
new Rectangle(0, 0, _chara.szテクスチャサイズ.Width / 2, _chara.szテクスチャサイズ.Height));
_chara.t2D中心基準描画(TJAPlayer3.app.Device, 640 + _chara.szテクスチャサイズ.Width / 4 - 114 + anime, 360,
new Rectangle(_chara.szテクスチャサイズ.Width / 2, 0, _chara.szテクスチャサイズ.Width / 2, _chara.szテクスチャサイズ.Height));
}
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle)?.t2D中心基準描画(TJAPlayer3.app.Device, 631, 379 - BarAnimeCount / 1.5f);
CTexture currentText = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkBoxText);
if (currentText != null)
{
currentText.Opacity = (int)(BarAnimeCount * 2.55f);
currentText?.t2D中心基準描画(TJAPlayer3.app.Device, 640, 331 + 132 / 2);
}
}
else
{
@ -686,7 +728,8 @@ namespace TJAPlayer3
#region [Position precalculation]
int CurrentPos = this.stModeBar[i].n現在存在している行;
//int CurrentPos = this.stModeBar[i].n現在存在している行;
int CurrentPos = usedMenusPos[i];
int Selected;
if (this.bDownPushed)
@ -699,32 +742,27 @@ namespace TJAPlayer3
#endregion
#region [Disable visualy 1p specific buttons if 2p]
if (restricted1p[i] == true && TJAPlayer3.ConfigIni.nPlayerCount > 1)
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = C変換.ColorToColor4(Color.DarkGray);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = C変換.ColorToColor4(Color.DarkGray);
this.stModeBar[i].BarTexture.color4 = C変換.ColorToColor4(Color.DarkGray);
}
else
{
TJAPlayer3.Tx.ModeSelect_Bar_Chara[i].color4 = C変換.ColorToColor4(Color.White);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i)).color4 = C変換.ColorToColor4(Color.White);
this.stModeBar[i].BarTexture.color4 = C変換.ColorToColor4(Color.White);
}
#endregion
BarMoveX = ctBarMove.n現在の値 <= 100 ? (int)(pos.X - posSelect.X) - (int)(ctBarMove.n現在の値 / 100f * (pos.X - posSelect.X)) : 0;
BarMoveY = ctBarMove.n現在の値 <= 100 ? (int)(pos.Y - posSelect.Y) - (int)(ctBarMove.n現在の値 / 100f * (pos.Y - posSelect.Y)) : 0;
this.stModeBar[i].BarTexture.vc拡大縮小倍率.Y = 1.0f;
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].vc拡大縮小倍率.Y = 1.0f;
this.stModeBar[i].BarTexture.t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
TJAPlayer3.Tx.ModeSelect_Bar[this.nbModes].t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(idxToTex(i))?.t2D中心基準描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX + 311, pos.Y + BarAnimeY - BarMoveY + 72);
if (_bar != null)
{
_bar.vc拡大縮小倍率.Y = 1.0f;
_bar.t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
}
if (TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount] != null)
{
CTexture _overlap = TJAPlayer3.Tx.ModeSelect_Bar[CMainMenuTab.__MenuCount];
_overlap.vc拡大縮小倍率.Y = 1.0f;
_overlap.t2D描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX, pos.Y + BarAnimeY - BarMoveY);
}
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(_menu.ttkTitle)?.t2D中心基準描画(TJAPlayer3.app.Device, pos.X + BarAnimeX - BarMoveX + 311, pos.Y + BarAnimeY - BarMoveY + 72);
}
}
}
@ -767,36 +805,13 @@ namespace TJAPlayer3
TJAPlayer3.Skin.bgmタイトルイン.t停止する();
break;
}
base.eフェーズID = CStage.Eフェーズ.共通_終了状態;
switch ( this.n現在の選択行モード選択)
{
case (int)E戻り値.GAMESTART - 1:
return (int)E戻り値.GAMESTART;
case (int)E戻り値.DANGAMESTART - 1:
return (int)E戻り値.DANGAMESTART;
case (int)E戻り値.TAIKOTOWERSSTART - 1:
return (int)E戻り値.TAIKOTOWERSSTART;
base.eフェーズID = CStage.Eフェーズ.共通_終了状態;
case (int)E戻り値.SHOPSTART - 1:
return (int)E戻り値.SHOPSTART;
case (int)E戻り値.BOUKENSTART - 1:
return (int)E戻り値.BOUKENSTART;
case (int)E戻り値.HEYA - 1:
return (int)E戻り値.HEYA;
case (int) E戻り値.CONFIG - 1:
return (int) E戻り値.CONFIG;
case (int)E戻り値.EXIT - 1:
return (int) E戻り値.EXIT;
}
break;
// Select Menu here
return ((int)CMainMenuTab.__Menus[usedMenus[this.n現在の選択行モード選択]].rp);
case CStage.Eフェーズ.タイトル_起動画面からのフェードイン:
if( this.actFIfromSetup.On進行描画() != 0 )
{
@ -817,7 +832,13 @@ namespace TJAPlayer3
BOUKENSTART,
HEYA,
CONFIG,
EXIT
EXIT,
ONLINELOUNGE,
ENCYCLOPEDIA,
AIBATTLEMODE,
PLAYERSTATS,
CHARTEDITOR,
TOOLBOX,
}
@ -913,17 +934,9 @@ namespace TJAPlayer3
private CPrivateFastFont pfMenuTitle;
private CPrivateFastFont pfBoxText;
private TitleTextureKey ttkEnsou;
private TitleTextureKey ttkDan;
private TitleTextureKey ttkTower;
private TitleTextureKey ttkShop;
private TitleTextureKey ttkBouken;
private TitleTextureKey ttkSettings;
private TitleTextureKey ttkExit;
private TitleTextureKey ttkHeya;
private TitleTextureKey[] ttkBoxText;
private int[] usedMenus;
private int[] usedMenusPos;
private int usedMenusCount;
private bool bバナパス読み込み;
private bool bバナパス読み込み失敗;
@ -939,17 +952,7 @@ namespace TJAPlayer3
{ new Point(337, 488), new Point( 529, 487), new Point(743, 486) };
private Point[] ptモード選択バー座標 =
{ new Point(290, 107), new Point(319, 306), new Point(356, 513) };
private int nbModes = 8;
private STModeBar[] stModeBar = new STModeBar[8];
private bool[] restricted1p = { false, true, true, false, true, false, false, false };
private struct STModeBar
{
public int n現在存在している行;
public CTexture BarTexture;
}
{ new Point(290, 107), new Point(319, 306), new Point(356, 513) };
private Point getFixedPositionForBar(int CurrentPos)
{
@ -977,30 +980,6 @@ namespace TJAPlayer3
return new Point(posX, posY);
}
private TitleTextureKey idxToTex(int idx)
{
switch (idx)
{
case 7:
return this.ttkExit;
case 6:
return this.ttkSettings;
case 5:
return this.ttkHeya;
case 4:
return this.ttkBouken;
case 3:
return this.ttkShop;
case 2:
return this.ttkTower;
case 1:
return this.ttkDan;
case 0:
default:
return this.ttkEnsou;
}
}
private bool b音声再生;
private CActFIFOBlack actFI;
private CActFIFOBlack actFIfromSetup;

2
TJAPlayer3/TJAPlayer3.csproj
View File

@ -124,6 +124,7 @@
<Compile Include="Character\CResultCharacter.cs" />
<Compile Include="Character\CMenuCharacter.cs" />
<Compile Include="Common\CCrypto.cs" />
<Compile Include="Common\CVersionList.cs" />
<Compile Include="Common\RecentlyPlayedSongs.cs" />
<Compile Include="Common\ModalQueue.cs" />
<Compile Include="Common\Modal.cs" />
@ -205,6 +206,7 @@
<Compile Include="Songs\C曲リストノード.cs" />
<Compile Include="Stages\01.StartUp\CStage起動.cs" />
<Compile Include="Stages\02.Title\CActEnumSongs.cs" />
<Compile Include="Stages\02.Title\CMainMenuTab.cs" />
<Compile Include="Stages\02.Title\CStageタイトル.cs" />
<Compile Include="Stages\04.Config\CActConfigKeyAssign.cs" />
<Compile Include="Stages\04.Config\CActConfigList.cs" />

12
Test/Documentation/I18N/DictionnaryIndexes.md
View File

@ -176,6 +176,12 @@
105 : Heya main menu button
106 : Settings main menu button
107 : Quit main menu button
108 : Online lounge main menu button
109 : Open encyclopedia main menu button
110 : AI Battle main menu button
111 : Player stats main menu button
112 : Chart editor main menu button
113 : Open Toolbox main menu button
150 : Ensou main menu box text
151 : Dan main menu box text
@ -185,6 +191,12 @@
155 : Heya main menu box text
156 : Settings main menu box text
157 : Quit main menu box text
158 : Online lounge main menu box text
159 : Open encyclopedia main menu box text
160 : AI Battle main menu box text
161 : Player stats main menu box text
162 : Chart editor main menu box text
163 : Open Toolbox main menu box text
# Special items (002XX)

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
Test/System/SimpleStyle/Graphics/1_Title/ModeSelect_Bar_9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB