diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index ca194f82..2445acfb 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1280 - m_Height: 720 + m_Width: 1600 + m_Height: 900 m_AntiAliasing: 2 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index d13320f7..116de67f 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1920 - m_Height: 1080 + m_Width: 2400 + m_Height: 1350 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 973e1437..11eaddf0 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -10986,7 +10986,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 171581557} m_HandleRect: {fileID: 171581556} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -18620,8 +18620,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 29, y: -29} - m_SizeDelta: {x: 48, y: 48} + m_AnchoredPosition: {x: 29.3, y: -29.3} + m_SizeDelta: {x: 48.6, y: 48.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &781200687 MonoBehaviour: @@ -20896,8 +20896,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 - m_Size: 0.9999943 + m_Value: 1 + m_Size: 0.9999938 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25541,7 +25541,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 125.591866} + m_AnchoredPosition: {x: 0, y: 162.32596} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -34587,8 +34587,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1220118245} m_HandleRect: {fileID: 1220118244} m_Direction: 2 - m_Value: 1.0000002 - m_Size: 0.6423325 + m_Value: 1.0000017 + m_Size: 0.9467054 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs index 0d669e5e..028327f0 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs @@ -6,6 +6,7 @@ using Jukebox; using TMPro; using System.Linq; using System.Collections.Generic; +using UnityEngine.Timeline; namespace HeavenStudio.Editor.Track { @@ -148,8 +149,11 @@ namespace HeavenStudio.Editor.Track if (selected) { - if (moving) + if (TimelineBlockManager.Instance.MovingAnyEvents) + { outline.color = Color.magenta; + SetColor((int)entity["track"]); + } else outline.color = Color.cyan; } @@ -200,6 +204,7 @@ namespace HeavenStudio.Editor.Track if (!isCreating && movedEntity) { + // NOTE (PELLY): Replace with arrays soon List lastBeats = new(); List lastLayers = new(); foreach (var marker in Selections.instance.eventsSelected) @@ -318,7 +323,8 @@ namespace HeavenStudio.Editor.Track if (Input.GetMouseButton(1) || Input.GetMouseButton(2)) return; if (!moving) - altWhenClicked = Input.GetKey(KeyCode.LeftAlt); + if (!altWhenClicked) + altWhenClicked = Input.GetKey(KeyCode.LeftAlt); if (!altWhenClicked) {