From eee02ef70ec2dbda5795845df2a1c7f0368cc85f Mon Sep 17 00:00:00 2001 From: davidmfinol Date: Wed, 29 Nov 2017 23:16:38 -0600 Subject: [PATCH] Release version 0.12.0 --- Assets/Resources/Game Selection Menu.prefab | 30 ++++++++++---------- Assets/Scenes/DeckEditor.unity | 16 +++++------ Assets/Scenes/TitleScreen.unity | 1 + Assets/Scripts/CardGameManager.cs | 2 +- Assets/Scripts/DeckEditor/DeckLoadMenu.cs | 1 + Assets/Scripts/MainMenu/GameSelectionMenu.cs | 2 ++ ProjectSettings/ProjectSettings.asset | 2 +- 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Assets/Resources/Game Selection Menu.prefab b/Assets/Resources/Game Selection Menu.prefab index b354bb02d..f0918604f 100644 --- a/Assets/Resources/Game Selection Menu.prefab +++ b/Assets/Resources/Game Selection Menu.prefab @@ -82,7 +82,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &1123489803708214 GameObject: m_ObjectHideFlags: 1 @@ -1294,7 +1294,7 @@ MonoBehaviour: m_HandleRect: {fileID: 224627027903471596} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.9803945 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2466,9 +2466,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -47, y: 0} m_Pivot: {x: 0, y: 1} --- !u!224 &224308302772163354 RectTransform: @@ -2681,7 +2681,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.9803945} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -2774,9 +2774,9 @@ RectTransform: m_Father: {fileID: 224308302772163354} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 901.19073, y: -150} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!224 &224859769213183740 @@ -2794,7 +2794,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000002719462} + m_AnchoredPosition: {x: 0, y: 0.3733739} m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224885025437741184 @@ -2811,9 +2811,9 @@ RectTransform: m_Father: {fileID: 224308302772163354} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1651.9846, y: -150} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 1, y: 0} --- !u!224 &224885441671494252 @@ -2941,8 +2941,8 @@ RectTransform: m_Father: {fileID: 224308302772163354} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150.39691, y: -150} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0, y: 0} diff --git a/Assets/Scenes/DeckEditor.unity b/Assets/Scenes/DeckEditor.unity index e070d5d53..7bc2dfa6e 100644 --- a/Assets/Scenes/DeckEditor.unity +++ b/Assets/Scenes/DeckEditor.unity @@ -507,7 +507,7 @@ Prefab: - target: {fileID: 224673017872509486, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -69.70148 objectReference: {fileID: 0} - target: {fileID: 224673017872509486, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} @@ -517,7 +517,7 @@ Prefab: - target: {fileID: 224673017872509486, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 139.40295 objectReference: {fileID: 0} - target: {fileID: 224174961411463182, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} @@ -537,7 +537,7 @@ Prefab: - target: {fileID: 224174961411463182, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -69.70148 objectReference: {fileID: 0} - target: {fileID: 224174961411463182, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} @@ -547,7 +547,7 @@ Prefab: - target: {fileID: 224174961411463182, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 139.40295 objectReference: {fileID: 0} - target: {fileID: 224677791729663838, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} @@ -567,7 +567,7 @@ Prefab: - target: {fileID: 224677791729663838, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -69.70148 objectReference: {fileID: 0} - target: {fileID: 224677791729663838, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} @@ -577,17 +577,17 @@ Prefab: - target: {fileID: 224677791729663838, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 139.40295 objectReference: {fileID: 0} - target: {fileID: 224143448842205196, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: -236.34697 objectReference: {fileID: 0} - target: {fileID: 224560339167716316, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: -139.40295 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 09ee4d14818c1ba47b96c322e8a36f1d, type: 2} diff --git a/Assets/Scenes/TitleScreen.unity b/Assets/Scenes/TitleScreen.unity index b33f2d86a..80a6f03d7 100644 --- a/Assets/Scenes/TitleScreen.unity +++ b/Assets/Scenes/TitleScreen.unity @@ -591,6 +591,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: exitButton: {fileID: 0} + currentGameText: {fileID: 0} versionText: {fileID: 1672633402} --- !u!1001 &1471381903 Prefab: diff --git a/Assets/Scripts/CardGameManager.cs b/Assets/Scripts/CardGameManager.cs index 9b179c3f8..7b804c510 100644 --- a/Assets/Scripts/CardGameManager.cs +++ b/Assets/Scripts/CardGameManager.cs @@ -15,7 +15,7 @@ public class CardGameManager : MonoBehaviour public const string CanvasTag = "Canvas"; public const string SelectorPrefabName = "Game Selection Menu"; public const string PlayerPrefGameName = "DefaultGame"; - public const string FirstGameName = "Standard"; + public const string FirstGameName = "Standard Playing Cards"; public const string MessengerPrefabName = "Popup"; public const string InvalidGameSelectionMessage = "Could not select the card game because the name is not recognized in the list of card games! Try selecting a different card game."; diff --git a/Assets/Scripts/DeckEditor/DeckLoadMenu.cs b/Assets/Scripts/DeckEditor/DeckLoadMenu.cs index ffa31d1a8..94a94725c 100644 --- a/Assets/Scripts/DeckEditor/DeckLoadMenu.cs +++ b/Assets/Scripts/DeckEditor/DeckLoadMenu.cs @@ -73,6 +73,7 @@ public void BuildDeckFileSelectionOptions() foreach (string deckFile in deckFiles) { GameObject deckFileSelection = Instantiate(fileSelectionTemplate.gameObject, fileSelectionArea) as GameObject; deckFileSelection.SetActive(true); + // WORKAROUND FOR UNITY BUG SETTING SCALE TO 0 WHEN RESOLUTION=REFERENCE_RESOLUTION(1080p) deckFileSelection.transform.localScale = Vector3.one; deckFileSelection.transform.localPosition = pos; Toggle toggle = deckFileSelection.GetComponent(); diff --git a/Assets/Scripts/MainMenu/GameSelectionMenu.cs b/Assets/Scripts/MainMenu/GameSelectionMenu.cs index 9fddae021..c3268968d 100644 --- a/Assets/Scripts/MainMenu/GameSelectionMenu.cs +++ b/Assets/Scripts/MainMenu/GameSelectionMenu.cs @@ -29,6 +29,8 @@ public void Show() foreach (string gameName in CardGameManager.Instance.AllCardGames.Keys) { GameObject gameSelection = Instantiate(gameSelectionTemplate.gameObject, gameSelectionArea) as GameObject; gameSelection.SetActive(true); + // WORKAROUND FOR UNITY BUG SETTING SCALE TO 0 WHEN RESOLUTION=REFERENCE_RESOLUTION(1080p) + gameSelection.transform.localScale = Vector3.one; gameSelection.transform.localPosition = pos; gameSelection.GetComponentInChildren().text = gameName; Toggle toggle = gameSelection.GetComponent(); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c97a9e5a3..8e43369f7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -147,7 +147,7 @@ PlayerSettings: Standalone: com.FinolDigital.CardGameSim iOS: com.finoldigital.CardGameSimTest buildNumber: - Standalone: 12 + Standalone: 13 iOS: 11 AndroidBundleVersionCode: 13 AndroidMinSdkVersion: 16