Merge branch 'main' of https://github.com/MiracleForest-Ichni/IchniCreatorStudio

Assets/Dreamteck/Splines/Components/SplineRenderer.cs

@@ -107,7 +107,7 @@ namespace Dreamteck.Splines
             }
             else if (EditorManager.instance.cameraManager.haveGameCamera && !EditorManager.instance.cameraManager.isSceneCameraActive)
             {
-                RenderWithCamera(EditorManager.instance.cameraManager.gameCamera.camera);
+                RenderWithCamera(EditorManager.instance.cameraManager.gameCamera.gameCamera);
             }
             else
             {

Assets/Scripts/EditorGame/GameElements/GameCamera/GameCamera.cs

@@ -15,7 +15,7 @@ namespace Ichni.RhythmGame
 {
     public partial class GameCamera : GameElement, IHaveTransformSubmodule, IHaveTimeDurationSubmodule
     {
-        public new Camera camera;
+        [FormerlySerializedAs("camera")] public new Camera gameCamera;
         public Transform rotationPoint;
         public Transform positionPoint;
         public Transform cameraTransform;
@@ -44,13 +44,13 @@ namespace Ichni.RhythmGame
             gameCamera.Initialize(elementName, id, tags, isFirstGenerated, parentElement);
 
             cameraManager.gameCamera = gameCamera;
-            cameraManager.backgroundCamera.GetComponent<UniversalAdditionalCameraData>().cameraStack.Add(gameCamera.camera);
-            if (cameraManager.isSceneCameraActive) gameCamera.camera.enabled = false;
+            cameraManager.backgroundCamera.GetComponent<UniversalAdditionalCameraData>().cameraStack.Add(gameCamera.gameCamera);
+            if (cameraManager.isSceneCameraActive) gameCamera.gameCamera.enabled = false;
 
 
             gameCamera.parentElement = parentElement;
             gameCamera.cameraViewType = cameraViewType;
-            gameCamera.camera.orthographic = cameraViewType == CameraViewType.Orthographic;
+            gameCamera.gameCamera.orthographic = cameraViewType == CameraViewType.Orthographic;
             gameCamera.perspectiveAngle = perspectiveAngle;
             gameCamera.orthographicSize = orthographicSize;
             gameCamera.cameraTransform = gameCamera.transform;
@@ -75,6 +75,10 @@ namespace Ichni.RhythmGame
             var swirlButton = inspector.GenerateButton(this, generateAnimation, "Swirl",
                 () => Swirl.GenerateElement("New Swirl", Guid.NewGuid(), new List<string>(), true, this,
                     new FlexibleFloat(), new FlexibleFloat(), new FlexibleFloat()));
+            
+            var extensionButton = inspector.GenerateButton(this, generateAnimation, "Extension",
+                () => GameCameraExtension.GenerateElement("New Extension", Guid.NewGuid(), 
+                    new List<string>(), true, this, 1000f));
         }
     }
 

Assets/Scripts/EditorGame/GameElements/GameCamera/GameCameraExtension.cs

@@ -1,18 +1,87 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using Ichni.Editor;
+using Ichni.RhythmGame.Beatmap;
 using UnityEngine;
+using UnityEngine.Serialization;
 
-public class GameCameraExtension : MonoBehaviour
+namespace Ichni.RhythmGame
 {
-    // Start is called before the first frame update
-    void Start()
+    public partial class GameCameraExtension : GameElement
     {
+        public GameCamera gameCamera;
+        public SceneCamera sceneCamera => EditorManager.instance.cameraManager.sceneCamera;
+
+        public float farClipRange = 1000f;
+
+        public static GameCameraExtension GenerateElement(string elementName, Guid id,
+            List<string> tags, bool isFirstGenerated, GameElement parentElement, float farClipRange)
+        {
+            GameCameraExtension gameCameraExtension = Instantiate(EditorManager.instance.basePrefabs.emptyObject)
+                .AddComponent<GameCameraExtension>();
+            gameCameraExtension.Initialize(elementName, id, tags, isFirstGenerated, parentElement);
+            gameCameraExtension.gameCamera = parentElement as GameCamera;
+            gameCameraExtension.farClipRange = farClipRange;
+            gameCameraExtension.ApplyExtension();
+            return gameCameraExtension;
+        }
+
+        public void ApplyExtension()
+        {
+            gameCamera.gameCamera.farClipPlane = farClipRange;
+            sceneCamera.sceneCamera.farClipPlane = farClipRange;
+        }
         
+        public override void SetUpInspector()
+        {
+            IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
+            base.SetUpInspector();
+            var container = inspector.GenerateContainer("Settings");
+            var settingsSubcontainer = container.GenerateSubcontainer(3);
+            var farClipRangeButton = inspector.GenerateInputField(this, settingsSubcontainer, "Far Clip Range",
+                nameof(farClipRange)).AddListenerFunction(ApplyExtension);
+        }
+    }
+    
+    public partial class GameCameraExtension
+    {
+        public override void SaveBM()
+        {
+            matchedBM = new GameCameraExtension_BM(elementName, elementGuid, tags,
+                parentElement.matchedBM as GameElement_BM, farClipRange);
+        }
     }
 
-    // Update is called once per frame
-    void Update()
+    namespace Beatmap
     {
-        
+        public class GameCameraExtension_BM : GameElement_BM
+        {
+            public float farClipRange;
+            
+            public GameCameraExtension_BM()
+            {
+
+            }
+
+            public GameCameraExtension_BM(string elementName, Guid elementGuid, List<string> tags,
+                GameElement_BM attachedElement, float farClipRange)
+                : base(elementName, elementGuid, tags, attachedElement)
+            {
+                this.farClipRange = farClipRange;
+            }
+            
+            public override void ExecuteBM()
+            {
+                matchedElement = GameCameraExtension.GenerateElement(elementName, elementGuid, tags, false,
+                    GetElement(attachedElementGuid), farClipRange);
+            }
+
+            public override GameElement DuplicateBM(GameElement parent)
+            {
+                return GameCameraExtension.GenerateElement(elementName, Guid.NewGuid(), tags, false,
+                    parent, farClipRange);
+            }
+        }
     }
-}
+}

Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs

@@ -211,7 +211,7 @@ namespace Ichni.RhythmGame
 
                 if (EditorManager.instance.cameraManager.haveGameCamera)
                 {
-                    noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.camera.WorldToScreenPoint(noteVisual.transform.position);
+                    noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.transform.position);
                 }
             }
         }

Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs

@@ -124,7 +124,7 @@ namespace Ichni.RhythmGame
 
                 if (EditorManager.instance.cameraManager.haveGameCamera)
                 {
-                    noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.camera.WorldToScreenPoint(noteVisual.transform.position);
+                    noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.transform.position);
                 }
             }
         }

Assets/Scripts/Manager/CameraManager.cs

@@ -19,7 +19,7 @@ namespace Ichni.Editor
         
         public GameCamera gameCamera;
         public bool haveGameCamera => gameCamera != null;
-        public Camera currentCamera => haveGameCamera && !isSceneCameraActive ? gameCamera.camera : sceneCamera.sceneCamera;
+        public Camera currentCamera => haveGameCamera && !isSceneCameraActive ? gameCamera.gameCamera : sceneCamera.sceneCamera;
         
         public BaseElement_BM matchedBM { get; set; }
         
@@ -33,7 +33,7 @@ namespace Ichni.Editor
                 
             isSceneCameraActive = !isSceneCameraActive;
             sceneCamera.sceneCamera.enabled = isSceneCameraActive;
-            gameCamera.camera.enabled = !isSceneCameraActive;
+            gameCamera.gameCamera.enabled = !isSceneCameraActive;
         }
 
         public void SetUpInspector()

Assets/StreamingAssets/Projects/IceFlowerMaster/Beatmap.json

@@ -222661,6 +222661,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -222815,6 +222816,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -222969,6 +222971,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223123,6 +223126,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223277,6 +223281,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223431,6 +223436,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223585,6 +223591,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223739,6 +223746,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -223893,6 +223901,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224047,6 +224056,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224201,6 +224211,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224355,6 +224366,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224509,6 +224521,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224663,6 +224676,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224817,6 +224831,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -224971,6 +224986,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225125,6 +225141,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225279,6 +225296,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225433,6 +225451,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225587,6 +225606,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225741,6 +225761,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -225895,6 +225916,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226049,6 +226071,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226203,6 +226226,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226357,6 +226381,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226511,6 +226536,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226665,6 +226691,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226819,6 +226846,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -226973,6 +227001,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227127,6 +227156,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227281,6 +227311,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227435,6 +227466,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227589,6 +227621,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227743,6 +227776,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -227897,6 +227931,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228051,6 +228086,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228205,6 +228241,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228359,6 +228396,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228513,6 +228551,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228667,6 +228706,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228821,6 +228861,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -228975,6 +229016,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229129,6 +229171,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229283,6 +229326,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229437,6 +229481,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229591,6 +229636,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229745,6 +229791,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -229899,6 +229946,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230053,6 +230101,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230207,6 +230256,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230361,6 +230411,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230515,6 +230566,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230669,6 +230721,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230823,6 +230876,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -230977,6 +231031,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231131,6 +231186,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231285,6 +231341,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231439,6 +231496,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231593,6 +231651,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231747,6 +231806,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -231901,6 +231961,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232055,6 +232116,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232209,6 +232271,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232363,6 +232426,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232517,6 +232581,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232671,6 +232736,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232825,6 +232891,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -232979,6 +233046,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233133,6 +233201,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233287,6 +233356,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233441,6 +233511,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233595,6 +233666,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233749,6 +233821,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -233903,6 +233976,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234057,6 +234131,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234211,6 +234286,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234365,6 +234441,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234519,6 +234596,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234673,6 +234751,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234827,6 +234906,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -234981,6 +235061,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -235135,6 +235216,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -235289,6 +235371,7 @@
 					}
 				},{
 					"__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp",
+					"isHighlighted" : false,
 					"themeBundleName" : "departure_to_multiverse",
 					"objectName" : "DTM_NoteVisualTap",
 					"elementName" : "New Note Visual",
@@ -235696,6 +235779,19 @@
 					"attachedElementGuid" : {
 						"value" : "1fa96f15-8a53-45f3-9dc5-517c1b59db3f"
 					}
+				},{
+					"__type" : "Ichni.RhythmGame.Beatmap.GameCameraExtension_BM,Assembly-CSharp",
+					"farClipRange" : 200,
+					"elementName" : "New Extension",
+					"tags" : [
+						
+					],
+					"elementGuid" : {
+						"value" : "f1709962-6d2b-4c24-86c0-2d0302b19e80"
+					},
+					"attachedElementGuid" : {
+						"value" : "ad91cec4-1cae-4a78-b386-6fb3d0e5f855"
+					}
 				}
 			],
 			"attachedElementGuid" : {

Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 3049316252
+CRC: 3655490403
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest

@@ -1,15 +1,15 @@
 ManifestFileVersion: 0
-CRC: 3853765483
+CRC: 3085407850
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 3d10830b84cbc7584d348b3914999687
+    Hash: 1812ff41e21c7f9e2f54ab9c8716381f
   TypeTreeHash:
     serializedVersion: 2
     Hash: 6f6fddb4189435859f7911e8c9a54df2
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: 3d10830b84cbc7584d348b3914999687
+    Hash: 1812ff41e21c7f9e2f54ab9c8716381f
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/ThemeBundles/Basic/Scripts/EnvironmentObjects/JudgeTrigger.cs

@@ -40,7 +40,7 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
         private bool IsMouseOver()
         {
             //Raycast to check if mouse is over the object
-            Ray ray = EditorManager.instance.cameraManager.gameCamera.camera.ScreenPointToRay(Mouse.current.position.ReadValue());
+            Ray ray = EditorManager.instance.cameraManager.gameCamera.gameCamera.ScreenPointToRay(Mouse.current.position.ReadValue());
             if (Physics.Raycast(ray, out RaycastHit hit))
             {
                 if (hit.collider == triggerCollider)

Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualFlick.prefab

@@ -39760,13 +39760,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7089777165997333510}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.6532815, y: -0.27059805, z: 0.27059805, w: 0.6532815}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 3280136974552143098}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: -45, z: 0}
 --- !u!33 &6811687827371002137
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -39795,7 +39795,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 30ebcd09c269ea844b37acf7d1280f8f, type: 2}
+  - {fileID: 2100000, guid: 3d8156b4159c175408f8af5a365ea332, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualTap.prefab

@@ -19641,13 +19641,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1288579742112386154}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2530095146853640636}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0}
 --- !u!33 &8466080989844526628
 MeshFilter:
   m_ObjectHideFlags: 0