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,2 +0,0 @@
-fileFormatVersion: 2
-guid: 5178747fac4dbfc448ff15d8a687e03c
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: fdb3d58d94b76834598e408448e19d2a
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5af93d291e7d4d51b312bdf1e47dc6ef
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: bd550368fd0c75d43a53aa4fb3b6541e
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 8b5b43b43c697c142b33fbfc5160cf90
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 1470a223647d6514f9439de7ded702c9