Skip to content

Commit

Permalink
FIX - Allow music and sound effects to play simultaneously
Browse files Browse the repository at this point in the history 
FIX - Enemies are not hurting player
FIX - Enemies are shooting themselves / collider issue
FIX - Fix flying enemies
  • Loading branch information
@tbigfish
tbigfish committed Nov 28, 2014
1 parent 9e095d3 commit 1795338
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 196 deletions.
1 change: 1 addition & 0 deletions Assets/Prefab/Enemies/Enemy_HeavyAlien.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Bullet: {fileID: 5400000, guid: e5c6f0f3711b92747998afacb391be6c, type: 2}
RechargeTime: 1
GunEnd: {fileID: 100018}
--- !u!143 &14300000
CharacterController:
m_ObjectHideFlags: 1
Expand Down
1 change: 1 addition & 0 deletions Assets/Prefab/Enemies/Enemy_LightAlien.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Bullet: {fileID: 5400000, guid: e5c6f0f3711b92747998afacb391be6c, type: 2}
RechargeTime: 1
GunEnd: {fileID: 100022}
--- !u!143 &14300000
CharacterController:
m_ObjectHideFlags: 1
Expand Down
3 changes: 2 additions & 1 deletion Assets/Prefab/Enemies/Enemy_Robot.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -878,9 +878,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1a153aa058d6cb746b177e7a06c98a4e, type: 3}
m_Name:
m_EditorClassIdentifier:
AttackRechargeTime: 5
AttackRechargeTime: 3
AttackDamage: 60
AttackRange: 5
AttackPoint: {fileID: 100024}
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
1 change: 1 addition & 0 deletions Assets/Prefab/Enemies/Enemy_Zombie.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,7 @@ MonoBehaviour:
AttackRechargeTime: 1
AttackDamage: 20
AttackRange: 5
AttackPoint: {fileID: 100016}
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefab/Map/Objects/Obstacle.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 2, y: 4, z: 2}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
Expand Down
24 changes: 3 additions & 21 deletions Assets/Scenes/DeliverableLevels/Dynamic_Level 1.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ GameObject:
- 81: {fileID: 404271884}
- 114: {fileID: 404271889}
- 82: {fileID: 404271890}
- 114: {fileID: 404271891}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -136,7 +135,7 @@ Camera:
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 10
m_Depth: -1
m_CullingMask:
Expand Down Expand Up @@ -182,9 +181,9 @@ AudioSource:
m_GameObject: {fileID: 404271883}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: .100000001
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -232,23 +231,6 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &404271891
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 404271883}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4075a5db73151d042b720eafc3fabb9b, type: 3}
m_Name:
m_EditorClassIdentifier:
BackingTracks:
- {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
- {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
- {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
- {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
TimeBetweenTracks: 0
--- !u!1 &527390455
GameObject:
m_ObjectHideFlags: 0
Expand Down
24 changes: 3 additions & 21 deletions Assets/Scenes/DeliverableLevels/Dynamic_Level 2.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ GameObject:
- 81: {fileID: 404271884}
- 114: {fileID: 404271889}
- 82: {fileID: 404271890}
- 114: {fileID: 404271891}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -136,7 +135,7 @@ Camera:
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 10
m_Depth: -1
m_CullingMask:
Expand Down Expand Up @@ -182,9 +181,9 @@ AudioSource:
m_GameObject: {fileID: 404271883}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: .100000001
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -232,23 +231,6 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &404271891
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 404271883}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4075a5db73151d042b720eafc3fabb9b, type: 3}
m_Name:
m_EditorClassIdentifier:
BackingTracks:
- {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
- {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
- {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
- {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
TimeBetweenTracks: 0
--- !u!1 &527390455
GameObject:
m_ObjectHideFlags: 0
Expand Down
24 changes: 3 additions & 21 deletions Assets/Scenes/DeliverableLevels/Dynamic_Level 3.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ GameObject:
- 81: {fileID: 404271884}
- 114: {fileID: 404271889}
- 82: {fileID: 404271890}
- 114: {fileID: 404271891}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -136,7 +135,7 @@ Camera:
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 10
m_Depth: -1
m_CullingMask:
Expand Down Expand Up @@ -182,9 +181,9 @@ AudioSource:
m_GameObject: {fileID: 404271883}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: .100000001
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -232,23 +231,6 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &404271891
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 404271883}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4075a5db73151d042b720eafc3fabb9b, type: 3}
m_Name:
m_EditorClassIdentifier:
BackingTracks:
- {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
- {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
- {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
- {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
TimeBetweenTracks: 0
--- !u!1 &527390455
GameObject:
m_ObjectHideFlags: 0
Expand Down
24 changes: 3 additions & 21 deletions Assets/Scenes/DeliverableLevels/Dynamic_Level 4.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ GameObject:
- 81: {fileID: 404271884}
- 114: {fileID: 404271889}
- 82: {fileID: 404271890}
- 114: {fileID: 404271891}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -136,7 +135,7 @@ Camera:
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 10
m_Depth: -1
m_CullingMask:
Expand Down Expand Up @@ -182,9 +181,9 @@ AudioSource:
m_GameObject: {fileID: 404271883}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: .100000001
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -232,23 +231,6 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &404271891
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 404271883}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4075a5db73151d042b720eafc3fabb9b, type: 3}
m_Name:
m_EditorClassIdentifier:
BackingTracks:
- {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
- {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
- {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
- {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
TimeBetweenTracks: 0
--- !u!1 &527390455
GameObject:
m_ObjectHideFlags: 0
Expand Down
24 changes: 3 additions & 21 deletions Assets/Scenes/DeliverableLevels/Dynamic_Level 5.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ GameObject:
- 81: {fileID: 404271884}
- 114: {fileID: 404271889}
- 82: {fileID: 404271890}
- 114: {fileID: 404271891}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -136,7 +135,7 @@ Camera:
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic: 0
orthographic size: 10
m_Depth: -1
m_CullingMask:
Expand Down Expand Up @@ -182,9 +181,9 @@ AudioSource:
m_GameObject: {fileID: 404271883}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 4e99a3a3ed8053c43a24106f83bf4006, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: .100000001
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -232,23 +231,6 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &404271891
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 404271883}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4075a5db73151d042b720eafc3fabb9b, type: 3}
m_Name:
m_EditorClassIdentifier:
BackingTracks:
- {fileID: 8300000, guid: 737644b99ff2124459cef47e82d99de3, type: 3}
- {fileID: 8300000, guid: e8d0d9a322f0a504198ad3ac7e4e7f45, type: 3}
- {fileID: 8300000, guid: 32a7d410e0fc06a4785f455070351fb4, type: 3}
- {fileID: 8300000, guid: d7b09353b32f88e4bbf7badd4c250287, type: 3}
TimeBetweenTracks: 0
--- !u!1 &527390455
GameObject:
m_ObjectHideFlags: 0
Expand Down
60 changes: 0 additions & 60 deletions Assets/Scripts/BackingTrackPlayList.cs
View file

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Scripts/BackingTrackPlayList.cs.meta
View file

This file was deleted.

Loading

0 comments on commit 1795338

Please sign in to comment.