Selection of various sized arctap

yojohanshinwataikei · Apr 1, 2024 · 8ecb57e · 8ecb57e
1 parent 0ba7d95
commit 8ecb57e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Assets/Scripts/Gameplay/ArcGameplayManager.cs b/Assets/Scripts/Gameplay/ArcGameplayManager.cs
@@ -78,7 +78,8 @@ private void Update()
 			{
 				float playBackSpeed = ArcAudioManager.Instance.PlayBackSpeed;
 				timing += Time.deltaTime * playBackSpeed;
-				if(EnablePlaybackSync){
+				if (EnablePlaybackSync)
+				{
 					float t = ArcAudioManager.Instance.Timing;
 					if (deltaDspTime > 0f && (timing >= 0 || ArcAudioManager.Instance.Timing > 0))
 					{
@@ -137,11 +138,13 @@ public void ResetJudge()
 		{
 			if (Chart != null)
 			{
-				foreach (var t in Chart.Arcs) {
+				foreach (var t in Chart.Arcs)
+				{
 					foreach (var a in t.ArcTaps) { a.Judged = false; }
 					t.Judged = false; t.Judging = false; t.AudioPlayed = false;
-					if(t.ConvertedVariousSizedArctap!=null){
-						t.ConvertedVariousSizedArctap.Judged=false;
+					if (t.ConvertedVariousSizedArctap != null)
+					{
+						t.ConvertedVariousSizedArctap.Judged = false;
 					}
 				};
 				foreach (var t in Chart.Holds) { t.Judged = false; t.Judging = false; t.AudioPlayed = false; };
@@ -194,6 +197,7 @@ public ArcNote FindNoteByRaycastHit(RaycastHit h)
 			foreach (var arc in Chart.Arcs)
 			{
 				if (arc.IsHitMyself(h)) return arc;
+				if (arc.ConvertedVariousSizedArctap?.IsMyself(h.transform.gameObject) ?? false) return arc;
 				foreach (var arctap in arc.ArcTaps)
 				{
 					if (arctap.IsMyself(h.transform.gameObject)) return arctap;

diff --git a/Assets/Scripts/Gameplay/Chart/ArcChart.cs b/Assets/Scripts/Gameplay/Chart/ArcChart.cs
@@ -1167,6 +1167,10 @@ public override bool Selected
 			set
 			{
 				arcRenderer.Selected = value;
+				if (ConvertedVariousSizedArctap != null)
+				{
+					ConvertedVariousSizedArctap.Selected = value;
+				}
 			}
 		}
 		public override GameObject Instance
@@ -1257,6 +1261,7 @@ public void InstantiateArcTaps()
 					IsConvertedVariousSizedArctap = true,
 				};
 				ConvertedVariousSizedArctap.Instantiate(this);
+				ConvertedVariousSizedArctap.Selected=Selected;
 			}
 		}
 		public void DestroyArcTaps()

diff --git a/Assets/Scripts/Gameplay/Components/ArcArcRenderer.cs b/Assets/Scripts/Gameplay/Components/ArcArcRenderer.cs
@@ -487,7 +487,7 @@ public void BuildHead()
 		}
 		public void BuildCollider()
 		{
-			if (arc.Timing > arc.EndTiming || segments.Count == 0)
+			if (arc.Timing > arc.EndTiming || segments.Count == 0 || arc.IsVariousSizedArctap)
 			{
 				if (ArcCollider.sharedMesh)
 				{