Merge pull request eesast#126 from shangfengh/dev

refactor: 🎨 use the AtomicLongOnlyAddScore
GuoWQ222 · Mar 15, 2024 · 672fbad · 672fbad
2 parents d29693c + 773dce8
commit 672fbad
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 87 deletions.
diff --git a/logic/GameClass/GameObj/Map/Map.cs b/logic/GameClass/GameObj/Map/Map.cs
@@ -187,7 +187,6 @@ public Map(MapStruct mapResource)
             {
                 for (int j = 0; j < width; ++j)
                 {
-                    bool hasWormhole = false;
                     switch (mapResource.map[i, j])
                     {
                         case PlaceType.Resource:

diff --git a/logic/GameClass/GameObj/Map/MapGameTimer.cs b/logic/GameClass/GameObj/Map/MapGameTimer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using Preparation.Interface;
+using Preparation.Utility;
 using ITimer = Preparation.Interface.ITimer;
 
 namespace GameClass.GameObj
@@ -16,30 +17,16 @@ public class GameTimer : ITimer
             private long startTime;
             public int nowTime() => (int)(Environment.TickCount64 - startTime);
 
-            private bool isGaming = false;
-            public bool IsGaming
-            {
-                get => isGaming;
-                set
-                {
-                    lock (isGamingLock)
-                        isGaming = value;
-                }
-            }
-
-            readonly object isGamingLock = new();
+            private AtomicBool isGaming = new(false);
+            public AtomicBool IsGaming => isGaming;
 
             public bool StartGame(int timeInMilliseconds)
             {
-                lock (isGamingLock)
-                {
-                    if (isGaming)
-                        return false;
-                    isGaming = true;
-                    startTime = Environment.TickCount64;
-                }
+                if (!IsGaming.TrySet(true))
+                    return false;
+                startTime = Environment.TickCount64;
                 Thread.Sleep(timeInMilliseconds);
-                isGaming = false;
+                IsGaming.SetReturnOri(false);
                 return true;
             }
         }

diff --git a/logic/GameClass/GameObj/MoneyPool.cs b/logic/GameClass/GameObj/MoneyPool.cs
@@ -5,12 +5,15 @@ namespace GameClass.GameObj;
 
 public class MoneyPool : IMoneyPool
 {
-    public AtomicLong Money { get; } = new AtomicLong(0);
+    public AtomicLongOnlyAddScore Money { get; } = new(0);
     public AtomicLong Score { get; } = new AtomicLong(0);
+    public MoneyPool()
+    {
+        Money.SetScore(Score);
+    }
     public long AddMoney(long add)
     {
         Money.Add(add);
-        Score.Add(add);
         return add;
     }
     public void SubMoney(long sub)

diff --git a/logic/Preparation/Interface/IMoneyPool.cs b/logic/Preparation/Interface/IMoneyPool.cs
@@ -4,7 +4,7 @@ namespace Preparation.Interface
 {
     public interface IMoneyPool
     {
-        public AtomicLong Money { get; }
+        public AtomicLongOnlyAddScore Money { get; }
         public AtomicLong Score { get; }
         public long AddMoney(long add);
         public void SubMoney(long sub);

diff --git a/logic/Preparation/Interface/ITimer.cs b/logic/Preparation/Interface/ITimer.cs
@@ -1,8 +1,10 @@
-namespace Preparation.Interface
+using Preparation.Utility;
+
+namespace Preparation.Interface
 {
     public interface ITimer
     {
-        bool IsGaming { get; set; }
+        AtomicBool IsGaming { get; }
         public int nowTime();
         public bool StartGame(int timeInMilliseconds);
     }

diff --git a/logic/Preparation/Preparation.csproj b/logic/Preparation/Preparation.csproj
@@ -13,7 +13,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\dependency\proto\Protos.csproj"/>
+		<ProjectReference Include="..\..\dependency\proto\Protos.csproj" />
 	</ItemGroup>
 
 </Project>