Merge pull request #170 from Zhangyr2022/main

Prepare release
thuasta · May 12, 2024 · 62b4ba4 · 62b4ba4
2 parents de045b6 + 3416ee3
commit 62b4ba4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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).
 
+## [1.3.0] - 2024-05-12
+
+### Added
+
+- Added grenade explosion events in record files.
+
+### Changed
+
+- Change the WALL_GENERATE_TRY_TIMES from 1024 to 2048
+
 ## [1.2.0] - 2024-05-12
 
 ### Added
@@ -172,6 +182,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   [0.1.0]: https://github.com/Zhangyr2022/thuai-7/compare/v0.0.2...v0.1.0
   [0.0.2]: https://github.com/Zhangyr2022/thuai-7/compare/v0.0.1...v0.0.2
 
+[1.3.0]: https://github.com/Zhangyr2022/thuai-7/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/Zhangyr2022/thuai-7/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/Zhangyr2022/thuai-7/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/Zhangyr2022/thuai-7/compare/v0.4.1...v1.0.0

diff --git a/client/Assets/Scripts/Classes/PlayerSource.cs b/client/Assets/Scripts/Classes/PlayerSource.cs
@@ -51,8 +51,8 @@ public static bool AddPlayer(int id, string name)
         canvas.sortingLayerID = LayerMask.NameToLayer("UI");
         canvas.renderMode = RenderMode.WorldSpace; // Set the render mode to World Space
         TextMeshProUGUI textComponent = uiCanvasGO.AddComponent<TextMeshProUGUI>();
-        textComponent.text = "Player Token: " + (name.Length <= 6 ? name : name.Substring(0, 6) + "..."); // Set the initial text to the player's token
-        textComponent.fontSize = 1; // Set the font size
+        textComponent.text = "" + (name.Length <= 6 ? name : name.Substring(0, 6) + "..."); // Set the initial text to the player's token
+        textComponent.fontSize = 2; // Set the font size
         textComponent.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f);
         if (_playerDict.Count == 0)
         {
@@ -80,7 +80,7 @@ public static bool AddPlayer(int id, string name)
         return true;
     }
 
-    public static void UpdatePlayer(int id, int health, ArmorTypes armor, float speed, FirearmTypes firearm, Dictionary<string, int> inventory, Position position,float firearmRange)
+    public static void UpdatePlayer(int id, int health, ArmorTypes armor, float speed, FirearmTypes firearm, Dictionary<string, int> inventory, Position position, float firearmRange)
     {
         if (_playerDict.ContainsKey(id))
         {

diff --git a/client/ProjectSettings/ProjectSettings.asset b/client/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 1.2.0
+  bundleVersion: 1.3.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

diff --git a/server/src/GameServer/GameLogic/Constants/Constant.GameSetting.cs b/server/src/GameServer/GameLogic/Constants/Constant.GameSetting.cs
@@ -6,7 +6,7 @@ public partial class Constant
 
     public const int PREPERATION_TICKS = 10 * TICKS_PER_SECOND;
 
-    public const int WALL_GENERATE_TRY_TIMES = 1024;
+    public const int WALL_GENERATE_TRY_TIMES = 2048;
 
     public const int NUM_SUPPLY_POINTS = 256;
     public const int MIN_ITEMS_PER_SUPPLY = 1;

diff --git a/server/src/GameServer/GameServer.csproj b/server/src/GameServer/GameServer.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>