Fix #110

0auBSQ · Jan 9, 2022 · 6716125 · 6716125
1 parent 430e513
commit 6716125
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
@@ -2854,8 +2854,7 @@ protected bool t進行描画_チップ( E楽器パート ePlayMode, int nPlayer
                                 if( chip現在処理中の連打チップ[ nPlayer ] != null )
                                 {
                                     chip現在処理中の連打チップ[ nPlayer ].bHit = true;
-                                    if (nPlayer == 0 
-                                        && chip現在処理中の連打チップ[nPlayer].nBalloon > chip現在処理中の連打チップ[nPlayer].nRollCount 
+                                    if (chip現在処理中の連打チップ[nPlayer].nBalloon > chip現在処理中の連打チップ[nPlayer].nRollCount 
                                         && chip現在処理中の連打チップ[nPlayer].nRollCount > 0 
                                         && actChara.CharaAction_Balloon_Miss[nPlayer] != null)
                                     {
@@ -2869,7 +2868,7 @@ protected bool t進行描画_チップ( E楽器パート ePlayMode, int nPlayer
                                                 TJAPlayer3.Skin.Characters_Balloon_Timer[actChara.iCurrentCharacter[nPlayer]], 
                                                 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, 
                                                 1, 
                                                 TJAPlayer3.Timer);

diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs
@@ -305,18 +305,25 @@ public void OnDraw_Balloon()
                 if (bマイどんアクション中[i])
                 {
                     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_FadeOut[i].Counter.b停止中 && CharaAction_Balloon_Broke[i].n現在の値 > CharaAction_Balloon_FadeOut_StartMs[i][0])
                         {
                             CharaAction_Balloon_FadeOut[i].Start();
                         }
+
                         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現在の値].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);
+
                         if (CharaAction_Balloon_Broke[i].b終了値に達した)
                         {
                             CharaAction_Balloon_Broke[i].t停止();
@@ -330,6 +337,7 @@ public void OnDraw_Balloon()
                         {
                             CharaAction_Balloon_FadeOut[i].Start();
                         }
+
                         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;
@@ -338,7 +346,9 @@ public void OnDraw_Balloon()
                                 + 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);
+
                         if (CharaAction_Balloon_Miss[i].b終了値に達した)
                         {
                             CharaAction_Balloon_Miss[i].t停止();