Merge pull request #73 from THU-ASTA/develop

Fix tons of bugs and optimize performance

Author: futrime

CHANGELOG.md

@@ -4,8 +4,36 @@ 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).
 
+
 ## [Unreleased]
-None
+
+
+## [24.1.0-beta.6]
+## Added
+- Frame rate displaying by @Futrime
+
+## Changed
+- Dramatically improve performance in communication by @Futrime and @Zhangyr2022
+
+## Fixed
+- Tons of bugs in communication by @Futrime and @Zhangyr2022
+- Timing bug by @Futrime
+- Not responding when receiving endless bytes from serial ports by @Futrime
+- Slave being able to set four charging piles by @Futrime and @Zhangyr2022
+
+
+## [24.1.0-beta.5]
+## Added
+- Exception handling in packet construction by @Zhangyr2022
+
+## Changed
+- Adapt to new Communication Protocol by @Zhangyr2022
+
+## Fixed
+- Camera index always set to zero when opening settings window by @Futrime
+- Main window not responding when applying camera change by @Futrime
+- That more than five orders can be carried simultaneously by @Futrime
+
 
 ## [24.1.0-beta.4]
 ### Fixed

Source/Game.cs

@@ -270,6 +270,22 @@ public long? GameTime
         }
     }
 
+    /// <summary>
+    /// The duration of the last tick
+    /// </summary>
+    /// <remarks>
+    /// Should be update externally.
+    /// </remarks>
+    public long LastTickDuration => this._lastTickDuraion;
+
+    /// <summary>
+    /// The time of the last tick
+    /// </summary>
+    /// <remarks>
+    /// Should be update externally.
+    /// </remarks>
+    public long LastTickTime => this._lastTickTime;
+
     /// <summary>
     /// A list of the generated orders.
     /// </summary>
@@ -325,6 +341,8 @@ public long? RemainingTime
     // inner court.
     private bool? _hasMovedIntoInnerCourt = null;
 
+    private long _lastTickDuraion = 1000; // Just a magic default value.
+
     // Minus one to prevent division by zero.
     private long _lastTickTime = Utility.SystemTime - 1;
 
@@ -343,14 +361,6 @@ public long? RemainingTime
 
     private long? _startTime = null;
 
-    private long _lastTickDuration
-    {
-        get
-        {
-            return Utility.SystemTime - this._lastTickTime;
-        }
-    }
-
     private Dictionary<CampType, Vehicle> _vehicle = null;
 
     #endregion
@@ -417,6 +427,9 @@ public Game()
     /// </summary>
     public void Refresh()
     {
+        this._lastTickDuraion = Utility.SystemTime - this._lastTickTime;
+        this._lastTickTime = Utility.SystemTime;
+
         // The game should only refresh when running.
         if (
             this._gameState != GameStatusType.Running
@@ -457,8 +470,9 @@ public void Refresh()
 
         this.AutoCharge();
 
-        // Update the time of the last tick.
-        this._lastTickTime = Utility.SystemTime;
+        // Must generate orders after refreshing the game to avoid interacting with
+        // orders not processed by the slave.
+        this.GenerateOrder();
     }
 
     /// <summary>
@@ -602,7 +616,7 @@ public void SetChargingPile()
                 ++chargingPileNumber;
             }
         }
-        if (chargingPileNumber > Game.ChargingPileMaxNumber)
+        if (chargingPileNumber >= Game.ChargingPileMaxNumber)
         {
             return;
         }
@@ -651,7 +665,7 @@ private void AutoCharge()
     /// <summary>
     /// Attempt to generate an order.
     /// </summary>
-    public void GenerateOrder()
+    private void GenerateOrder()
     {
         var newOrder = this._orderGenerator.Generate((long)this.GameTime);
         if (newOrder != null)
@@ -758,7 +772,7 @@ void ScoreHittingWall()
         if (this.IsInWall(vehiclePosition))
         {
             this._score[(CampType)this._camp] +=
-                Game.ScoreHittingWallRate * this._lastTickDuration;
+                Game.ScoreHittingWallRate * this.LastTickDuration;
         }
     }
 
@@ -798,11 +812,11 @@ void ScoreMoving()
         // Score parking penalty.
         if (
             vehicle.ParkingDuration != null &&
-            (long)vehicle.ParkingDuration >= 5000 + this._lastTickDuration
+            (long)vehicle.ParkingDuration >= 5000 + this.LastTickDuration
         )
         {
             this._score[(CampType)this._camp] +=
-                Game.ScoreOvertimeParkingRate * this._lastTickDuration;
+                Game.ScoreOvertimeParkingRate * this.LastTickDuration;
         }
     }
 
@@ -823,7 +837,7 @@ void TackleBarriers()
         if (this.IsInBarrier(vehiclePosition))
         {
             vehicle.IncreaseMaxDistance(
-                (int)Math.Round(Game.BarrierDischargingRate * this._lastTickDuration)
+                (int)Math.Round(Game.BarrierDischargingRate * this.LastTickDuration)
             );
         }
     }
@@ -848,7 +862,7 @@ void TackleChargingPiles()
         ))
         {
             vehicle.IncreaseMaxDistance(
-                (int)Math.Round(Game.ChargingPileChargingRate * this._lastTickDuration)
+                (int)Math.Round(Game.ChargingPileChargingRate * this.LastTickDuration)
             );
         }
 
@@ -859,7 +873,7 @@ void TackleChargingPiles()
         ))
         {
             vehicle.IncreaseMaxDistance(
-                (int)Math.Round(Game.ChargingPileDischargingRate * this._lastTickDuration)
+                (int)Math.Round(Game.ChargingPileDischargingRate * this.LastTickDuration)
             );
         }
     }