diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a7cd43a..16c91c9 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2259,7 +2259,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -61.2, y: -35.86} + m_AnchoredPosition: {x: -61.2, y: -31.4} m_SizeDelta: {x: 15.358, y: 33.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &393224021 @@ -4245,7 +4245,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mainCamera: {fileID: 519420031} - AutoPlay: 1 --- !u!224 &601344169 RectTransform: m_ObjectHideFlags: 0 @@ -10672,7 +10671,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -77.116, y: -35.86} + m_AnchoredPosition: {x: -77.116, y: -31.4} m_SizeDelta: {x: 15.358, y: 33.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1678688328 diff --git a/Assets/Scripts/HttpHandler.cs b/Assets/Scripts/HttpHandler.cs index a458199..e872ecc 100644 --- a/Assets/Scripts/HttpHandler.cs +++ b/Assets/Scripts/HttpHandler.cs @@ -8,7 +8,7 @@ public class HttpHandler : MonoBehaviour { - public bool IsReloding { get; set; } = false; + public static bool IsReloding { get; set; } = false; private readonly HttpListener http = new(); private Task listen; private string request = ""; diff --git a/Assets/Scripts/JsonDataLoader.cs b/Assets/Scripts/JsonDataLoader.cs index 95f381b..4d1ee57 100644 --- a/Assets/Scripts/JsonDataLoader.cs +++ b/Assets/Scripts/JsonDataLoader.cs @@ -1,4 +1,4 @@ -using Assets.Scripts.IO; +using Assets.Scripts.Types; using Assets.Scripts.Notes; using Newtonsoft.Json; using System; diff --git a/Assets/Scripts/JudgeArea.cs b/Assets/Scripts/JudgeArea.cs index b769f48..c95363c 100644 --- a/Assets/Scripts/JudgeArea.cs +++ b/Assets/Scripts/JudgeArea.cs @@ -1,4 +1,4 @@ -using Assets.Scripts.IO; +using Assets.Scripts.Types; using System.Collections.Generic; using System.Linq; diff --git a/Assets/Scripts/Misc/DestroySelf.cs b/Assets/Scripts/Misc/DestroySelf.cs index d50cebc..deeba95 100644 --- a/Assets/Scripts/Misc/DestroySelf.cs +++ b/Assets/Scripts/Misc/DestroySelf.cs @@ -1,5 +1,5 @@ using UnityEngine; - +#nullable enable public class DestroySelf : MonoBehaviour { public bool ifDestroy; diff --git a/Assets/Scripts/Misc/DontDestroyOnLoad.cs b/Assets/Scripts/Misc/DontDestroyOnLoad.cs index 10601d2..9c03426 100644 --- a/Assets/Scripts/Misc/DontDestroyOnLoad.cs +++ b/Assets/Scripts/Misc/DontDestroyOnLoad.cs @@ -1,5 +1,5 @@ using UnityEngine; - +#nullable enable public class DontDestroyOnLoad : MonoBehaviour { private void Start() diff --git a/Assets/Scripts/Misc/Input.cs b/Assets/Scripts/Misc/Input.cs deleted file mode 100644 index 2005f58..0000000 --- a/Assets/Scripts/Misc/Input.cs +++ /dev/null @@ -1,66 +0,0 @@ - -namespace Assets.Scripts.IO -{ - public enum SensorStatus - { - On, - Off - } - public enum SensorType - { - A1, - A2, - A3, - A4, - A5, - A6, - A7, - A8, - B1, - B2, - B3, - B4, - B5, - B6, - B7, - B8, - C, - D1, - D2, - D3, - D4, - D5, - D6, - D7, - D8, - E1, - E2, - E3, - E4, - E5, - E6, - E7, - E8 - } - public enum SensorGroup - { - A, - B, - C, - D, - E - } - public interface IIOComponent - { - - } - public struct InputEventArgs - { - public SensorType Type { get; set; } - public SensorStatus OldStatus { get; set; } - public SensorStatus Status { get; set; } - public bool IsButton { get; set; } - public bool IsClick => OldStatus == SensorStatus.Off && Status == SensorStatus.On; - - } -} diff --git a/Assets/Scripts/Misc/InputManager.cs b/Assets/Scripts/Misc/InputManager.cs index f4e53b4..c11244c 100644 --- a/Assets/Scripts/Misc/InputManager.cs +++ b/Assets/Scripts/Misc/InputManager.cs @@ -1,54 +1,45 @@ -using Assets.Scripts.IO; +using Assets.Scripts.Types; using System; using System.Collections.Generic; using System.Linq; using UnityEngine; -using static UnityEngine.GraphicsBuffer; - +#nullable enable public class InputManager : MonoBehaviour { public Camera mainCamera; - public bool AutoPlay = false; + public static AutoPlayMode Mode { get; private set; } = AutoPlayMode.DJAuto; public Dictionary> triggerSensors = new(); - //public event EventHandler OnSensorStatusChanged; - public event EventHandler OnButtonStatusChanged; - Guid guid = Guid.NewGuid(); - List sensors = new(); + List sensorObjs = new(); + List sensors = new(); + List