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}
Assets/Data/Distros.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: b5d4e612df874934a2fe5e4ce5cf43de
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Art.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 296f57316cdb4f9ba2227b877b091c23
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Art/fedora.txt.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f2373174b6954f2d9088d83d10e0d9e4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Art/mint.txt.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 412c9be402ec4d8c8510e71066ec22ff
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Art/ubuntu.txt.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 975f1f5de289435eb81c91c3eddd31dc
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/DistroDatabase.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4d88ca5446fa4d80b2fbd4b12697cb7c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Fedora.asset
+6 -6
View File
@@ -16,7 +16,7 @@ MonoBehaviour:
displayName: Fedora
primaryLanguage: 2
secondaryLanguage: 8
passive: {fileID: 11400000, guid: a1100000000000000000000000000002, type: 2}
passive: {fileID: 11400000, guid: ded62c69f70d38a49b21972d857df4e2, type: 2}
description: First to every new feature. Occasionally first to the bugs that come with it.
playstyleSummary: high-tempo gambler. her first play each turn is pushed hard, but bleeding edge bites back. rust cards are her safety net.
languageBlurbs:
@@ -30,8 +30,8 @@ MonoBehaviour:
baseRam: 5
baseCyclesPerTurn: 3
exclusiveCards:
- {fileID: 11400000, guid: feda0000000000000000000000000001, type: 2}
- {fileID: 11400000, guid: feda0000000000000000000000000002, type: 2}
- {fileID: 11400000, guid: feda0000000000000000000000000003, type: 2}
- {fileID: 11400000, guid: feda0000000000000000000000000004, type: 2}
- {fileID: 11400000, guid: feda0000000000000000000000000005, type: 2}
- {fileID: 11400000, guid: 93ddfe2f35c5c4447b1e5f49b50c544d, type: 2}
- {fileID: 11400000, guid: e6a3f582f36bb2647ab6101d60a05075, type: 2}
- {fileID: 11400000, guid: e0a15eebcb5cb7b409a6afe60710e1e1, type: 2}
- {fileID: 11400000, guid: fde58599fc89f4f4ab515612f4f481f7, type: 2}
- {fileID: 11400000, guid: 7f1a9912cb72c5b448fa2cb101eb9785, type: 2}
Assets/Data/Distros/Fedora.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 245dfb73afe047d5a3a3ef54c30d5135
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Mint.asset
+6 -6
View File
@@ -16,7 +16,7 @@ MonoBehaviour:
displayName: Mint
primaryLanguage: 3
secondaryLanguage: 4
passive: {fileID: 11400000, guid: a1100000000000000000000000000003, type: 2}
passive: {fileID: 11400000, guid: d97481a7d54be2045a96165d3977c980, type: 2}
description: Comfort incarnate. No surprises, no drama, ever.
playstyleSummary: zero-variance comfort. every number lands at its ceiling, so you always know exactly what a turn does -- at the cost of a high-roll upside.
languageBlurbs:
@@ -30,8 +30,8 @@ MonoBehaviour:
baseRam: 5
baseCyclesPerTurn: 3
exclusiveCards:
- {fileID: 11400000, guid: c1a50000000000000000000000000001, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000002, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000003, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000004, type: 2}
- {fileID: 11400000, guid: c1a50000000000000000000000000005, type: 2}
- {fileID: 11400000, guid: 258f2221f41c405468e0024e8e769614, type: 2}
- {fileID: 11400000, guid: ab370770e5f6c544996be970b87e7801, type: 2}
- {fileID: 11400000, guid: cdde7bad9bde5ff44a047263bce1bb4e, type: 2}
- {fileID: 11400000, guid: 698dfb4b10be9f2419ca74e0b3443d48, type: 2}
- {fileID: 11400000, guid: e6c02c38647698744903032f93fb30da, type: 2}
Assets/Data/Distros/Mint.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 366e71361387449abcfaa1a50c9af87b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Data/Distros/Ubuntu.asset
+6 -6
View File
@@ -16,7 +16,7 @@ MonoBehaviour:
displayName: Ubuntu
primaryLanguage: 3
secondaryLanguage: 4
passive: {fileID: 11400000, guid: a1100000000000000000000000000001, type: 2}
passive: {fileID: 11400000, guid: 19deb73cec3d5dc42a5cc336222ce9df, type: 2}
description: The friendly one. Everything works out of the box, and she will not stop helping.
playstyleSummary: an accessible engine that never runs dry -- cheap python cards and a passive that always finds you the right package.
languageBlurbs:
@@ -30,8 +30,8 @@ MonoBehaviour:
baseRam: 5
baseCyclesPerTurn: 3
exclusiveCards:
- {fileID: 11400000, guid: 0a4f1d1d84564f3cad58b8863e941201, type: 2}
- {fileID: 11400000, guid: 14c5d40f866a4cb6b0a6316e01f42891, type: 2}
- {fileID: 11400000, guid: 2a0f50d541f046fc99c8fb6deef4f1aa, type: 2}
- {fileID: 11400000, guid: 3d57857f3f30419c8be4c44914c5abbe, type: 2}
- {fileID: 11400000, guid: 4cae271a0f4146c59aab74e4c9d6d0f8, type: 2}
- {fileID: 11400000, guid: f2a229189aa753e48806c9459618f10b, type: 2}
- {fileID: 11400000, guid: 1120e87243f2b5c48b6a334855af7937, type: 2}
- {fileID: 11400000, guid: f3d46628fc9cc2142ab5dfc5d78b158f, type: 2}
- {fileID: 11400000, guid: 6bfadf916238fd74b91e28a875239da4, type: 2}
- {fileID: 11400000, guid: 662257d2f1d13554fb1eb6c63257859c, type: 2}
Assets/Data/Distros/Ubuntu.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1b0892a0d4c34b03a54c3d511ae59356
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: