diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index bb771d0..b20413f 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -3,10 +3,10 @@ using UnityEngine.UI; public abstract class UIManager : MonoBehaviour { - protected float scale = 1F; - public virtual void Start () { + float scale; + if (Screen.dpi < 140) scale = 0.22F; @@ -25,9 +25,9 @@ public abstract class UIManager : MonoBehaviour { else scale = 1F; - rebuild(); + rebuild(scale); } - protected abstract void rebuild(); + protected abstract void rebuild(float scale); } diff --git a/Assets/Scripts/UIManagerInfo.cs b/Assets/Scripts/UIManagerInfo.cs index eb2e2f4..8d05e96 100644 --- a/Assets/Scripts/UIManagerInfo.cs +++ b/Assets/Scripts/UIManagerInfo.cs @@ -10,44 +10,44 @@ public class UIManagerInfo : UIManager { public Button tutorial; public Image info; - protected override void rebuild() + protected override void rebuild(float scale) { // bar { - bar.transform.localScale = new Vector3(base.scale, base.scale, 1); - bar.transform.position -= new Vector3(0, 165 * (1F - base.scale), 0); + bar.transform.localScale = new Vector3(scale, scale, 1); + bar.transform.position -= new Vector3(0, 165 * (1F - scale), 0); } // logo { - logo.transform.localScale = new Vector3(base.scale, base.scale, 1); - logo.transform.position -= new Vector3(0, -160 * (1F - base.scale), 0); + logo.transform.localScale = new Vector3(scale, scale, 1); + logo.transform.position -= new Vector3(0, -160 * (1F - scale), 0); } // back { - float dist = 100 * (1F - base.scale); + float dist = 100 * (1F - scale); - back.transform.localScale = new Vector3(base.scale, base.scale, 1); + back.transform.localScale = new Vector3(scale, scale, 1); back.transform.position -= new Vector3(dist, -dist, 0); } // facebook { - facebook.transform.localScale = new Vector3(base.scale, base.scale, 1); - facebook.transform.position -= new Vector3(0, 500 * (1F - base.scale), 0); + facebook.transform.localScale = new Vector3(scale, scale, 1); + facebook.transform.position -= new Vector3(0, 500 * (1F - scale), 0); } // tutorial { - tutorial.transform.localScale = new Vector3(base.scale, base.scale, 1); - tutorial.transform.position -= new Vector3(0, 900 * (1F - base.scale), 0); + tutorial.transform.localScale = new Vector3(scale, scale, 1); + tutorial.transform.position -= new Vector3(0, 900 * (1F - scale), 0); } // info { - info.transform.localScale = new Vector3(base.scale, base.scale, 1); - //info.transform.position -= new Vector3(0, 540 * (1F - base.scale), 0); + info.transform.localScale = new Vector3(scale, scale, 1); + //info.transform.position -= new Vector3(0, 540 * (1F - scale), 0); } } diff --git a/Assets/Scripts/UIManagerLoading.cs b/Assets/Scripts/UIManagerLoading.cs new file mode 100644 index 0000000..7622166 --- /dev/null +++ b/Assets/Scripts/UIManagerLoading.cs @@ -0,0 +1,36 @@ +using UnityEngine; +using UnityEngine.UI; + +public class UIManagerLoading : UIManager { + + public Text text; + public Image image; + + protected override void rebuild(float scale) + { + float textHeight = Screen.height / 2; + + // text + { + text.fontSize = (int)( text.fontSize * scale ); + + Vector2 textSize = text.GetComponent().sizeDelta; + textSize.y = textHeight; + text.GetComponent().sizeDelta = textSize; + + Vector3 textPosition = text.transform.position; + textPosition.y = (3 * Screen.height) / 4; + text.transform.position = textPosition; + } + + // image + { + image.transform.localScale = new Vector3(scale, scale, 1); + + Vector3 imagePosition = image.transform.position; + imagePosition.y = textHeight - (90 * scale); + image.transform.position = imagePosition; + } + } + +} diff --git a/Assets/Scripts/UIManagerLoading.cs.meta b/Assets/Scripts/UIManagerLoading.cs.meta new file mode 100644 index 0000000..62c31a6 --- /dev/null +++ b/Assets/Scripts/UIManagerLoading.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 823c98ddc010736408f7ed99ec13991e +timeCreated: 1443546340 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIManagerMain.cs b/Assets/Scripts/UIManagerMain.cs index fd27588..c7690cc 100644 --- a/Assets/Scripts/UIManagerMain.cs +++ b/Assets/Scripts/UIManagerMain.cs @@ -7,11 +7,11 @@ public class UIManagerMain : UIManager { public GameObject container; public Text text; - protected override void rebuild() + protected override void rebuild(float scale) { - container.transform.localScale = new Vector3(base.scale, 1, 1); - bar.transform.localScale = new Vector3(1, base.scale, 1); - bar.transform.position -= new Vector3(0, 165 * (1F - base.scale), 0); + container.transform.localScale = new Vector3(scale, 1, 1); + bar.transform.localScale = new Vector3(1, scale, 1); + bar.transform.position -= new Vector3(0, 165 * (1F - scale), 0); } } diff --git a/Assets/Scripts/UIManagerTextEntry.cs b/Assets/Scripts/UIManagerTextEntry.cs index 02fa622..1a1996c 100644 --- a/Assets/Scripts/UIManagerTextEntry.cs +++ b/Assets/Scripts/UIManagerTextEntry.cs @@ -8,22 +8,22 @@ public class UIManagerTextEntry : UIManager { public GameObject textEntry; public Button translate; - protected override void rebuild() + protected override void rebuild(float scale) { // back { float dist = 132 * scale * 0.75F; - back.transform.localScale = new Vector3(base.scale, base.scale, 1); + back.transform.localScale = new Vector3(scale, scale, 1); back.transform.position = new Vector3(dist, Screen.height - dist); } - float labelHeight = 187.5F * base.scale; + float labelHeight = 187.5F * scale; float labelDist = labelHeight * 0.75F; // label { - label.transform.localScale = new Vector3(base.scale, base.scale, 1); + label.transform.localScale = new Vector3(scale, scale, 1); label.transform.position = new Vector3(Screen.width / 2, Screen.height - labelDist, 0); } @@ -31,14 +31,14 @@ public class UIManagerTextEntry : UIManager { // translate { - translate.transform.localScale = new Vector3(base.scale, base.scale, 1); + translate.transform.localScale = new Vector3(scale, scale, 1); translate.transform.localPosition = new Vector3(translate.transform.localPosition.x, - translateHeight, 0); } // textEntry { float labelBottom = labelDist + labelHeight - (33 * scale); - float margin = 80 * base.scale; + float margin = 80 * scale; float barTop = 165 * scale; float marginTop = labelBottom + margin; diff --git a/Assets/Scripts/UIManagerTutorial.cs b/Assets/Scripts/UIManagerTutorial.cs index de9a968..a172f24 100644 --- a/Assets/Scripts/UIManagerTutorial.cs +++ b/Assets/Scripts/UIManagerTutorial.cs @@ -9,20 +9,20 @@ public class UIManagerTutorial : UIManager { public Button exit; public RawImage text; - protected override void rebuild() + protected override void rebuild(float scale) { - container.transform.localScale = new Vector3(base.scale, 1, 1); - next.transform.localScale = new Vector3(base.scale, 1, 1); - bar.transform.localScale = new Vector3(1, base.scale, 1); + container.transform.localScale = new Vector3(scale, 1, 1); + next.transform.localScale = new Vector3(scale, 1, 1); + bar.transform.localScale = new Vector3(1, scale, 1); - bar.transform.position -= new Vector3(0, 165 * (1F - base.scale), 0); - next.transform.localPosition = new Vector3((Screen.width / 2) - (122.4F * base.scale), 0, 0); + bar.transform.position -= new Vector3(0, 165 * (1F - scale), 0); + next.transform.localPosition = new Vector3((Screen.width / 2) - (122.4F * scale), 0, 0); - exit.transform.localScale = new Vector3(base.scale, base.scale, 1); - float dist = 116 * base.scale * 0.75F; + exit.transform.localScale = new Vector3(scale, scale, 1); + float dist = 116 * scale * 0.75F; exit.transform.position = new Vector3(Screen.width - dist, Screen.height - dist, 0); - text.transform.localScale = new Vector3(base.scale, base.scale, 1); + text.transform.localScale = new Vector3(scale, scale, 1); } } -- libgit2 0.21.2