Merge pull request #16 from capriccioso-studio/ashley-branch

Ashley branch

Assets/--Scenes--/Main Menu.unity

@@ -865,6 +865,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
+      - m_Target: {fileID: 1414327976}
+        m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp
+        m_MethodName: UnpauseMusic
+        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
       - m_Target: {fileID: 1360587567}
         m_TargetAssemblyTypeName: 
         m_MethodName: ChangeGUI
@@ -1755,7 +1767,7 @@ MonoBehaviour:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
           m_IntArgument: 0
-          m_FloatArgument: 1
+          m_FloatArgument: 0
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
@@ -2103,7 +2115,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &183633780
 Transform:
   m_ObjectHideFlags: 0
@@ -6852,7 +6864,7 @@ RectTransform:
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -8200,8 +8212,8 @@ RectTransform:
   m_Father: {fileID: 607040963}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0.8999996}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -8899,9 +8911,9 @@ MonoBehaviour:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1080, y: 1920}
+  m_ReferenceResolution: {x: 1080, y: 2400}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -12248,7 +12260,7 @@ RectTransform:
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -14495,6 +14507,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mixer: {fileID: 24100000, guid: 8b1268cc3c87ecd4c9c45384b12c4134, type: 2}
+  pause: {fileID: 6317017775944451128, guid: 8b1268cc3c87ecd4c9c45384b12c4134, type: 2}
+  unpause: {fileID: 24500006, guid: 8b1268cc3c87ecd4c9c45384b12c4134, type: 2}
 --- !u!4 &1414327977
 Transform:
   m_ObjectHideFlags: 0
@@ -17157,7 +17171,7 @@ MonoBehaviour:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
           m_IntArgument: 0
-          m_FloatArgument: 1
+          m_FloatArgument: 0
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
@@ -18994,6 +19008,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1414327976}
+        m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp
+        m_MethodName: UnpauseMusic
+        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 &1775800054
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20095,6 +20121,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
+      - m_Target: {fileID: 1414327976}
+        m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp
+        m_MethodName: PauseMenuMusic
+        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
       - m_Target: {fileID: 1360587567}
         m_TargetAssemblyTypeName: 
         m_MethodName: ChangeGUI
@@ -20381,7 +20419,7 @@ MonoBehaviour:
   m_margin: {x: -39.915176, y: 0, z: -19.29963, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &1864585362
@@ -21263,8 +21301,8 @@ RectTransform:
   m_Father: {fileID: 2145445546}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0.8999996}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/--Scripts--/AudioManager.cs

@@ -5,27 +5,29 @@
 
 public class AudioManager : MonoBehaviour
 {
-    public static AudioManager instance;
-    [SerializeField] AudioMixer mixer;
+    public AudioMixer mixer;
+    public AudioMixerSnapshot pause;
+    public AudioMixerSnapshot unpause;
 
     public const string MUSIC_KEY = "musicVolume";
     public const string SFX_KEY = "sfxVolume";
 
-    void Awake()
-    {
-        if(instance != null)
-            Destroy(this);
-        instance = this;
-
-        LoadVolume();
-    }
-
-    void LoadVolume()
+    public void Start()
     {
         float musicVolume = PlayerPrefs.GetFloat(MUSIC_KEY, 1f);
         float sfxVolume = PlayerPrefs.GetFloat(SFX_KEY, 1f);
 
         mixer.SetFloat(settingsMenu.MIXER_MUSIC, Mathf.Log10(musicVolume) * 20);
         mixer.SetFloat(settingsMenu.MIXER_SFX, Mathf.Log10(sfxVolume) * 20);
     }
+
+    public void PauseMenuMusic()
+    {
+        pause.TransitionTo(.01f*Time.timeScale);
+    }
+
+    public void UnpauseMusic()
+    {
+        unpause.TransitionTo(.01f*Time.timeScale);
+    }
 }

Assets/--Scripts--/GUIManager.cs

@@ -83,7 +83,7 @@ private void StartGameGUI()
     {
         ResetGUI();
         guiPanels[(int)Global.guiState].SetActive(true);
-        Time.timeScale = 1;        
+        Time.timeScale = 0;        
         if(!bm.isPlaying){
             bm.Play();
         }
@@ -118,7 +118,7 @@ private void PauseGUI()
     {
         ResetGUI();
         guiPanels[(int)Global.guiState].SetActive(true);
-       Time.timeScale = 0;        
+        Time.timeScale = 1;  
     }
     private void InventoryGUI()
     {

Assets/--Scripts--/settingsMenu.cs

@@ -13,7 +13,7 @@ public class settingsMenu : MonoBehaviour
     public const string MIXER_MUSIC = "MusicVolume";
     public const string MIXER_SFX = "SFXVolume";
 
-    void Awake()
+    public void Awake()
     {
         musicSlider.onValueChanged.AddListener(SetMusicVolume);
         sfxSlider.onValueChanged.AddListener(SetSFXVolume);

Assets/ExternalDependencyManager/Editor/CHANGELOG.md

@@ -1,40 +1,4 @@
-# Version 1.2.175 - Nov 16, 2022
-* General - Added tvOS podfile support to the iOS resolver.
-
-# Version 1.2.174 - Oct 06, 2022
-* General - Added tvOS support to the iOS resolver.
-* General - Fixed #484 - Changed `EditorMeasurement` to use secure connection.
-* Android Resolver - Fixed Android Resolver unable to resolve
-  `mainTemplate.gradle` in Unity `2022.2+` or `2023.1+`.
-
-# Version 1.2.173 - Sep 28, 2022
-* General - Added tvOS library support to the export unity package scripts.
-
-# Version 1.2.172 - Jun 23, 2022
-* iOS Resolver - Stop forcing `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` to `YES`,
-  which seems to cause problem for some when submitting apps. See #526 for more
-  information.
-
-# Version 1.2.171 - May 11, 2022
-* iOS Resolver - Change `Enable Swift Framework Support Workaround` setting to
-  be `ON` by default since more pods are using Swift Framework now.
-
-# Version 1.2.170 - Apr 4, 2022
-* Android Resolver - Fixes #498 - Fix the path separator of the Maven repo
-  injected to `mainTemplate.gradle`.
-* iOS Resolver - Fixes #470 - Switch default Cocoapods master repo from Github
-  to CDN.
-* iOS Resolver - `Link Framework Statically` setting is now default to `true`.
-  That is, `use_frameworks! :linkage => static` will be added to `Podfile` by
-  default instead of `use_frameworks!`. This can be changed in iOS Resolver
-  settings. This fixes odd behaviors when pods include static libraries, ex.
-  Firebase Analytics.
-* iOS Resolver - Added a workaround when app crashes on launch due to
-  `Library not loaded: @rpath/libswiftCore.dylib` when some pods includes Swift
-  framework. This is turned `OFF` by default and can be changed in iOS Resolver
-  settings.
-
-# Version 1.2.169 - Jan 20, 2022
+# Version 1.2.169 - Jan 20, 2021
 * General - Fixes #425 - Change to save `GvhProjectSettings.xml` without
   Unicode byte order mark (BoM).
 * Android Resolver - Remove reference to `jcenter()`

Assets/ExternalDependencyManager/Editor/README.md

@@ -26,7 +26,7 @@ This causes the following problems:
      Unity project can be complex and a burden on a Unity plugin maintainer.
    * The process of resolving conflicting dependencies on platform specific
      libraries is pushed to the developer attempting to use a Unity plugin.
-     The developer trying to use your plugin is very likely to give up when
+     The developer trying to use you plugin is very likely to give up when
      faced with Android or iOS specific build errors.
    * The process of resolving conflicting Unity plugins (due to shared Unity
      plugin components) is pushed to the developer attempting to use your Unity