Skip to content

Commit

Permalink
sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
TSKsmiley committed Apr 23, 2021
1 parent efb3304 commit a18bf8c
Show file tree
Hide file tree
Showing 35 changed files with 2,290 additions and 26 deletions.
7 changes: 4 additions & 3 deletions .idea/.idea.RedDead2D/.idea/contentModel.xml

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

2 changes: 1 addition & 1 deletion .idea/.idea.RedDead2D/.idea/indexLayout.xml

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

2 changes: 1 addition & 1 deletion .idea/.idea.RedDead2D/.idea/modules.xml

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/GetOutOfHere.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/Greetings_benja-01.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/Greetings_benja-02.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/Greetings_benja-03.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/Greetings_benja-04.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/Hello_benja.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/LeaveMeAlone.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/LeaveMeAlone2.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/door.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/fuckOff.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/fuckOff2.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/greetings_ads.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/greetings_ads2.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/greetings_ads3.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/greetings_ads4.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/howdee_fred.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/hurt_ads.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/hurt_ads2.wav.meta

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

2 changes: 1 addition & 1 deletion Assets/Audio/sfx/hurt_ads_bearDIE.wav.meta

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

3 changes: 3 additions & 0 deletions Assets/Audio/sfx/walk.wav
Git LFS file not shown
22 changes: 22 additions & 0 deletions Assets/Audio/sfx/walk.wav.meta

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

32 changes: 30 additions & 2 deletions Assets/Scenes/Game World.unity
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ MonoBehaviour:
sounds:
- name: Music
clip: {fileID: 8300000, guid: ddf347cd81e76df4888ad164d1f5d930, type: 3}
volume: 0.3
volume: 0.16
pitch: 1
spatialBlend: 0
source: {fileID: 0}
Expand Down Expand Up @@ -433,6 +433,20 @@ MonoBehaviour:
spatialBlend: 0
source: {fileID: 0}
loop: 0
- name: walk
clip: {fileID: 8300000, guid: 6fd071f799faa024c99fec59c2781c76, type: 3}
volume: 0.45
pitch: 1
spatialBlend: 0
source: {fileID: 0}
loop: 1
- name: bearDie
clip: {fileID: 8300000, guid: 099746e886774584298178f8ae20a19c, type: 3}
volume: 0.45
pitch: 1
spatialBlend: 0
source: {fileID: 0}
loop: 0
--- !u!4 &7859229
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -114792,10 +114806,11 @@ GameObject:
- component: {fileID: 138023832}
- component: {fileID: 138023831}
- component: {fileID: 138023836}
- component: {fileID: 138023837}
m_Layer: 0
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
m_Icon: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
Expand Down Expand Up @@ -114960,6 +114975,19 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &138023837
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 138023830}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e67f2e2a94eb9d4fa03a04978a38a78, type: 3}
m_Name:
m_EditorClassIdentifier:
rb: {fileID: 0}
--- !u!224 &139853988 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5069555597587458235, guid: c5d166f5d0c338f4fb058df4ff372113,
Expand Down
1 change: 1 addition & 0 deletions Assets/Scripts/Enemy Behaviour/Enemy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private void Start()

public void TakeDamage(int damage) {
if (health <= 0) {
AudioManager.instance.Play("bearDie");
QuestManager.instance.GetActive().CheckCompleteConditions(null, this.gameObject);
Destroy(this.gameObject);
}
Expand Down
31 changes: 31 additions & 0 deletions Assets/Scripts/PlayerSound.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class PlayerSound : MonoBehaviour
{

public Rigidbody2D rb;
private bool isPlaying;

// Start is called before the first frame update
void Start()
{
rb = GetComponent<Rigidbody2D>();
}


void FixedUpdate()
{
if (rb.velocity.sqrMagnitude > 0)
{
if(!isPlaying)AudioManager.instance.Play("walk");
isPlaying = true;
}
else
{
if(isPlaying)AudioManager.instance.Stop("walk");
isPlaying = false;
}
}
}
11 changes: 11 additions & 0 deletions Assets/Scripts/PlayerSound.cs.meta

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

9 changes: 9 additions & 0 deletions UIElementsSchema/UIElements.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.U2D.Animation" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
<xs:import schemaLocation="UnityEditor.PackageManager.UI.xsd" namespace="UnityEditor.PackageManager.UI" />
<xs:import schemaLocation="UnityEditor.UIElements.xsd" namespace="UnityEditor.UIElements" />
<xs:import schemaLocation="UnityEditor.UIElements.Debugger.xsd" namespace="UnityEditor.UIElements.Debugger" />
<xs:import schemaLocation="UnityEditor.U2D.Layout.xsd" namespace="UnityEditor.U2D.Layout" />
<xs:import schemaLocation="UnityEditor.U2D.Animation.xsd" namespace="UnityEditor.U2D.Animation" />
</xs:schema>
Loading

0 comments on commit a18bf8c

Please sign in to comment.