Browse Source

idk, stuff

Priz 1 month ago
parent
commit
3430589127

+ 4 - 4
GAMEN3-ValleyRunner_SanTi036/Assets/Scenes/Game.unity

@@ -3145,7 +3145,7 @@ MonoBehaviour:
   allOrbs: []
   orbsCounter: {fileID: 2113331569}
   timertext: {fileID: 805139188}
-  timeRemaining: 20
+  timeRemaining: 60
   player: {fileID: 684316688}
   timeManager: {fileID: 1385640938}
   worldSeed: 0
@@ -3174,7 +3174,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   orbPrefab: {fileID: 7121586420440051958, guid: 3dc5c8f1519e1aa4a8321cc6dfadd701, type: 3}
   numberOfOrbsToSpawn: 20
-  spawnAreaSize: {x: 300, y: 100}
+  spawnAreaSize: {x: 100, y: 50}
   heightOffset: 1
   terrainLayer:
     serializedVersion: 2
@@ -3849,7 +3849,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.71
+      value: 14.1
       objectReference: {fileID: 0}
     - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3}
       propertyPath: m_LocalPosition.z
@@ -5938,7 +5938,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1938943069
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -2414,6 +2414,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1588937585}
   - component: {fileID: 1588937586}
+  - component: {fileID: 1588937587}
   m_Layer: 5
   m_Name: VolumeControl
   m_TagString: Untagged
@@ -2506,6 +2507,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &1588937587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1588937584}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a61ca550561414e4f92df8eb8ce85c98, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1676956261
 GameObject:
   m_ObjectHideFlags: 0

+ 6 - 1
GAMEN3-ValleyRunner_SanTi036/Assets/Scripts/GameManager.cs

@@ -15,7 +15,6 @@ public class GameManager : MonoBehaviour
     public int totalOrbs = 20;
     private int collectedOrbs = 0;
 
-    // CHANGED: From Array to List to allow dynamic adding
     public List<EnergyOrb> allOrbs = new List<EnergyOrb>();
 
     [Header("UI")]
@@ -122,6 +121,9 @@ public class GameManager : MonoBehaviour
 
         Time.timeScale = 0f;
 
+        if (player != null)
+            player.enabled = false;
+
         Cursor.lockState = CursorLockMode.None;
         Cursor.visible = true;
 
@@ -136,6 +138,9 @@ public class GameManager : MonoBehaviour
 
         Time.timeScale = 0f;
 
+        if (player != null)
+            player.enabled = false;
+
         Cursor.lockState = CursorLockMode.None;
         Cursor.visible = true;
 

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

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

+ 48 - 14
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/MasterController.cs

@@ -1,41 +1,75 @@
 using UnityEngine;
-using UnityEngine.Audio;
 using UnityEngine.UI;
+using UnityEngine.Audio;
+using UnityEngine.SceneManagement;
+using TMPro;
 
 public class MasterController : MonoBehaviour
 {
+    public static MasterController Instance;
+
     public AudioMixer mixer;
     public Slider volumeSlider;
 
-    private static MasterController instance;
-
-    void Start()
+    void Awake()
     {
-        
+        if (Instance != null && Instance != this)
+        {
+            Destroy(gameObject);
+            return;
+        }
+
+        Instance = this;
+        DontDestroyOnLoad(gameObject);
+
+        ApplySavedVolume();
+        SceneManager.sceneLoaded += OnSceneLoaded;
     }
 
-    void Awake()
+    void OnDestroy()
     {
-        float savedVolume = PlayerPrefs.GetFloat("MasterVolume", 0.75f);
+        SceneManager.sceneLoaded -= OnSceneLoaded;
+    }
 
-        volumeSlider.minValue = 0f;
-        volumeSlider.maxValue = 1f;
+    void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+    {
+        // ALWAYS re-apply volume when a scene loads
+        ApplySavedVolume();
 
-        volumeSlider.value = savedVolume;
-        SetVolume(savedVolume);
+        // If a slider exists in this scene, sync it
+        if (volumeSlider != null)
+        {
+            float savedVolume = PlayerPrefs.GetFloat("MasterVolume", 0.75f);
+            volumeSlider.SetValueWithoutNotify(savedVolume);
+        }
     }
 
-
+    void ApplySavedVolume()
+    {
+        float value = PlayerPrefs.GetFloat("MasterVolume", 0.75f);
+        float dB = Mathf.Log10(Mathf.Clamp(value, 0.0001f, 1f)) * 20f;
+        mixer.SetFloat("MasterVolume", dB);
+    }
 
     public void SetVolume(float value)
     {
         float dB = Mathf.Log10(Mathf.Clamp(value, 0.0001f, 1f)) * 20f;
         mixer.SetFloat("MasterVolume", dB);
 
-        Debug.Log($"[Mixer] Setting volume to {value} ({dB} dB)");
-
         PlayerPrefs.SetFloat("MasterVolume", value);
         PlayerPrefs.Save();
     }
 
+    // Called from Main Menu only
+    public void RegisterSlider(Slider slider)
+    {
+        volumeSlider = slider;
+
+        slider.minValue = 0f;
+        slider.maxValue = 1f;
+
+        float saved = PlayerPrefs.GetFloat("MasterVolume", 0.75f);
+        slider.SetValueWithoutNotify(saved);
+        slider.onValueChanged.AddListener(SetVolume);
+    }
 }

+ 10 - 0
GAMEN3-ValleyRunner_SanTi036/Assets/Sound/VolumeSliderBinder.cs

@@ -0,0 +1,10 @@
+using UnityEngine.UI;
+using UnityEngine;
+
+public class VolumeSliderBinder : MonoBehaviour
+{
+    void Start()
+    {
+        MasterController.Instance?.RegisterSlider(GetComponent<Slider>());
+    }
+}

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

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a61ca550561414e4f92df8eb8ce85c98

+ 1 - 1
GAMEN3-ValleyRunner_SanTi036/Assets/the_wood_cabin/Materials/roof_02_s.mat

@@ -64,7 +64,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: e093db3efca460c46a15fa91d27db3e7, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap: