Skip to content

Commit e2bddec

Browse files
authored
Merge pull request #59 from SCCapstone/Audio-Upload
Audio upload
2 parents ae25e48 + c9cb9e8 commit e2bddec

14 files changed

Lines changed: 313 additions & 289 deletions

Unity-Job-Search/Assets/Scenes/SampleScene.unity.meta renamed to Unity-Job-Search/Assets/Audio/Outside_door.meta

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Unity-Job-Search/Assets/Audio/Outside_door/Career Center Info.wav.meta

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
422 KB
Binary file not shown.

Unity-Job-Search/Assets/Audio/Outside_door/ClickOnDoor.wav.meta

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

Unity-Job-Search/Assets/Audio/Outside_door/Merged_Caree_Click.wav.meta

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

Unity-Job-Search/Assets/ImportedAsset/Food Assets/Textures/Thumbs.db.meta renamed to Unity-Job-Search/Assets/Oculus/VR/Textures/Icons.meta

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

Unity-Job-Search/Assets/Scenes/Inside_Front_Desk.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ MeshRenderer:
820820
m_CorrespondingSourceObject: {fileID: 0}
821821
m_PrefabInternal: {fileID: 0}
822822
m_GameObject: {fileID: 1367698873}
823-
m_Enabled: 1
823+
m_Enabled: 0
824824
m_CastShadows: 1
825825
m_ReceiveShadows: 1
826826
m_DynamicOccludee: 1

Unity-Job-Search/Assets/Scenes/Outside_Front.unity

Lines changed: 204 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ GameObject:
477477
- component: {fileID: 766097122}
478478
- component: {fileID: 766097121}
479479
- component: {fileID: 766097124}
480+
- component: {fileID: 766097125}
480481
m_Layer: 0
481482
m_Name: OVRPlayerController
482483
m_TagString: Untagged
@@ -555,6 +556,13 @@ MonoBehaviour:
555556
insideToFrontDesk: {fileID: 0}
556557
frontDeskToInside: {fileID: 0}
557558
frontDeskGO: {fileID: 0}
559+
--- !u!81 &766097125
560+
AudioListener:
561+
m_ObjectHideFlags: 0
562+
m_CorrespondingSourceObject: {fileID: 0}
563+
m_PrefabInternal: {fileID: 0}
564+
m_GameObject: {fileID: 766097120}
565+
m_Enabled: 1
558566
--- !u!4 &766097128
559567
Transform:
560568
m_ObjectHideFlags: 0
@@ -977,6 +985,202 @@ MeshFilter:
977985
m_PrefabInternal: {fileID: 0}
978986
m_GameObject: {fileID: 1616174574}
979987
m_Mesh: {fileID: 4300000, guid: e0f1914fdbfd3764faeff5474c0cbe1e, type: 3}
988+
--- !u!1 &1808617703
989+
GameObject:
990+
m_ObjectHideFlags: 0
991+
m_CorrespondingSourceObject: {fileID: 0}
992+
m_PrefabInternal: {fileID: 0}
993+
serializedVersion: 6
994+
m_Component:
995+
- component: {fileID: 1808617708}
996+
- component: {fileID: 1808617707}
997+
- component: {fileID: 1808617706}
998+
- component: {fileID: 1808617705}
999+
- component: {fileID: 1808617704}
1000+
- component: {fileID: 1808617709}
1001+
m_Layer: 0
1002+
m_Name: Audio
1003+
m_TagString: Untagged
1004+
m_Icon: {fileID: 0}
1005+
m_NavMeshLayer: 0
1006+
m_StaticEditorFlags: 0
1007+
m_IsActive: 1
1008+
--- !u!82 &1808617704
1009+
AudioSource:
1010+
m_ObjectHideFlags: 0
1011+
m_CorrespondingSourceObject: {fileID: 0}
1012+
m_PrefabInternal: {fileID: 0}
1013+
m_GameObject: {fileID: 1808617703}
1014+
m_Enabled: 1
1015+
serializedVersion: 4
1016+
OutputAudioMixerGroup: {fileID: 0}
1017+
m_audioClip: {fileID: 8300000, guid: 0ffdc6833199bb046b908b7c6342e09d, type: 3}
1018+
m_PlayOnAwake: 0
1019+
m_Volume: 1
1020+
m_Pitch: 1
1021+
Loop: 0
1022+
Mute: 0
1023+
Spatialize: 0
1024+
SpatializePostEffects: 0
1025+
Priority: 128
1026+
DopplerLevel: 1
1027+
MinDistance: 1
1028+
MaxDistance: 500
1029+
Pan2D: 0
1030+
rolloffMode: 0
1031+
BypassEffects: 0
1032+
BypassListenerEffects: 0
1033+
BypassReverbZones: 0
1034+
rolloffCustomCurve:
1035+
serializedVersion: 2
1036+
m_Curve:
1037+
- serializedVersion: 3
1038+
time: 0
1039+
value: 1
1040+
inSlope: 0
1041+
outSlope: 0
1042+
tangentMode: 0
1043+
weightedMode: 0
1044+
inWeight: 0.33333334
1045+
outWeight: 0.33333334
1046+
- serializedVersion: 3
1047+
time: 1
1048+
value: 0
1049+
inSlope: 0
1050+
outSlope: 0
1051+
tangentMode: 0
1052+
weightedMode: 0
1053+
inWeight: 0.33333334
1054+
outWeight: 0.33333334
1055+
m_PreInfinity: 2
1056+
m_PostInfinity: 2
1057+
m_RotationOrder: 4
1058+
panLevelCustomCurve:
1059+
serializedVersion: 2
1060+
m_Curve:
1061+
- serializedVersion: 3
1062+
time: 0
1063+
value: 0
1064+
inSlope: 0
1065+
outSlope: 0
1066+
tangentMode: 0
1067+
weightedMode: 0
1068+
inWeight: 0.33333334
1069+
outWeight: 0.33333334
1070+
m_PreInfinity: 2
1071+
m_PostInfinity: 2
1072+
m_RotationOrder: 4
1073+
spreadCustomCurve:
1074+
serializedVersion: 2
1075+
m_Curve:
1076+
- serializedVersion: 3
1077+
time: 0
1078+
value: 0
1079+
inSlope: 0
1080+
outSlope: 0
1081+
tangentMode: 0
1082+
weightedMode: 0
1083+
inWeight: 0.33333334
1084+
outWeight: 0.33333334
1085+
m_PreInfinity: 2
1086+
m_PostInfinity: 2
1087+
m_RotationOrder: 4
1088+
reverbZoneMixCustomCurve:
1089+
serializedVersion: 2
1090+
m_Curve:
1091+
- serializedVersion: 3
1092+
time: 0
1093+
value: 1
1094+
inSlope: 0
1095+
outSlope: 0
1096+
tangentMode: 0
1097+
weightedMode: 0
1098+
inWeight: 0.33333334
1099+
outWeight: 0.33333334
1100+
m_PreInfinity: 2
1101+
m_PostInfinity: 2
1102+
m_RotationOrder: 4
1103+
--- !u!135 &1808617705
1104+
SphereCollider:
1105+
m_ObjectHideFlags: 0
1106+
m_CorrespondingSourceObject: {fileID: 0}
1107+
m_PrefabInternal: {fileID: 0}
1108+
m_GameObject: {fileID: 1808617703}
1109+
m_Material: {fileID: 0}
1110+
m_IsTrigger: 0
1111+
m_Enabled: 1
1112+
serializedVersion: 2
1113+
m_Radius: 0.5
1114+
m_Center: {x: 0, y: 0, z: 0}
1115+
--- !u!23 &1808617706
1116+
MeshRenderer:
1117+
m_ObjectHideFlags: 0
1118+
m_CorrespondingSourceObject: {fileID: 0}
1119+
m_PrefabInternal: {fileID: 0}
1120+
m_GameObject: {fileID: 1808617703}
1121+
m_Enabled: 0
1122+
m_CastShadows: 1
1123+
m_ReceiveShadows: 1
1124+
m_DynamicOccludee: 1
1125+
m_MotionVectors: 1
1126+
m_LightProbeUsage: 1
1127+
m_ReflectionProbeUsage: 1
1128+
m_RenderingLayerMask: 4294967295
1129+
m_Materials:
1130+
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
1131+
m_StaticBatchInfo:
1132+
firstSubMesh: 0
1133+
subMeshCount: 0
1134+
m_StaticBatchRoot: {fileID: 0}
1135+
m_ProbeAnchor: {fileID: 0}
1136+
m_LightProbeVolumeOverride: {fileID: 0}
1137+
m_ScaleInLightmap: 1
1138+
m_PreserveUVs: 0
1139+
m_IgnoreNormalsForChartDetection: 0
1140+
m_ImportantGI: 0
1141+
m_StitchLightmapSeams: 0
1142+
m_SelectedEditorRenderState: 3
1143+
m_MinimumChartSize: 4
1144+
m_AutoUVMaxDistance: 0.5
1145+
m_AutoUVMaxAngle: 89
1146+
m_LightmapParameters: {fileID: 0}
1147+
m_SortingLayerID: 0
1148+
m_SortingLayer: 0
1149+
m_SortingOrder: 0
1150+
--- !u!33 &1808617707
1151+
MeshFilter:
1152+
m_ObjectHideFlags: 0
1153+
m_CorrespondingSourceObject: {fileID: 0}
1154+
m_PrefabInternal: {fileID: 0}
1155+
m_GameObject: {fileID: 1808617703}
1156+
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
1157+
--- !u!4 &1808617708
1158+
Transform:
1159+
m_ObjectHideFlags: 0
1160+
m_CorrespondingSourceObject: {fileID: 0}
1161+
m_PrefabInternal: {fileID: 0}
1162+
m_GameObject: {fileID: 1808617703}
1163+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1164+
m_LocalPosition: {x: 27.475368, y: 17.207758, z: -5.356476}
1165+
m_LocalScale: {x: 1, y: 1, z: 1}
1166+
m_Children: []
1167+
m_Father: {fileID: 0}
1168+
m_RootOrder: 5
1169+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1170+
--- !u!114 &1808617709
1171+
MonoBehaviour:
1172+
m_ObjectHideFlags: 0
1173+
m_CorrespondingSourceObject: {fileID: 0}
1174+
m_PrefabInternal: {fileID: 0}
1175+
m_GameObject: {fileID: 1808617703}
1176+
m_Enabled: 1
1177+
m_EditorHideFlags: 0
1178+
m_Script: {fileID: 11500000, guid: b34af3fd15be8c5469f53303bcea3cfa, type: 3}
1179+
m_Name:
1180+
m_EditorClassIdentifier:
1181+
sound: {fileID: 8300000, guid: 0ffdc6833199bb046b908b7c6342e09d, type: 3}
1182+
Volume: 1
1183+
playedAlready: 0
9801184
--- !u!1 &1833138052
9811185
GameObject:
9821186
m_ObjectHideFlags: 0
@@ -986,21 +1190,13 @@ GameObject:
9861190
m_Component:
9871191
- component: {fileID: 1833138055}
9881192
- component: {fileID: 1833138054}
989-
- component: {fileID: 1833138053}
9901193
m_Layer: 0
9911194
m_Name: Main Camera
9921195
m_TagString: MainCamera
9931196
m_Icon: {fileID: 0}
9941197
m_NavMeshLayer: 0
9951198
m_StaticEditorFlags: 0
9961199
m_IsActive: 1
997-
--- !u!81 &1833138053
998-
AudioListener:
999-
m_ObjectHideFlags: 0
1000-
m_CorrespondingSourceObject: {fileID: 0}
1001-
m_PrefabInternal: {fileID: 0}
1002-
m_GameObject: {fileID: 1833138052}
1003-
m_Enabled: 1
10041200
--- !u!20 &1833138054
10051201
Camera:
10061202
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)