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

Assets/Resources/Audio/player_die.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c470a138c7b02cb4c8f44668aedded95
+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/Audio/sub.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: ce5c0ca926e6b5d4888dcdbf0136af0c
+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/Entities/Player.cs

@@ -123,7 +123,7 @@ public class Player : EntityBase {
         string fireKey = InputM.GetKeyRaw(InputM.KeyType.Fire);
         bool isFireDown = fireKey == "l" ? Input.GetMouseButtonDown(0) : (fireKey == "r" ? Input.GetMouseButtonDown(1) : Input.GetKeyDown(fireKey));
         if (isFireDown && currentBullet == 0 && currentReloadDelay <= 0f) {
-            AudioM.Play("bullet_empty", 0.7f);
+            AudioM.Play("bullet_empty", 0.5f);
         }
         // 更新 UI
         textBullet.text = currentReloadDelay > 0f ?

Assets/Resources/System/StoryM.cs

@@ -15,6 +15,7 @@ public class StoryM : MonoBehaviour {
     /// 设置旁白，并返回预期时间。旁白字幕将在预期时间后消失。
     /// </summary>
     public float SetStoryText(string textCn, string textEn = "English") {
+        AudioM.Play("sub");
         bool isCn = LocalizationSettings.SelectedLocale.LocaleName == "Chinese (Simplified) (zh-CN)";
         textStory.text = isCn ? textCn : textEn;
         LayoutRebuilder.ForceRebuildLayoutImmediate(textStory.rectTransform);
@@ -117,6 +118,7 @@ public class StoryM : MonoBehaviour {
     }
     private int deathInStage = 0; private bool respawning = false, noDifficulty = false;
     IEnumerator Respawn() {
+        AudioM.Play("player_die");
         deathInStage++; respawning = true;
         // 停止场景
         arrowMax = 0;