Merge remote-tracking branch 'origin/main'

# Conflicts: # Assets/Data/Cards/CardDatabase.asset # Assets/Scenes/MainMenuScene.unity # Assets/Scripts/UI/MainMenuController.cs
2026-07-06 22:49:09 +02:00
parent abe9816985 23df9a3968
commit 73f3d2a15e
101 changed files with 2036 additions and 541 deletions
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e4259fa62d854e27af3cc2a10fb210c8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8c9cfa26abfee488c85f1582747f6a02
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: