Berry-Dash/source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove spookyness

Browse Source
This commit is contained in:
Lncvrt
2025-10-06 16:04:37 -07:00
parent e2f9cecf81
commit d7795ba1c3
4 changed files with 7 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Sounds/Spooky.wav
View File

Binary file not shown.

41
Assets/Resources/Sounds/Spooky.wav.meta
View File

@@ -1,41 +0,0 @@
fileFormatVersion: 2
guid: ee2d4248f8eab426087b9c595f0441ea
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

227
Assets/Scenes/PlayMenu.unity
View File

@@ -552,7 +552,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &164218987
RectTransform:
m_ObjectHideFlags: 0
@@ -603,13 +603,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 174953426}
m_LocalRotation: {x: 0, y: 0, z: -0.10886683, w: 0.9940564}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1607812743}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.5}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 22.5, y: -22.5}
@@ -1385,7 +1385,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 658.25, y: 45.01}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &459138108
MonoBehaviour:
@@ -2194,9 +2194,6 @@ MonoBehaviour:
antiBerryChance: {fileID: 1230511725}
nothingBerryChance: {fileID: 830548777}
validateTotalText: {fileID: 598155839}
jumpscareImage: {fileID: 972157958}
jumpscareAudio: {fileID: 1202270393}
jumpscareButton: {fileID: 174953430}
--- !u!4 &639162580
Transform:
m_ObjectHideFlags: 0
@@ -3674,81 +3671,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936243368}
m_CullTransparentMesh: 1
--- !u!1 &972157956
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 972157957}
- component: {fileID: 972157959}
- component: {fileID: 972157958}
m_Layer: 5
m_Name: JumpscareImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &972157957
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972157956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1153859193}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1280, y: 720}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &972157958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972157956}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 59235d26eca651e63a56cb40b86e7afb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &972157959
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 972157956}
m_CullTransparentMesh: 1
--- !u!1 &1056526447
GameObject:
m_ObjectHideFlags: 0
@@ -4154,7 +4076,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 517161050}
- {fileID: 972157957}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -4208,139 +4129,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1202270391
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1202270392}
- component: {fileID: 1202270393}
m_Layer: 5
m_Name: JumpscareAudio
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1202270392
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1202270391}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!82 &1202270393
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1202270391}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 8300000, guid: ee2d4248f8eab426087b9c595f0441ea, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
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 &1219795704
GameObject:
m_ObjectHideFlags: 0
@@ -5099,7 +4887,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 400.43, y: 70.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1447186681
MonoBehaviour:
@@ -5837,7 +5625,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "5%\u200B"
m_text: "0%\u200B"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
@@ -6121,7 +5909,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1723463929
RectTransform:
m_ObjectHideFlags: 0
@@ -7202,6 +6990,5 @@ SceneRoots:
- {fileID: 1091950791}
- {fileID: 639162580}
- {fileID: 444464386}
- {fileID: 1202270392}
- {fileID: 1153859193}
- {fileID: 1559931345}

40
Assets/Scripts/PlayMenu.cs
View File

@@ -26,10 +26,6 @@ public class PlayMenu : MonoBehaviour
public TMP_Text validateTotalText;
public Image jumpscareImage;
public AudioSource jumpscareAudio;
public Button jumpscareButton;
void Awake()
{
customButton.onClick.AddListener(() =>
@@ -211,12 +207,6 @@ public class PlayMenu : MonoBehaviour
customBackButton.interactable = true;
ValidateTotal();
});
jumpscareButton.onClick.AddListener(() =>
{
jumpscareButton.GetComponent<Image>().color = Color.red;
jumpscareButton.onClick.RemoveAllListeners();
StartCoroutine(Jumpscare());
});
}
void ValidateTotal()
@@ -251,34 +241,4 @@ public class PlayMenu : MonoBehaviour
validateTotalText.gameObject.SetActive(true);
}
}
IEnumerator Jumpscare()
{
jumpscareAudio.Play();
float t = 0;
jumpscareImage.gameObject.SetActive(true);
jumpscareImage.rectTransform.localScale = Vector3.zero;
while (t < 0.25f)
{
t += Time.deltaTime;
float p = t / 0.25f;
jumpscareImage.rectTransform.localScale = Vector3.Lerp(Vector3.zero, Vector3.one, p);
jumpscareImage.color = Color.Lerp(Color.white, Color.red, p);
yield return null;
}
jumpscareImage.rectTransform.localScale = Vector3.one;
yield return _waitForSeconds3;
jumpscareAudio.Stop();
jumpscareImage.gameObject.SetActive(false);
jumpscareImage.rectTransform.localScale = Vector3.zero;
jumpscareImage.color = Color.white;
yield return _waitForSeconds7;
jumpscareButton.GetComponent<Image>().color = Color.white;
jumpscareButton.onClick.AddListener(() =>
{
jumpscareButton.GetComponent<Image>().color = Color.red;
jumpscareButton.onClick.RemoveAllListeners();
StartCoroutine(Jumpscare());
});
}
}