Merge pull request #181 from eesast/dev

gai

Author: lch24

docs/规则.md

@@ -99,7 +99,7 @@
 **算力产出**：基础 1 点/秒，每个已占领算力中心 +2 点/秒
 
 **被攻击**：
-- 前 30 秒工厂处于**无敌状态**，不受任何伤害
+- 前 20 秒工厂处于**无敌状态**，不受任何伤害
 - 实际伤害 = `Max(ATK − Robust, 1)`
 - 攻击方获得 `伤害量` 分（等于工厂实际损失的血量）
 - 工厂被攻击后进入 1s 停摆（CanProduce 和 CanRecruit 均为 false）
@@ -129,7 +129,7 @@
 |:----:|:----:|:----:|:----:|
 | 血量 | 100 | 150 | 100 |
 | 攻击力 | 40 | 30 | 18 |
-| 攻击范围 | 1000 | 1000 | 1000 |
+| 攻击范围 | 1500 | 1500 | 1500 |
 | 防御力 | 10 | 15 | 8 |
 | 视野范围 | 7000 (7格) | 5000 (5格) | 5000 (5格) |
 | 负载上限 | 5 | 5 | 5 |

logic/Gaming/ActionManager.cs

@@ -309,7 +309,7 @@ public bool Attack(Character character, Factory gameobj)
                 // 前7分钟工厂不掉血
                 if (game.NowTime() < GameData.FactoryInvulnerableTimeMs)
                 {
-                    LogicLogging.logger.LogDebug("Factory is invulnerable in the first 7 minutes!");
+                    LogicLogging.logger.LogDebug("Factory is invulnerable in the first 20 seconds!");
                     return false;
                 }
 

logic/Gaming/Game.cs

@@ -252,29 +252,22 @@ public bool Attack(long teamId, long playerId)
                 return false;
             }
             int attackRange = (int)character.AttackSize.GetValue();
+            IGameObj? bestTarget = null;
+            long bestDist = long.MaxValue;
+
+            // 遍历范围内所有敌方角色
             var enemies = gameMap.CharacterInTheRangeNotTeamID(character.Position, attackRange, character.TeamID.Get());
-            if (enemies != null && enemies.Count > 0)
+            if (enemies != null)
             {
-                Character nearest = null;
-                long bestDist = long.MaxValue;
                 foreach (var e in enemies)
                 {
                     if (e == null || e.IsRemoved || e.HP <= 0) continue;
                     long d = (long)XY.DistanceCeil3(e.Position, character.Position);
-                    if (d < bestDist)
-                    {
-                        bestDist = d;
-                        nearest = e;
-                    }
-                }
-                if (nearest != null)
-                {
-                    return actionManager.Attack(character, nearest);
+                    if (d < bestDist) { bestDist = d; bestTarget = e; }
                 }
             }
 
-            Factory? enemyFactory = null;
-            long bestFactoryDist = long.MaxValue;
+            // 遍历范围内所有敌方工厂
             var factoryObjs = gameMap.GameObjDict[GameObjType.FACTORY].ToNewList();
             if (factoryObjs != null)
             {
@@ -283,14 +276,17 @@ public bool Attack(long teamId, long playerId)
                     if (obj is not Factory f || f.TeamID.Get() == character.TeamID.Get() || f.HP <= 0) continue;
                     if (!GameData.IsInTheRange(f.Position, character.Position, attackRange)) continue;
                     long d = (long)XY.DistanceCeil3(f.Position, character.Position);
-                    if (d < bestFactoryDist) { bestFactoryDist = d; enemyFactory = f; }
+                    if (d < bestDist) { bestDist = d; bestTarget = f; }
                 }
             }
-            if (enemyFactory != null)
-            {
-                return actionManager.Attack(character, enemyFactory);
-            }
-            LogicLogging.logger.LogWarning($"Attack failed: No valid targets in range for character of team {teamId} player {playerId}.");
+
+            if (bestTarget is Character targetChar)
+                return actionManager.Attack(character, targetChar);
+            if (bestTarget is Factory targetFac)
+                return actionManager.Attack(character, targetFac);
+
+            int factoryCount = gameMap.GameObjDict.TryGetValue(GameObjType.FACTORY, out var flist) ? flist.ToNewList()?.Count ?? -1 : -1;
+            LogicLogging.logger.LogWarning($"Attack failed: No valid targets in range for character of team {teamId} player {playerId}. pos=({character.Position.x},{character.Position.y}) range={attackRange} factoryCount={factoryCount}");
             return false;
         }
 

logic/Preparation/Utility/GameData.cs

@@ -27,7 +27,7 @@ public static class GameData
 
         public const int MaxRobust = 50;
         public const int MaxEfficiency = 10;
-        public const int MaxHP = 300;
+        public const int MaxHP = 10000;
         public const int MaxCost = 2;
         public const int MaxATKSize = 3 * NumOfPosGridPerCell;
         public const int MaxATKPower = 100;
@@ -39,7 +39,7 @@ public static class GameData
 
         public const int FactoryScore = 20000;
         public const int FactoryDisableTimeMs = 10_00;
-        public const int FactoryInvulnerableTimeMs = 30 * 1000;  // 前30秒工厂不掉血
+        public const int FactoryInvulnerableTimeMs = 20 * 1000;  // 前20秒工厂不掉血
 
         // Score multipliers for combat
         public const int CharacterDamageScoreMultiplier = 20;
@@ -58,7 +58,7 @@ public static class GameData
 
         public const int DroneHP = 100;
         public const int DroneCost = 50;
-        public const int DroneATKsize = 1000;
+        public const int DroneATKsize = 1500;
         public const int DroneATKpower = 40;
         public const int DroneLoad = 5;
         public const int DroneRobust = 10;
@@ -68,7 +68,7 @@ public static class GameData
 
         public const int AutonomouCarHP = 100;
         public const int AutonomouCarCost = 50;
-        public const int AutonomouCarATKsize = 1000;
+        public const int AutonomouCarATKsize = 1500;
         public const int AutonomouCarATKpower = 18;
         public const int AutonomouCarLoad = 5;
         public const int AutonomouCarRobust = 8;
@@ -78,7 +78,7 @@ public static class GameData
 
         public const int RobotHP = 150;
         public const int RobotCost = 50;
-        public const int RobotATKsize = 1000;
+        public const int RobotATKsize = 1500;
         public const int RobotATKpower = 30;
         public const int RobotLoad = 5;
         public const int RobotRobust = 15;

logic/Server/RpcServices.cs

@@ -318,14 +318,21 @@ public override Task<BoolRes> Attack(AttackMsg request, ServerCallContext contex
             GameServerLogging.logger.LogDebug(
                 $"TRY Attack: Player {request.PlayerId} from Team {request.TeamId} attacking Player {request.AttackedPlayerId} from Team {request.AttackedTeamId}");
             BoolRes boolRes = new();
-            if (request.AttackedTeamId > 0 && request.AttackedPlayerId == 0)
+            if (request.AttackedTeamId > 0 && request.AttackedPlayerId > 0)
             {
-                // 指定攻击工厂：跳过自动索敌，直接打目标工厂
+                // 指定攻击角色：进攻指定队伍的指定玩家角色（暂用自动索敌，后续可扩展）
+                boolRes.ActSuccess = game.Attack(
+                    request.TeamId, request.PlayerId);
+            }
+            else if (request.AttackedTeamId > 0)
+            {
+                // 指定攻击工厂：attacked_team_id > 0 且 attacked_player_id == 0
                 boolRes.ActSuccess = game.AttackFactory(
                     request.TeamId, request.PlayerId, request.AttackedTeamId);
             }
             else
             {
+                // 未指定目标：自动索敌（最近敌方角色或工厂）
                 boolRes.ActSuccess = game.Attack(
                     request.TeamId, request.PlayerId);
             }