NeonTea/quakeball
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.teascade.net:neontea/quakeball into master

Browse Source
This commit is contained in:
Jens Pitkänen 2020-08-08 10:20:56 +03:00
commit d2ff71d899
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/GameObjects/Prefabs/Player.prefab
View File

@ -1578,13 +1578,13 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
--- !u!198 &5204970423912589616 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 4926916423109787287, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
m_PrefabInstance: {fileID: 892884152691873703}
m_PrefabAsset: {fileID: 0}
--- !u!4 &835288951058457063 stripped --- !u!4 &835288951058457063 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
m_PrefabInstance: {fileID: 892884152691873703} m_PrefabInstance: {fileID: 892884152691873703}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!198 &5204970423912589616 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 4926916423109787287, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
m_PrefabInstance: {fileID: 892884152691873703}
m_PrefabAsset: {fileID: 0}

4
Assets/Scripts/Players/Player.cs
View File

@ -206,8 +206,12 @@ namespace NeonTea.Quakeball.Players {
} }
Debug.Log("I was hit! Aaagh!"); Debug.Log("I was hit! Aaagh!");
Splatter.Play(); Splatter.Play();
<<<<<<< HEAD
HitAudioSource.Play(); HitAudioSource.Play();
LocalHitAudioSource.Play(); LocalHitAudioSource.Play();
=======
HitAudioSource.PlayOneShot(HitClip);
>>>>>>> cbce3a6a7c2ad4de57bd4feb36e306e603039960
} }
public bool IsGrounded() { public bool IsGrounded() {