Minor fixes

krimevn · Jun 30, 2023 · 4fcb2b7 · 4fcb2b7
1 parent bdb0476
commit 4fcb2b7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/Assets/Resources/Prefabs/Pal3.prefab b/Assets/Resources/Prefabs/Pal3.prefab
@@ -3857,7 +3857,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 20}
-  m_SizeDelta: {x: 1200, y: -40}
+  m_SizeDelta: {x: 800, y: -40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &4450587676581078315
 CanvasGroup:
@@ -3883,9 +3883,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e9d6f17a4e68481a9705f217be9b4156, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  thresholdRatio: 1.666667
+  maxThresholdRatio: 1.66667
+  minThresholdRatio: 1.4
   minWidth: 800
-  maxWidth: 1200
+  midWidth: 950
+  maxWidth: 1100
 --- !u!223 &7116787231374669820
 Canvas:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/Pal3/Effect/PostProcessing/PostProcessManager.cs b/Assets/Scripts/Pal3/Effect/PostProcessing/PostProcessManager.cs
@@ -165,21 +165,21 @@ or nameof(GameSettings.IsAmbientOcclusionEnabled))
                 TogglePostProcessLayerWhenNeeded();
             }
 
-            #if UNITY_IOS
+            #if UNITY_IOS || UNITY_STANDALONE_OSX
             if (command.SettingName is nameof(GameSettings.ResolutionScale))
             {
                 StartCoroutine(ReloadAmbientOcclusionSettingAsync());
             }
             #endif
         }
 
-        #if UNITY_IOS
+        #if UNITY_IOS || UNITY_STANDALONE_OSX
         private IEnumerator Start()
         {
             yield return ReloadAmbientOcclusionSettingAsync();
         }
 
-        // On iOS, the SSAO and Resolution changing are causing the RoundedFrostedGlass
+        // On iOS and MacOS, the SSAO and Resolution changing are causing the RoundedFrostedGlass
         // shader to malfunction. This is a workaround to disable and re-enable SSAO to fix the issue.
         private IEnumerator ReloadAmbientOcclusionSettingAsync()
         {

diff --git a/Assets/Scripts/Pal3/UI/RectTransformWidthResizer.cs b/Assets/Scripts/Pal3/UI/RectTransformWidthResizer.cs
@@ -11,8 +11,11 @@ namespace Pal3.UI
     [RequireComponent(typeof(RectTransform))]
     public class RectTransformWidthResizer : MonoBehaviour
     {
-        public float thresholdRatio;
+        public float maxThresholdRatio;
+        public float minThresholdRatio;
+
         public float minWidth;
+        public float midWidth;
         public float maxWidth;
 
         private RectTransform _transform;
@@ -25,8 +28,12 @@ void OnEnable()
 
         void Update()
         {
-            bool useMinWidth = (float)Screen.width / Screen.height < thresholdRatio;
-            _transform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, useMinWidth ? minWidth : maxWidth);
+            float currentRatio = (float) Screen.width / Screen.height;
+
+            bool useMaxWidth = currentRatio > maxThresholdRatio;
+            bool useMinWidth = currentRatio < minThresholdRatio;
+
+            _transform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, useMaxWidth ? maxWidth : useMinWidth ? minWidth : midWidth);
         }
 
         void OnValidate() => OnEnable();