Browse Source

merge & fix

龙腾猫跃 4 years ago
parent
commit
7d183fba87

BIN
Assets/Resources/Audio/enemy_die.ogg


BIN
Assets/Resources/Dice/Images/die_face_lmb.png


BIN
Assets/Resources/Dice/Images/die_face_rmb.png


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

@@ -28,7 +28,7 @@ public abstract class EnemyBase : EntityBase {
         if (currentHp == -1) currentHp = hp;
         if (currentHp == -1) currentHp = hp;
         currentHp--;
         currentHp--;
         if (currentHp <= 0) {
         if (currentHp <= 0) {
-            AudioM.Play("enemy_die", 0.5f);
+            AudioM.Play("enemy_die", 0.7f);
             Modules.DestroyGameObject(gameObject);
             Modules.DestroyGameObject(gameObject);
         }
         }
     }
     }

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

@@ -72,7 +72,7 @@ public class Player : EntityBase {
     public GameObject bullet; public TMPro.TextMeshProUGUI textBullet;
     public GameObject bullet; public TMPro.TextMeshProUGUI textBullet;
     internal override void OnUpdate() {
     internal override void OnUpdate() {
         // 反向
         // 反向
-        if ((towardsRight && isPressingLeft()) || (!towardsRight && isPressingRight())) {
+        if ((towardsRight && isPressingLeft() && !isPressingRight()) || (!towardsRight && isPressingRight() && !isPressingLeft())) {
             towardsRight = !towardsRight;
             towardsRight = !towardsRight;
             transform.DOScaleX(towardsRight ? 1 : -1, 0.15f);
             transform.DOScaleX(towardsRight ? 1 : -1, 0.15f);
         }
         }
@@ -92,7 +92,7 @@ public class Player : EntityBase {
         }
         }
         // 装填
         // 装填
         if (InputM.GetKeyEvent(InputM.KeyType.Reload) && currentBullet < maxBullet && currentReloadDelay <= 0f) {
         if (InputM.GetKeyEvent(InputM.KeyType.Reload) && currentBullet < maxBullet && currentReloadDelay <= 0f) {
-            AudioM.Play("reload", 0.8f);
+            AudioM.Play("reload", 1f);
             currentReloadDelay = reloadDelay;
             currentReloadDelay = reloadDelay;
         } else if (currentReloadDelay > 0 && currentReloadDelay < Time.deltaTime) {
         } else if (currentReloadDelay > 0 && currentReloadDelay < Time.deltaTime) {
             currentReloadDelay = 0f; currentBullet = maxBullet;
             currentReloadDelay = 0f; currentBullet = maxBullet;
@@ -101,7 +101,7 @@ public class Player : EntityBase {
         }
         }
         // 开火
         // 开火
         if (InputM.GetKeyEvent(InputM.KeyType.Fire) && currentBullet > 0 && currentShootDelay <= 0f && currentReloadDelay <= 0f) {
         if (InputM.GetKeyEvent(InputM.KeyType.Fire) && currentBullet > 0 && currentShootDelay <= 0f && currentReloadDelay <= 0f) {
-            AudioM.Play("fire", 0.6f);
+            AudioM.Play("fire", 0.65f);
             currentBullet--; currentShootDelay = shootDelay;
             currentBullet--; currentShootDelay = shootDelay;
             Vector2 fromPos = transform.position + Vector3.up * ((canCrouch && isPressingCrouch()) ? 0.55f : 1.3f);
             Vector2 fromPos = transform.position + Vector3.up * ((canCrouch && isPressingCrouch()) ? 0.55f : 1.3f);
             Vector2 toPos = AspectUtility.cam.ScreenToWorldPoint(Input.mousePosition);
             Vector2 toPos = AspectUtility.cam.ScreenToWorldPoint(Input.mousePosition);

+ 2 - 2
Assets/Scenes/SceneMain.unity

@@ -1624,7 +1624,7 @@ MonoBehaviour:
   fallA: 0.4
   fallA: 0.4
   filpSpeed: 0.6
   filpSpeed: 0.6
   jumpBufferTime: 0.15
   jumpBufferTime: 0.15
-  jumpWolfTime: 0.2
+  jumpWolfTime: 0.15
   baseMass: 1
   baseMass: 1
   hearts:
   hearts:
   - {fileID: 181884992}
   - {fileID: 181884992}
@@ -10442,7 +10442,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: fad5f40108e03ec4dbe42eb884f842c1, type: 3}
   m_audioClip: {fileID: 8300000, guid: fad5f40108e03ec4dbe42eb884f842c1, type: 3}
   m_PlayOnAwake: 1
   m_PlayOnAwake: 1
-  m_Volume: 0.2
+  m_Volume: 0.787
   m_Pitch: 1
   m_Pitch: 1
   Loop: 1
   Loop: 1
   Mute: 0
   Mute: 0