From cb47191ea33fea8146dfd4ae4aa016688a9a0ee7 Mon Sep 17 00:00:00 2001 From: David Finol Date: Fri, 8 Dec 2023 19:48:03 -0600 Subject: [PATCH 1/7] Updates --- Assets/Scripts/Cgs/Play/PlayMatRotation.cs | 3 ++- Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs | 3 +++ Packages/manifest.json | 4 ++-- Packages/packages-lock.json | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Cgs/Play/PlayMatRotation.cs b/Assets/Scripts/Cgs/Play/PlayMatRotation.cs index a69d4561..f641843e 100644 --- a/Assets/Scripts/Cgs/Play/PlayMatRotation.cs +++ b/Assets/Scripts/Cgs/Play/PlayMatRotation.cs @@ -18,6 +18,7 @@ public class PlayMatRotation : MonoBehaviour public CanvasGroup sliderCanvasGroup; private const float PageHorizontalSensitivity = 45f; + private const float PageHorizontalSensitivity2 = 0.2f; private const float Tolerance = 0.01f; private const float TimeToDisappear = 3f; @@ -75,7 +76,7 @@ private void Update() Time.deltaTime * Inputs.FPageHorizontal * PageHorizontalSensitivity; else _playController.playArea.horizontalNormalizedPosition -= - Inputs.FPageHorizontal * PageHorizontalSensitivity * Time.deltaTime; + Inputs.FPageHorizontal * PageHorizontalSensitivity2 * Time.deltaTime; } [UsedImplicitly] diff --git a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs index ec53010e..73690f52 100644 --- a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs +++ b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs @@ -84,6 +84,9 @@ protected override void SetContentAnchoredPosition(Vector2 position) public override void OnDrag(PointerEventData eventData) { + if (Input.GetMouseButton(0) && !(Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift))) + return; + PointerPositions[eventData.pointerId] = eventData.position; switch (eventData.button) { diff --git a/Packages/manifest.json b/Packages/manifest.json index def37f37..c9ba4dc7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,12 +3,12 @@ "com.davidmfinol.sfb": "https://github.com/davidmfinol/UnityStandaloneFileBrowser.git", "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.27", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.netcode.gameobjects": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.lobby": "1.1.0", + "com.unity.services.lobby": "1.1.1", "com.unity.services.relay": "1.0.5", "com.unity.test-framework": "1.3.0", "com.unity.testtools.codecoverage": "1.2.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 4ce364ca..f9b41a0a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -128,7 +128,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.lobby": { - "version": "1.1.0", + "version": "1.1.1", "depth": 0, "source": "registry", "dependencies": { From 1058e91d11c610f817a928d75782da3344a40cc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 05:34:05 +0000 Subject: [PATCH 2/7] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/activation.yml | 2 +- .github/workflows/main.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml index 2118c0c5..4b43ddf5 100644 --- a/.github/workflows/activation.yml +++ b/.github/workflows/activation.yml @@ -13,7 +13,7 @@ jobs: id: requestActivationFile uses: game-ci/unity-request-activation-file@v2.0-alpha-1 - name: Upload activation file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.requestActivationFile.outputs.filePath }} path: ${{ steps.requestActivationFile.outputs.filePath }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b147e35..39d432a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -203,7 +203,7 @@ jobs: androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }} androidTargetSdkVersion: AndroidApiLevel33 - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: github.event.action == 'published' || contains(github.event.inputs.workflow_mode, matrix.targetPlatform) || (contains(github.event.inputs.workflow_mode, 'Steam') && matrix.targetPlatform == 'StandaloneLinux64') with: path: build/${{ matrix.targetPlatform }} @@ -287,12 +287,12 @@ jobs: ./fastlane/sign-mac-build.sh - name: Upload Build if: github.event.action == 'published' || contains(github.event.inputs.workflow_mode, 'StandaloneOSX') || contains(github.event.inputs.workflow_mode, 'Steam') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cgs-StandaloneOSX path: build/StandaloneOSX - name: Upload App - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: github.event.action == 'published' || contains(github.event.inputs.workflow_mode, 'StandaloneOSX') || contains(github.event.inputs.workflow_mode, 'Steam') with: path: build/StandaloneOSX/Card Game Simulator.app @@ -517,7 +517,7 @@ jobs: targetPlatform: ${{ matrix.targetPlatform }} buildMethod: Cgs.Editor.BuildCgs.BuildOptions - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: github.event.action == 'published' || contains(github.event.inputs.workflow_mode, matrix.targetPlatform) || (contains(github.event.inputs.workflow_mode, 'Steam') && contains(matrix.targetPlatform, 'StandaloneWindows')) with: path: build/${{ matrix.targetPlatform }} @@ -581,7 +581,7 @@ jobs: targetPlatform: WSAPlayer buildMethod: Cgs.Editor.BuildCgs.BuildOptions - name: Upload Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cgs-WSAPlayer path: build/WSAPlayer @@ -691,7 +691,7 @@ jobs: echo ".\$env:UwpProjectDirectory\Package.appxmanifest" cat ".\$env:UwpProjectDirectory\Package.appxmanifest" - name: Upload Build2 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cgs-WSAPlayer2 path: ${{ format('{0}\build\WSAPlayer', 'C:\Card-Game-Simulator.git') }} @@ -721,7 +721,7 @@ jobs: SigningCertificate: Card Game Simulator_StoreKey.pfx run: Remove-Item -path $env:UwpProjectDirectory\$env:SigningCertificate - name: Upload .appxupload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ format('CardGameSimulator_{0}.0_x86_x64_arm_arm64_bundle_Master.appxupload', needs.buildWSAPlayer.outputs.buildVersion) }} path: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\CardGameSimulator\CardGameSimulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', needs.buildWSAPlayer.outputs.buildVersion) }} From c448002df26eded3ed361fc1e3d1db38170f8792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 05:34:09 +0000 Subject: [PATCH 3/7] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b147e35..c015d5d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -323,7 +323,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Download iOS Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-iOS path: build/iOS @@ -366,7 +366,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Download Android Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-Android path: build/Android @@ -405,7 +405,7 @@ jobs: with: path: Card-Game-Simulator - name: Download WebGL Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-WebGL path: Card-Game-Simulator/build/WebGL @@ -443,7 +443,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Download StandaloneOSX Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-StandaloneOSX path: build/StandaloneOSX @@ -593,7 +593,7 @@ jobs: if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'WSAPlayer')) steps: - name: Download WSAPlayer Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-WSAPlayer path: build/WSAPlayer @@ -757,22 +757,22 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - name: Download StandaloneWindows Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-StandaloneWindows path: build/StandaloneWindows - name: Download StandaloneLinux64 Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-StandaloneLinux64 path: build/StandaloneLinux64 - name: Download StandaloneWindows64 Artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: cgs-StandaloneWindows64 path: build/StandaloneWindows64 - name: Download App - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: Card Game Simulator.app path: build/StandaloneOSX/Card Game Simulator.app From b200de902ff64f89721d2a9ca8529c4dab276810 Mon Sep 17 00:00:00 2001 From: David Finol Date: Thu, 21 Dec 2023 12:57:54 -0600 Subject: [PATCH 4/7] Develop --- Assets/Scripts/Cgs/CardGameManager.cs | 3 ++- ProjectSettings/ProjectSettings.asset | 8 ++++---- docs/pages/roadmap.md | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Cgs/CardGameManager.cs b/Assets/Scripts/Cgs/CardGameManager.cs index 692efb63..935bb629 100644 --- a/Assets/Scripts/Cgs/CardGameManager.cs +++ b/Assets/Scripts/Cgs/CardGameManager.cs @@ -622,7 +622,8 @@ private IEnumerator Start() yield return null; Debug.Log("CardGameManager::Start:GameReady"); - if (Current == null || Current == UnityCardGame.UnityInvalid || Current.Id.Equals(Tags.StandardPlayingCardsDirectoryName)) + if (Current == null || Current == UnityCardGame.UnityInvalid || !string.IsNullOrEmpty(Current.Error) + || Current.Id.Equals(Tags.StandardPlayingCardsDirectoryName)) GameReady(); } #endif diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7a1745f7..3cbf2409 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -254,7 +254,7 @@ PlayerSettings: clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: - useCustomMainManifest: 1 + useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 @@ -966,6 +966,7 @@ PlayerSettings: metroSplashScreenUseBackgroundColor: 1 platformCapabilities: WindowsStoreApps: + EnterpriseAuthentication: False OfflineMapsManagement: False HumanInterfaceDevice: False Location: False @@ -978,7 +979,6 @@ PlayerSettings: InternetClientServer: True VideosLibrary: False Objects3D: False - InternetClient: True RemoteSystem: False BlockedChatMessages: False PhoneCall: False @@ -1000,10 +1000,10 @@ PlayerSettings: PointOfService: False RecordedCallsFolder: False Contacts: False - Proximity: False + InternetClient: True CodeGeneration: False BackgroundMediaPlayback: False - EnterpriseAuthentication: False + Proximity: False metroTargetDeviceFamilies: Desktop: False Holographic: False diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index cfe7755d..45219f2d 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -8,6 +8,8 @@ permalink: roadmap.html - Minor Bug Fixes ## Active Sprint +game creation menu copyright +game play deck positions on android - Game-Play: Display values on Card in Play Area - Game-Play: Contextual green button for default action based on card location - Game-Play: Right-click for context menu From c320041f4b890b17589c79cc294b51cbe270e7a4 Mon Sep 17 00:00:00 2001 From: David Finol Date: Fri, 22 Dec 2023 11:32:58 -0600 Subject: [PATCH 5/7] Fix web links --- Assets/Scripts/Cgs/CardGameManager.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Cgs/CardGameManager.cs b/Assets/Scripts/Cgs/CardGameManager.cs index 935bb629..f7391c7d 100644 --- a/Assets/Scripts/Cgs/CardGameManager.cs +++ b/Assets/Scripts/Cgs/CardGameManager.cs @@ -374,11 +374,10 @@ private void OnDeepLinkActivated(string deepLink) { Debug.Log("OnDeepLinkActivated!"); var autoUpdateUrl = GetAutoUpdateUrl(deepLink); - if (string.IsNullOrEmpty(autoUpdateUrl) || - !Uri.IsWellFormedUriString(autoUpdateUrl, UriKind.RelativeOrAbsolute)) + if (string.IsNullOrEmpty(autoUpdateUrl)) { - Debug.LogError("OnDeepLinkActivated::autoUpdateUrlMalformed: " + deepLink); - Messenger.Show("OnDeepLinkActivated::autoUpdateUrlMalformed: " + deepLink); + Debug.LogError("OnDeepLinkActivated::autoUpdateUrlMissing!"); + Messenger.Show("OnDeepLinkActivated::autoUpdateUrlMissing!"); } else StartGetCardGame(autoUpdateUrl); @@ -621,9 +620,10 @@ private IEnumerator Start() while (Current is {IsDownloading: true}) yield return null; - Debug.Log("CardGameManager::Start:GameReady"); - if (Current == null || Current == UnityCardGame.UnityInvalid || !string.IsNullOrEmpty(Current.Error) - || Current.Id.Equals(Tags.StandardPlayingCardsDirectoryName)) + bool callGameReady = Current == null || Current == UnityCardGame.UnityInvalid || !string.IsNullOrEmpty(Current.Error) + || Current.Id.Equals(Tags.StandardPlayingCardsDirectoryName); + Debug.Log("CardGameManager::Start:callGameReady " + callGameReady); + if (callGameReady) GameReady(); } #endif From bd0af1fa02b8bf35116750a4f48c8c15bca23b86 Mon Sep 17 00:00:00 2001 From: David Finol Date: Fri, 22 Dec 2023 11:45:29 -0600 Subject: [PATCH 6/7] Update roadmap --- docs/pages/roadmap.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index 45219f2d..ce803f84 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -4,12 +4,12 @@ permalink: roadmap.html # Roadmap -## What's New - v1.98 +## What's New - v1.99 - Minor Bug Fixes ## Active Sprint -game creation menu copyright -game play deck positions on android +- Bug-fix: Game creation menu copyright on portrait +- Bug-fix: Game play deck positions on android - Game-Play: Display values on Card in Play Area - Game-Play: Contextual green button for default action based on card location - Game-Play: Right-click for context menu From 70531c46004cfad6cfdb800e007ffa60504dd97a Mon Sep 17 00:00:00 2001 From: David Finol Date: Fri, 22 Dec 2023 12:00:21 -0600 Subject: [PATCH 7/7] Update workflow --- .github/workflows/main.yml | 89 +++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a324ac19..5ab488da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -539,6 +539,48 @@ jobs: overwrite: true body: ${{ github.event.release.body }} + deployToSteam: + name: Deploy to the Steam Marketplace + runs-on: ubuntu-latest + needs: buildWithWindows + if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'Steam')) + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Download StandaloneWindows Artifact + uses: actions/download-artifact@v4 + with: + name: cgs-StandaloneWindows + path: build/StandaloneWindows + - name: Download StandaloneLinux64 Artifact + uses: actions/download-artifact@v4 + with: + name: cgs-StandaloneLinux64 + path: build/StandaloneLinux64 + - name: Download StandaloneWindows64 Artifact + uses: actions/download-artifact@v4 + with: + name: cgs-StandaloneWindows64 + path: build/StandaloneWindows64 + - name: Download App + uses: actions/download-artifact@v4 + with: + name: Card Game Simulator.app + path: build/StandaloneOSX/Card Game Simulator.app + - name: Deploy to Steam + uses: game-ci/steam-deploy@main + with: + username: ${{ secrets.STEAM_USERNAME }} + configVdf: ${{ secrets.STEAM_CONFIG_VDF }} + appId: 1742850 + buildDescription: v${{ needs.buildWithWindows.outputs.buildVersion }} + rootPath: build + depot1Path: StandaloneWindows + depot2Path: StandaloneLinux64 + depot3Path: StandaloneWindows64 + depot4Path: StandaloneOSX + releaseBranch: prerelease + buildWSAPlayer: name: Build for WSAPlayer runs-on: windows-2022 @@ -590,7 +632,8 @@ jobs: name: Deploy to the Microsoft Store runs-on: windows-2022 needs: buildWSAPlayer - if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'WSAPlayer')) + if: false +# if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'WSAPlayer')) steps: - name: Download WSAPlayer Artifact uses: actions/download-artifact@v4 @@ -748,52 +791,10 @@ jobs: New-SubmissionPackage -ConfigPath $env:STOREBROKER_CONFIG_PATH -PDPRootPath $env:PDP_ROOT_PATH -ImagesRootPath $env:IMAGES_ROOT_PATH -AppxPath $env:APPX_PATH -OutPath $env:OUT_PATH -OutName 'upload' -Verbose Update-ApplicationSubmission -AppId $env:MICROSOFT_APP_ID -SubmissionDataPath $env:SUBMISSION_DATA_PATH -PackagePath $env:PACKAGE_PATH -ReplacePackages -UpdateListings -AutoCommit -Force - deployToSteam: - name: Deploy to the Steam Marketplace - runs-on: ubuntu-latest - needs: buildWithWindows - if: github.event.action == 'published' || (contains(github.event.inputs.workflow_mode, 'release') && contains(github.event.inputs.workflow_mode, 'Steam')) - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - name: Download StandaloneWindows Artifact - uses: actions/download-artifact@v4 - with: - name: cgs-StandaloneWindows - path: build/StandaloneWindows - - name: Download StandaloneLinux64 Artifact - uses: actions/download-artifact@v4 - with: - name: cgs-StandaloneLinux64 - path: build/StandaloneLinux64 - - name: Download StandaloneWindows64 Artifact - uses: actions/download-artifact@v4 - with: - name: cgs-StandaloneWindows64 - path: build/StandaloneWindows64 - - name: Download App - uses: actions/download-artifact@v4 - with: - name: Card Game Simulator.app - path: build/StandaloneOSX/Card Game Simulator.app - - name: Deploy to Steam - uses: game-ci/steam-deploy@main - with: - username: ${{ secrets.STEAM_USERNAME }} - configVdf: ${{ secrets.STEAM_CONFIG_VDF }} - appId: 1742850 - buildDescription: v${{ needs.buildWithWindows.outputs.buildVersion }} - rootPath: build - depot1Path: StandaloneWindows - depot2Path: StandaloneLinux64 - depot3Path: StandaloneWindows64 - depot4Path: StandaloneOSX - releaseBranch: prerelease - announceReleaseToSocialMedia: name: Announce Release to Social Media runs-on: ubuntu-latest - needs: [buildWithWindows, deployToAppStore, deployToGooglePlay, deployToFirebase, deployToMacAppStore, deployToMicrosoftStore, deployToSteam] + needs: [buildWithWindows, deployToAppStore, deployToGooglePlay, deployToFirebase, deployToMacAppStore, deployToSteam] #, deployToMicrosoftStore] if: github.event.action == 'published' steps: - name: Checkout Repository