Skip to content

Commit 227c85d

Browse files
MsMojoMsMojo
committed
Merge remote-tracking branch 'origin/master'
2 parents cb780d3 + 5a3401e commit 227c85d

6 files changed

Lines changed: 75 additions & 12 deletions

File tree

‎Assets/Graph/Materials/Broken_Glass.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Material:
4343
- first:
4444
name: _EmissionMap
4545
second:
46-
m_Texture: {fileID: 0}
46+
m_Texture: {fileID: 2800000, guid: 5b962138ed279b5458b410446125d4b4, type: 3}
4747
m_Scale: {x: 1, y: 1}
4848
m_Offset: {x: 0, y: 0}
4949
- first:
@@ -131,7 +131,7 @@ Material:
131131
second: {r: 1, g: 1, b: 1, a: 0}
132132
- first:
133133
name: _EmissionColor
134-
second: {r: 0, g: 0, b: 0, a: 1}
134+
second: {r: 0.5, g: 0.5, b: 0.5, a: 1}
135135
- first:
136136
name: _SpecColor
137137
second: {r: 0.2, g: 0.2, b: 0.2, a: 1}

‎Assets/HUD/casse.wav‎

183 KB
Binary file not shown.

‎Assets/HUD/casse.wav.meta‎

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

‎Assets/Level1.unity‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,46 @@ Prefab:
666666
propertyPath: m_Pivot.y
667667
value: 0
668668
objectReference: {fileID: 0}
669+
- target: {fileID: 224000012754622274, guid: e0fda71948aa8414ca8c6ad20e79fe02,
670+
type: 2}
671+
propertyPath: m_AnchorMax.x
672+
value: 1
673+
objectReference: {fileID: 0}
674+
- target: {fileID: 224000012754622274, guid: e0fda71948aa8414ca8c6ad20e79fe02,
675+
type: 2}
676+
propertyPath: m_AnchorMax.y
677+
value: 1
678+
objectReference: {fileID: 0}
679+
- target: {fileID: 224000012754622274, guid: e0fda71948aa8414ca8c6ad20e79fe02,
680+
type: 2}
681+
propertyPath: m_SizeDelta.x
682+
value: -17
683+
objectReference: {fileID: 0}
684+
- target: {fileID: 224000012754622274, guid: e0fda71948aa8414ca8c6ad20e79fe02,
685+
type: 2}
686+
propertyPath: m_SizeDelta.y
687+
value: -17
688+
objectReference: {fileID: 0}
689+
- target: {fileID: 224000012421876174, guid: e0fda71948aa8414ca8c6ad20e79fe02,
690+
type: 2}
691+
propertyPath: m_AnchorMax.x
692+
value: 1
693+
objectReference: {fileID: 0}
694+
- target: {fileID: 224000012421876174, guid: e0fda71948aa8414ca8c6ad20e79fe02,
695+
type: 2}
696+
propertyPath: m_SizeDelta.x
697+
value: -17
698+
objectReference: {fileID: 0}
699+
- target: {fileID: 224000013263231892, guid: e0fda71948aa8414ca8c6ad20e79fe02,
700+
type: 2}
701+
propertyPath: m_AnchorMax.y
702+
value: 1
703+
objectReference: {fileID: 0}
704+
- target: {fileID: 224000013263231892, guid: e0fda71948aa8414ca8c6ad20e79fe02,
705+
type: 2}
706+
propertyPath: m_SizeDelta.y
707+
value: -17
708+
objectReference: {fileID: 0}
669709
m_RemovedComponents: []
670710
m_ParentPrefab: {fileID: 100100000, guid: e0fda71948aa8414ca8c6ad20e79fe02, type: 2}
671711
m_IsPrefabParent: 0
@@ -775,16 +815,6 @@ Prefab:
775815
propertyPath: m_Name
776816
value: Microb1
777817
objectReference: {fileID: 0}
778-
- target: {fileID: 82000012300840372, guid: aac6b3084b8823e4a953b8afd64c793a,
779-
type: 2}
780-
propertyPath: m_Pitch
781-
value: 0.3
782-
objectReference: {fileID: 0}
783-
- target: {fileID: 82000012300840372, guid: aac6b3084b8823e4a953b8afd64c793a,
784-
type: 2}
785-
propertyPath: m_Volume
786-
value: 0.261
787-
objectReference: {fileID: 0}
788818
m_RemovedComponents: []
789819
m_ParentPrefab: {fileID: 100100000, guid: aac6b3084b8823e4a953b8afd64c793a, type: 2}
790820
m_IsPrefabParent: 0
@@ -971,6 +1001,11 @@ Prefab:
9711001
propertyPath: dishBrokenRenderer
9721002
value:
9731003
objectReference: {fileID: 535062177}
1004+
- target: {fileID: 114000011119023806, guid: 50edafa6743036340b3fa7907ee6c473,
1005+
type: 2}
1006+
propertyPath: SFX_Step
1007+
value:
1008+
objectReference: {fileID: 8300000, guid: 4a59cdd695683d646becd22e723b85af, type: 3}
9741009
m_RemovedComponents: []
9751010
m_ParentPrefab: {fileID: 100100000, guid: 50edafa6743036340b3fa7907ee6c473, type: 2}
9761011
m_IsPrefabParent: 0

‎Assets/Scripts/GameManager.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class GameManager : MonoBehaviour
2323
public bool killEveryone = false;
2424
public int currentLife = 0;
2525
public AudioClip SFX_GameOver = null;
26+
public AudioClip SFX_Step = null;
2627

2728
private int lastPop = 0;
2829
private List<int> brokenSteps = new List<int>();
@@ -96,26 +97,31 @@ public void Hit()
9697
}
9798
else if (currentLife == brokenSteps[4])
9899
{
100+
GetComponent<AudioSource>().PlayOneShot(SFX_Step);
99101
CameraManager.Instance.StartCoroutine("Shake");
100102
dishBrokenRenderer.material.color = new Color(dishBrokenRenderer.material.color.r, dishBrokenRenderer.material.color.g, dishBrokenRenderer.material.color.b, 0f);
101103
}
102104
else if (currentLife == brokenSteps[3])
103105
{
106+
GetComponent<AudioSource>().PlayOneShot(SFX_Step);
104107
CameraManager.Instance.StartCoroutine("Shake");
105108
dishBrokenRenderer.material.color = new Color(dishBrokenRenderer.material.color.r, dishBrokenRenderer.material.color.g, dishBrokenRenderer.material.color.b, 0.2f);
106109
}
107110
else if (currentLife == brokenSteps[2])
108111
{
112+
GetComponent<AudioSource>().PlayOneShot(SFX_Step);
109113
CameraManager.Instance.StartCoroutine("Shake");
110114
dishBrokenRenderer.material.color = new Color(dishBrokenRenderer.material.color.r, dishBrokenRenderer.material.color.g, dishBrokenRenderer.material.color.b, 0.4f);
111115
}
112116
else if (currentLife == brokenSteps[1])
113117
{
118+
GetComponent<AudioSource>().PlayOneShot(SFX_Step);
114119
CameraManager.Instance.StartCoroutine("Shake");
115120
dishBrokenRenderer.material.color = new Color(dishBrokenRenderer.material.color.r, dishBrokenRenderer.material.color.g, dishBrokenRenderer.material.color.b, 0.6f);
116121
}
117122
else if (currentLife == brokenSteps[0])
118123
{
124+
GetComponent<AudioSource>().PlayOneShot(SFX_Step);
119125
CameraManager.Instance.StartCoroutine("Shake");
120126
dishBrokenRenderer.material.color = new Color(dishBrokenRenderer.material.color.r, dishBrokenRenderer.material.color.g, dishBrokenRenderer.material.color.b, 0.8f);
121127
}

‎Sources_Ref/Musique/casse.wav‎

183 KB
Binary file not shown.

0 commit comments

Comments
 (0)