Fretux/linuxdistro-roguelite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	Assets/Data/Cards/CardDatabase.asset
#	Assets/Scenes/MainMenuScene.unity
#	Assets/Scripts/UI/MainMenuController.cs
This commit is contained in:
fretuks
2026-07-06 22:49:09 +02:00
parent abe9816985 23df9a3968
commit 73f3d2a15e
101 changed files with 2036 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Data/Cards/CardDatabase.asset
+1 -7
View File
@@ -9,7 +9,7 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85f230365a0e4f28a4bfbdb0a15115a8, type: 3}
m_Script: {fileID: 11500000, guid: fd9e459379f339742a14cf224cd91234, type: 3}
m_Name: CardDatabase
m_EditorClassIdentifier:
allCards:
@@ -29,9 +29,3 @@ MonoBehaviour:
- {fileID: 11400000, guid: c1a50000000000000000000000000003, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000004, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000005, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000001, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000002, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000003, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000004, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000005, type: 2}
- {fileID: 11400000, guid: a7d40000000000000000000000000006, type: 2}