Fix conflicts

lambdaclass · Jun 12, 2024 · 7e7021d · 7e7021d
2 parents e739d27 + 116227e
commit 7e7021d
Show file tree

Hide file tree

Showing 22 changed files with 11,683 additions and 1,184 deletions.
diff --git a/client/Assets/Images/Campaign backgrounds/campaign_background_3.png b/client/Assets/Images/Campaign backgrounds/campaign_background_3.png
diff --git a/client/Assets/Images/Campaign backgrounds/campaign_background_3.png.meta b/client/Assets/Images/Campaign backgrounds/campaign_background_3.png.meta
diff --git a/client/Assets/Images/Campaign backgrounds/campaign_background_4.jpg b/client/Assets/Images/Campaign backgrounds/campaign_background_4.jpg
diff --git a/client/Assets/Images/Campaign backgrounds/campaign_background_4.jpg.meta b/client/Assets/Images/Campaign backgrounds/campaign_background_4.jpg.meta
diff --git a/client/Assets/Prefabs/Campaign/Campaign.prefab b/client/Assets/Prefabs/Campaign/Campaign.prefab
@@ -387,7 +387,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -4, y: -84}
+  m_AnchoredPosition: {x: 0, y: -59}
   m_SizeDelta: {x: 220, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7096975054899021653
@@ -504,7 +504,7 @@ MonoBehaviour:
   lockObject: {fileID: 830745684171372261}
   completedCrossObject: {fileID: 8365586952368866566}
   campaignToShowPrefab: {fileID: 0}
-  sceneManager: {fileID: 0}
+  sceneNavigator: {fileID: 0}
 --- !u!1 &7096975055422375309
 GameObject:
   m_ObjectHideFlags: 0