Merge pull request #660 from shangfengh/new

fix: 🐛 fix the SafeValues
eesast · Jul 9, 2023 · 837d736 · 837d736
2 parents 7eaad7d + 66d2b27
commit 837d736
Show file tree

Hide file tree

Showing 25 changed files with 705 additions and 394 deletions.
diff --git a/logic/Client/MainWindow.xaml.cs b/logic/Client/MainWindow.xaml.cs
@@ -844,7 +844,7 @@ private void Refresh(object? sender, EventArgs e) //log未更新
                     }
                     foreach (var obj in listOfButcher)
                     {
-                        if (!isDataFixed[obj.PlayerId])
+                        if (obj.PlayerId < GameData.numOfStudent && !isDataFixed[obj.PlayerId])
                         {
                             IGhostType occupation1 = (IGhostType)OccupationFactory.FindIOccupation(Transformation.ToTrickerType(obj.TrickerType));
                             int j = 0;

diff --git a/logic/GameClass/GameObj/Bullet/Bullet.Ghost.cs b/logic/GameClass/GameObj/Bullet/Bullet.Ghost.cs
@@ -8,7 +8,7 @@ internal sealed class CommonAttackOfGhost : Bullet
         public CommonAttackOfGhost(Character player, XY pos, int radius = GameData.bulletRadius) :
             base(player, radius, pos)
         {
-            AP.Set(GameData.basicApOfGhost);
+            AP.SetReturnOri(GameData.basicApOfGhost);
         }
         public override double BulletBombRange => 0;
         public override double AttackDistance => GameData.basicAttackShortRange;
@@ -45,7 +45,7 @@ internal sealed class Strike : Bullet
         public Strike(Character player, XY pos, int radius = GameData.bulletRadius) :
             base(player, radius, pos)
         {
-            AP.Set(GameData.basicApOfGhost * 16 / 15);
+            AP.SetReturnOri(GameData.basicApOfGhost * 16 / 15);
         }
         public override double BulletBombRange => 0;
         public override double AttackDistance => GameData.basicAttackShortRange * 20 / 22;
@@ -83,7 +83,7 @@ internal sealed class FlyingKnife : Bullet
         public FlyingKnife(Character player, XY pos, int radius = GameData.bulletRadius) :
             base(player, radius, pos)
         {
-            AP.Set(GameData.basicApOfGhost * 4 / 5);
+            AP.SetReturnOri(GameData.basicApOfGhost * 4 / 5);
         }
         public override double BulletBombRange => 0;
         public override double AttackDistance => GameData.basicRemoteAttackRange * 13;
@@ -123,7 +123,7 @@ internal sealed class BombBomb : Bullet
     {
         public BombBomb(Character player, XY pos, int radius = GameData.bulletRadius) : base(player, radius, pos)
         {
-            AP.Set((int)(GameData.basicApOfGhost * 6.0 / 5));
+            AP.SetReturnOri((int)(GameData.basicApOfGhost * 6.0 / 5));
         }
         public override double BulletBombRange => GameData.basicBulletBombRange;
         public override double AttackDistance => GameData.basicAttackShortRange;
@@ -163,7 +163,7 @@ internal sealed class JumpyDumpty : Bullet
     {
         public JumpyDumpty(Character player, XY pos, int radius = GameData.bulletRadius) : base(player, radius, pos)
         {
-            AP.Set((int)(GameData.basicApOfGhost * 0.6));
+            AP.SetReturnOri((int)(GameData.basicApOfGhost * 0.6));
         }
         public override double BulletBombRange => GameData.basicBulletBombRange / 2;
         public override double AttackDistance => GameData.basicAttackShortRange * 18 / 22;

diff --git a/logic/GameClass/GameObj/Bullet/Bullet.cs b/logic/GameClass/GameObj/Bullet/Bullet.cs
@@ -11,7 +11,8 @@ public abstract class Bullet : ObjOfCharacter
         /// </summary>
         public abstract double BulletBombRange { get; }
         public abstract double AttackDistance { get; }
-        public AtomicInt AP { get; }
+        private AtomicInt ap = new(0);
+        public AtomicInt AP { get => ap; }
         public abstract int Speed { get; }
         public abstract bool IsRemoteAttack { get; }
         public abstract int CastTime { get; }
@@ -43,8 +44,8 @@ public override bool IgnoreCollideExecutor(IGameObj targetObj)
         public Bullet(Character player, int radius, XY Position) :
             base(Position, radius, GameObjType.Bullet)
         {
-            this.CanMove.Set(true);
-            this.MoveSpeed.Set(this.Speed);
+            this.CanMove.SetReturnOri(true);
+            this.MoveSpeed.SetReturnOri(this.Speed);
             this.hasSpear = player.TryUseSpear();
             this.Parent = player;
         }

diff --git a/logic/GameClass/GameObj/Character/Character.Skill.cs b/logic/GameClass/GameObj/Character/Character.Skill.cs
@@ -31,12 +31,12 @@ public bool IsGhost()
         protected Character(XY initPos, int initRadius, CharacterType characterType) :
             base(initPos, initRadius, GameObjType.Character)
         {
-            this.CanMove.Set(true);
+            this.CanMove.SetReturnOri(true);
             this.score = 0;
             this.buffManager = new BuffManager();
             this.occupation = OccupationFactory.FindIOccupation(characterType);
-            this.MaxHp = this.hp = Occupation.MaxHp;
-            this.MoveSpeed.Set(this.orgMoveSpeed = Occupation.MoveSpeed);
+            this.HP = new(Occupation.MaxHp);
+            this.MoveSpeed.SetReturnOri(this.orgMoveSpeed = Occupation.MoveSpeed);
             this.BulletOfPlayer = this.OriBulletOfPlayer = Occupation.InitBullet;
             this.concealment = Occupation.Concealment;
             this.alertnessRadius = Occupation.AlertnessRadius;