Purple notes (G, flying notes remaining) and better handling of linked notes (A, B)
This commit is contained in:
0aubsq
parent
e1c086b5b1
commit
62124ff63b
@ -502,7 +502,7 @@ namespace TJAPlayer3
|
||||
|
||||
//太鼓1P(移動予定)
|
||||
"??", "ドン", "カツ", "ドン(大)", "カツ(大)", "連打", "連打(大)", "ふうせん連打",
|
||||
"連打終点", "芋", "ドン(手)", "カッ(手)", "??", "??", "??", "AD-LIB",
|
||||
"連打終点", "芋", "ドン(手)", "カッ(手)", "Mine", "??", "??", "AD-LIB",
|
||||
|
||||
//太鼓予備
|
||||
"??", "??", "??", "??", "??", "??", "??", "??",
|
||||
@ -552,7 +552,12 @@ namespace TJAPlayer3
|
||||
"", "", "", "", "", "", "", "",
|
||||
|
||||
"0xF0", "歌詞", "??", "SUDDEN", "??", "??", "??", "??",
|
||||
"??", "??", "??", "??", "??", "??", "??", "??", "譜面終了"
|
||||
"??", "??", "??", "??", "??", "??", "??", "??", "譜面終了",
|
||||
|
||||
// Extra notes
|
||||
|
||||
"KaDon", "??", "??", "??", "??", "??", "??", "??",
|
||||
"??", "??", "??", "??", "??", "??", "??", "??",
|
||||
};
|
||||
return string.Format("CChip: 位置:{0:D4}.{1:D3}, 時刻{2:D6}, Ch:{3:X2}({4}), Pn:{5}({11})(内部{6}), Pd:{7}, Sz:{8}, BMScroll:{9}, Auto:{10}, コース:{11}",
|
||||
this.n発声位置 / 384, this.n発声位置 % 384,
|
||||
@ -621,6 +626,7 @@ namespace TJAPlayer3
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 4, 4, //0xD0
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, //0xE0
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, //0xF0
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, //0x100
|
||||
};
|
||||
|
||||
public int CompareTo(CDTX.CChip other)
|
||||
@ -4375,7 +4381,7 @@ namespace TJAPlayer3
|
||||
chip.nPlayerSide = this.nPlayerSide;
|
||||
chip.bGOGOTIME = this.bGOGOTIME;
|
||||
|
||||
if (nObjectNum == 7 || nObjectNum == 9)
|
||||
if (NotesManager.IsBalloon(chip) || NotesManager.IsKusudama(chip))
|
||||
{
|
||||
//this.n現在のコースをswitchで分岐していたため風船の値がうまく割り当てられていない 2020.04.21 akasoko26
|
||||
|
||||
@ -4443,7 +4449,7 @@ namespace TJAPlayer3
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (nObjectNum == 8)
|
||||
if (NotesManager.IsRollEnd(chip))
|
||||
{
|
||||
chip.nノーツ終了位置 = (this.n現在の小節数 * 384) + ((384 * n) / n文字数);
|
||||
chip.nノーツ終了時刻ms = (int)this.dbNowTime;
|
||||
@ -4501,7 +4507,8 @@ namespace TJAPlayer3
|
||||
}
|
||||
#endregion
|
||||
|
||||
if (nObjectNum < 5)
|
||||
|
||||
if (NotesManager.IsMissableNote(chip))
|
||||
{
|
||||
#region [ 作り直し ]
|
||||
//譜面分岐がない譜面でも値は加算されてしまうがしゃあない
|
||||
@ -4527,7 +4534,7 @@ namespace TJAPlayer3
|
||||
this.nノーツ数[3]++;
|
||||
#endregion
|
||||
}
|
||||
else if (nObjectNum == 7)
|
||||
else if (NotesManager.IsBalloon(chip) || NotesManager.IsKusudama(chip))
|
||||
{
|
||||
//風船はこのままでも機能しているので何もしない.
|
||||
|
||||
|
||||
@ -340,6 +340,7 @@ namespace TJAPlayer3
|
||||
Notes[1] = TxC(GAME + @"Notes_Konga.png");
|
||||
|
||||
Note_Mine = TxC(GAME + @"Mine.png");
|
||||
Note_Swap = TxC(GAME + @"Swap.png");
|
||||
|
||||
Judge_Frame = TxC(GAME + @"Notes.png");
|
||||
SENotes = TxC(GAME + @"SENotes.png");
|
||||
@ -1586,6 +1587,7 @@ namespace TJAPlayer3
|
||||
#region 共通
|
||||
public CTexture Judge_Frame,
|
||||
Note_Mine,
|
||||
Note_Swap,
|
||||
SENotes,
|
||||
Notes_Arm,
|
||||
ChipEffect,
|
||||
|
||||
@ -919,7 +919,7 @@ namespace TJAPlayer3
|
||||
var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)];
|
||||
int index = pChip.nチャンネル番号;
|
||||
|
||||
if (index == 0x11 || index == 0x13 || index == 0x1A)
|
||||
if (index == 0x11 || index == 0x13 || index == 0x1A || index == 0x101)
|
||||
{
|
||||
if (pChip.nPlayerSide == 0)
|
||||
{
|
||||
@ -929,7 +929,7 @@ namespace TJAPlayer3
|
||||
{
|
||||
this.soundRed2?.t再生を開始する();
|
||||
}
|
||||
if (index == 0x13 && _gt == EGameType.KONGA)
|
||||
if ((index == 0x13 && _gt == EGameType.KONGA) || index == 0x101)
|
||||
{
|
||||
if (pChip.nPlayerSide == 0)
|
||||
{
|
||||
|
||||
@ -336,12 +336,14 @@ namespace TJAPlayer3
|
||||
case 0x15:
|
||||
case 0x16:
|
||||
case 0x17:
|
||||
case 0x1F:
|
||||
{
|
||||
this.stパッド状態[ 2 + nHand + playerShift].n明るさ = 8;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x13:
|
||||
case 0x1A:
|
||||
{
|
||||
if (_gt == EGameType.KONGA)
|
||||
{
|
||||
@ -363,6 +365,7 @@ namespace TJAPlayer3
|
||||
break;
|
||||
|
||||
case 0x14:
|
||||
case 0x1B:
|
||||
{
|
||||
if (_gt == EGameType.KONGA)
|
||||
{
|
||||
@ -375,7 +378,14 @@ namespace TJAPlayer3
|
||||
}
|
||||
|
||||
}
|
||||
break;
|
||||
break;
|
||||
|
||||
case 0x101:
|
||||
{
|
||||
this.stパッド状態[nHand + playerShift].n明るさ = 8;
|
||||
this.stパッド状態[2 + (nHand == 0 ? 1 : 0) + playerShift].n明るさ = 8;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1816,6 +1816,8 @@ namespace TJAPlayer3
|
||||
case 0x12:
|
||||
case 0x13:
|
||||
case 0x14:
|
||||
case 0x1C:
|
||||
case 0x101:
|
||||
{
|
||||
NotesManager.DisplayNote(nPlayer, x, y, pChip, num9);
|
||||
TJAPlayer3.Tx.SENotes?.t2D描画(device, x - 2, y + nSenotesY, new Rectangle(0, 30 * pChip.nSenote, 136, 30));
|
||||
|
||||
@ -253,14 +253,7 @@ namespace TJAPlayer3
|
||||
}
|
||||
else if (IsPurpleNote(chip))
|
||||
{
|
||||
if (TJAPlayer3.Tx.Notes[0] != null)
|
||||
{
|
||||
int _oldOp = TJAPlayer3.Tx.Notes[0].Opacity;
|
||||
TJAPlayer3.Tx.Notes[0]?.t2D描画(TJAPlayer3.app.Device, x, y, new Rectangle(130, frame, length, 130));
|
||||
TJAPlayer3.Tx.Notes[0].Opacity = 127;
|
||||
TJAPlayer3.Tx.Notes[0]?.t2D描画(TJAPlayer3.app.Device, x, y, new Rectangle(260, frame, length, 130));
|
||||
TJAPlayer3.Tx.Notes[0].Opacity = _oldOp;
|
||||
}
|
||||
TJAPlayer3.Tx.Note_Swap?.t2D描画(TJAPlayer3.app.Device, x, y, new Rectangle(0, frame, 130, 130));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
BIN
Test/System/SimpleStyle/Graphics/5_Game/Swap.png
Normal file
BIN
Test/System/SimpleStyle/Graphics/5_Game/Swap.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
Loading…
x
Reference in New Issue
Block a user