Merge branch 'dev' of github.com:Panxuc/THUAI7 into dev

eesast · Oct 27, 2023 · d988fab · d988fab
2 parents 7e3e45c + 66b0b61
commit d988fab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/logic/GameClass/GameObj/ObjOfShip.cs b/logic/GameClass/GameObj/ObjOfShip.cs
@@ -9,19 +9,18 @@ namespace GameClass.GameObj
     /// </summary>
     public abstract class ObjOfShip : Movable, IObjOfShip
     {
-        private ReaderWriterLockSlim objOfShipReaderWriterLock = new();
-        public ReaderWriterLockSlim ObjOfShipReaderWriterLock => objOfShipReaderWriterLock;
+        public object ObjOfShipLock { get; } = new();
         private IShip? parent = null;
         public IShip? Parent
         {
             get
             {
-                lock (objOfShipReaderWriterLock)
+                lock (ObjOfShipLock)
                     return parent;
             }
             set
             {
-                lock (objOfShipReaderWriterLock)
+                lock (ObjOfShipLock)
                     parent = value;
             }
         }

diff --git a/logic/GameClass/GameObj/Ship.cs b/logic/GameClass/GameObj/Ship.cs
@@ -138,7 +138,7 @@ public bool ResetShipStateInOneThread(long state, RunningStateType running = Run
     }
     public bool StartThread(long stateNum, RunningStateType runningState)
     {
-        lock (ActionLock)
+        lock (actionLock)
         {
             if (this.StateNum == stateNum)
             {