Fix: UI Scaling; FPS Counter

Assets/GWConquest/Scenes/GalaxyMap.unity

@@ -32436,6 +32436,7 @@ RectTransform:
   - {fileID: 361889917}
   - {fileID: 740356799}
   - {fileID: 953746576}
+  - {fileID: 894815927}
   m_Father: {fileID: 494226835}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -32465,6 +32466,7 @@ MonoBehaviour:
   ShowAllPlanetsToggle: {fileID: 361889916}
   MoveEnemyUnitsToggle: {fileID: 740356798}
   FreeBuildToggle: {fileID: 953746575}
+  FPSCounter: {fileID: 894815925}
 --- !u!1 &590405909
 GameObject:
   m_ObjectHideFlags: 0
@@ -47707,7 +47709,7 @@ PrefabInstance:
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -7.090027
+      value: -7.090088
       objectReference: {fileID: 0}
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
@@ -49770,6 +49772,87 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 893914851}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &894815924
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 894815927}
+  - component: {fileID: 894815926}
+  - component: {fileID: 894815925}
+  m_Layer: 5
+  m_Name: FPSCounter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &894815925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 894815924}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'FPS: 00
+
+'
+--- !u!222 &894815926
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 894815924}
+  m_CullTransparentMesh: 0
+--- !u!224 &894815927
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 894815924}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 587515776}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -375.26, y: 606}
+  m_SizeDelta: {x: -2396.52, y: -1415.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &896420470
 GameObject:
   m_ObjectHideFlags: 0
@@ -115616,10 +115699,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 2560, y: 1440}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

Assets/GWConquest/Scenes/MainMenu.unity

@@ -3762,10 +3762,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 2249, y: 1265}
+  m_ReferenceResolution: {x: 2560, y: 1440}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

Assets/GWConquest/Scripts/PlanetConnection.cs

@@ -138,7 +138,7 @@ namespace GWConquest
                     distance = Vector3.Distance(transform.position, cam.transform.position);
                 }
 
-                float scale = distance * 1000f / cam.pixelHeight;
+                float scale = distance * 1000f / PlanetScaling.FixedPixelHeight;
                 lineRenderer.widthMultiplier = ConstantWidth * scale;
 
                 var delta = QuadSpeed * Time.deltaTime;

Assets/GWConquest/Scripts/PlanetScaling.cs

@@ -6,6 +6,8 @@ namespace GWConquest
     public class PlanetScaling : MonoBehaviour, IZoomScaling
     {
 
+        public const float FixedPixelHeight = 1440f;
+
         public float NearScalingDistance = 1f;
         public float FarScalingDistance = 1f;
 
@@ -51,14 +53,14 @@ namespace GWConquest
                 scale = FixPlanetSize;
             }
 
-            scale *= (1000f / cam.pixelHeight);
+            scale *= (1000f / FixedPixelHeight);
 
             transform.localScale = scale * Vector3.one;
 
-            float circleScale = distance * CircleWidth * (1000f / cam.pixelHeight);
+            float circleScale = distance * CircleWidth * (1000f / FixedPixelHeight);
             CircleRenderer.widthMultiplier = circleScale;
 
-            float innerCircleScale = distance * InnerCircleWidth * (1000f / cam.pixelHeight);
+            float innerCircleScale = distance * InnerCircleWidth * (1000f / FixedPixelHeight);
             InnerCircleRenderer.widthMultiplier = innerCircleScale;
         }
 

Assets/GWConquest/Scripts/UI/DebugUI.cs

@@ -25,6 +25,8 @@ namespace GWConquest
         public Toggle MoveEnemyUnitsToggle;
         public Toggle FreeBuildToggle;
 
+        public Text FPSCounter;
+
 
         public void ClickSpawnButton()
         {
@@ -78,6 +80,11 @@ namespace GWConquest
 
             Planet.UpdateVisibilityStatus();
         }
+
+        void Update()
+        {
+            FPSCounter.text = string.Format("FPS: {0:00}", 1f/Time.unscaledDeltaTime);
+        }
     }
 }
 

Assets/GWConquest/Scripts/UI/IngameUI.cs

@@ -258,7 +258,7 @@ namespace GWConquest
 
         public static bool CanCameraScroll
         {
-            get => !IsInPauseMenu && !PlanetViewEnabled && !Instance.DebugUI.activeSelf;
+            get => !IsInPauseMenu && !PlanetViewEnabled;
         }
         
 

Assets/GWConquest/Scripts/UI/OptionsMenu.cs

@@ -23,7 +23,7 @@ namespace GWConquest
             for(int i = 0; i < Screen.resolutions.Length; i++)
             {
                 Resolution res = Screen.resolutions[i];
-                string str = res.width.ToString() + "x" + res.height.ToString();
+                string str = res.width.ToString() + "x" + res.height.ToString() + " @ " + res.refreshRate.ToString() + "Hz";
                 ResolutionDropdown.options.Add(new Dropdown.OptionData(str));
                 if(res.width == GameOptions.ResolutionWidth && res.height == GameOptions.ResolutionHeight)
                 {