Merge pull request #161 from finol-digital/develop

v1.121
finol-digital · Oct 21, 2024 · c3f353e · c3f353e
2 parents 536ba44 + 9ff10f8
commit c3f353e
Show file tree

Hide file tree

Showing 34 changed files with 1,642 additions and 192 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -129,11 +129,11 @@ jobs:
           ./dotnet-sonarscanner begin \
             /o:"finol-digital" \
             /k:"finol-digital_Card-Game-Simulator" \
-            /d:sonar.login="$SONAR_TOKEN" \
+            /d:sonar.token="$SONAR_TOKEN" \
             /d:sonar.host.url=https://sonarcloud.io \
-            /d:sonar.exclusions=Assets/Plugins/**
+            /d:sonar.exclusions=**/Plugins/**
           dotnet build Card-Game-Simulator.sln
-          ./dotnet-sonarscanner end /d:sonar.login="$SONAR_TOKEN"
+          ./dotnet-sonarscanner end /d:sonar.token="$SONAR_TOKEN"
           cd Card-Game-Simulator
       - name: SonarQube Quality Gate Check
         uses: SonarSource/[email protected]

diff --git a/.github/workflows/scrape.yml b/.github/workflows/scrape.yml
@@ -1,8 +1,8 @@
 name: scrape
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 21 * * *'
+#  schedule:
+#    - cron: '0 21 * * *'
 jobs:
   scrape:
     runs-on: ubuntu-latest

diff --git a/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll b/Assets/Plugins/FinolDigital.Cgs.CardGameDef.dll
diff --git a/Assets/Prefabs/CardGameView/Viewer/Card Action Panel.prefab b/Assets/Prefabs/CardGameView/Viewer/Card Action Panel.prefab