Merge pull request #118 from Siddhant-Patil0203/main

Backend Integration and Testing Done
UBA-GCOEN · Oct 16, 2023 · 785ebc4 · 785ebc4
2 parents 5efa388 + 0f3891f
commit 785ebc4
Show file tree

Hide file tree

Showing 12 changed files with 4,868 additions and 4,132 deletions.
diff --git a/Assets/Prefabs/NotifInfo .prefab b/Assets/Prefabs/NotifInfo .prefab
diff --git a/Assets/Prefabs/NotifInfo .prefab.meta b/Assets/Prefabs/NotifInfo .prefab.meta
diff --git a/Assets/Prefabs/Notification.prefab b/Assets/Prefabs/Notification.prefab
@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 3987693723285160119}
   - component: {fileID: 5680221778175720025}
   m_Layer: 5
-  m_Name: Notification Title
+  m_Name: NT
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -29,8 +29,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6421038972791377954}
+  m_Children: []
   m_Father: {fileID: 2107595340614988394}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -148,7 +147,7 @@ GameObject:
   - component: {fileID: 8000606056077758352}
   - component: {fileID: 1962905542605677264}
   m_Layer: 5
-  m_Name: Notification Description
+  m_Name: ND
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -166,12 +165,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1870060256494595709}
+  m_Father: {fileID: 2107595340614988394}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 358.274, y: -74}
+  m_AnchoredPosition: {x: 559.27405, y: -43}
   m_SizeDelta: {x: 716.548, y: 62}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8000606056077758352
@@ -302,8 +301,9 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1870060256494595709}
+  - {fileID: 6421038972791377954}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

diff --git a/Assets/Scenes/EditEvent.unity b/Assets/Scenes/EditEvent.unity
@@ -5889,6 +5889,17 @@ MonoBehaviour:
   time: {fileID: 164025260}
   venue: {fileID: 151634991}
   guest: {fileID: 364174369}
+  eventButtonPrefab: {fileID: 0}
+  sliderContent: {fileID: 0}
+  Panel: {fileID: 0}
+  EventTitle: {fileID: 0}
+  OrganiserName: {fileID: 0}
+  OrganiserEmail: {fileID: 0}
+  EventDescription: {fileID: 0}
+  CheifGuestName: {fileID: 0}
+  EventCoordinator: {fileID: 0}
+  EventTime: {fileID: 0}
+  EventVenue: {fileID: 0}
 --- !u!1 &1794739716
 GameObject:
   m_ObjectHideFlags: 0
@@ -6173,7 +6184,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1911746164
 RectTransform:
   m_ObjectHideFlags: 0