Merge branch 'dev' into dev

eesast · Mar 16, 2024 · 103fb0f · 103fb0f
2 parents 19279da + 060c567
commit 103fb0f
Show file tree

Hide file tree

Showing 40 changed files with 500 additions and 552 deletions.
diff --git a/dependency/Dockerfile/Dockerfile_run b/dependency/Dockerfile/Dockerfile_run
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.201-jammy-amd64 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.203-jammy-amd64 AS build
 MAINTAINER eesast
 WORKDIR /usr/local
 COPY . .

diff --git a/installer/installer.csproj b/installer/installer.csproj
@@ -86,8 +86,8 @@
 		<PackageReference Include="CommunityToolkit.Maui.Core" Version="7.0.1" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.36" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
+		<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.37" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/logic/Client/Client.csproj b/logic/Client/Client.csproj
@@ -63,7 +63,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 	</ItemGroup>
 

diff --git a/logic/GameClass/GameObj/Areas/Asteroid.cs b/logic/GameClass/GameObj/Areas/Asteroid.cs
@@ -3,12 +3,9 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class Asteroid : Immovable
+public class Asteroid(XY initPos)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Asteroid)
 {
     public override bool IsRigid => true;
     public override ShapeType Shape => ShapeType.Square;
-    public Asteroid(XY initPos)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Asteroid)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Construction.cs b/logic/GameClass/GameObj/Areas/Construction.cs
@@ -3,10 +3,11 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class Construction : Immovable
+public class Construction(XY initPos)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Construction)
 {
     public AtomicLong TeamID { get; } = new(long.MaxValue);
-    public LongInTheVariableRange HP { get; } = new LongInTheVariableRange(0, GameData.CommunityHP);
+    public LongInTheVariableRange HP { get; } = new(0, GameData.CommunityHP);
     public override bool IsRigid => constructionType == ConstructionType.Community;
     public override ShapeType Shape => ShapeType.Square;
     private ConstructionType constructionType = ConstructionType.Null;
@@ -18,13 +19,13 @@ public bool Construct(int constructSpeed, ConstructionType constructionType, Shi
         {
             return false;
         }
-        if (this.constructionType != ConstructionType.Null && this.constructionType != constructionType && this.HP > 0)
+        if (this.constructionType != ConstructionType.Null && this.constructionType != constructionType && HP > 0)
         {
             return false;
         }
-        if (this.constructionType == ConstructionType.Null || this.HP == 0)
+        if (this.constructionType == ConstructionType.Null || HP == 0)
         {
-            this.TeamID.SetReturnOri(ship.TeamID);
+            TeamID.SetReturnOri(ship.TeamID);
             this.constructionType = constructionType;
             switch (constructionType)
             {
@@ -45,12 +46,11 @@ public bool Construct(int constructSpeed, ConstructionType constructionType, Shi
     }
     public void BeAttacked(Bullet bullet)
     {
-        if (bullet!.Parent!.TeamID == this.TeamID)
+        if (bullet!.Parent!.TeamID != TeamID)
         {
-            return;
+            long subHP = bullet.AP;
+            HP.SubPositiveV(subHP);
         }
-        long subHP = bullet.AP;
-        this.HP.SubPositiveV(subHP);
     }
     public void AddConstructNum(int add = 1)
     {
@@ -60,8 +60,4 @@ public void SubConstructNum(int sub = 1)
     {
         ConstructNum.Sub(sub);
     }
-    public Construction(XY initPos)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Construction)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Home.cs b/logic/GameClass/GameObj/Areas/Home.cs
@@ -14,10 +14,7 @@ public class Home(XY initPos, long id)
 
     public void BeAttacked(Bullet bullet)
     {
-        if (bullet!.Parent!.TeamID == this.TeamID)
-        {
-            return;
-        }
-        this.HP.SubPositiveV(bullet.AP);
+        if (bullet!.Parent!.TeamID != TeamID)
+            HP.SubPositiveV(bullet.AP);
     }
 }
diff --git a/logic/GameClass/GameObj/Areas/NullArea.cs b/logic/GameClass/GameObj/Areas/NullArea.cs
@@ -2,12 +2,9 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class NullArea : Immovable
+public class NullArea(XY initPos)
+    : Immovable(initPos, int.MaxValue, GameObjType.Null)
 {
     public override bool IsRigid => false;
     public override ShapeType Shape => ShapeType.Null;
-    public NullArea(XY initPos)
-        : base(initPos, int.MaxValue, GameObjType.Null)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/OutOfBoundBlock.cs b/logic/GameClass/GameObj/Areas/OutOfBoundBlock.cs
@@ -6,12 +6,9 @@ namespace GameClass.GameObj.Areas;
 /// <summary>
 /// 逻辑墙
 /// </summary>
-public class OutOfBoundBlock : Immovable, IOutOfBound
+public class OutOfBoundBlock(XY initPos)
+    : Immovable(initPos, int.MaxValue, GameObjType.OutOfBoundBlock), IOutOfBound
 {
     public override bool IsRigid => true;
     public override ShapeType Shape => ShapeType.Square;
-    public OutOfBoundBlock(XY initPos)
-    : base(initPos, int.MaxValue, GameObjType.OutOfBoundBlock)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Resource.cs b/logic/GameClass/GameObj/Areas/Resource.cs
@@ -4,7 +4,8 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class Resource : Immovable
+public class Resource(XY initPos)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Resource)
 {
     public LongInTheVariableRange HP { get; } = new LongInTheVariableRange(GameData.ResourceHP);
     public override bool IsRigid => true;
@@ -22,8 +23,4 @@ public void SubProduceNum(int sub = 1)
     {
         ProduceNum.Sub(sub);
     }
-    public Resource(XY initPos)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Resource)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Ruin.cs b/logic/GameClass/GameObj/Areas/Ruin.cs
@@ -1,14 +1,10 @@
 using Preparation.Utility;
-using System;
 
 namespace GameClass.GameObj.Areas;
 
-public class Ruin : Immovable
+public class Ruin(XY initPos)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Ruin)
 {
     public override bool IsRigid => true;
     public override ShapeType Shape => ShapeType.Square;
-    public Ruin(XY initPos)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Ruin)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Shadow.cs b/logic/GameClass/GameObj/Areas/Shadow.cs
@@ -3,12 +3,9 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class Shadow : Immovable
+public class Shadow(XY initPos)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Shadow)
 {
     public override bool IsRigid => false;
     public override ShapeType Shape => ShapeType.Square;
-    public Shadow(XY initPos)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Shadow)
-    {
-    }
 }
diff --git a/logic/GameClass/GameObj/Areas/Wormhole.cs b/logic/GameClass/GameObj/Areas/Wormhole.cs
@@ -5,10 +5,11 @@
 
 namespace GameClass.GameObj.Areas;
 
-public class Wormhole : Immovable, IWormhole
+public class Wormhole(XY initPos, List<XY> grids)
+    : Immovable(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Wormhole), IWormhole
 {
-    public LongInTheVariableRange HP = new LongInTheVariableRange(GameData.WormholeHP);
-    private readonly List<XY> grids = new();
+    public LongInTheVariableRange HP = new(GameData.WormholeHP);
+    private readonly List<XY> grids = grids;
     public List<XY> Grids => grids;
     public override bool IsRigid => HP > GameData.WormholeHP / 2;
     public override ShapeType Shape => ShapeType.Square;
@@ -20,7 +21,7 @@ public bool Repair(int constructSpeed, Ship ship)
     public void BeAttacked(Bullet bullet)
     {
         long subHP = bullet.AP;
-        this.HP.SubPositiveV(subHP);
+        HP.SubPositiveV(subHP);
     }
     public void AddRepairNum(int add = 1)
     {
@@ -30,9 +31,4 @@ public void SubRepairNum(int sub = 1)
     {
         RepairNum.Sub(sub);
     }
-    public Wormhole(XY initPos, List<XY> grids)
-        : base(initPos, GameData.NumOfPosGridPerCell / 2, GameObjType.Wormhole)
-    {
-        this.grids = grids;
-    }
 }
diff --git a/logic/GameClass/GameObj/BombedBullet.cs b/logic/GameClass/GameObj/BombedBullet.cs
@@ -3,20 +3,13 @@
 namespace GameClass.GameObj
 {
     // 为方便界面组做子弹爆炸特效，现引入“爆炸中的子弹”，在每帧发送给界面组
-    public sealed class BombedBullet : Immovable
+    public sealed class BombedBullet(Bullet bullet)
+        : Immovable(bullet.Position, bullet.Radius, GameObjType.BombedBullet)
     {
         public override ShapeType Shape => ShapeType.Circle;
         public override bool IsRigid => false;
-        public long MappingID { get; }
-        public readonly Bullet bulletHasBombed;
-        public readonly XY facingDirection;
-
-        public BombedBullet(Bullet bullet) :
-            base(bullet.Position, bullet.Radius, GameObjType.BombedBullet)
-        {
-            this.bulletHasBombed = bullet;
-            this.MappingID = bullet.ID;
-            this.facingDirection = bullet.FacingDirection;
-        }
+        public long MappingID { get; } = bullet.ID;
+        public readonly Bullet bulletHasBombed = bullet;
+        public readonly XY facingDirection = bullet.FacingDirection;
     }
 }
diff --git a/logic/GameClass/GameObj/Bullet.cs b/logic/GameClass/GameObj/Bullet.cs
@@ -35,8 +35,8 @@ public override bool IgnoreCollideExecutor(IGameObj targetObj)
     public Bullet(Ship ship, int radius, XY Position) :
         base(Position, radius, GameObjType.Bullet)
     {
-        this.CanMove.SetReturnOri(true);
-        this.MoveSpeed.SetReturnOri(this.Speed);
-        this.Parent = ship;
+        CanMove.SetReturnOri(true);
+        MoveSpeed.SetReturnOri(Speed);
+        Parent = ship;
     }
 }
diff --git a/logic/GameClass/GameObj/Bullets/Arc.cs b/logic/GameClass/GameObj/Bullets/Arc.cs
@@ -9,7 +9,7 @@ public Arc(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
         Random random = new();
-        this.AP.SetReturnOri(random.Next(GameData.ArcDamageMin, GameData.ArcDamageMax));
+        AP.SetReturnOri(random.Next(GameData.ArcDamageMin, GameData.ArcDamageMax));
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.ArcRange;

diff --git a/logic/GameClass/GameObj/Bullets/Laser.cs b/logic/GameClass/GameObj/Bullets/Laser.cs
@@ -10,7 +10,7 @@ internal sealed class Laser : Bullet
     public Laser(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        this.AP.SetReturnOri(GameData.LaserDamage);
+        AP.SetReturnOri(GameData.LaserDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.LaserRange;

diff --git a/logic/GameClass/GameObj/Bullets/Missile.cs b/logic/GameClass/GameObj/Bullets/Missile.cs
@@ -8,7 +8,7 @@ internal sealed class Missile : Bullet
     public Missile(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        this.AP.SetReturnOri(GameData.MissileDamage);
+        AP.SetReturnOri(GameData.MissileDamage);
     }
     public override double BulletBombRange => GameData.MissileBombRange;
     public override double AttackDistance => GameData.MissileRange;

diff --git a/logic/GameClass/GameObj/Bullets/NullBullet.cs b/logic/GameClass/GameObj/Bullets/NullBullet.cs
@@ -2,7 +2,8 @@
 
 namespace GameClass.GameObj.Bullets;
 
-internal sealed class NullBullet(Ship ship, XY Position, int radius = GameData.BulletRadius) : Bullet(ship, radius, Position)
+internal sealed class NullBullet(Ship ship, XY Position, int radius = GameData.BulletRadius)
+    : Bullet(ship, radius, Position)
 {
     public override double BulletBombRange => 0;
     public override double AttackDistance => 0;

diff --git a/logic/GameClass/GameObj/Bullets/Plasma.cs b/logic/GameClass/GameObj/Bullets/Plasma.cs
@@ -7,7 +7,7 @@ internal sealed class Plasma : Bullet
     public Plasma(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        this.AP.SetReturnOri(GameData.PlasmaDamage);
+        AP.SetReturnOri(GameData.PlasmaDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.PlasmaRange;

diff --git a/logic/GameClass/GameObj/Bullets/Shell.cs b/logic/GameClass/GameObj/Bullets/Shell.cs
@@ -7,7 +7,7 @@ internal sealed class Shell : Bullet
     public Shell(Ship ship, XY pos, int radius = GameData.BulletRadius) :
         base(ship, radius, pos)
     {
-        this.AP.SetReturnOri(GameData.ShellDamage);
+        AP.SetReturnOri(GameData.ShellDamage);
     }
     public override double BulletBombRange => 0;
     public override double AttackDistance => GameData.ShellRange;

diff --git a/logic/GameClass/GameObj/GameObj.cs b/logic/GameClass/GameObj/GameObj.cs
@@ -7,37 +7,30 @@ namespace GameClass.GameObj
     /// <summary>
     /// 一切游戏元素的总基类，与THUAI4不同，继承IMoveable接口（出于一切物体其实都是可运动的指导思想）——LHR
     /// </summary>
-    public abstract class GameObj : IGameObj
+    public abstract class GameObj(XY initPos, int initRadius, GameObjType initType) : IGameObj
     {
         private readonly ReaderWriterLockSlim gameObjReaderWriterLock = new();
         public ReaderWriterLockSlim GameObjReaderWriterLock => gameObjReaderWriterLock;
         protected readonly object gameObjLock = new();
         public object GameLock => gameObjLock;
-        protected readonly XY birthPos;
-        private readonly GameObjType type;
+        protected readonly XY birthPos = initPos;
+        private readonly GameObjType type = initType;
         public GameObjType Type => type;
         private static long currentMaxID = 0;         // 目前游戏对象的最大ID
         public const long invalidID = long.MaxValue;  // 无效的ID
-        public long ID { get; }
-        protected XY position;
+        public long ID { get; } = Interlocked.Increment(ref currentMaxID);
+        protected XY position = initPos;
         public abstract XY Position { get; }
         public abstract bool IsRigid { get; }
         public abstract ShapeType Shape { get; }
 
-        private AtomicBool isRemoved = new(false);
+        private readonly AtomicBool isRemoved = new(false);
         public AtomicBool IsRemoved { get => isRemoved; }
         public virtual bool TryToRemove()
         {
             return IsRemoved.TrySet(true);
         }
-        public int Radius { get; }
+        public int Radius { get; } = initRadius;
         public virtual bool IgnoreCollideExecutor(IGameObj targetObj) => false;
-        public GameObj(XY initPos, int initRadius, GameObjType initType)
-        {
-            this.position = this.birthPos = initPos;
-            this.Radius = initRadius;
-            this.type = initType;
-            ID = Interlocked.Increment(ref currentMaxID);
-        }
     }
 }
diff --git a/logic/GameClass/GameObj/Immovable.cs b/logic/GameClass/GameObj/Immovable.cs
@@ -2,11 +2,8 @@
 
 namespace GameClass.GameObj;
 
-public abstract class Immovable : GameObj
+public abstract class Immovable(XY initPos, int initRadius, GameObjType initType)
+    : GameObj(initPos, initRadius, initType)
 {
     public override XY Position => position;
-    public Immovable(XY initPos, int initRadius, GameObjType initType)
-        : base(initPos, initRadius, initType)
-    {
-    }
 }