Merge branch 'main' into DamianBranch

2025-12-18 17:31:29 +01:00
parent 38f6094842 6c5a396540
commit 66213059e7
46 changed files with 3279 additions and 1366 deletions
--- a/Assets/Settings/BirdPooperSettings.asset
+++ b/Assets/Settings/BirdPooperSettings.asset
@@ -12,8 +12,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e7d3f5b948b3454681fa573071bee978, type: 3}
  m_Name: BirdPooperSettings
  m_EditorClassIdentifier: AppleHillsScripts::Core.Settings.BirdPooperSettings
-  gravity: 110
-  flapForce: 55
+  gravity: 75
+  flapForce: 25
  maxFallSpeed: 120
  minY: -15
  maxY: 15
--- a/Assets/Settings/CardSortingSettings.asset
+++ b/Assets/Settings/CardSortingSettings.asset
@@ -40,12 +40,15 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
-  garbageItems:
-  - {fileID: 11400000, guid: b9c54fbced64684419e983429fd27b34, type: 2}
-  normalCardWeight: 40
-  rareCardWeight: 30
-  legendCardWeight: 20
-  garbageWeight: 40
+  normalCardPrefabs:
+  - {fileID: 1205919338430796931, guid: caab778e5a08341498fe895141ad7dd7, type: 3}
+  rareCardPrefabs:
+  - {fileID: 1205919338430796931, guid: 2a3f5cc2e7ca670459ebe1c556883c9f, type: 3}
+  legendaryCardPrefabs:
+  - {fileID: 1205919338430796931, guid: 0cc305839e3ff7843b350430206543b4, type: 3}
+  garbagePrefabs:
+  - {fileID: 8040288309226191295, guid: 16a53235286e7a9438ec114b71ef6230, type: 3}
+  cardToGarbageRatio: 0.75
  correctSortPoints: 1
  incorrectSortPenalty: -1
  missedItemPenalty: 0