Skip to content

Commit

Permalink
Merge pull request #120 from Siddhant-Patil0203/main
Browse files Browse the repository at this point in the history
Final Commit
  • Loading branch information
UBA-GCOEN authored Oct 20, 2023
2 parents 654e0e7 + d25db81 commit 8e49b80
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Assets/Prefabs/MascotPrefab.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ PrefabInstance:
- target: {fileID: -3124914424127336872, guid: 05b235b3218d73443a1926821111804d,
type: 3}
propertyPath: m_LocalScale.x
value: 15
value: 1
objectReference: {fileID: 0}
- target: {fileID: -3124914424127336872, guid: 05b235b3218d73443a1926821111804d,
type: 3}
propertyPath: m_LocalScale.y
value: 15
value: 1
objectReference: {fileID: 0}
- target: {fileID: -3124914424127336872, guid: 05b235b3218d73443a1926821111804d,
type: 3}
propertyPath: m_LocalScale.z
value: 15
value: 1
objectReference: {fileID: 0}
- target: {fileID: -3124914424127336872, guid: 05b235b3218d73443a1926821111804d,
type: 3}
Expand Down
91 changes: 81 additions & 10 deletions Assets/Scenes/CampusTour.unity
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &371782100
PrefabInstance:
Expand Down Expand Up @@ -668,7 +668,7 @@ Transform:
m_Children:
- {fileID: 1042996411}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &563229581
GameObject:
Expand Down Expand Up @@ -750,7 +750,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &595657626
PrefabInstance:
Expand Down Expand Up @@ -1062,6 +1062,77 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 907873302}
m_PrefabAsset: {fileID: 0}
--- !u!1 &935547605
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 935547607}
- component: {fileID: 935547606}
m_Layer: 0
m_Name: GPS Stage Consturction
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &935547606
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935547605}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ed08d66cc34e4c49bf4ebb7b1ac269a, type: 3}
m_Name:
m_EditorClassIdentifier:
LocationOptions:
LocationInput:
LocationInputType: 0
LocationData: {fileID: 11400000, guid: 02ee5e625347ced43aa5f15f5d957c68, type: 2}
Location:
Latitude: 21.052438
Longitude: 79.059243
Altitude: 0
AltitudeMode: 0
Label:
OverrideAltitudeData:
OverrideAltitude: 1
Altitude: 0
AltitudeMode: 0
PlacementOptions:
MovementSmoothing: 0.05
MaxNumberOfLocationUpdates: 2
UseMovingAverage: 0
HideObjectUntilItIsPlaced: 1
ShowObjectAfterThisManyUpdates: 1
DebugMode: 0
ObjectLocationUpdated:
m_PersistentCalls:
m_Calls: []
ObjectPositionUpdated:
m_PersistentCalls:
m_Calls: []
--- !u!4 &935547607
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 935547605}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &980396933
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1228,7 +1299,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1089696742
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -1246,8 +1317,8 @@ MonoBehaviour:
LocationInputType: 0
LocationData: {fileID: 11400000, guid: b3d786843e8c12049ba7b2602e0c535d, type: 2}
Location:
Latitude: 21.052289
Longitude: 79.059636
Latitude: 21.052438
Longitude: 79.059243
Altitude: 0
AltitudeMode: 0
Label:
Expand Down Expand Up @@ -1291,7 +1362,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1112975931
PrefabInstance:
Expand Down Expand Up @@ -2175,7 +2246,7 @@ Transform:
m_Children:
- {fileID: 1675847484}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1516234559
GameObject:
Expand Down Expand Up @@ -2257,7 +2328,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1587218882
GameObject:
Expand Down Expand Up @@ -2329,7 +2400,7 @@ Transform:
m_Children:
- {fileID: 752226172}
m_Father: {fileID: 0}
m_RootOrder: 17
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1667297491
PrefabInstance:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Notifications.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private IEnumerator SendNotification()

Debug.Log(request.downloadHandler.text);

SceneManager.LoadScene("Notifications");
SceneManager.LoadScene("Notification");

}
else
Expand Down

0 comments on commit 8e49b80

Please sign in to comment.