Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit a8905f1

Browse files
HeavenOfHell221HeavenOfHell221
committed
Heaven/Sound Jump and autel
1 parent ad291f8 commit a8905f1

File tree

10 files changed

+163
-79
lines changed

10 files changed

+163
-79
lines changed

‎Assets/Data/Events/JumpEvent.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 788cf15a156f93c459b78abb321a2e80, type: 3}
13+
m_Name: JumpEvent
14+
m_EditorClassIdentifier:

‎Assets/Data/Events/JumpEvent.asset.meta‎

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

‎Assets/Data/Prefabs/Level/Gameplay/Autel.prefab‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,48 @@ BoxCollider:
1313
serializedVersion: 2
1414
m_Size: {x: 2.6, y: 2, z: 3.51}
1515
m_Center: {x: -0.14, y: 1.1, z: -0.06}
16+
--- !u!114 &3130105512880051929
17+
MonoBehaviour:
18+
m_ObjectHideFlags: 0
19+
m_CorrespondingSourceObject: {fileID: 0}
20+
m_PrefabInstance: {fileID: 0}
21+
m_PrefabAsset: {fileID: 0}
22+
m_GameObject: {fileID: 5164108242750382102}
23+
m_Enabled: 1
24+
m_EditorHideFlags: 0
25+
m_Script: {fileID: 11500000, guid: 3976a1fd3e335d4458a2b7ed19d267ce, type: 3}
26+
m_Name:
27+
m_EditorClassIdentifier:
28+
m_event: {fileID: 11400000, guid: 0e4abd6988862cc48af23f67ce143061, type: 2}
29+
m_func:
30+
m_PersistentCalls:
31+
m_Calls:
32+
- m_Target: {fileID: 4371646599904214497}
33+
m_TargetAssemblyTypeName: AutelSound, Assembly-CSharp
34+
m_MethodName: OnInteraction
35+
m_Mode: 0
36+
m_Arguments:
37+
m_ObjectArgument: {fileID: 0}
38+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
39+
m_IntArgument: 0
40+
m_FloatArgument: 0
41+
m_StringArgument:
42+
m_BoolArgument: 0
43+
m_CallState: 2
44+
--- !u!114 &4371646599904214497
45+
MonoBehaviour:
46+
m_ObjectHideFlags: 0
47+
m_CorrespondingSourceObject: {fileID: 0}
48+
m_PrefabInstance: {fileID: 0}
49+
m_PrefabAsset: {fileID: 0}
50+
m_GameObject: {fileID: 5164108242750382102}
51+
m_Enabled: 1
52+
m_EditorHideFlags: 0
53+
m_Script: {fileID: 11500000, guid: 795b2fbe797bc4e47b9728bd1213b517, type: 3}
54+
m_Name:
55+
m_EditorClassIdentifier:
56+
m_autelVictoryName: event:/SoundFX/ObjectFound
57+
m_autelWrongName: event:/SoundFX/ObjectFound
1658
--- !u!114 &6471938960726025062
1759
MonoBehaviour:
1860
m_ObjectHideFlags: 0

‎Assets/Data/Prefabs/UI/Main Menu.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ MonoBehaviour:
228228
229229
Gabriel Dubois
230230
231-
Theo'
231+
Theo Lopez'
232232
m_isRightToLeft: 0
233233
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
234234
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -864,7 +864,7 @@ GameObject:
864864
m_Icon: {fileID: 0}
865865
m_NavMeshLayer: 0
866866
m_StaticEditorFlags: 0
867-
m_IsActive: 0
867+
m_IsActive: 1
868868
--- !u!224 &7762978115362854768
869869
RectTransform:
870870
m_ObjectHideFlags: 0
@@ -1582,7 +1582,7 @@ RectTransform:
15821582
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15831583
m_AnchorMin: {x: 0, y: 0}
15841584
m_AnchorMax: {x: 0, y: 1}
1585-
m_AnchoredPosition: {x: 1000, y: 0}
1585+
m_AnchoredPosition: {x: 1014.7, y: -153.9}
15861586
m_SizeDelta: {x: 1000, y: 0}
15871587
m_Pivot: {x: 1, y: 0.5}
15881588
--- !u!1 &7762978116138308863

‎Assets/Scripts/Runtime/AutelSound.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using FMOD.Studio;
5+
6+
public class AutelSound : MonoBehaviour
7+
{
8+
[FMODUnity.EventRef]
9+
[SerializeField]
10+
private string m_autelVictoryName;
11+
12+
[FMODUnity.EventRef]
13+
[SerializeField]
14+
private string m_autelWrongName;
15+
16+
private EventInstance m_autelVictory;
17+
private EventInstance m_autelWrong;
18+
19+
private void OnEnable()
20+
{
21+
m_autelVictory = FMODUnity.RuntimeManager.CreateInstance(m_autelVictoryName);
22+
m_autelWrong = FMODUnity.RuntimeManager.CreateInstance(m_autelWrongName);
23+
}
24+
25+
private void OnDisable()
26+
{
27+
m_autelVictory.release();
28+
m_autelWrong.release();
29+
}
30+
31+
public void OnInteraction(bool isFull)
32+
{
33+
if(isFull)
34+
{
35+
m_autelVictory.start();
36+
}
37+
else
38+
{
39+
m_autelWrong.start();
40+
}
41+
}
42+
}

‎Assets/Scripts/Runtime/AutelSound.cs.meta‎

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

‎Assets/Scripts/Runtime/JumpSound.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using FMOD.Studio;
4+
using CustomEvents;
5+
6+
using UnityEngine;
7+
8+
public class JumpSound : MonoBehaviour
9+
{
10+
[FMODUnity.EventRef]
11+
[SerializeField]
12+
private string m_jumpName;
13+
14+
private EventInstance m_jump;
15+
16+
private void OnEnable()
17+
{
18+
m_jump = FMODUnity.RuntimeManager.CreateInstance(m_jumpName);
19+
}
20+
21+
private void OnDisable()
22+
{
23+
m_jump.release();
24+
}
25+
26+
public void OnJump()
27+
{
28+
m_jump.start();
29+
}
30+
}

‎Assets/Scripts/Runtime/JumpSound.cs.meta‎

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

‎Assets/Scripts/Runtime/Player/Controllers/PlayerMovementContoller.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class PlayerMovementContoller : MonoBehaviour
3434

3535
[Header("Events", order = 4)]
3636
[SerializeField] private MoveEvent m_moveEvent;
37+
[SerializeField] private SimpleEvent m_jumpEvent;
3738

3839
public bool IsGrounded { get; private set; } = false;
3940
public bool IsMoving => m_inputVelocity.sqrMagnitude > 0.1;
@@ -177,6 +178,7 @@ public void OnJump(InputAction.CallbackContext context)
177178
{
178179
m_jumpToPerformThisFrame = true;
179180
m_canJump = false;
181+
m_jumpEvent.Invoke();
180182
}
181183
}
182184
}

‎Assets/Settings/Graphics/VFX/ObjectFound.vfx‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -117,62 +117,6 @@ MonoBehaviour:
117117
loopCount: 0
118118
delayBeforeLoop: 0
119119
delayAfterLoop: 0
120-
--- !u!114 &8926484042661614556
121-
MonoBehaviour:
122-
m_ObjectHideFlags: 0
123-
m_CorrespondingSourceObject: {fileID: 0}
124-
m_PrefabInstance: {fileID: 0}
125-
m_PrefabAsset: {fileID: 0}
126-
m_GameObject: {fileID: 0}
127-
m_Enabled: 1
128-
m_EditorHideFlags: 0
129-
m_Script: {fileID: 11500000, guid: f05c6884b705ce14d82ae720f0ec209f, type: 3}
130-
m_Name:
131-
m_EditorClassIdentifier:
132-
m_UIIgnoredErrors: []
133-
m_Parent: {fileID: 8926484042661614555}
134-
m_Children: []
135-
m_UIPosition: {x: 233.38269, y: 57.572144}
136-
m_UICollapsed: 0
137-
m_UISuperCollapsed: 0
138-
m_InputSlots:
139-
- {fileID: 8926484042661614557}
140-
m_OutputSlots: []
141-
m_Disabled: 0
142-
--- !u!114 &8926484042661614557
143-
MonoBehaviour:
144-
m_ObjectHideFlags: 0
145-
m_CorrespondingSourceObject: {fileID: 0}
146-
m_PrefabInstance: {fileID: 0}
147-
m_PrefabAsset: {fileID: 0}
148-
m_GameObject: {fileID: 0}
149-
m_Enabled: 1
150-
m_EditorHideFlags: 0
151-
m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
152-
m_Name:
153-
m_EditorClassIdentifier:
154-
m_UIIgnoredErrors: []
155-
m_Parent: {fileID: 0}
156-
m_Children: []
157-
m_UIPosition: {x: 0, y: 0}
158-
m_UICollapsed: 1
159-
m_UISuperCollapsed: 0
160-
m_MasterSlot: {fileID: 8926484042661614557}
161-
m_MasterData:
162-
m_Owner: {fileID: 8926484042661614556}
163-
m_Value:
164-
m_Type:
165-
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
166-
PublicKeyToken=b77a5c561934e089
167-
m_SerializableObject: 16
168-
m_Space: 2147483647
169-
m_Property:
170-
name: Rate
171-
m_serializedType:
172-
m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
173-
PublicKeyToken=b77a5c561934e089
174-
m_Direction: 0
175-
m_LinkedSlots: []
176120
--- !u!114 &8926484042661614558
177121
MonoBehaviour:
178122
m_ObjectHideFlags: 0
@@ -1297,26 +1241,6 @@ MonoBehaviour:
12971241
Culture=neutral, PublicKeyToken=null
12981242
m_Direction: 0
12991243
m_LinkedSlots: []
1300-
--- !u!114 &8926484042661614595
1301-
MonoBehaviour:
1302-
m_ObjectHideFlags: 0
1303-
m_CorrespondingSourceObject: {fileID: 0}
1304-
m_PrefabInstance: {fileID: 0}
1305-
m_PrefabAsset: {fileID: 0}
1306-
m_GameObject: {fileID: 0}
1307-
m_Enabled: 1
1308-
m_EditorHideFlags: 0
1309-
m_Script: {fileID: 11500000, guid: f68759077adc0b143b6e1c101e82065e, type: 3}
1310-
m_Name:
1311-
m_EditorClassIdentifier:
1312-
m_UIIgnoredErrors: []
1313-
m_Parent: {fileID: 0}
1314-
m_Children: []
1315-
m_UIPosition: {x: 0, y: 0}
1316-
m_UICollapsed: 1
1317-
m_UISuperCollapsed: 0
1318-
title:
1319-
m_Owners: []
13201244
--- !u!114 &8926484042661614616
13211245
MonoBehaviour:
13221246
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)