Explorar el Código

Game done - FInal Submission

Priz hace 3 días
padre
commit
3e5f6c25e8

+ 23 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Scenes/Game.unity

@@ -3149,6 +3149,17 @@ MonoBehaviour:
   player: {fileID: 684316688}
   timeManager: {fileID: 1385640938}
   worldSeed: 0
+  inMemorySave:
+    playerPosition: {x: 0, y: 0, z: 0}
+    playerRotation: {x: 0, y: 0, z: 0, w: 0}
+    stamina: 0
+    orbsCollected: 0
+    remainingTime: 0
+    worldSeed: 0
+    orbs: []
+    enemies: []
+    mouseSensitivity: 0
+    masterVolume: 0
 --- !u!114 &1066904066
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4965,6 +4976,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 11500000, guid: 450cabc410c0590488af441b62a76388, type: 3}
+        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 0
 --- !u!114 &1538726323
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 164 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Scenes/MainMenu.unity

@@ -214,6 +214,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1254267247}
+        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
+        m_MethodName: PlayButtonClick
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &45461454
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -483,6 +495,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1254267247}
+        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
+        m_MethodName: PlayButtonClick
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &272723051
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1146,6 +1170,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1254267247}
+        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
+        m_MethodName: PlayButtonClick
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &849390248
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1387,6 +1423,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   MainMenuPanel: {fileID: 1516864106}
   SettingsPanel: {fileID: 1724287342}
+  loadGameButton: {fileID: 849390247}
 --- !u!4 &1111048066
 Transform:
   m_ObjectHideFlags: 0
@@ -1412,6 +1449,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1254267246}
   - component: {fileID: 1254267245}
+  - component: {fileID: 1254267248}
+  - component: {fileID: 1254267247}
   m_Layer: 0
   m_Name: AudioController
   m_TagString: Untagged
@@ -1448,6 +1487,119 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1254267247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1254267244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3d20a5bb62b98ab48890187e10a1387d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mixer: {fileID: 24100000, guid: a1ea43c1e18101d48b08b22ed1eeab37, type: 2}
+  audioSource: {fileID: 1254267248}
+  buttonClickClip: {fileID: 8300000, guid: b5d4daaa9b2f66540aeb9c5cb68e1931, type: 3}
+  buttonClickVolume: 1
+--- !u!82 &1254267248
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1254267244}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_Resource: {fileID: 0}
+  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 &1255675289
 GameObject:
   m_ObjectHideFlags: 0
@@ -2122,6 +2274,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1254267247}
+        m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp
+        m_MethodName: PlayButtonClick
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &1498765509
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 0 - 1
GAMEN3-ValleyRunner_SanTi036/Assets/Scripts/LoadingManager.cs

@@ -82,7 +82,6 @@ public class LoadingManager : MonoBehaviour
             yield return null;
         }
 
-        // Scene is now fully loaded
         // Wait one frame for GameManager to Awake
         yield return null;
 

+ 2 - 2
GAMEN3-ValleyRunner_SanTi036/Assets/Scripts/MenuManager.cs

@@ -19,7 +19,7 @@ public class MenuManager : MonoBehaviour
         WorldSettings.seed = Random.Range(int.MinValue, int.MaxValue);
 
         LoadingManager.sceneToLoad = "Game";
-        LoadingManager.loadSave = false;  // No loading for new game
+        LoadingManager.loadSave = false;
 
         SceneManager.LoadScene("LoadingScreen");
     }
@@ -29,7 +29,7 @@ public class MenuManager : MonoBehaviour
         WorldSettings.generateNewWorld = false;
 
         LoadingManager.sceneToLoad = "Game";
-        LoadingManager.loadSave = true; // load the last save
+        LoadingManager.loadSave = true;
 
         SceneManager.LoadScene("LoadingScreen");
     }

+ 1 - 1
GAMEN3-ValleyRunner_SanTi036/Assets/Skybox.mat

@@ -112,7 +112,7 @@ Material:
     - _DstBlend: 0
     - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
-    - _Exposure: 0.637199
+    - _Exposure: 0.91794574
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0

+ 47 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/UIAudio.cs

@@ -0,0 +1,47 @@
+using UnityEngine;
+using UnityEngine.Audio;
+
+public class UIAudio : MonoBehaviour
+{
+    public static UIAudio Instance;
+
+    public AudioMixer mixer;
+    public AudioSource audioSource;
+
+    public AudioClip buttonClickClip; 
+    public float buttonClickVolume = 1f;
+
+
+    public void PlayButtonClick()
+    {
+        if (buttonClickClip != null)
+            audioSource.PlayOneShot(buttonClickClip, buttonClickVolume);
+    }
+
+
+    private void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+        }
+        else
+        {
+            Destroy(gameObject);
+            return;
+        }
+        Instance = this;
+        DontDestroyOnLoad(gameObject);
+    }
+
+    public void PlaySound(AudioClip clip, float volume = 1f)
+    {
+        audioSource.PlayOneShot(clip, volume);
+    }
+
+    public void SetVolume(float value)
+    {
+        float dB = Mathf.Log10(Mathf.Clamp(value, 0.0001f, 1f)) * 20f;
+        mixer.SetFloat("MasterVolume", dB);
+    }
+}

+ 2 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/UIAudio.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3d20a5bb62b98ab48890187e10a1387d

+ 70 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/UIMixer.mixer

@@ -0,0 +1,70 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UIMixer
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters:
+  - guid: 50b5db9814826d441ac08333ec1782a8
+    name: UIVolume
+  m_AudioMixerGroupViews:
+  - guids:
+    - dfa721416dcc1c5459a2979d2be00562
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: dfa721416dcc1c5459a2979d2be00562
+  m_Children: []
+  m_Volume: 50b5db9814826d441ac08333ec1782a8
+  m_Pitch: ef638936da687e44f8a01838277cda9b
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: bd933189d6564bd458e558e58eb2014f
+  m_EffectName: Attenuation
+  m_MixLevel: 7941151ac3459b844a491bd29bc0c4e6
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: b076ccae0ecf4134d81e82c6e251330d
+  m_FloatValues: {}
+  m_TransitionOverrides: {}

+ 8 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/UIMixer.mixer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a1ea43c1e18101d48b08b22ed1eeab37
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 24100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/buttonclick-2.wav


+ 23 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/buttonclick-2.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: b5d4daaa9b2f66540aeb9c5cb68e1931
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: