From cba73cecda5195b3f661c163d6ed27672b827462 Mon Sep 17 00:00:00 2001 From: Firerise9402 <90978630+Firerise9402@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:02:46 -0400 Subject: [PATCH] fixed stuff --- Assets/Scenes/Editor.unity | 20 ++++++++++---------- Assets/Scripts/AppInfo.cs | 4 ++-- Assets/Scripts/WindowController.cs | 19 ++++++++----------- ProjectSettings/ProjectSettings.asset | 6 +++--- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 707421552..f39eaf281 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -12215,7 +12215,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchoredPosition: {x: 0, y: -50.000015} m_SizeDelta: {x: -48, y: -148} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &572765323 @@ -13315,7 +13315,7 @@ MonoBehaviour: m_HandleRect: {fileID: 704039020} m_Direction: 0 m_Value: 0 - m_Size: 0.10518808 + m_Size: 0.10518809 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -13779,6 +13779,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 176381795900272283, guid: 720073bc7682b1441bece7116681f72c, type: 3} + propertyPath: UniController + value: + objectReference: {fileID: 693146899} - target: {fileID: 198071653306764931, guid: 720073bc7682b1441bece7116681f72c, type: 3} propertyPath: m_Enabled value: 1 @@ -13803,10 +13807,6 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} - - target: {fileID: 176381795900272283, guid: 720073bc7682b1441bece7116681f72c, type: 3} - propertyPath: UniController - value: - objectReference: {fileID: 693146899} - target: {fileID: 3558106557710386107, guid: 720073bc7682b1441bece7116681f72c, type: 3} propertyPath: m_BlockingMask.m_Bits value: 0 @@ -24935,7 +24935,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: 118.41051} + m_AnchoredPosition: {x: 0, y: 118.49953} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -31767,7 +31767,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -42.495117} + m_AnchoredPosition: {x: 0, y: -42.49511} m_SizeDelta: {x: 1440.022, y: -84.99} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1527251881 @@ -37084,7 +37084,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -84.98996} + m_AnchoredPosition: {x: 0, y: -84.989975} m_SizeDelta: {x: 320, y: -84.99} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 @@ -41156,7 +41156,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -42.495117} + m_AnchoredPosition: {x: 0, y: -42.49511} m_SizeDelta: {x: 1054, y: -84.99} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2066632681 diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs index bb7aef405..af648d207 100644 --- a/Assets/Scripts/AppInfo.cs +++ b/Assets/Scripts/AppInfo.cs @@ -1,8 +1,8 @@ using System; public static class AppInfo { - public const string Version = "0.0.1051"; - public static readonly DateTime Date = new DateTime(2023, 10, 09, 19, 05, 36, 828, DateTimeKind.Utc); + public const string Version = "0.0.1060"; + public static readonly DateTime Date = new DateTime(2023, 10, 09, 20, 01, 39, 315, DateTimeKind.Utc); } diff --git a/Assets/Scripts/WindowController.cs b/Assets/Scripts/WindowController.cs index 7e941d679..56753abd0 100644 --- a/Assets/Scripts/WindowController.cs +++ b/Assets/Scripts/WindowController.cs @@ -48,8 +48,12 @@ namespace HeavenStudio #if UNITY_EDITOR return; #else - UniController.windowSize = (new Vector2(resX, resY)); - UniController.windowPosition = (new Vector2(x, y)); + if(Application.isEditor || !Editor.Editor.instance.fullscreen || !Conductor.instance.isPlaying) return; + if(PersistentDataManager.gameSettings.windowDanceEnable) + { + UniController.windowSize = (new Vector2(resX, resY)); + UniController.windowPosition = (new Vector2(x, y)); + } #endif } @@ -101,10 +105,7 @@ namespace HeavenStudio UpdateScale(); UpdatePan(); //SetShakeIntensity(); - if(PersistentDataManager.gameSettings.windowDanceEnable) - { - SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y)); - } + SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y)); } private void UpdatePan() @@ -213,11 +214,7 @@ namespace HeavenStudio pan = defaultPan; scale = defaultScale; shakeResult = defaultShake; - if(Application.isEditor) return; - if(PersistentDataManager.gameSettings.windowDanceEnable) - { - SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y)); - } + SetPosition(Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y)); } } } \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 666c42da2..ce3977243 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.0.1051 + bundleVersion: 0.0.1060 preloadedAssets: - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3} metroInputSource: 0 @@ -158,11 +158,11 @@ PlayerSettings: applicationIdentifier: Standalone: com.RHeavenStudio.Heaven-Studio buildNumber: - Standalone: 1051 + Standalone: 1060 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 1051 + AndroidBundleVersionCode: 1060 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1