Skip to content

Commit c3b76fa

Browse files
diefessondiefesson
authored
Merge pull request #34 from diefesson/audio
Audio
2 parents ad161e9 + c8497e6 commit c3b76fa

31 files changed

Lines changed: 886 additions & 15 deletions

‎unity/Assets/Music.meta‎

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

‎unity/Assets/Music/Music.mp3‎

9.15 MB
Binary file not shown.

‎unity/Assets/Music/Music.mp3.meta‎

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

‎unity/Assets/Prefabs/Bullets/Bullet.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ MonoBehaviour:
142142
change: -1
143143
affectsPlayer: 0
144144
affectsEnemy: 1
145+
audioClip: {fileID: 8300000, guid: 7db16efb35ef7dd43a24ce40a5f3dd3e, type: 3}
145146
--- !u!114 &1578220931465500377
146147
MonoBehaviour:
147148
m_ObjectHideFlags: 0

‎unity/Assets/Prefabs/Bullets/RevengeBullet.prefab‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ MonoBehaviour:
282282
change: -1
283283
affectsPlayer: 1
284284
affectsEnemy: 0
285+
audioClip: {fileID: 8300000, guid: 7db16efb35ef7dd43a24ce40a5f3dd3e, type: 3}
285286
--- !u!114 &1795722441210035109
286287
MonoBehaviour:
287288
m_ObjectHideFlags: 0

‎unity/Assets/Prefabs/Enemies/ArmoredBlue.prefab‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ GameObject:
132132
- component: {fileID: 7552160544039048082}
133133
- component: {fileID: 3981350626606583326}
134134
- component: {fileID: 8456032909901616435}
135+
- component: {fileID: 1255976932660377256}
135136
m_Layer: 0
136137
m_Name: ArmoredBlue
137138
m_TagString: Untagged
@@ -279,6 +280,8 @@ MonoBehaviour:
279280
change: -1
280281
affectsPlayer: 1
281282
affectsEnemy: 0
283+
audioClip: {fileID: 0}
284+
volume: 1
282285
--- !u!114 &7552160544039048082
283286
MonoBehaviour:
284287
m_ObjectHideFlags: 0
@@ -321,3 +324,17 @@ MonoBehaviour:
321324
gameObject: {fileID: 3185988872225001172, guid: d8bcc74d9f62c3d47abb469987d62dea, type: 3}
322325
- weight: 1
323326
gameObject: {fileID: 0}
327+
--- !u!114 &1255976932660377256
328+
MonoBehaviour:
329+
m_ObjectHideFlags: 0
330+
m_CorrespondingSourceObject: {fileID: 0}
331+
m_PrefabInstance: {fileID: 0}
332+
m_PrefabAsset: {fileID: 0}
333+
m_GameObject: {fileID: 9150734796446786089}
334+
m_Enabled: 1
335+
m_EditorHideFlags: 0
336+
m_Script: {fileID: 11500000, guid: dfdfaaaba9f39974f87b2c476dec7e5d, type: 3}
337+
m_Name:
338+
m_EditorClassIdentifier:
339+
audioClip: {fileID: 8300000, guid: 4c81032199cd3c4408d34e8d0febb9ed, type: 3}
340+
volume: 0.4

‎unity/Assets/Prefabs/Enemies/DashingYellow.prefab‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ GameObject:
115115
- component: {fileID: 4158396437951175759}
116116
- component: {fileID: 7594759189353258300}
117117
- component: {fileID: 1737895620815135823}
118+
- component: {fileID: 4272131489234482617}
118119
m_Layer: 0
119120
m_Name: DashingYellow
120121
m_TagString: Untagged
@@ -262,6 +263,8 @@ MonoBehaviour:
262263
change: -1
263264
affectsPlayer: 1
264265
affectsEnemy: 0
266+
audioClip: {fileID: 0}
267+
volume: 1
265268
--- !u!114 &7594759189353258300
266269
MonoBehaviour:
267270
m_ObjectHideFlags: 0
@@ -287,3 +290,17 @@ MonoBehaviour:
287290
m_Name:
288291
m_EditorClassIdentifier:
289292
change: 100
293+
--- !u!114 &4272131489234482617
294+
MonoBehaviour:
295+
m_ObjectHideFlags: 0
296+
m_CorrespondingSourceObject: {fileID: 0}
297+
m_PrefabInstance: {fileID: 0}
298+
m_PrefabAsset: {fileID: 0}
299+
m_GameObject: {fileID: 8751615567848948483}
300+
m_Enabled: 1
301+
m_EditorHideFlags: 0
302+
m_Script: {fileID: 11500000, guid: dfdfaaaba9f39974f87b2c476dec7e5d, type: 3}
303+
m_Name:
304+
m_EditorClassIdentifier:
305+
audioClip: {fileID: 8300000, guid: 4c81032199cd3c4408d34e8d0febb9ed, type: 3}
306+
volume: 0.4

‎unity/Assets/Prefabs/Enemies/DullCyan.prefab‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ GameObject:
115115
- component: {fileID: 4534719252415247969}
116116
- component: {fileID: 1479720378182530638}
117117
- component: {fileID: 2994431796477982857}
118+
- component: {fileID: 6792769917944676878}
118119
m_Layer: 0
119120
m_Name: DullCyan
120121
m_TagString: Untagged
@@ -262,6 +263,8 @@ MonoBehaviour:
262263
change: -1
263264
affectsPlayer: 1
264265
affectsEnemy: 0
266+
audioClip: {fileID: 0}
267+
volume: 1
265268
--- !u!114 &1479720378182530638
266269
MonoBehaviour:
267270
m_ObjectHideFlags: 0
@@ -287,3 +290,17 @@ MonoBehaviour:
287290
m_Name:
288291
m_EditorClassIdentifier:
289292
change: 200
293+
--- !u!114 &6792769917944676878
294+
MonoBehaviour:
295+
m_ObjectHideFlags: 0
296+
m_CorrespondingSourceObject: {fileID: 0}
297+
m_PrefabInstance: {fileID: 0}
298+
m_PrefabAsset: {fileID: 0}
299+
m_GameObject: {fileID: 8021787892878118496}
300+
m_Enabled: 1
301+
m_EditorHideFlags: 0
302+
m_Script: {fileID: 11500000, guid: dfdfaaaba9f39974f87b2c476dec7e5d, type: 3}
303+
m_Name:
304+
m_EditorClassIdentifier:
305+
audioClip: {fileID: 8300000, guid: 4c81032199cd3c4408d34e8d0febb9ed, type: 3}
306+
volume: 0.4

‎unity/Assets/Prefabs/Enemies/SpawningPurple.prefab‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ GameObject:
118118
- component: {fileID: 3804420479295794262}
119119
- component: {fileID: 2533264348437076183}
120120
- component: {fileID: 5701657499569394442}
121+
- component: {fileID: 6052577246139635774}
121122
m_Layer: 0
122123
m_Name: SpawningPurple
123124
m_TagString: Untagged
@@ -265,6 +266,8 @@ MonoBehaviour:
265266
change: -1
266267
affectsPlayer: 1
267268
affectsEnemy: 0
269+
audioClip: {fileID: 0}
270+
volume: 1
268271
--- !u!114 &4199433265050398468
269272
MonoBehaviour:
270273
m_ObjectHideFlags: 0
@@ -302,6 +305,7 @@ MonoBehaviour:
302305
m_Script: {fileID: 11500000, guid: 5f8da92d004c6be4093c2d08adb77eb4, type: 3}
303306
m_Name:
304307
m_EditorClassIdentifier:
308+
playerMinRange: 0
305309
limit: 1
306310
entries:
307311
- rest: 3
@@ -338,3 +342,17 @@ MonoBehaviour:
338342
m_Name:
339343
m_EditorClassIdentifier:
340344
change: 500
345+
--- !u!114 &6052577246139635774
346+
MonoBehaviour:
347+
m_ObjectHideFlags: 0
348+
m_CorrespondingSourceObject: {fileID: 0}
349+
m_PrefabInstance: {fileID: 0}
350+
m_PrefabAsset: {fileID: 0}
351+
m_GameObject: {fileID: 6603557939440346834}
352+
m_Enabled: 1
353+
m_EditorHideFlags: 0
354+
m_Script: {fileID: 11500000, guid: dfdfaaaba9f39974f87b2c476dec7e5d, type: 3}
355+
m_Name:
356+
m_EditorClassIdentifier:
357+
audioClip: {fileID: 8300000, guid: 4c81032199cd3c4408d34e8d0febb9ed, type: 3}
358+
volume: 0.4

‎unity/Assets/Prefabs/Enemies/VegencefulRed.prefab‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ GameObject:
116116
- component: {fileID: 4352425056895235747}
117117
- component: {fileID: 5565079096651624158}
118118
- component: {fileID: 427497068146729633}
119+
- component: {fileID: 2154063235463862201}
119120
m_Layer: 0
120121
m_Name: VegencefulRed
121122
m_TagString: Untagged
@@ -263,6 +264,8 @@ MonoBehaviour:
263264
change: -1
264265
affectsPlayer: 1
265266
affectsEnemy: 0
267+
audioClip: {fileID: 0}
268+
volume: 1
266269
--- !u!114 &4352425056895235747
267270
MonoBehaviour:
268271
m_ObjectHideFlags: 0
@@ -303,3 +306,17 @@ MonoBehaviour:
303306
droptable:
304307
- weight: 1
305308
gameObject: {fileID: 1983754648131510555, guid: 58a9fb2d9edfa9f47840eb92cf1dfd01, type: 3}
309+
--- !u!114 &2154063235463862201
310+
MonoBehaviour:
311+
m_ObjectHideFlags: 0
312+
m_CorrespondingSourceObject: {fileID: 0}
313+
m_PrefabInstance: {fileID: 0}
314+
m_PrefabAsset: {fileID: 0}
315+
m_GameObject: {fileID: 3438196584198665699}
316+
m_Enabled: 1
317+
m_EditorHideFlags: 0
318+
m_Script: {fileID: 11500000, guid: dfdfaaaba9f39974f87b2c476dec7e5d, type: 3}
319+
m_Name:
320+
m_EditorClassIdentifier:
321+
audioClip: {fileID: 8300000, guid: 4c81032199cd3c4408d34e8d0febb9ed, type: 3}
322+
volume: 0.4

0 commit comments

Comments
 (0)