diff --git a/Assets/CheckUIScale.cs b/Assets/CheckUIScale.cs new file mode 100644 index 0000000..301b3a4 --- /dev/null +++ b/Assets/CheckUIScale.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class CheckUIScale : MonoBehaviour { + + CanvasScaler canvas; + + private void Awake() { + canvas = GetComponent(); + } + + // Use this for initialization + void Start () { + if (Screen.dpi >= 190) + canvas.scaleFactor = 2.6f; + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/CheckUIScale.cs.meta b/Assets/CheckUIScale.cs.meta new file mode 100644 index 0000000..97e7703 --- /dev/null +++ b/Assets/CheckUIScale.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 469e55976a26c4d96ad7c12fc6b31a81 +timeCreated: 1532514250 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity index 005d3d5..f26d73e 100644 --- a/Assets/MainScene.unity +++ b/Assets/MainScene.unity @@ -556,7 +556,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -0.0000038146973 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -646,7 +646,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -2389,7 +2389,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 384800659} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.330025, y: 0.12402344, z: 0} + m_LocalPosition: {x: 119.33002, y: 0.12402344, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2127403382} @@ -3527,7 +3527,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -0.0000038146973 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -3617,7 +3617,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -3707,7 +3707,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.000017166138 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -3797,7 +3797,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -3906,7 +3906,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565950011} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 239.53925, y: 170.1077, z: 0} + m_LocalPosition: {x: 284.92386, y: 195.49232, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2059424200} @@ -4238,7 +4238,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -0.0000038146973 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -4328,7 +4328,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -5404,7 +5404,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -0.0000038146973 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -5494,7 +5494,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -5801,7 +5801,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 715392269} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18.180008, y: 43.432693, z: 0} + m_LocalPosition: {x: 18.180008, y: 68.81732, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1202556823} @@ -5854,7 +5854,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -22.80001 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -5944,7 +5944,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 1783968414692944, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_Name @@ -6758,7 +6758,7 @@ Prefab: - target: {fileID: 224350159365492842, guid: 8d31e36d99cd3470a9098165f53d0979, type: 2} propertyPath: m_LocalPosition.y - value: -146.815 + value: -494.46735 objectReference: {fileID: 0} - target: {fileID: 224350159365492842, guid: 8d31e36d99cd3470a9098165f53d0979, type: 2} @@ -7083,7 +7083,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 897516546} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.05000305, y: 162.4327, z: 0} + m_LocalPosition: {x: 0.05000305, y: 187.81732, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1059206952} @@ -7656,7 +7656,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 967983572} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -184.81561, z: 0} + m_LocalPosition: {x: 0, y: -184.81558, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1602435184} @@ -8549,7 +8549,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1144076161} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 119.82997, y: -106.57268, z: 0} + m_LocalPosition: {x: 119.829956, y: -131.9573, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1340324852} @@ -8881,7 +8881,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1197122674} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.025032043, y: 197.33017, z: 0} + m_LocalPosition: {x: 0.025032043, y: 222.71478, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 211861403} @@ -9574,7 +9574,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1371052590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.1500015, y: 197.33101, z: 0} + m_LocalPosition: {x: 1.1500015, y: 222.71564, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1051724950} @@ -9864,7 +9864,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1433522475} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 232.04454, y: 60, z: 0} + m_LocalPosition: {x: 277.58182, y: 60, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 637090571} @@ -9873,7 +9873,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: 232.04454, y: 60} + m_AnchoredPosition: {x: 277.58182, y: 60} m_SizeDelta: {x: 400, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &1433522477 @@ -10783,7 +10783,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1616544792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.000015258789, y: 164.43773, z: 0} + m_LocalPosition: {x: 0.000015258789, y: 189.82236, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2119123834} @@ -10978,7 +10978,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -22.80001 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -11068,7 +11068,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 1783968414692944, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_Name @@ -11643,7 +11643,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1764345208} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -232.78926, y: 0.12501526, z: 0} + m_LocalPosition: {x: -278.17383, y: 0.12501526, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 157423044} @@ -12115,7 +12115,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -0.0000038146973 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -12205,7 +12205,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -12561,7 +12561,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1861917361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 236.66925, y: 44.307693, z: 0} + m_LocalPosition: {x: 282.05386, y: 69.69232, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1659316461} @@ -12791,7 +12791,7 @@ Prefab: - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 0.000017166138 objectReference: {fileID: 0} - target: {fileID: 224625523562565964, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -12881,7 +12881,7 @@ Prefab: - target: {fileID: 224794236505317320, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -25.399994 objectReference: {fileID: 0} - target: {fileID: 224186251391229476, guid: 6c102dc0946bc4b52bc63bf9f4b4af23, type: 2} @@ -13620,7 +13620,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2078342590} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.07500458, y: 162.4327, z: 0} + m_LocalPosition: {x: 0.07500458, y: 187.81732, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2102326051} @@ -13996,6 +13996,7 @@ GameObject: - component: {fileID: 2127403384} - component: {fileID: 2127403385} - component: {fileID: 2127403386} + - component: {fileID: 2127403387} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -14067,7 +14068,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2127403378} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 456, y: 256.5, z: 0} + m_LocalPosition: {x: 515, y: 289.5, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: - {fileID: 187655526} @@ -14272,6 +14273,17 @@ MonoBehaviour: disabledColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} firstWeekMonday: 1 mapControls: 1 +--- !u!114 &2127403387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2127403378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 469e55976a26c4d96ad7c12fc6b31a81, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2129109460 stripped GameObject: m_PrefabParentObject: {fileID: 1328464336494078, guid: 0f4facaf280fd45fa915ec10eb352abb, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 13a88d5..32106c3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -16,7 +16,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -53,7 +53,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + displayResolutionDialog: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -63,7 +63,7 @@ PlayerSettings: use32BitDisplayBuffer: 1 disableDepthAndStencilBuffers: 0 androidBlitType: 0 - defaultIsFullScreen: 1 + defaultIsFullScreen: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 @@ -72,10 +72,10 @@ PlayerSettings: Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 submitAnalytics: 1 - usePlayerLog: 1 + usePlayerLog: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0