diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b51692d7..c7262b61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,7 @@ name: Test, Build, and Deploy with GameCI concurrency: unity +env: + UNITY_VERSION: 6000.0.30f1 on: push: branches: @@ -37,6 +39,9 @@ jobs: checks: write contents: write steps: + - name: Pre-pull Unity Docker image + run: | + docker pull unityci/editor:${{ env.UNITY_VERSION }}-linux-il2cpp-3 & - name: Checkout Repository uses: actions/checkout@v4 with: @@ -87,7 +92,7 @@ jobs: lint: name: Quality Check runs-on: ubuntu-latest - container: unityci/editor:ubuntu-6000.0.23f1-linux-il2cpp-3 + container: unityci/editor:ubuntu-6000.0.30f1-linux-il2cpp-3 steps: - name: Checkout Repository uses: actions/checkout@v1 @@ -162,6 +167,9 @@ jobs: outputs: buildVersion: ${{ steps.buildStep.outputs.buildVersion }} steps: + - name: Pre-pull Unity Docker image + run: | + docker pull unityci/editor:${{ env.UNITY_VERSION }}-linux-${{ matrix.targetPlatform }}-3 & - name: Checkout Repository uses: actions/checkout@v4 with: @@ -710,11 +718,12 @@ jobs: working-directory: C:/Card-Game-Simulator.git shell: pwsh env: + UnityWsaPlayerDir: ${{ format('C:\Program Files\Unity\Hub\Editor\{0}\Editor\Data\PlaybackEngines\MetroSupport\', env.UNITY_VERSION) }} WsaPlayerDirectory: build\WSAPlayer\WSAPlayer UwpProjectDirectory: build\WSAPlayer\WSAPlayer\Card Game Simulator run: | [xml]$manifest = get-content ".\$env:WsaPlayerDirectory\UnityCommon.props" - $manifest.Project.PropertyGroup.UnityWSAPlayerDir = "C:\Program Files\Unity\Hub\Editor\6000.0.23f1-x86_64\Editor\Data\PlaybackEngines\MetroSupport\" + $manifest.Project.PropertyGroup.UnityWSAPlayerDir = "$env:UnityWsaPlayerDir" $manifest.save(".\$env:WsaPlayerDirectory\UnityCommon.props") echo ".\$env:WsaPlayerDirectory\UnityCommon.props" cat ".\$env:WsaPlayerDirectory\UnityCommon.props" @@ -807,7 +816,7 @@ jobs: dir "C:\Card-Game-Simulator.git\build\WSAPlayer\WSAPlayer" dir "C:\Card-Game-Simulator.git\build\WSAPlayer\WSAPlayer\Card Game Simulator" - name: Build the .appxupload -# if: false + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh env: @@ -815,7 +824,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 + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh env: @@ -823,7 +832,7 @@ jobs: SigningCertificate: Card Game Simulator_StoreKey.pfx run: Remove-Item -path $env:UwpProjectDirectory\$env:SigningCertificate - name: Copy .appxupload -# if: false + if: false working-directory: C:/Card-Game-Simulator.git shell: pwsh env: @@ -831,6 +840,7 @@ jobs: upload_path: ${{ format('Card Game Simulator_{0}.0_x86_x64_arm_arm64_bundle_Master.appxupload', needs.buildWSAPlayer.outputs.buildVersion) }} run: Copy-Item ".\$env:APPX_PATH" -Destination ".\$env:upload_path" - name: Upload .appxupload + if: false uses: actions/upload-artifact@v4 with: name: ${{ format('Card Game Simulator_{0}.0_x86_x64_arm_arm64_bundle_Master.appxupload', needs.buildWSAPlayer.outputs.buildVersion) }} diff --git a/.github/workflows/release_announcement.yml b/.github/workflows/release_announcement.yml index 406123bb..884d547b 100644 --- a/.github/workflows/release_announcement.yml +++ b/.github/workflows/release_announcement.yml @@ -13,7 +13,7 @@ jobs: id: versioning uses: paulhatch/semantic-version@v5.4.0 with: - version_format: "${major}.${minor}" + version_format: "${major}.${minor}.${patch}" minor_pattern: "(MINOR)" bump_each_commit: true debug: true diff --git a/Assets/Scenes/Settings.unity b/Assets/Scenes/Settings.unity index 82f10253..ec58c29d 100644 --- a/Assets/Scenes/Settings.unity +++ b/Assets/Scenes/Settings.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -1005,8 +1001,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 6 - m_GIWorkflowMode: 1 + serializedVersion: 9 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_RealtimeEnvironmentLighting: 1 @@ -1016,6 +1011,8 @@ LightingSettings: m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 + m_UseMipmapLimits: 1 m_BakeResolution: 40 m_Padding: 2 m_LightmapCompression: 2 @@ -1029,13 +1026,11 @@ LightingSettings: m_FilterMode: 1 m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 + m_EnableWorkerProcessBaking: 1 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 m_ForceWhiteAlbedo: 0 m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -1059,8 +1054,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!114 &633972502 stripped MonoBehaviour: @@ -2734,7 +2727,7 @@ PrefabInstance: - target: {fileID: 9063206868995599585, guid: cb34354267e822c41877c9c04f71e643, type: 3} propertyPath: m_SizeDelta.x - value: 410 + value: 450 objectReference: {fileID: 0} - target: {fileID: 9063206868995599585, guid: cb34354267e822c41877c9c04f71e643, type: 3} diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs index 8192d6c2..4b04eeae 100644 --- a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs +++ b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs @@ -380,6 +380,7 @@ public void OnDrop(CardModel cardModel) { cardModel.PlaceHolderCardZone = null; RequestInsert(Cards.Count, cardModel.Id); + cardModel.RequestDelete(); } public void OnDrop(CardStack cardStack) diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/TextMesh Pro/Resources/TMP Settings.asset index 6dd04e50..fab83137 100644 --- a/Assets/TextMesh Pro/Resources/TMP Settings.asset +++ b/Assets/TextMesh Pro/Resources/TMP Settings.asset @@ -15,7 +15,7 @@ MonoBehaviour: assetVersion: 2 m_TextWrappingMode: 1 m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 m_enableTintAllSprites: 0 m_enableParseEscapeCharacters: 1 diff --git a/Gemfile.lock b/Gemfile.lock index 44a4ca77..7d754655 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,16 +15,18 @@ GEM base64 nkf rexml - activesupport (7.1.3.4) + activesupport (7.2.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) @@ -33,16 +35,16 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.992.0) - aws-sdk-core (3.211.0) + aws-partitions (1.1018.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.95.0) + aws-sdk-kms (1.96.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.169.0) + aws-sdk-s3 (1.176.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -50,12 +52,13 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) + benchmark (0.4.0) bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.15.2) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -69,8 +72,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.15.2) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -93,7 +96,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) declarative (0.0.20) digest-crc (0.6.5) @@ -223,31 +226,31 @@ GEM http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.0) jwt (2.9.3) base64 + logger (1.6.2) mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.24.1) + minitest (5.25.4) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.1) - mutex_m (0.2.0) - nanaimo (0.3.0) + nanaimo (0.4.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) nkf (0.2.0) - optparse (0.5.0) + optparse (0.6.0) os (1.1.4) plist (3.7.1) public_suffix (4.0.7) rake (13.2.1) - rbnacl (7.1.1) - ffi + rbnacl (7.1.2) + ffi (~> 1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -258,6 +261,7 @@ GEM ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) + securerandom (0.4.0) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -284,12 +288,12 @@ GEM uber (0.1.0) unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.25.1) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) + nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) xcpretty (0.3.0) rouge (~> 2.0.7) diff --git a/Packages/manifest.json b/Packages/manifest.json index f4d5f041..30090816 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.davidmfinol.sfb": "https://github.com/davidmfinol/UnityStandaloneFileBrowser.git", "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "2.0.4", + "com.unity.ai.navigation": "2.0.5", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", "com.unity.multiplayer.center": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 737bf656..7624bf22 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,7 +14,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "2.0.4", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": { @@ -277,7 +277,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.3.0", + "version": "2.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2959d933..90ec11ef 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -932,11 +932,11 @@ PlayerSettings: m_MobileRenderingPath: 1 metroPackageName: CardGameSimulator metroPackageVersion: 0.0.0.0 - metroCertificatePath: Card Game Simulator_StoreKey.pfx + metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: Finol Digital LLC metroCertificateIssuer: Finol Digital LLC - metroCertificateNotAfter: 80d5f508fdf5d901 + metroCertificateNotAfter: 006d661e3c67dc01 metroApplicationDescription: Create, Share, and Play wsaImages: 65636: Assets/Sprites and Textures/UWP/StoreLogo.scale-100.png diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 11b73a4b..2f43e325 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.23f1 -m_EditorVersionWithRevision: 6000.0.23f1 (1c4764c07fb4) +m_EditorVersion: 6000.0.30f1 +m_EditorVersionWithRevision: 6000.0.30f1 (62b05ba0686a) diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md index a9f58bc6..3e9253de 100644 --- a/docs/pages/roadmap.md +++ b/docs/pages/roadmap.md @@ -4,9 +4,8 @@ permalink: roadmap.html # Roadmap -## What's New - v1.123 -- Bug-Fix: Sometimes cards disappear when moving them -- Bug-Fix: Deck Editor accommodates non-standard card sizes +## What's New - v1.124 +- Bug-Fix: Cards stacking in center of Play Area ## Sprint - Priority 1 - Bug-Fix: macOS Mission Control freezes