Enable mod selection menu on Dan-i song select, fix panel color not displaying in dan songs if language is not japanese and add cover image for BassBoL
This commit is contained in:
parent
f1105ec375
commit
53070fe762
@ -17,6 +17,7 @@ namespace TJAPlayer3
|
|||||||
ctBarOut = new CCounter();
|
ctBarOut = new CCounter();
|
||||||
ctBarOut.n現在の値 = 255;
|
ctBarOut.n現在の値 = 255;
|
||||||
TJAPlayer3.stage段位選択.bDifficultyIn = false;
|
TJAPlayer3.stage段位選択.bDifficultyIn = false;
|
||||||
|
bOption = false;
|
||||||
|
|
||||||
base.On活性化();
|
base.On活性化();
|
||||||
}
|
}
|
||||||
@ -49,7 +50,7 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
#region [Key bindings]
|
#region [Key bindings]
|
||||||
|
|
||||||
if (ctBarIn.b終了値に達した && !TJAPlayer3.stage段位選択.b選択した)
|
if (ctBarIn.b終了値に達した && !TJAPlayer3.stage段位選択.b選択した && bOption == false)
|
||||||
{
|
{
|
||||||
if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.RightArrow) ||
|
if (TJAPlayer3.Input管理.Keyboard.bキーが押された((int)SlimDXKeys.Key.RightArrow) ||
|
||||||
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue))
|
TJAPlayer3.Pad.b押された(E楽器パート.DRUMS, Eパッド.RBlue))
|
||||||
@ -86,6 +87,10 @@ namespace TJAPlayer3
|
|||||||
TJAPlayer3.Skin.soundDanSongSelect.t再生する();
|
TJAPlayer3.Skin.soundDanSongSelect.t再生する();
|
||||||
TJAPlayer3.stage段位選択.ct待機.t開始(0, 3000, 1, TJAPlayer3.Timer);
|
TJAPlayer3.stage段位選択.ct待機.t開始(0, 3000, 1, TJAPlayer3.Timer);
|
||||||
}
|
}
|
||||||
|
else if (n現在の選択行 == 2)
|
||||||
|
{
|
||||||
|
bOption = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,6 +103,8 @@ namespace TJAPlayer3
|
|||||||
public CCounter ctBarIn;
|
public CCounter ctBarIn;
|
||||||
public CCounter ctBarOut;
|
public CCounter ctBarOut;
|
||||||
|
|
||||||
|
public bool bOption;
|
||||||
|
|
||||||
private int n現在の選択行;
|
private int n現在の選択行;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ namespace TJAPlayer3
|
|||||||
base.list子Activities.Add(this.actFOtoNowLoading = new CActFIFOStart());
|
base.list子Activities.Add(this.actFOtoNowLoading = new CActFIFOStart());
|
||||||
base.list子Activities.Add(this.段位挑戦選択画面 = new CActSelect段位挑戦選択画面());
|
base.list子Activities.Add(this.段位挑戦選択画面 = new CActSelect段位挑戦選択画面());
|
||||||
base.list子Activities.Add(this.actFOtoTitle = new CActFIFOBlack());
|
base.list子Activities.Add(this.actFOtoTitle = new CActFIFOBlack());
|
||||||
|
base.list子Activities.Add(this.actPlayOption = new CActPlayOption());
|
||||||
base.list子Activities.Add(this.PuchiChara = new PuchiChara());
|
base.list子Activities.Add(this.PuchiChara = new PuchiChara());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +80,6 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
this.段位リスト.On進行描画();
|
this.段位リスト.On進行描画();
|
||||||
|
|
||||||
|
|
||||||
if (stamp < 6000)
|
if (stamp < 6000)
|
||||||
{
|
{
|
||||||
#region [Dan intro anim]
|
#region [Dan intro anim]
|
||||||
@ -144,6 +143,7 @@ namespace TJAPlayer3
|
|||||||
}
|
}
|
||||||
|
|
||||||
TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0);
|
TJAPlayer3.NamePlate.tNamePlateDraw(TJAPlayer3.Skin.SongSelect_NamePlate_X[0], TJAPlayer3.Skin.SongSelect_NamePlate_Y[0] + 5, 0);
|
||||||
|
ModIcons.tDisplayModsMenu(40, 672, 0);
|
||||||
|
|
||||||
#region [ キー関連 ]
|
#region [ キー関連 ]
|
||||||
|
|
||||||
@ -210,6 +210,8 @@ namespace TJAPlayer3
|
|||||||
this.段位挑戦選択画面.On進行描画();
|
this.段位挑戦選択画面.On進行描画();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (段位挑戦選択画面.bOption) actPlayOption.On進行描画(0);
|
||||||
|
|
||||||
if (ct待機.n現在の値 >= 3000)
|
if (ct待機.n現在の値 >= 3000)
|
||||||
{
|
{
|
||||||
TJAPlayer3.stage段位選択.t段位を選択する();
|
TJAPlayer3.stage段位選択.t段位を選択する();
|
||||||
@ -280,5 +282,6 @@ namespace TJAPlayer3
|
|||||||
public CActFIFOBlack actFOtoTitle;
|
public CActFIFOBlack actFOtoTitle;
|
||||||
public CActSelect段位リスト 段位リスト;
|
public CActSelect段位リスト 段位リスト;
|
||||||
public CActSelect段位挑戦選択画面 段位挑戦選択画面;
|
public CActSelect段位挑戦選択画面 段位挑戦選択画面;
|
||||||
|
public CActPlayOption actPlayOption;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,6 +117,7 @@ namespace TJAPlayer3
|
|||||||
if (!ctOpen.b進行中) ctOpen.t開始(0, 50, 6, TJAPlayer3.Timer);
|
if (!ctOpen.b進行中) ctOpen.t開始(0, 50, 6, TJAPlayer3.Timer);
|
||||||
|
|
||||||
var act難易度 = TJAPlayer3.stage選曲.act難易度選択画面;
|
var act難易度 = TJAPlayer3.stage選曲.act難易度選択画面;
|
||||||
|
var danAct = TJAPlayer3.stage段位選択.段位挑戦選択画面;
|
||||||
|
|
||||||
#region [ Open & Close ]
|
#region [ Open & Close ]
|
||||||
|
|
||||||
@ -135,7 +136,7 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
float baseX = (player == 0) ? 200 : 1180;
|
float baseX = (player == 0) ? 200 : 1188;
|
||||||
float baseY = 659.9f + y - nOptionCount * 40.7f;
|
float baseY = 659.9f + y - nOptionCount * 40.7f;
|
||||||
|
|
||||||
var _textures = new CTexture[]
|
var _textures = new CTexture[]
|
||||||
@ -178,6 +179,7 @@ namespace TJAPlayer3
|
|||||||
ctClose.n現在の値 = 0;
|
ctClose.n現在の値 = 0;
|
||||||
bEnd = false;
|
bEnd = false;
|
||||||
act難易度.bOption[player] = false;
|
act難易度.bOption[player] = false;
|
||||||
|
danAct.bOption = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region [ Key ]
|
#region [ Key ]
|
||||||
|
@ -138,6 +138,10 @@ namespace TJAPlayer3
|
|||||||
{
|
{
|
||||||
this.txGENRE.color4 = tTagDict[genreName];
|
this.txGENRE.color4 = tTagDict[genreName];
|
||||||
}
|
}
|
||||||
|
else if (genreName == CLangManager.LangInstance.GetString(101))
|
||||||
|
{
|
||||||
|
this.txGENRE.color4 = tTagDict["段位道場"];
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.txGENRE.color4 = C変換.ColorToColor4(stageColor);
|
this.txGENRE.color4 = C変換.ColorToColor4(stageColor);
|
||||||
@ -332,6 +336,15 @@ namespace TJAPlayer3
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum ESongType
|
||||||
|
{
|
||||||
|
REGULAR,
|
||||||
|
DAN,
|
||||||
|
TOWER,
|
||||||
|
BOSS,
|
||||||
|
TOTAL,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// その他
|
// その他
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ WAVE:BassBoL.ogg
|
|||||||
OFFSET:-0
|
OFFSET:-0
|
||||||
DEMOSTART:176
|
DEMOSTART:176
|
||||||
SCOREMODE:2
|
SCOREMODE:2
|
||||||
|
PREIMAGE:BassBol.png
|
||||||
|
|
||||||
COURSE:Oni
|
COURSE:Oni
|
||||||
LEVEL:10
|
LEVEL:10
|
||||||
|
BIN
Test/Songs/08 OpenTaiko Original/BassBoL/BassBol.png
Normal file
BIN
Test/Songs/08 OpenTaiko Original/BassBoL/BassBol.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 99 KiB |
Loading…
Reference in New Issue
Block a user