Merge pull request #178 from lch24/dev

lei le

Author: lch24

docs/规则.md

@@ -85,7 +85,7 @@
 
 | 属性 | 初始值 | 上限 |
 |:----:|:------:|:----:|
-| 血量 (HP) | 100 | 300 |
+| 血量 (HP) | 1000 | 3000 |
 | 防御力 (Robust) | 20 | 50 |
 | 仓储 (Storage) | 5 | 150 |
 | 效率 (Efficiency) | 1 | 2 |
@@ -99,11 +99,11 @@
 **算力产出**：基础 1 点/秒，每个已占领算力中心 +2 点/秒
 
 **被攻击**：
-- 前 7 分钟工厂处于**无敌状态**，不受任何伤害
+- 前 30 秒工厂处于**无敌状态**，不受任何伤害
 - 实际伤害 = `Max(ATK − Robust, 1)`
 - 攻击方获得 `伤害量` 分（等于工厂实际损失的血量）
 - 工厂被攻击后进入 1s 停摆（CanProduce 和 CanRecruit 均为 false）
-- 工厂被摧毁（HP=0）：攻击方获得 **1000** 分
+- 工厂被摧毁（HP=0）：攻击方获得 **20000** 分
 
 ### 市场
 
@@ -202,7 +202,7 @@
 | **对敌方角色造成伤害** | 伤害量 × 20 |
 | **击杀敌方角色** | 角色造价 × 40（Drone=2000, Robot=2000, Car=2000） |
 | **对敌方工厂造成伤害** | 伤害量（工厂实际损失血量） |
-| **摧毁敌方工厂** | 1000 |
+| **摧毁敌方工厂** | 20000 |
 
 - 买入商品会消耗队伍分数
 - 游戏结束（10 分钟）或所有队伍工厂被摧毁时结算

logic/Gaming/CharacterManager.cs

@@ -22,6 +22,7 @@ private sealed class CharacterManager(Game game, Map gameMap)
             private readonly Game game = game;
             private readonly Map map = gameMap;
             private readonly ConcurrentDictionary<long, ConcurrentDictionary<long, Character>> teamCharacters = new(); // key: TeamID -> (PlayerID -> Character)
+            private readonly ConcurrentDictionary<long, object> teamRecruitLocks = new(); // 防止同一队伍并发创建角色导致出生点重叠
 
             public Character CreateCharacter(long teamId, long playerId, CharacterType type)
             {
@@ -51,33 +52,33 @@ public bool RecruitCharacter(long teamId, long playerId, CharacterType type, XY
                     LogicLogging.logger.LogWarning($"Factory for Team {teamId} cannot recruit at this time.");
                     return false;
                 }
-                var teamDict = teamCharacters.GetOrAdd(teamId, _ => new ConcurrentDictionary<long, Character>());
-                if (teamDict.Count >= GameData.MaxCharactersPerTeam)
-                {
-                    LogicLogging.logger.LogWarning($"Team {teamId} has reached the maximum character limit ({GameData.MaxCharactersPerTeam}). Cannot recruit more.");
-                    return false;
-                }
-                if (teamDict.ContainsKey(playerId))
-                {
-                    LogicLogging.logger.LogWarning($"Team {teamId} already has an alive character for Player {playerId}. Cannot recruit.");
-                    return false;
-                }
-                if (teamCharacters.TryGetValue(teamId, out var dict) && dict.Count >= GameData.MaxCharactersPerTeam)
-                {
-                    LogicLogging.logger.LogWarning($"Team {teamId} has reached the maximum character limit ({GameData.MaxCharactersPerTeam}). Cannot recruit more.");
-                    return false;
-                }
                 var occ = OccupationFactory.FindIOccupation(type);
                 int cost = occ.Cost;
-                if (factory.ComputingPower.Get() < cost)
+
+                var teamLock = teamRecruitLocks.GetOrAdd(teamId, _ => new object());
+                lock (teamLock)
                 {
-                    LogicLogging.logger.LogWarning($"Not enough computing power for Team {teamId} to recruit character. Required: {cost}, Available: {factory.ComputingPower.Get()}");
-                    return false;
+                    var teamDict = teamCharacters.GetOrAdd(teamId, _ => new ConcurrentDictionary<long, Character>());
+                    if (teamDict.Count >= GameData.MaxCharactersPerTeam)
+                    {
+                        LogicLogging.logger.LogWarning($"Team {teamId} has reached the maximum character limit ({GameData.MaxCharactersPerTeam}). Cannot recruit more.");
+                        return false;
+                    }
+                    if (teamDict.ContainsKey(playerId))
+                    {
+                        LogicLogging.logger.LogWarning($"Team {teamId} already has an alive character for Player {playerId}. Cannot recruit.");
+                        return false;
+                    }
+                    if (factory.ComputingPower.Get() < cost)
+                    {
+                        LogicLogging.logger.LogWarning($"Not enough computing power for Team {teamId} to recruit character. Required: {cost}, Available: {factory.ComputingPower.Get()}");
+                        return false;
+                    }
+                    factory.ComputingPower.SubRNow(cost);
+                    var ch = CreateCharacter(teamId, playerId, type);
+                    ActivateCharacter(teamId, playerId, birthPos);
+                    return true;
                 }
-                factory.ComputingPower.SubRNow(cost);
-                var ch = CreateCharacter(teamId, playerId, type);
-                ActivateCharacter(teamId, playerId, birthPos);
-                return true;
             }
 
             public bool ActivateCharacter(long teamId, long playerId, XY pos)
@@ -154,8 +155,8 @@ private bool IsPositionColliding(Character ch, XY pos)
             // 在基准位置附近按环形搜索一个非碰撞点
             private bool TryFindNearbyFreePosition(Character ch, XY center, out XY result)
             {
-                // 从工厂半径 + 角色半径开始，保证与工厂外部至少间隔1
-                int startDist = GameData.FactoryRadius + ch.Radius + 1;
+                // 工厂外至少两个格子的缓冲区，确保角色不会卡在工厂边缘
+                int startDist = GameData.FactoryRadius + GameData.NumOfPosGridPerCell * 2;
                 int maxDist = GameData.NumOfPosGridPerCell * 5; // 最多搜索 5 个格子的半径
                 int distStep = Math.Max(1, GameData.NumOfPosGridPerCell / 8);
                 int angleStepDeg = 15;

logic/Preparation/Utility/GameData.cs

@@ -37,15 +37,15 @@ public static class GameData
 
         public const int ResourceHP = 500;              // 资源血量
 
-        public const int FactoryScore = 1000;
+        public const int FactoryScore = 20000;
         public const int FactoryDisableTimeMs = 10_00;
-        public const int FactoryInvulnerableTimeMs = 7 * 60 * 1000;  // 前7分钟工厂不掉血
+        public const int FactoryInvulnerableTimeMs = 30 * 1000;  // 前30秒工厂不掉血
 
         // Score multipliers for combat
         public const int CharacterDamageScoreMultiplier = 20;
         public const int CharacterKillScoreMultiplier = 40;
 
-        public const int FactoryHP = 100;
+        public const int FactoryHP = 1000;
         public const int FactoryStorage = 5;
         public const int FactoryRobust = 20;
         public const int FactoryEfficiency = 1;