Merge branch 'main' into card-juice

2025-11-20 16:20:54 +01:00
parent 609f4cde57 058af331e0
commit 2d3168d86b
113 changed files with 9398 additions and 1957 deletions
--- a/Assets/AddressableAssetsData/AssetGroups/Default
+++ b/Assets/AddressableAssetsData/AssetGroups/Default
@@ -20,11 +20,6 @@ MonoBehaviour:
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 9d4a355954ae0a544a9c2a8281bc4bee
-    m_Address: Settings/CardSortingSettings
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: d28c589c05c122f449a8b34e696cda53
    m_Address: Puzzles/Quarry
    m_ReadOnly: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Settings.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Settings.asset
@@ -25,6 +25,11 @@ MonoBehaviour:
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 35d377f68c0a6704d838fe69a20b4bb8
+    m_Address: Settings/BirdPooperSettings
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: 44f8b357e56ef9d4784ec1b1df1a13a8
    m_Address: Settings/Developer/DebugSettings
    m_ReadOnly: 0
@@ -40,6 +45,11 @@ MonoBehaviour:
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9d4a355954ae0a544a9c2a8281bc4bee
+    m_Address: Settings/CardSortingSettings
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: a9569848f604a6540827d4d4bb0a35c2
    m_Address: Settings/DivingMinigameSettings
    m_ReadOnly: 0