Merge branch 'master' of https://github.com/Hex-Dragon/GMTK2022

Assets/Resources/Audio/DicePickup.ogg.meta → Assets/Resources/Audio/DicePickup1.ogg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec60e9682a290cb47b14961e7e239844
+guid: edbf4d7a81c89c84dac29a82ad8d9d30
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Assets/Resources/Audio/DicePickup2.ogg.meta

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

Assets/Resources/Dice/DiceEntity.cs

@@ -21,7 +21,7 @@ public class DiceEntity : MonoBehaviour {
     public bool canRestore = true;
     private void OnCollisionEnter2D(Collision2D collision) {
         if (!collision.gameObject.CompareTag("Player")) return;
-        AudioM.Play("DicePickup");
+        AudioM.Play("DicePickup1");
         // ¹Ø±ÕÆäËûÒƶ¯
         GetComponent<Collider2D>().enabled = false;
         GetComponent<Rigidbody2D>().gravityScale = 0;
@@ -50,6 +50,7 @@ public class DiceEntity : MonoBehaviour {
         UpdateSpriteText();
         yield return new WaitForSeconds(0.5f);
         // Ç¿µ÷¶¯»­
+        AudioM.Play("DicePickup2");
         transform.DOScale(2.5f, 0.1f);
         yield return new WaitForSeconds(0.1f);
         transform.DOScale(2.3f, 0.1f);

Assets/Resources/System/AudioM.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
 
-public static class AudioM {
+public class AudioM : MonoBehaviour {
 
     private static Dictionary<string, AudioClip> audios = null;
     public static void Play(string name, float volume = 1f) {
@@ -14,4 +14,8 @@ public static class AudioM {
         AudioSource.PlayClipAtPoint(audios[name], Camera.allCameras[0].transform.position, volume);
     }
 
+    private void Awake() {
+        audios = null;
+    }
+
 }

Assets/Scenes/SceneMain.unity

@@ -4182,6 +4182,7 @@ GameObject:
   - component: {fileID: 1378097946}
   - component: {fileID: 1378097949}
   - component: {fileID: 1378097950}
+  - component: {fileID: 1378097951}
   m_Layer: 0
   m_Name: Managers
   m_TagString: Untagged
@@ -4287,6 +4288,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textStory: {fileID: 1797852847}
   shapeBack: {fileID: 2088920593}
+--- !u!114 &1378097951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1378097945}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d9bd502a18108c4faace5119884accb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1415309056
 GameObject:
   m_ObjectHideFlags: 0