Skip to content
Snippets Groups Projects
Commit 3fe1cf39 authored by 13519045 M Reyhanullah Budiaman's avatar 13519045 M Reyhanullah Budiaman
Browse files

add shop bgm

parent bfa50801
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1065 additions and 45 deletions
Assets/Audio/Mixers/SoundEffects.mixer
+ 36
− 20
View file @ 3fe1cf39
......@@ -3,8 +3,9 @@
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SoundEffects
m_OutputGroup: {fileID: 24300002, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
m_MasterGroup: {fileID: 24300001}
......@@ -13,6 +14,7 @@ AudioMixerController:
m_StartSnapshot: {fileID: 24500003}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews:
- guids:
......@@ -22,17 +24,20 @@ AudioMixerController:
- 5f15538cd3fbd4b83bb0b692c83671b6
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 0}
--- !u!243 &24300000
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player
m_AudioMixer: {fileID: 24100000}
m_GroupID: 5997a644a3e1d4859b81144a96a4e147
m_Children: []
m_Volume: 32c675072b03a498a9c24ff8890d6cc5
m_Pitch: de6f3903fa8a748759a75aab3edea616
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400000}
m_UserColorIndex: 0
......@@ -42,8 +47,9 @@ AudioMixerGroupController:
--- !u!243 &24300001
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 8a1ad67b18fb24d16bfca1085c10b8b1
......@@ -53,6 +59,7 @@ AudioMixerGroupController:
- {fileID: 24300002}
m_Volume: e4c1f95f2c67440afa1e0fddac2942ec
m_Pitch: 884905a0a40284da3b4d96a27bdaf271
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400002}
m_UserColorIndex: 0
......@@ -62,14 +69,16 @@ AudioMixerGroupController:
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemies
m_AudioMixer: {fileID: 24100000}
m_GroupID: c1a99f616386b433ebbd30ef170449cc
m_Children: []
m_Volume: 23bf2dcd67c7b48898634430b66eb30d
m_Pitch: eeaedd8959ce9498bb6f1ed875d5ccc2
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
......@@ -79,14 +88,16 @@ AudioMixerGroupController:
--- !u!243 &24300004
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Gunshots
m_AudioMixer: {fileID: 24100000}
m_GroupID: 5f15538cd3fbd4b83bb0b692c83671b6
m_Children: []
m_Volume: 15ddc11abab5248c08e9b2a2d8fc3df5
m_Pitch: 849a9af2605074216ada5141c340cee3
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400006}
m_UserColorIndex: 0
......@@ -96,8 +107,9 @@ AudioMixerGroupController:
--- !u!244 &24400000
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 41ad3dcf5f2054b5582edd7e1404fb7f
m_EffectName: Attenuation
......@@ -109,8 +121,9 @@ AudioMixerEffectController:
--- !u!244 &24400002
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: a60d6cf07289a4d3cb199901de05b881
m_EffectName: Attenuation
......@@ -122,8 +135,9 @@ AudioMixerEffectController:
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 2ddae617a4322410e83e2f1e15747f14
m_EffectName: Attenuation
......@@ -135,8 +149,9 @@ AudioMixerEffectController:
--- !u!244 &24400006
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 032c7ed8ffe7344ffaf2ea68a64c1ca8
m_EffectName: Attenuation
......@@ -148,8 +163,9 @@ AudioMixerEffectController:
--- !u!245 &24500003
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 3a18c617e8f3a42dfba152a2e0d8da66
......
Assets/Audio/Music/BLUE GIANT Hiromi.mp3 0 → 100644 LFS
+ 3
− 0
View file @ 3fe1cf39
File added
Assets/Audio/Music/BLUE GIANT Hiromi.mp3.meta 0 → 100644
+ 22
− 0
View file @ 3fe1cf39
fileFormatVersion: 2
guid: 04ae9cd08a5531b41973d4d38f947d2d
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Shop.prefab
+ 97
− 0
View file @ 3fe1cf39
......@@ -431,6 +431,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3706613389833283421}
- component: {fileID: 1506428297896836370}
m_Layer: 8
m_Name: ShopUI
m_TagString: Untagged
......@@ -454,6 +455,102 @@ Transform:
m_Father: {fileID: 732385392148688642}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1506428297896836370
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3706613389833283410}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300000, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
m_audioClip: {fileID: 8300000, guid: 04ae9cd08a5531b41973d4d38f947d2d, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 10
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &4160127699956994035
GameObject:
m_ObjectHideFlags: 0
......
Assets/Scripts/Enemy/BossHealth.cs
+ 1
− 1
View file @ 3fe1cf39
......@@ -92,7 +92,7 @@ public class BossHealth : MonoBehaviour
hitParticles.transform.position = hitPoint;
hitParticles.Play();
if (currentHealth <= 0)
if (currentHealth <= 0 || CheatState.oneHitKillState)
{
anim.SetBool("Dead", true);
Death ();
......
Assets/Scripts/Shop/ShopController.cs
+ 0
− 2
View file @ 3fe1cf39
......@@ -67,7 +67,6 @@ public class ShopController : MonoBehaviour
{
isTrigerred = true;
interractBubble.ShowUI();
Debug.Log("Player in range for interract with Shop");
}
}
......@@ -77,7 +76,6 @@ public class ShopController : MonoBehaviour
{
isTrigerred = false;
interractBubble.CloseUI();
Debug.Log("Player not reached the max radius");
}
}
}
Assets/Scripts/Shop/ShopInteractAnim.cs
+ 1
− 1
View file @ 3fe1cf39
......@@ -8,7 +8,7 @@ public class ShopInteractAnim : MonoBehaviour
{
public List<Image> UIImages = new List<Image>();
public TextMeshProUGUI text;
public float Speed = 100f;
public float Speed = 5f;
// Start is called before the first frame update
void Start()
{
......
Assets/Scripts/Shop/ShopSpawn.cs
+ 2
− 1
View file @ 3fe1cf39
......@@ -14,7 +14,8 @@ public class ShopSpawn : MonoBehaviour
// Start is called before the first frame update
void Start()
{
shopSpawnTime = Random.Range(0,2);
shopSpawnTime = Random.Range(110,130);
// shopSpawnTime = Random.Range(0,2);
}
// Update is called once per frame
......
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset
+ 145
− 10
View file @ 3fe1cf39
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset
+ 758
− 10
View file @ 3fe1cf39
This source diff could not be displayed because it is too large. You can view the blob instead.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment