From 54c4dc506d1067f0f432a7de1e34f93783e09b2d Mon Sep 17 00:00:00 2001
From: Takkkom <76614532+Takkkom@users.noreply.github.com>
Date: Sat, 9 Dec 2023 12:13:51 +0900
Subject: [PATCH] =?UTF-8?q?=E9=80=A3=E6=89=93=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#535)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs         | 4 ++--
 OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
index 9beb7944..487ab199 100644
--- a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
+++ b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
@@ -3764,12 +3764,12 @@ namespace TJAPlayer3
                         break;
                     case 0x18:
                         {
-                            if( ( !pChip.bHit && (pChip.nバーからの距離dot.Drums < 0 ) ) )
+                            if( ( !pChip.bProcessed && (pChip.nバーからの距離dot.Drums < 0 ) ) )
                             {
                                 this.b連打中[ nPlayer ] = false;
                                 this.actRoll.b表示[ nPlayer ] = false;
                                 this.actChara.b風船連打中[nPlayer] = false;
-                                pChip.bHit = true;
+                                pChip.bProcessed = true;
                                 if( chip現在処理中の連打チップ[ nPlayer ] != null )
                                 {
                                     chip現在処理中の連打チップ[ nPlayer ].bHit = true;
diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
index 26a42ef3..34df4e4b 100644
--- a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
+++ b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
@@ -2285,7 +2285,8 @@ namespace TJAPlayer3
                 //if( CDTXMania.ConfigIni.eScrollMode != EScrollMode.Normal )
                 //x -= 10;
 
-                if(x末端 > 0 - TJAPlayer3.Skin.Game_Notes_Size[0] && x < TJAPlayer3.Skin.Resolution[0])
+                //if(x末端 > 0 - TJAPlayer3.Skin.Game_Notes_Size[0] && x < TJAPlayer3.Skin.Resolution[0])
+                if((Math.Min(x, x末端) < TJAPlayer3.Skin.Resolution[0] && Math.Max(x, x末端) > 0 - TJAPlayer3.Skin.Game_Notes_Size[0]))
                 {
                     if (TJAPlayer3.Tx.Notes[(int)_gt] != null)
                     {