Skip to content

Commit

Permalink
merged with the sound system. There are some audio related errors to …
Browse files Browse the repository at this point in the history
…be fixed. The game however is playable.
  • Loading branch information
hackerspacevr committed Oct 17, 2017
2 parents 1041ab5 + d0ed767 commit 455bcd9
Show file tree
Hide file tree
Showing 30 changed files with 1,561 additions and 303 deletions.
88 changes: 88 additions & 0 deletions Assets/Prefabs/Enemies/Enemy_Wolf.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GameObject:
- component: {fileID: 23220297284214924}
- component: {fileID: 114625139027536526}
- component: {fileID: 195566649392851366}
- component: {fileID: 82762029520166984}
m_Layer: 0
m_Name: Enemy_Wolf
m_TagString: Untagged
Expand Down Expand Up @@ -83,6 +84,86 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1484509504004192}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!82 &82762029520166984
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1484509504004192}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 1
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!114 &114625139027536526
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -99,6 +180,13 @@ MonoBehaviour:
HealthBarPrefab: {fileID: 1526444277414400, guid: be44979df32dbbd48bfe006dfa3b8d86,
type: 2}
HeadsetPosition: {fileID: 0}
idleSounds:
- {fileID: 8300000, guid: 99e7fc6c4ce6e15429747b7e156662b9, type: 3}
- {fileID: 8300000, guid: 9621d669dbbb85c4c8de44f859b1e722, type: 3}
hurtSounds:
- {fileID: 8300000, guid: 0739d54f4b9765c4b9829f12ffcac308, type: 3}
deathSounds:
- {fileID: 8300000, guid: 0739d54f4b9765c4b9829f12ffcac308, type: 3}
speed: 4
--- !u!136 &136791210700273234
CapsuleCollider:
Expand Down
11 changes: 11 additions & 0 deletions Assets/Prefabs/Enemies/LowPoly_wolf.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1920,6 +1920,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -1935,6 +1936,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand All @@ -1952,6 +1954,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -1968,6 +1971,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand All @@ -1985,6 +1989,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -2000,6 +2005,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand All @@ -2017,6 +2023,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -2032,6 +2039,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down Expand Up @@ -2098,6 +2106,9 @@ MonoBehaviour:
health: 0
HealthBarPrefab: {fileID: 1526444277414400, guid: be44979df32dbbd48bfe006dfa3b8d86,
type: 2}
idleSounds: []
hurtSounds: []
deathSounds: []
speed: 4
--- !u!114 &114566792879767558
MonoBehaviour:
Expand Down
9 changes: 9 additions & 0 deletions Assets/Prefabs/Sound.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

122 changes: 122 additions & 0 deletions Assets/Prefabs/Sound/PointSound.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1244514901859244}
m_IsPrefabParent: 1
--- !u!1 &1244514901859244
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4327442255696092}
- component: {fileID: 82562462049037556}
m_Layer: 0
m_Name: PointSound
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4327442255696092
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1244514901859244}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &82562462049037556
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1244514901859244}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 1
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
9 changes: 9 additions & 0 deletions Assets/Prefabs/Sound/PointSound.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 39 additions & 1 deletion Assets/Prefabs/Spawner.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ GameObject:
- component: {fileID: 33194127225136368}
- component: {fileID: 65216454935447410}
- component: {fileID: 23350649202170900}
- component: {fileID: 114171376665348028}
- component: {fileID: 114805863563315106}
m_Layer: 0
m_Name: Spawner
m_TagString: Untagged
Expand All @@ -36,7 +38,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1111779193677888}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.1, y: 2.88, z: -16.33}
m_LocalPosition: {x: -8.89, y: 7.26, z: -46.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand All @@ -51,6 +53,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand All @@ -66,6 +69,7 @@ MeshRenderer:
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
Expand Down Expand Up @@ -93,3 +97,37 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &114171376665348028
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1111779193677888}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a34ea048c5ff7c84493756059d23047d, type: 3}
m_Name:
m_EditorClassIdentifier:
enemyPrefabs:
- {fileID: 114450340983142668, guid: decfb6dd343791c488b04617b9603373, type: 2}
enemyContainer: {fileID: 0}
goal: {fileID: 0}
spawnFrequency: 3
spawnManager: {fileID: 0}
--- !u!114 &114805863563315106
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1111779193677888}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a34ea048c5ff7c84493756059d23047d, type: 3}
m_Name:
m_EditorClassIdentifier:
enemyPrefabs:
- {fileID: 114450340983142668, guid: decfb6dd343791c488b04617b9603373, type: 2}
enemyContainer: {fileID: 0}
goal: {fileID: 0}
spawnFrequency: 3
spawnManager: {fileID: 0}
Loading

0 comments on commit 455bcd9

Please sign in to comment.