Merge pull request #215 from Zhangyr2022/main

Prepare release

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.0] - 2024-05-24
+
+### Fixed
+
+- More audios in client.
+
 ## [2.3.1] - 2024-05-23
 
 ### Fixed
@@ -282,6 +288,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing.
 
+[2.4.0]: https://github.com/thuasta/thuai-7/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/thuasta/thuai-7/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/thuasta/thuai-7/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/thuasta/thuai-7/compare/v2.1.0...v2.2.0

client/Assets/Scripts/ReplayLoader/Record.cs

@@ -202,6 +202,9 @@ private void Start()
             { "Die", Resources.Load<AudioClip>("Music/Audio/die") },
             { "Grenade", Resources.Load<AudioClip>("Music/Audio/grenade") },
             { "Pickup", Resources.Load<AudioClip>("Music/Audio/pickup") },
+            { "Heal", Resources.Load<AudioClip>("Music/Audio/heal") },
+            { "Hurt", Resources.Load<AudioClip>("Music/Audio/hurt") },
+            { "Die", Resources.Load<AudioClip>("Music/Audio/die") },
         };
         _grenadeExplosionPrefab = Resources.Load<GameObject>("Prefabs/BigExplosionEffect");
         _grenadeBeamPrefab = Resources.Load<GameObject>("Beam/GrenadeBeam");
@@ -534,6 +537,19 @@ private void UpdatePlayers(JArray players)
                 }
             }
             int health = player["health"].ToObject<int>();
+            Player nowPlayer = PlayerSource.GetPlayers()[playerId];
+            if(nowPlayer is not null)
+            {
+                if (nowPlayer.Health- health > 5)
+                {
+                    // Play hurt audio
+                    _as.PlayOneShot(_audioClipDict["Hurt"]);
+                }
+                if (health < 1)
+                {
+                    _as.PlayOneShot(_audioClipDict["Die"]);
+                }
+            }
             PlayerSource.UpdatePlayer(
                 playerId,
                 health,
@@ -674,6 +690,7 @@ private void AfterPlayerAttackEvent(JObject eventJson)
     private void AfterPlayerUseMedicineEvent(JObject eventJson)
     {
         int playerId = eventJson["data"]["playerId"].ToObject<int>();
+        _as.PlayOneShot(_audioClipDict["Heal"]);
         PlayerSource.GetPlayers()[playerId].UseMedicine();
     }
 

client/ProjectSettings/ProjectSettings.asset

@@ -135,7 +135,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 2.3.1
+  bundleVersion: 2.4.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

server/src/GameServer/GameServer.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>2.3.1</Version>
+    <Version>2.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>