= пре 4 година
родитељ
комит
972a863bbb

BIN
Assets/Resources/Audio/bullet_explode.ogg


+ 22 - 0
Assets/Resources/Audio/bullet_explode.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 333e657229f6fe1438ade7ddb4053409
+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: 

BIN
Assets/Resources/Audio/enemy_die.ogg


+ 22 - 0
Assets/Resources/Audio/enemy_die.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bc444da31339d244e9225fb5d442472c
+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: 

BIN
Assets/Resources/Audio/fire.ogg


+ 22 - 0
Assets/Resources/Audio/fire.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c15ae229d0788db40a4aedd4b9c6e485
+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: 

BIN
Assets/Resources/Audio/reload.ogg


+ 22 - 0
Assets/Resources/Audio/reload.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a0c8cebf96fccc3448fd0ef6d0e838d9
+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: 

+ 1 - 1
Assets/Resources/Entities/Bullet.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 public class Bullet : MonoBehaviour {
 
     private void OnCollisionEnter2D(Collision2D collision) {
-        //TODO: ×Óµ¯±¬Õ¨ÒôЧ£¨Ïú»Ù£©
+        AudioM.Play("bullet_explode");
         Destroy(gameObject);
     }
 

+ 1 - 1
Assets/Resources/Entities/EnemyBase.cs

@@ -18,7 +18,7 @@ public abstract class EnemyBase : EntityBase {
         if (currentHp == -1) currentHp = hp;
         currentHp--;
         if (currentHp < 0) {
-            //TODO: 敌人死亡音效
+            AudioM.Play("enemy_die");
             transform.localScale = Vector3.zero;
             Destroy(gameObject, 1); // 防止动画没播放完导致报错
         }

+ 3 - 3
Assets/Resources/Entities/Player.cs

@@ -71,7 +71,7 @@ public class Player : EntityBase {
         }
         // 装填
         if (InputM.GetKeyEvent(InputM.KeyType.Reload) && currentBullet < maxBullet && currentReloadDelay <= 0f) {
-            // TODO: 装填音效(总时长为 reloadDelay,看 Unity 里的 Player 右边栏,这里的数字可能是过期的)
+            AudioM.Play("reload");
             currentReloadDelay = reloadDelay;
         } else if (currentReloadDelay > 0 && currentReloadDelay < Time.deltaTime) {
             currentReloadDelay = 0f; currentBullet = maxBullet;
@@ -80,7 +80,7 @@ public class Player : EntityBase {
         }
         // 开火
         if (InputM.GetKeyEvent(InputM.KeyType.Fire) && currentBullet > 0 && currentShootDelay <= 0f && currentReloadDelay <= 0f) {
-            // TODO: 开火音效
+            AudioM.Play("fire");
             currentBullet--; currentShootDelay = shootDelay;
             Vector2 fromPos = transform.position + Vector3.up * 0.55f;
             Vector2 toPos = Camera.allCameras[0].ScreenToWorldPoint(Input.mousePosition);
@@ -97,7 +97,7 @@ public class Player : EntityBase {
         textBullet.text = currentReloadDelay > 0f ?
             "".PadLeft(maxBullet - Mathf.RoundToInt(currentReloadDelay / reloadDelay * maxBullet), "|".ToCharArray().First()) : 
             "".PadLeft(currentBullet, "|".ToCharArray().First());
-        textBullet.color = currentReloadDelay > 0f ? new Color(0.6f, 0.6f, 0.6f) : new Color(1, 1, 0.5f);
+        textBullet.color = currentReloadDelay > 0f ? new Color(0.6f, 0.6f, 0.6f) : new Color(0.6588235f, 1f, 0.6941177f);
     }
 
 }

BIN
Assets/Resources/UI/Heart.png


+ 37 - 1
Assets/Resources/UI/Heart.png.meta

@@ -47,7 +47,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 64
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -76,6 +76,42 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
Assets/Resources/UI/HeartEmpty.png