diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3e21309..5ffddaca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -817,6 +817,7 @@ jobs: shell: pwsh run: msstore reconfigure --tenantId ${{ secrets.MICROSOFT_TENANT_ID }} --sellerId ${{ secrets.MICROSOFT_SELLER_ID }} --clientId ${{ secrets.MICROSOFT_CLIENT_ID }} --clientSecret ${{ secrets.MICROSOFT_KEY }} - name: Build the .appxupload with Microsoft Store Developer CLI + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh run: | @@ -832,6 +833,7 @@ jobs: SigningCertificate: Card Game Simulator_StoreKey.pfx run: msbuild $env:SolutionPath /p:Configuration="Master" /p:Platform="x64" /p:UapAppxPackageBuildMode="StoreUpload" /p:AppxBundle="Always" /p:AppxBundlePlatforms="x86|x64|arm|arm64" /p:PackageCertificateKeyFile=$env:SigningCertificate - name: Remove the .pfx + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh env: @@ -839,6 +841,7 @@ jobs: SigningCertificate: Card Game Simulator_StoreKey.pfx run: Remove-Item -path $env:UwpProjectDirectory\$env:SigningCertificate - name: Copy .appxupload + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh env: diff --git a/Assets/Prefabs/Play/Drawer/Card Drawer.prefab b/Assets/Prefabs/Play/Drawer/Card Drawer.prefab index 46e363de..1f3823c0 100644 --- a/Assets/Prefabs/Play/Drawer/Card Drawer.prefab +++ b/Assets/Prefabs/Play/Drawer/Card Drawer.prefab @@ -452,7 +452,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1216.9076, y: 0} + m_AnchoredPosition: {x: 940, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2400259895064996105 @@ -659,6 +659,8 @@ RectTransform: - {fileID: 3475859695022482424} - {fileID: 4912098299363833893} - {fileID: 8805751466411992643} + - {fileID: 7016335031602449174} + - {fileID: 7532451831274138352} - {fileID: 6505893261598143532} - {fileID: 3004100670776422371} m_Father: {fileID: 0} @@ -1878,6 +1880,366 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5465897429009186957} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6936039899626512919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3475859695529778835} + m_Modifications: + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3475859695529778837} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Draw + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Play.Drawer.CardDrawer, Cgs + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 633149931556260070, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Name + value: Draw Button + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_SizeDelta.x + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5606556387005000519, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 71d9178794cabf2449d8db00b5977195, + type: 3} + - target: {fileID: 8387297474274779720, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: isBelow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8387297474274779720, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: tooltip + value: Draw 1 Card + objectReference: {fileID: 0} + - target: {fileID: 8688795498816596447, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Text + value: Draw 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 050b35c711bf97548b7054e54e7b44b4, type: 3} +--- !u!224 &7532451831274138352 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + m_PrefabInstance: {fileID: 6936039899626512919} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7608375322109690865 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3475859695529778835} + m_Modifications: + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3475859695529778837} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Deal + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cgs.Play.Drawer.CardDrawer, Cgs + objectReference: {fileID: 0} + - target: {fileID: 633149931556260068, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 633149931556260070, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Name + value: Deal Button + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_SizeDelta.x + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5606556387005000519, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d88066f98ff7b1a4187dcde1818d12ba, + type: 3} + - target: {fileID: 8387297474274779720, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: isBelow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8387297474274779720, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: tooltip + value: Deal X Cards + objectReference: {fileID: 0} + - target: {fileID: 8688795498816596447, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + propertyPath: m_Text + value: Deal X + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 050b35c711bf97548b7054e54e7b44b4, type: 3} +--- !u!224 &7016335031602449174 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 633149931556260071, guid: 050b35c711bf97548b7054e54e7b44b4, + type: 3} + m_PrefabInstance: {fileID: 7608375322109690865} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8968796215011926450 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs b/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs index 51051864..2c6b5923 100644 --- a/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs +++ b/Assets/Scripts/Cgs/Play/Drawer/CardDrawer.cs @@ -85,13 +85,19 @@ private void Update() if (CardGameManager.Instance.ModalCanvas != null) return; - if (!Inputs.IsFocusNext || Inputs.WasFocusNext) - return; + if (Inputs.IsVertical) + { + if (Inputs.IsUp && !Inputs.WasUp) + Show(); + else if (Inputs.IsDown && !Inputs.WasDown) + Hide(); + } - if (upButton.interactable) - Show(); - else - Hide(); + if (Inputs.IsFocusBack && !Inputs.WasFocusBack) + Deal(); + + if (Inputs.IsFocusNext && !Inputs.WasFocusNext) + Draw(); } private void Resize() @@ -124,6 +130,18 @@ public void AddCard(UnityCard card) viewer.AddCard(card); } + [UsedImplicitly] + public void Deal() + { + PlayController.Instance.ShowDealer(); + } + + [UsedImplicitly] + public void Draw() + { + PlayController.Instance.DealHand(1); + } + [UsedImplicitly] public void AddTab() { diff --git a/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs b/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs index 9dfa78c7..edae2848 100644 --- a/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs +++ b/Assets/Scripts/Cgs/Play/Drawer/HandDealer.cs @@ -45,7 +45,7 @@ private static string DealDraw public int Count { get => _count; - private set + set { _count = value; RefreshText(); diff --git a/Assets/Scripts/Cgs/Play/PlayController.cs b/Assets/Scripts/Cgs/Play/PlayController.cs index eb311400..0173e092 100644 --- a/Assets/Scripts/Cgs/Play/PlayController.cs +++ b/Assets/Scripts/Cgs/Play/PlayController.cs @@ -176,9 +176,7 @@ private void Update() scoreboard.nameInputField.isFocused) return; - if (Inputs.IsFocusBack && !Inputs.WasFocusBack) - Deal(1); - else if (Inputs.IsOption && CardViewer.Instance.PreviewCardModel == null) + if (Inputs.IsOption && CardViewer.Instance.PreviewCardModel == null) menu.ToggleMenu(); else if (Inputs.IsCancel) PromptBackToMainMenu(); @@ -368,16 +366,21 @@ public CardStack CreateCardStack(string stackName, IReadOnlyList card public void PromptForHand() { if (CardGameManager.Current.GameStartHandCount > 0) - Dealer.Show(DealStartingHand); + ShowDealer(); } - private void DealStartingHand() + public void ShowDealer() + { + Dealer.Show(DealHand); + } + + private void DealHand() { drawer.SemiShow(); - Deal(Dealer.Count); + DealHand(Dealer.Count); } - private void Deal(int cardCount) + public void DealHand(int cardCount) { if (CgsNetManager.Instance.IsOnline && CgsNetManager.Instance.LocalPlayer != null && CgsNetManager.Instance.LocalPlayer.CurrentDeck != null) diff --git a/Assets/Scripts/Cgs/Play/PlaySettings.cs b/Assets/Scripts/Cgs/Play/PlaySettings.cs index f441b6d2..22e9abe7 100644 --- a/Assets/Scripts/Cgs/Play/PlaySettings.cs +++ b/Assets/Scripts/Cgs/Play/PlaySettings.cs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ using Cgs.CardGameView.Multiplayer; +using Cgs.UI.ScrollRects; using UnityEngine; namespace Cgs.Play @@ -15,6 +16,7 @@ public static class PlaySettings private const string PlayerPrefsDoubleClickToViewStacks = "DoubleClickToViewStacks"; private const string PlayerPrefsStackViewerOverlap = "StackViewerOverlap"; private const string PlayerPrefsShowActionsMenu = "ShowActionsMenu"; + private const string PlayerPrefsDefaultZoom = "DefaultZoom"; public static bool AutoStackCards { @@ -51,5 +53,11 @@ public static bool ShowActionsMenu get => PlayerPrefs.GetInt(PlayerPrefsShowActionsMenu, 1) == 1; set => PlayerPrefs.SetInt(PlayerPrefsShowActionsMenu, value ? 1 : 0); } + + public static float DefaultZoom + { + get => PlayerPrefs.GetFloat(PlayerPrefsDefaultZoom, RotateZoomableScrollRect.DefaultZoom); + set => PlayerPrefs.SetFloat(PlayerPrefsDefaultZoom, value); + } } } diff --git a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs index 7c60f943..f94b9038 100644 --- a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs +++ b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using Cgs.CardGameView.Multiplayer; +using Cgs.Play; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -45,7 +46,13 @@ public float CurrentRotation public float CurrentZoom { get => _currentZoom; - set => _currentZoom = ZoomEnabled ? Mathf.Clamp(value, MinZoom, MaxZoom) : _currentZoom; + set + { + if (!ZoomEnabled) + return; + _currentZoom = Mathf.Clamp(value, MinZoom, MaxZoom); + PlaySettings.DefaultZoom = _currentZoom; + } } private float _currentZoom = DefaultZoom; @@ -71,6 +78,7 @@ protected override void Awake() Input.multiTouchEnabled = true; scrollSensitivity = ScrollWheelSensitivity; _scrollSensitivity = scrollSensitivity > 0 ? scrollSensitivity : ScrollWheelSensitivity; + _currentZoom = PlaySettings.DefaultZoom; } protected override void SetContentAnchoredPosition(Vector2 position) diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 7f7e4c02..5286f06a 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -4,14 +4,13 @@ permalink: roadmap.html # Roadmap -## What's New - v1.118 -- Bug-Fix: Crashes -- Bug-Fix: Visibility of facedown cards -- Game-Play: Context Menu Positioning +## What's New - v1.119 +- Game-Play: Drawer Buttons +- Game-Play: Persistent Zoom Setting ## Sprint - Priority 1 -- Bug-Fix: Loading more than 200 cards - Bug-Fix: macOS Mission Control freezes +- Bug-Fix: Importing more than 200 cards & Pagination for Deck Editor - Game-Play: Support for card back faces - Select backs folder in Game Editor Menu - Select back from dropdown in Card Creator Menu