Merge remote-tracking branch 'origin/savya' into work_branch

2026-05-29 17:49:28 +05:45
parent 5b2a30a7f6 2d519a37b4
commit 02a58a1652
11 changed files with 296 additions and 64 deletions
--- a/UI/Prefabs/SlotMarkers/Square.prefab
+++ b/UI/Prefabs/SlotMarkers/Square.prefab
@@ -68,7 +68,7 @@ MonoBehaviour:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: c3293fddd457324499e794c843736653, type: 3}
  m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
  m_FillCenter: 1
  m_FillMethod: 4
  m_FillAmount: 1
--- a/UI/Prefabs/SlotMarkers/Triangle.prefab
+++ b/UI/Prefabs/SlotMarkers/Triangle.prefab
@@ -68,7 +68,7 @@ MonoBehaviour:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: cbc63d77c9f7c8448b6ff8900b09cc3f, type: 3}
  m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
  m_FillCenter: 1
  m_FillMethod: 4
  m_FillAmount: 1
--- a/Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold
+++ b/Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold