Merge pull request #1 from kameffee/develop

Bugfix
kameffee · Jan 9, 2022 · 8f0ba8f · 8f0ba8f
2 parents 82f354d + 127748a
commit 8f0ba8f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/Packages/AudioPlayer/Runtime/AudioPlayer.cs b/Packages/AudioPlayer/Runtime/AudioPlayer.cs
@@ -50,6 +50,12 @@ public float MasterVolume
         public bool Initialized => _initialized;
         private bool _initialized;
 
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void PreInitialize()
+        {
+            _instance = null;
+        }
+
         public void Initialize()
         {
             if (_initialized)
@@ -83,4 +89,4 @@ public void InitializeSe()
             _seManager.Initialize();
         }
     }
-}
+}
diff --git a/Packages/AudioPlayer/Runtime/BgmManager.cs b/Packages/AudioPlayer/Runtime/BgmManager.cs
@@ -27,6 +27,7 @@ public class BgmManager : MonoBehaviour
         public static BgmManager Create()
         {
             var bgm = new GameObject(ManagerName);
+            DontDestroyOnLoad(bgm);
             return bgm.AddComponent<BgmManager>();
         }
 
@@ -169,7 +170,7 @@ public void UnPause()
         public void SetVolume(float volume)
         {
             var toVolume = Mathf.Clamp01(volume);
-            var isChange = volume != toVolume;
+            var isChange = _volume != toVolume;
             _volume = toVolume;
 
             foreach (var bgmPlayer in _bgmPlayers)
@@ -183,4 +184,4 @@ public void SetVolume(float volume)
             }
         }
     }
-}
+}
diff --git a/Packages/AudioPlayer/Runtime/SeManager.cs b/Packages/AudioPlayer/Runtime/SeManager.cs
@@ -21,6 +21,7 @@ public class SeManager : MonoBehaviour
         public static SeManager Create()
         {
             var se = new GameObject(SeManagerName);
+            DontDestroyOnLoad(se);
             return se.AddComponent<SeManager>();
         }
 
@@ -85,7 +86,7 @@ public void Stop()
         public void SetVolume(float volume)
         {
             var toVolume = Mathf.Clamp01(volume);
-            var isChange = volume != toVolume;
+            var isChange = _volume != toVolume;
             _volume = toVolume;
 
             foreach (var sePlayer in _sePlayers)
@@ -99,4 +100,4 @@ public void SetVolume(float volume)
             }
         }
     }
-}
+}
diff --git a/Packages/AudioPlayer/Runtime/SeSlider.cs b/Packages/AudioPlayer/Runtime/SeSlider.cs
@@ -3,7 +3,7 @@
 
 namespace Kameffee.AudioPlayer
 {
-    [AddComponentMenu("UI/Audio/BgmSlider")]
+    [AddComponentMenu("UI/Audio/SeSlider")]
     public class SeSlider : MonoBehaviour
     {
         [SerializeField]
@@ -25,4 +25,4 @@ private void SetVolume(float volume)
             AudioPlayer.Instance.Se.SetVolume(volume);
         }
     }
-}
+}
diff --git a/Packages/AudioPlayer/package.json b/Packages/AudioPlayer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.kameffee.audio-player",
   "displayName": "AudioPlayer",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "unity": "2019.4",
   "description": "Simple Audio Player",
   "author": {