Skip to content

Commit 785ebc4

Browse files
authored
Merge pull request #118 from Siddhant-Patil0203/main
Backend Integration and Testing Done
2 parents 5efa388 + 0f3891f commit 785ebc4

File tree

12 files changed

+4868
-4132
lines changed

12 files changed

+4868
-4132
lines changed

Assets/Prefabs/NotifInfo .prefab

Lines changed: 421 additions & 0 deletions
Large diffs are not rendered by default.

Assets/Prefabs/NotifInfo .prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Prefabs/Notification.prefab

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GameObject:
1212
- component: {fileID: 3987693723285160119}
1313
- component: {fileID: 5680221778175720025}
1414
m_Layer: 5
15-
m_Name: Notification Title
15+
m_Name: NT
1616
m_TagString: Untagged
1717
m_Icon: {fileID: 0}
1818
m_NavMeshLayer: 0
@@ -29,8 +29,7 @@ RectTransform:
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
3131
m_ConstrainProportionsScale: 0
32-
m_Children:
33-
- {fileID: 6421038972791377954}
32+
m_Children: []
3433
m_Father: {fileID: 2107595340614988394}
3534
m_RootOrder: -1
3635
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -148,7 +147,7 @@ GameObject:
148147
- component: {fileID: 8000606056077758352}
149148
- component: {fileID: 1962905542605677264}
150149
m_Layer: 5
151-
m_Name: Notification Description
150+
m_Name: ND
152151
m_TagString: Untagged
153152
m_Icon: {fileID: 0}
154153
m_NavMeshLayer: 0
@@ -166,12 +165,12 @@ RectTransform:
166165
m_LocalScale: {x: 1, y: 1, z: 1}
167166
m_ConstrainProportionsScale: 0
168167
m_Children: []
169-
m_Father: {fileID: 1870060256494595709}
168+
m_Father: {fileID: 2107595340614988394}
170169
m_RootOrder: -1
171170
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
172171
m_AnchorMin: {x: 0, y: 0.5}
173172
m_AnchorMax: {x: 0, y: 0.5}
174-
m_AnchoredPosition: {x: 358.274, y: -74}
173+
m_AnchoredPosition: {x: 559.27405, y: -43}
175174
m_SizeDelta: {x: 716.548, y: 62}
176175
m_Pivot: {x: 0.5, y: 0.5}
177176
--- !u!222 &8000606056077758352
@@ -302,8 +301,9 @@ RectTransform:
302301
m_ConstrainProportionsScale: 0
303302
m_Children:
304303
- {fileID: 1870060256494595709}
304+
- {fileID: 6421038972791377954}
305305
m_Father: {fileID: 0}
306-
m_RootOrder: 0
306+
m_RootOrder: -1
307307
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
308308
m_AnchorMin: {x: 0, y: 1}
309309
m_AnchorMax: {x: 0, y: 1}

Assets/Scenes/EditEvent.unity

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5889,6 +5889,17 @@ MonoBehaviour:
58895889
time: {fileID: 164025260}
58905890
venue: {fileID: 151634991}
58915891
guest: {fileID: 364174369}
5892+
eventButtonPrefab: {fileID: 0}
5893+
sliderContent: {fileID: 0}
5894+
Panel: {fileID: 0}
5895+
EventTitle: {fileID: 0}
5896+
OrganiserName: {fileID: 0}
5897+
OrganiserEmail: {fileID: 0}
5898+
EventDescription: {fileID: 0}
5899+
CheifGuestName: {fileID: 0}
5900+
EventCoordinator: {fileID: 0}
5901+
EventTime: {fileID: 0}
5902+
EventVenue: {fileID: 0}
58925903
--- !u!1 &1794739716
58935904
GameObject:
58945905
m_ObjectHideFlags: 0
@@ -6173,7 +6184,7 @@ GameObject:
61736184
m_Icon: {fileID: 0}
61746185
m_NavMeshLayer: 0
61756186
m_StaticEditorFlags: 0
6176-
m_IsActive: 1
6187+
m_IsActive: 0
61776188
--- !u!224 &1911746164
61786189
RectTransform:
61796190
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)