Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-31 03:53:44 +01:00
Code Releases Activity

Fix #110

Browse Source
This commit is contained in:
0aubsq 2022-01-09 07:24:43 +01:00
parent 430e513b18
commit 6716125986
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -2854,8 +2854,7 @@ namespace TJAPlayer3
if( chip現在処理中の連打チップ[ nPlayer ] != null ) if( chip現在処理中の連打チップ[ nPlayer ] != null )
{ {
chip現在処理中の連打チップ[ nPlayer ].bHit = true; chip現在処理中の連打チップ[ nPlayer ].bHit = true;
if (nPlayer == 0 if (chip現在処理中の連打チップ[nPlayer].nBalloon > chip現在処理中の連打チップ[nPlayer].nRollCount
&& chip現在処理中の連打チップ[nPlayer].nBalloon > chip現在処理中の連打チップ[nPlayer].nRollCount
&& chip現在処理中の連打チップ[nPlayer].nRollCount > 0 && chip現在処理中の連打チップ[nPlayer].nRollCount > 0
&& actChara.CharaAction_Balloon_Miss[nPlayer] != null) && actChara.CharaAction_Balloon_Miss[nPlayer] != null)
{ {
@ -2869,7 +2868,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Characters_Balloon_Timer[actChara.iCurrentCharacter[nPlayer]], TJAPlayer3.Skin.Characters_Balloon_Timer[actChara.iCurrentCharacter[nPlayer]],
TJAPlayer3.Timer); TJAPlayer3.Timer);
if (actChara.CharaAction_Balloon_Delay != null) actChara.CharaAction_Balloon_Delay[nPlayer] = new CCounter(0, if (actChara.CharaAction_Balloon_Delay[nPlayer] != null) actChara.CharaAction_Balloon_Delay[nPlayer] = new CCounter(0,
TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[nPlayer]] - 1, TJAPlayer3.Skin.Characters_Balloon_Delay[actChara.iCurrentCharacter[nPlayer]] - 1,
1, 1,
TJAPlayer3.Timer); TJAPlayer3.Timer);

12
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs
View File

@ -305,18 +305,25 @@ namespace TJAPlayer3
if (bマイどんアクション中[i]) if (bマイどんアクション中[i])
{ {
var nowOpacity = CharaAction_Balloon_FadeOut[i].Counter.b進行中 ? (int)CharaAction_Balloon_FadeOut[i].GetAnimation() : 255; var nowOpacity = CharaAction_Balloon_FadeOut[i].Counter.b進行中 ? (int)CharaAction_Balloon_FadeOut[i].GetAnimation() : 255;
if (CharaAction_Balloon_Broke[i]?.b進行中 == true && TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0) if (CharaAction_Balloon_Broke[i]?.b進行中 == true && TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0)
{ {
if (CharaAction_Balloon_FadeOut[i].Counter.b停止中 && CharaAction_Balloon_Broke[i].n現在の値 > CharaAction_Balloon_FadeOut_StartMs[i][0]) if (CharaAction_Balloon_FadeOut[i].Counter.b停止中 && CharaAction_Balloon_Broke[i].n現在の値 > CharaAction_Balloon_FadeOut_StartMs[i][0])
{ {
CharaAction_Balloon_FadeOut[i].Start(); CharaAction_Balloon_FadeOut[i].Start();
} }
if (TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値] != null) if (TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値] != null)
{ {
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].Opacity = nowOpacity;
TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0], TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]); TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].t2D描画(TJAPlayer3.app.Device,
(TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0])
+ TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0],
TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]);
} }
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i);
if (CharaAction_Balloon_Broke[i].b終了値に達した) if (CharaAction_Balloon_Broke[i].b終了値に達した)
{ {
CharaAction_Balloon_Broke[i].t停止(); CharaAction_Balloon_Broke[i].t停止();
@ -330,6 +337,7 @@ namespace TJAPlayer3
{ {
CharaAction_Balloon_FadeOut[i].Start(); CharaAction_Balloon_FadeOut[i].Start();
} }
if (TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値] != null) if (TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値] != null)
{ {
TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].Opacity = nowOpacity; TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].Opacity = nowOpacity;
@ -338,7 +346,9 @@ namespace TJAPlayer3
+ TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0], + TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0],
TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]); TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]);
} }
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i);
if (CharaAction_Balloon_Miss[i].b終了値に達した) if (CharaAction_Balloon_Miss[i].b終了値に達した)
{ {
CharaAction_Balloon_Miss[i].t停止(); CharaAction_Balloon_Miss[i].t停止();