Merge pull request #116 from finol-digital/develop

v1.99
finol-digital · Dec 22, 2023 · 98c6a8d · 98c6a8d
2 parents bb7d2e7 + 70531c4
commit 98c6a8d
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 73 deletions.
diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml
@@ -13,7 +13,7 @@ jobs:
         id: requestActivationFile
         uses: game-ci/[email protected]
       - 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
@@ -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
@@ -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
@@ -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 }}
@@ -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
@@ -581,7 +623,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
@@ -590,10 +632,11 @@ 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@v3
+        uses: actions/download-artifact@v4
         with:
           name: cgs-WSAPlayer
           path: build/WSAPlayer
@@ -691,7 +734,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 +764,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) }}
@@ -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@v3
-        with:
-          name: cgs-StandaloneWindows
-          path: build/StandaloneWindows
-      - name: Download StandaloneLinux64 Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: cgs-StandaloneLinux64
-          path: build/StandaloneLinux64
-      - name: Download StandaloneWindows64 Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: cgs-StandaloneWindows64
-          path: build/StandaloneWindows64
-      - name: Download App
-        uses: actions/download-artifact@v3
-        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

diff --git 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,8 +620,10 @@ private IEnumerator Start()
             while (Current is {IsDownloading: true})
                 yield return null;
 
-            Debug.Log("CardGameManager::Start:GameReady");
-            if (Current == null || Current == UnityCardGame.UnityInvalid || 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

diff --git 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
@@ -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
@@ -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
@@ -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": {

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md
@@ -4,10 +4,12 @@ permalink: roadmap.html
 
 # Roadmap
 
-## What's New - v1.98
+## What's New - v1.99
 - Minor Bug Fixes
 
 ## Active Sprint
+- 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