fix: 🐛 fix the bug about Lock the Door

logic/GameClass/GameObj/Character/Character.Skill.cs

@@ -96,7 +96,7 @@ namespace GameClass.GameObj
             this.alertnessRadius = Occupation.AlertnessRadius;
             this.ViewRange = Occupation.ViewRange;
             this.characterType = characterType;
-            this.SpeedOfOpeningOrLocking = Occupation.TimeOfOpeningOrLocking;
+            this.SpeedOfOpeningOrLocking = Occupation.SpeedOfOpeningOrLocking;
             this.SpeedOfClimbingThroughWindows = Occupation.SpeedOfClimbingThroughWindows;
             this.SpeedOfOpenChest = Occupation.SpeedOfOpenChest;
 

logic/GameClass/GameObj/Map/Window.cs

@@ -20,7 +20,7 @@ namespace GameClass.GameObj
         {
             if (targetObj.Type != GameObjType.Character)
                 return true;  // 非玩家不碰撞
-            if (whoIsClimbing != null && targetObj.ID == whoIsClimbing.ID)
+            if (whoIsClimbing != null && targetObj == whoIsClimbing)
             {
                 return true;
             }

logic/Gaming/ActionManager.cs

@@ -454,7 +454,7 @@ namespace Gaming
                       loopCondition: () => flag && player.PlayerState == PlayerStateType.LockingOrOpeningTheDoor && gameMap.Timer.IsGaming && doorToLock.OpenOrLockDegree < GameData.degreeOfLockingOrOpeningTheDoor,
                       loopToDo: () =>
                       {
-                          flag = ((gameMap.OneInTheSameCell(doorToLock.Position, GameObjType.Character)) != null);
+                          flag = ((gameMap.OneInTheSameCell(doorToLock.Position, GameObjType.Character)) == null);
                           doorToLock.OpenOrLockDegree += GameData.frameDuration * player.SpeedOfOpeningOrLocking;
                       },
                       timeInterval: GameData.frameDuration,

logic/Preparation/Interface/IOccupation.cs

@@ -13,7 +13,7 @@ namespace Preparation.Interface
         public double Concealment { get; }
         public int AlertnessRadius { get; }
         public int ViewRange { get; }
-        public int TimeOfOpeningOrLocking { get; }
+        public int SpeedOfOpeningOrLocking { get; }
         public int SpeedOfClimbingThroughWindows { get; }
         public int SpeedOfOpenChest { get; }
     }
@@ -51,8 +51,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 1.3);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = GameData.basicGhostSpeedOfClimbingThroughWindows;
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -82,8 +82,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 1.1);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = (int)(GameData.basicSpeedOfOpeningOrLocking / 1.1);
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = (int)(GameData.basicSpeedOfOpeningOrLocking / 1.1);
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = (int)(GameData.basicGhostSpeedOfClimbingThroughWindows / 1.1);
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -113,8 +113,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = (int)(GameData.basicGhostSpeedOfClimbingThroughWindows * 1.1);
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -153,8 +153,8 @@ namespace Preparation.Interface
         public int viewRange = GameData.basicViewRange * 9 / 10;
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = GameData.basicStudentSpeedOfClimbingThroughWindows / 2;
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -193,8 +193,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 1.1);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking * 12 / 10;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking * 12 / 10;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = GameData.basicStudentSpeedOfClimbingThroughWindows * 12 / 10;
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -233,8 +233,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 0.9);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = (int)(GameData.basicStudentSpeedOfClimbingThroughWindows * 10 / 12.0);
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -273,8 +273,8 @@ namespace Preparation.Interface
         public int viewRange = GameData.basicViewRange;
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = 1;
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -313,8 +313,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 0.9);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = (int)(GameData.basicStudentSpeedOfClimbingThroughWindows * 3 / 4);
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;
@@ -353,8 +353,8 @@ namespace Preparation.Interface
         public int viewRange = (int)(GameData.basicViewRange * 1.1);
         public int ViewRange => viewRange;
 
-        public int timeOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
-        public int TimeOfOpeningOrLocking => timeOfOpeningOrLocking;
+        public int speedOfOpeningOrLocking = GameData.basicSpeedOfOpeningOrLocking;
+        public int SpeedOfOpeningOrLocking => speedOfOpeningOrLocking;
 
         public int speedOfClimbingThroughWindows = GameData.basicStudentSpeedOfClimbingThroughWindows;
         public int SpeedOfClimbingThroughWindows => speedOfClimbingThroughWindows;

logic/Preparation/Utility/GameData.cs

@@ -84,7 +84,7 @@ namespace Preparation.Utility
 
         public const int basicTreatSpeed = 100;
         public const int basicFixSpeed = 100;
-        public const int basicSpeedOfOpeningOrLocking = 3280;
+        public const int basicSpeedOfOpeningOrLocking = 30;
         public const int basicStudentSpeedOfClimbingThroughWindows = 611;
         public const int basicGhostSpeedOfClimbingThroughWindows = 1270;
         public const int basicSpeedOfOpenChest = 1000;

logic/cmd/gameServer.cmd

@@ -4,7 +4,7 @@ start cmd /k ..\Server\bin\Debug\net6.0\Server.exe --ip 0.0.0.0  --port 8888 --s
 
 ping -n 2 127.0.0.1 > NUL
 
-start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 4 --type 2 --occupation 2
+start cmd /k ..\Client\bin\Debug\net6.0-windows\Client.exe --cl --port 8888 --characterID 4 --type 2 --occupation 1
 
 ping -n 2 127.0.0.1 > NUL