Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-06 22:34:26 +01:00
Code Releases Activity

紫の飛んでいくノーツが正しく機能しない問題の修正 (#234)

Browse Source
This commit is contained in:
Takkkom 2022-06-03 19:29:29 +09:00 committed by GitHub
parent 6c735d68dc
commit 9924112cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
View File

@ -750,6 +750,40 @@ namespace TJAPlayer3
this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, nLane, E楽器パート.DRUMS); this.tチップのヒット処理_BadならびにTight時のMiss(eCourse, part, nLane, E楽器パート.DRUMS);
} }
private int ChannelNumToFlyNoteNum(CDTX.CChip pChip, int nPlayer, bool b両手入力 = false, int nInput = 0)
{
var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)];
int nFly = 0;
switch (pChip.nチャンネル番号)
{
case 0x11:
nFly = 1;
break;
case 0x12:
nFly = 2;
break;
case 0x13:
case 0x1A:
nFly = b両手入力 ? 3 : 1;
break;
case 0x14:
case 0x1B:
nFly = (b両手入力 || _gt == EGameType.KONGA) ? 4 : 2;
break;
case 0x1F:
nFly = nInput == 0 ? 1 : 2;
break;
case 0x101:
nFly = 5;
break;
default:
nFly = 1;
break;
}
return nFly;
}
private bool tドラムヒット処理( long nHitTime, Eパッド type, CDTX.CChip pChip, bool b両手入力, int nPlayer ) private bool tドラムヒット処理( long nHitTime, Eパッド type, CDTX.CChip pChip, bool b両手入力, int nPlayer )
{ {
int nInput = 0; int nInput = 0;
@ -795,8 +829,6 @@ namespace TJAPlayer3
return false; return false;
} }
var _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(nPlayer)];
E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nPlayer ); E判定 e判定 = this.e指定時刻からChipのJUDGEを返す( nHitTime, pChip, nPlayer );
e判定 = AlterJudgement(nPlayer, e判定, false); e判定 = AlterJudgement(nPlayer, e判定, false);
@ -814,30 +846,7 @@ namespace TJAPlayer3
{ {
TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start( pChip.nチャンネル番号, e判定, b両手入力, nPlayer ); TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.Start( pChip.nチャンネル番号, e判定, b両手入力, nPlayer );
int nFly = 0; int nFly = ChannelNumToFlyNoteNum(pChip, nPlayer, b両手入力, nInput);
switch(pChip.nチャンネル番号)
{
case 0x11:
nFly = 1;
break;
case 0x12:
nFly = 2;
break;
case 0x13:
case 0x1A:
nFly = b両手入力 ? 3 : 1;
break;
case 0x14:
case 0x1B:
nFly = (b両手入力 || _gt == EGameType.KONGA) ? 4 : 2;
break;
case 0x1F:
nFly = nInput == 0 ? 1 : 2;
break;
default:
nFly = 1;
break;
}
//this.actChipFireTaiko.Start( nFly, nPlayer ); //this.actChipFireTaiko.Start( nFly, nPlayer );
@ -1635,8 +1644,8 @@ namespace TJAPlayer3
if (bAutoPlay && !this.bPAUSE) if (bAutoPlay && !this.bPAUSE)
{ {
pChip.bHit = true; pChip.bHit = true;
if (!NotesManager.IsADLIB(pChip) && pChip.nチャンネル番号 < 0x20) // Provisional, to avoid crash on 0x101 if (!NotesManager.IsADLIB(pChip)) // Provisional, to avoid crash on 0x101
this.FlyingNotes.Start(pChip.nチャンネル番号 < 0x1A ? (pChip.nチャンネル番号 - 0x10) : (pChip.nチャンネル番号 - 0x17), nPlayer); this.FlyingNotes.Start(ChannelNumToFlyNoteNum(pChip, nPlayer), nPlayer);
//this.actChipFireTaiko.Start(pChip.nチャンネル番号 < 0x1A ? (pChip.nチャンネル番号 - 0x10) : (pChip.nチャンネル番号 - 0x17), nPlayer); //this.actChipFireTaiko.Start(pChip.nチャンネル番号 < 0x1A ? (pChip.nチャンネル番号 - 0x10) : (pChip.nチャンネル番号 - 0x17), nPlayer);
if (pChip.nチャンネル番号 == 0x12 || pChip.nチャンネル番号 == 0x14 || pChip.nチャンネル番号 == 0x1B) nLane = (int)PlayerLane.FlashType.Blue; if (pChip.nチャンネル番号 == 0x12 || pChip.nチャンネル番号 == 0x14 || pChip.nチャンネル番号 == 0x1B) nLane = (int)PlayerLane.FlashType.Blue;

11
TJAPlayer3/Stages/07.Game/Taiko/NotesManager.cs
View File

@ -244,7 +244,18 @@ namespace TJAPlayer3
{ {
EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)]; EGameType _gt = TJAPlayer3.ConfigIni.nGameType[TJAPlayer3.GetActualPlayer(player)];
switch (Lane)
{
case 1:
case 2:
case 3:
case 4:
TJAPlayer3.Tx.Notes[(int)_gt]?.t2D中心基準描画(TJAPlayer3.app.Device, x, y, new Rectangle(Lane * 130, 390, 130, 130)); TJAPlayer3.Tx.Notes[(int)_gt]?.t2D中心基準描画(TJAPlayer3.app.Device, x, y, new Rectangle(Lane * 130, 390, 130, 130));
break;
case 5:
TJAPlayer3.Tx.Note_Swap?.t2D中心基準描画(TJAPlayer3.app.Device, x, y, new Rectangle(0, 390, 130, 130));
break;
}
} }
// Regular display // Regular display