Skip to content

Commit c8b4e97

Browse files
committed
Lol I forgot the music
Fixed
1 parent 3073b9b commit c8b4e97

8 files changed

+187
-6
lines changed

Armed/Assets/Music/Ambient.wav.meta

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Armed/Assets/Music/Battle 3.wav

6.02 MB
Binary file not shown.

Armed/Assets/Music/Battle.wav.meta Armed/Assets/Music/Battle 3.wav.meta

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Armed/Assets/Music/Battle.wav

-7.19 MB
Binary file not shown.

Armed/Assets/MusicPlayer.cs

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Collections;
2+
3+
using System.Collections.Generic;
4+
5+
using UnityEngine;
6+
7+
8+
9+
public class MusicPlayer : MonoBehaviour
10+
{
11+
public static MusicPlayer instance;
12+
public AudioSource player;
13+
14+
private void Awake()
15+
{
16+
if (instance == null)
17+
{
18+
instance = this;
19+
DontDestroyOnLoad(this.gameObject);
20+
}
21+
else
22+
{
23+
Destroy(this.gameObject);
24+
}
25+
}
26+
// Use this for initialization
27+
void Start()
28+
{
29+
player.loop = true;
30+
player.Play();
31+
}
32+
// Update is called once per frame
33+
void Update()
34+
{
35+
}
36+
37+
}

Armed/Assets/MusicPlayer.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Armed/Assets/Scenes/Credits.unity

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ MonoBehaviour:
183183
m_Text: "Directors: Robert Anton and Jared Capelle\n\nHead Programmers: Omar El
184184
Sheikh and Laura Maimon\nProgramming: William Wong, Stefan Norling, Xinyuan Zhu,
185185
Savannah Martin, Chnghan Zhou, \nJack Vance, and Tiimothy Kim\n\nDesigners: Alex
186-
Kim, Nick Moon, Everett Adams\n\nArt: Marlene Wartenberg\n"
186+
Kim, Nick Moon, Everett Adams\n\nArt: Marlene Wartenberg\n\nMusic: Victoria Lu\n"
187187
--- !u!222 &433244236
188188
CanvasRenderer:
189189
m_ObjectHideFlags: 0

Armed/Assets/Scenes/Main_Menu.unity

+137
Original file line numberDiff line numberDiff line change
@@ -1100,3 +1100,140 @@ CanvasRenderer:
11001100
m_PrefabInternal: {fileID: 0}
11011101
m_GameObject: {fileID: 2128491801}
11021102
m_CullTransparentMesh: 0
1103+
--- !u!1 &2132901192
1104+
GameObject:
1105+
m_ObjectHideFlags: 0
1106+
m_CorrespondingSourceObject: {fileID: 0}
1107+
m_PrefabInternal: {fileID: 0}
1108+
serializedVersion: 6
1109+
m_Component:
1110+
- component: {fileID: 2132901195}
1111+
- component: {fileID: 2132901194}
1112+
- component: {fileID: 2132901193}
1113+
m_Layer: 0
1114+
m_Name: Music
1115+
m_TagString: Untagged
1116+
m_Icon: {fileID: 0}
1117+
m_NavMeshLayer: 0
1118+
m_StaticEditorFlags: 0
1119+
m_IsActive: 1
1120+
--- !u!114 &2132901193
1121+
MonoBehaviour:
1122+
m_ObjectHideFlags: 0
1123+
m_CorrespondingSourceObject: {fileID: 0}
1124+
m_PrefabInternal: {fileID: 0}
1125+
m_GameObject: {fileID: 2132901192}
1126+
m_Enabled: 1
1127+
m_EditorHideFlags: 0
1128+
m_Script: {fileID: 11500000, guid: 402bc14191001c8479fc8f1d45e4eee0, type: 3}
1129+
m_Name:
1130+
m_EditorClassIdentifier:
1131+
player: {fileID: 2132901194}
1132+
--- !u!82 &2132901194
1133+
AudioSource:
1134+
m_ObjectHideFlags: 0
1135+
m_CorrespondingSourceObject: {fileID: 0}
1136+
m_PrefabInternal: {fileID: 0}
1137+
m_GameObject: {fileID: 2132901192}
1138+
m_Enabled: 1
1139+
serializedVersion: 4
1140+
OutputAudioMixerGroup: {fileID: 0}
1141+
m_audioClip: {fileID: 8300000, guid: 17dd5f24286b0b84a8b0c496fe81be1a, type: 3}
1142+
m_PlayOnAwake: 0
1143+
m_Volume: 1
1144+
m_Pitch: 1
1145+
Loop: 0
1146+
Mute: 0
1147+
Spatialize: 0
1148+
SpatializePostEffects: 0
1149+
Priority: 128
1150+
DopplerLevel: 1
1151+
MinDistance: 1
1152+
MaxDistance: 500
1153+
Pan2D: 0
1154+
rolloffMode: 0
1155+
BypassEffects: 0
1156+
BypassListenerEffects: 0
1157+
BypassReverbZones: 0
1158+
rolloffCustomCurve:
1159+
serializedVersion: 2
1160+
m_Curve:
1161+
- serializedVersion: 3
1162+
time: 0
1163+
value: 1
1164+
inSlope: 0
1165+
outSlope: 0
1166+
tangentMode: 0
1167+
weightedMode: 0
1168+
inWeight: 0.33333334
1169+
outWeight: 0.33333334
1170+
- serializedVersion: 3
1171+
time: 1
1172+
value: 0
1173+
inSlope: 0
1174+
outSlope: 0
1175+
tangentMode: 0
1176+
weightedMode: 0
1177+
inWeight: 0.33333334
1178+
outWeight: 0.33333334
1179+
m_PreInfinity: 2
1180+
m_PostInfinity: 2
1181+
m_RotationOrder: 4
1182+
panLevelCustomCurve:
1183+
serializedVersion: 2
1184+
m_Curve:
1185+
- serializedVersion: 3
1186+
time: 0
1187+
value: 0
1188+
inSlope: 0
1189+
outSlope: 0
1190+
tangentMode: 0
1191+
weightedMode: 0
1192+
inWeight: 0.33333334
1193+
outWeight: 0.33333334
1194+
m_PreInfinity: 2
1195+
m_PostInfinity: 2
1196+
m_RotationOrder: 4
1197+
spreadCustomCurve:
1198+
serializedVersion: 2
1199+
m_Curve:
1200+
- serializedVersion: 3
1201+
time: 0
1202+
value: 0
1203+
inSlope: 0
1204+
outSlope: 0
1205+
tangentMode: 0
1206+
weightedMode: 0
1207+
inWeight: 0.33333334
1208+
outWeight: 0.33333334
1209+
m_PreInfinity: 2
1210+
m_PostInfinity: 2
1211+
m_RotationOrder: 4
1212+
reverbZoneMixCustomCurve:
1213+
serializedVersion: 2
1214+
m_Curve:
1215+
- serializedVersion: 3
1216+
time: 0
1217+
value: 1
1218+
inSlope: 0
1219+
outSlope: 0
1220+
tangentMode: 0
1221+
weightedMode: 0
1222+
inWeight: 0.33333334
1223+
outWeight: 0.33333334
1224+
m_PreInfinity: 2
1225+
m_PostInfinity: 2
1226+
m_RotationOrder: 4
1227+
--- !u!4 &2132901195
1228+
Transform:
1229+
m_ObjectHideFlags: 0
1230+
m_CorrespondingSourceObject: {fileID: 0}
1231+
m_PrefabInternal: {fileID: 0}
1232+
m_GameObject: {fileID: 2132901192}
1233+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1234+
m_LocalPosition: {x: 384, y: 180, z: 0}
1235+
m_LocalScale: {x: 1, y: 1, z: 1}
1236+
m_Children: []
1237+
m_Father: {fileID: 0}
1238+
m_RootOrder: 3
1239+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)