Merge branch 'dev' into dev

eesast · May 20, 2024 · 0da630a · 0da630a
2 parents 8bb8c98 + 58cd2e5
commit 0da630a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 34 deletions.
diff --git a/dependency/Dockerfile/Dockerfile_run_client b/dependency/Dockerfile/Dockerfile_run_client
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.204-jammy-amd64 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.300-jammy-amd64 AS build
 LABEL maintainer="eesast"
 WORKDIR /usr/local
 COPY . .

diff --git a/dependency/Dockerfile/Dockerfile_run_server b/dependency/Dockerfile/Dockerfile_run_server
@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.204-jammy-amd64 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0.300-jammy-amd64 AS build
 LABEL maintainer="eesast"
 WORKDIR /usr/local
 COPY . .
 RUN dotnet publish logic/Server/Server.csproj -c Release -o /usr/local/Server --self-contained true -r linux-x64
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0.204-jammy-amd64
+FROM mcr.microsoft.com/dotnet/sdk:8.0.300-jammy-amd64
 LABEL maintainer="eesast"
 WORKDIR /usr/local
 COPY --from=build /usr/local/Server .

diff --git a/dependency/deploy/deploy.csproj b/dependency/deploy/deploy.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35" />
+    <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.37" />
   </ItemGroup>
 
 </Project>
diff --git a/installer/installer.csproj b/installer/installer.csproj
@@ -100,7 +100,7 @@
 		<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.37" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/logic/Client/Client.csproj b/logic/Client/Client.csproj
@@ -79,7 +79,7 @@
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
 

diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs
@@ -350,8 +350,9 @@ public bool RepairWormhole(Ship ship)
                 { IsBackground = true }.Start();
                 return false;
             }
-            public bool AddMoneyNaturally(Base team)
+            public bool TeamTask(Base team)
             {
+                Home home = team.Home;
                 new Thread
                 (
                     () =>
@@ -366,6 +367,18 @@ public bool AddMoneyNaturally(Base team)
                             loopToDo: () =>
                             {
                                 team.AddMoney(team.MoneyAddPerSecond / GameData.NumOfStepPerSecond);
+                                if (!home.HP.IsBelowMaxTimes(0.4))
+                                {
+                                    var ships = gameMap.ShipInTheRangeNotTeamID(
+                                                                    home.Position, GameData.FortRange, home.TeamID);
+                                    if (ships == null || ships.Count == 0)
+                                    {
+                                        return true;
+                                    }
+                                    var ship = ships[random.Next(ships.Count)];
+                                    shipManager.BeAttacked(ship,
+                                        GameData.FortDamage / GameData.NumOfStepPerSecond, home.TeamID);
+                                }
                                 return true;
                             },
                             timeInterval: GameData.CheckInterval,

diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs
@@ -114,7 +114,7 @@ public bool StartGame(int milliSeconds)
             // 开始游戏
             foreach (var team in TeamList)
             {
-                actionManager.AddMoneyNaturally(team);
+                actionManager.TeamTask(team);
                 ActivateShip(team.TeamID, ShipType.CivilShip);
             }
             gameMap.Timer.Start(() => { }, () => EndGame(), milliSeconds);

diff --git a/logic/Preparation/Utility/GameData.cs b/logic/Preparation/Utility/GameData.cs
@@ -74,41 +74,41 @@ public static bool IsInTheRange(XY pos1, XY pos2, int range)
 
         public const int BulletRadius = 200;            // 子弹半径
         public const int LaserRange = 4000;             // 激光射程
-        public const int LaserDamage = 1200;            // 激光伤害
+        public const int LaserDamage = 800;             // 激光伤害
         public const double LaserArmorModifier = 1.5;   // 激光装甲修正
         public const double LaserShieldModifier = 0.6;  // 激光护盾修正
         public const int LaserSpeed = 20000;            // 激光速度
-        public const int LaserCastTime = 300;           // 激光前摇时间
-        public const int LaserSwingTime = 300;          // 激光后摇时间
+        public const int LaserCastTime = 500;           // 激光前摇时间
+        public const int LaserSwingTime = 1000;         // 激光后摇时间
         public const int PlasmaRange = 4000;            // 等离子射程
-        public const int PlasmaDamage = 1300;           // 等离子伤害
+        public const int PlasmaDamage = 1000;           // 等离子伤害
         public const double PlasmaArmorModifier = 2.0;  // 等离子装甲修正
         public const double PlasmaShieldModifier = 0.4; // 等离子护盾修正
         public const int PlasmaSpeed = 10000;           // 等离子速度
-        public const int PlasmaCastTime = 400;          // 等离子前摇时间
-        public const int PlasmaSwingTime = 400;         // 等离子后摇时间
+        public const int PlasmaCastTime = 800;          // 等离子前摇时间
+        public const int PlasmaSwingTime = 1600;         // 等离子后摇时间
         public const int ShellRange = 4000;             // 炮弹射程
-        public const int ShellDamage = 1800;            // 炮弹伤害
+        public const int ShellDamage = 1200;            // 炮弹伤害
         public const double ShellArmorModifier = 0.4;   // 炮弹装甲修正
         public const double ShellShieldModifier = 1.5;  // 炮弹护盾修正
         public const int ShellSpeed = 8000;             // 炮弹速度
-        public const int ShellCastTime = 200;           // 炮弹前摇时间
-        public const int ShellSwingTime = 200;          // 炮弹后摇时间
-        public const int MissileRange = 8000;           // 导弹射程
+        public const int ShellCastTime = 500;           // 炮弹前摇时间
+        public const int ShellSwingTime = 1000;         // 炮弹后摇时间
+        public const int MissileRange = 6000;           // 导弹射程
         public const int MissileBombRange = 1600;       // 导弹爆炸范围
-        public const int MissileDamage = 1600;          // 导弹伤害
+        public const int MissileDamage = 1100;          // 导弹伤害
         public const double MissileArmorModifier = 1.0; // 导弹装甲修正
         public const int MissileSpeed = 6000;           // 导弹速度
-        public const int MissileCastTime = 600;         // 导弹前摇时间
-        public const int MissileSwingTime = 600;        // 导弹后摇时间
-        public const int ArcRange = 8000;               // 电弧射程
-        public const int ArcDamageMin = 100;            // 电弧伤害
-        public const int ArcDamageMax = 3200;           // 电弧伤害
+        public const int MissileCastTime = 1200;        // 导弹前摇时间
+        public const int MissileSwingTime = 1800;       // 导弹后摇时间
+        public const int ArcRange = 6000;               // 电弧射程
+        public const int ArcDamageMin = 800;            // 电弧伤害
+        public const int ArcDamageMax = 1600;           // 电弧伤害
         public const double ArcArmorModifier = 2.0;     // 电弧装甲修正
         public const double ArcShieldModifier = 2.0;    // 电弧护盾修正
         public const int ArcSpeed = 8000;               // 电弧速度
-        public const int ArcCastTime = 600;             // 电弧前摇时间
-        public const int ArcSwingTime = 600;            // 电弧后摇时间
+        public const int ArcCastTime = 1200;            // 电弧前摇时间
+        public const int ArcSwingTime = 1800;           // 电弧后摇时间
 
         public const int CivilShipCost = 4000;
         public const int CivilShipMaxHP = 3000;
@@ -165,7 +165,7 @@ public static bool IsInTheRange(XY pos1, XY pos2, int range)
         public const int FlagShipArcGunCost = 24000;
 
         public const int ScoreHomePerSecond = 100;
-        public const int ScoreFactoryPerSecond = 300;
+        public const int ScoreFactoryPerSecond = 200;
         public const int ScoreProducer1PerSecond = 100;
         public const int ScoreProducer2PerSecond = 200;
         public const int ScoreProducer3PerSecond = 300;
@@ -184,14 +184,14 @@ public static bool IsInTheRange(XY pos1, XY pos2, int range)
         public const int Shield2 = 3000;
         public const int Shield3 = 4000;
 
-        public const int ResourceHP = 16000;
-        public const int FactoryHP = 8000;
-        public const int CommunityHP = 6000;
-        public const int FortHP = 12000;
-        public const int WormholeHP = 18000;
-        public const int HomeHP = 24000;
+        public const int ResourceHP = 32000;
+        public const int FactoryHP = 12000;
+        public const int CommunityHP = 10000;
+        public const int FortHP = 16000;
+        public const int WormholeHP = 24000;
+        public const int HomeHP = 48000;
 
         public const int FortRange = 6000;
-        public const int FortDamage = 500;
+        public const int FortDamage = 300;
     }
 }