Merge pull request #5 from KevinYeti/v2

update to V2

Author: Yvees

api/API_CN.md

@@ -30,7 +30,7 @@ Y坐标相同的所有单元构成一行.
 - 只能攻击自己领地相邻的单元.
 - 占领不同的单元所需要的时间不同. 简单的说, 该单元被占领时间越长, 攻击它的所需时间越短.
 - 所有基地被占, 判负. 同时清空所有其他被占单元.
-
+- 每个玩家具有能量, 每秒自动获得当前占领单元一半数量的能量, 每次攻击单元消耗当前5%的能量. 能量初始值为10, 上限100.
 
 ## 测试脚本
 [PostMan脚本下载](/script/MagCore.postman_collection.json)

api/CreatePlayer_CN.md

@@ -44,7 +44,7 @@ Name: 新创建的玩家昵称
 
 Token: 新创建的玩家安全令牌(暂保留)
 
-Energy: 新创建的玩家能量(暂保留)
+Energy: 新创建的玩家能量
 
 Color: 新创建的玩家颜色
 

api/DataMap_CN.md

@@ -9,7 +9,7 @@
 - Id: 玩家Id
 - Name: 玩家昵称
 - Token: 玩家安全令牌(暂保留)
-- Energy: 玩家能量(暂保留)
+- Energy: 玩家能量
 - Color: 玩家颜色
 - State: 玩家状态
 - Index: 玩家标识号

api/GetPlayer_CN.md

@@ -35,7 +35,7 @@ Name: 玩家昵称
 
 Token: 玩家安全令牌(暂保留)
 
-Energy: 玩家能量(暂保留)
+Energy: 玩家能量
 
 Color: 玩家颜色
 

src/server/MagCore.Core/ActionLogic.cs

@@ -27,7 +27,7 @@ internal static int _calcInternal(Model.Action action, Cell target, Player sende
         {
             if (target.State == CellState.Occupied)
             {
-                int time = 1000;
+                int time = 2000;
                 if (target.Owner != sender
                     && DateTime.Now > target.OccupiedTime)
                 {
@@ -37,23 +37,23 @@ internal static int _calcInternal(Model.Action action, Cell target, Player sende
                     {
                         var duration = ts.Value.TotalSeconds;
                         if (duration > 60)
-                            time = 3000;
+                            time = 5000;
                         else if (duration > 30)
-                            time = 6000;
+                            time = 15000;
                         else if (duration > 15)
-                            time = 9000;
+                            time = 20000;
                         else if (duration > 5)
-                            time = 12000;
+                            time = 25000;
                         else
-                            time = 15000;
+                            time = 30000;
                     }
                 }
 
                 //Console.WriteLine("Sleep time:" + time.ToString());
                 return time;
             }
             else
-                return 1000;
+                return 2000;
         }
     }
 }

src/server/MagCore.Core/Game.cs

@@ -16,14 +16,17 @@ public class Game
         private IMap _map { get; set; }
         public string Map => _map.Name;
 
+        public int ThreadNum = Server.MaxThread;
+
         private GameState _state;
         public GameState State { get { return _state; } }
 
         private ConcurrentQueue<Command> _commands = new ConcurrentQueue<Command>();
 
         internal Hashtable Players { get; } = new Hashtable();
 
-        internal int ThreadId { get; set; }
+        internal string _MainThreadName { get; set; }
+        internal string _EnergyThreadName { get; set; }
 
         internal DateTime CreateTime { get; set; } = DateTime.Now;
 
@@ -51,13 +54,18 @@ public string ToJson()
             return string.Format(json, Id, _map.Name, (int)State, players, _map.Cells());
         }
 
-        public Game(IMap map)
+        public Game(IMap map, int thread)
         {
             _state = GameState.Wait;
-            _map = map.Clone();     
+            _map = map.Clone();
+
+            if (thread <= 0 || thread > Server.MaxThread)
+                ThreadNum = Server.MaxThread;
+            else
+                ThreadNum = thread;
 
             Task.Factory.StartNew(() => {
-                ThreadId = Thread.CurrentThread.ManagedThreadId;
+                _MainThreadName = "GameMainThread." + Thread.CurrentThread.ManagedThreadId.ToString();
                 while (_state == GameState.Wait)
                 {
                     var ts = DateTime.Now - CreateTime;
@@ -103,6 +111,34 @@ public Game(IMap map)
                 Thread.Sleep(10000);
                 Server.RemoveGame(Id);
             });
+
+            Task.Factory.StartNew( () => {
+                _EnergyThreadName = "GameEnergyThread." + Thread.CurrentThread.ManagedThreadId.ToString();
+                while (true)
+                {
+                    if (_state == GameState.Playing)
+                    {
+                        ProcessEnergy();
+                    }
+                    else if (_state >= GameState.Recycling)
+                    {
+                        break;
+                    }
+                    Thread.Sleep(1000);
+                }
+            });
+        }
+
+        private void ProcessEnergy()
+        {
+            foreach (Player player in Players.Values)
+            {
+                if (player.State == PlayerState.Playing)
+                {
+                    double inc = player.Cells.Count * 0.2;
+                    player.AddEnergy(inc);
+                }
+            }
         }
 
         private void ProcessAttack(Command cmd, IMap map)
@@ -113,12 +149,12 @@ private void ProcessAttack(Command cmd, IMap map)
                 var cell = map.Locate(cmd.Target);
                 var player = Core.Players.Get(cmd.Sender);
 
-                if (cell != null && cell.CanAttack(player))
+                if (cell != null && cell.CanAttack(player, ThreadNum))
                 {
                     time = ActionLogic.Calc(cmd.Action, cell, player);
                     Task<bool>.Factory.StartNew(() =>
                     {
-                        return cell.BeginChangeOwner(player, time);
+                        return cell.BeginChangeOwner(player, time, ThreadNum);
                     }).ContinueWith((task) =>
                     {
                         if (task.Result)

src/server/MagCore.Core/Server.cs

@@ -14,6 +14,8 @@ public static class Server
     {
         private static string _path = string.Empty;
 
+        public static int MaxThread = 2;
+
         private static Hashtable _games = new Hashtable();
 
         private static Hashtable _maps = new Hashtable();
@@ -26,12 +28,12 @@ public static void Start(string path)
             Console.WriteLine("MagCore Server Started.");
         }
 
-        public static string NewGame(string map)
+        public static string NewGame(string map, int thread)
         {
             map = map.Trim().ToLower();
             if (_maps.ContainsKey(map))
             {
-                var game = new Game(_maps[map] as IMap);
+                var game = new Game(_maps[map] as IMap, thread);
                 _games.Add(game.Id, game);
 
                 return game.Id;

src/server/MagCore.Model/Cell.cs

@@ -42,20 +42,32 @@ public int OwnerIndex {
         public object Locker = new object();
 
         public Player LastOwner { get; set; }
-        public bool BeginChangeOwner(Player sender, int time)
+        public bool BeginChangeOwner(Player sender, int time, int thread)
         {
             lock (this.Locker)
             {
-                if (State == CellState.Flicke)
+                if (State == CellState.Flicke
+                    || sender.Energy < 1
+                    || sender.ThreadLocker >= thread)
                     return false;
                 else
                 {
+                    double inc = -0.1 * sender.Energy;
+                    if (sender.Energy + inc <= 0)
+                    {
+                        return false;
+                    }
+                    sender.AddEnergy(inc);
+                    
                     State = CellState.Flicke;
                     LastOwner = Owner;
                     Owner = sender;
                     if (!sender.Cells.ContainsKey(Key))
                         sender.Cells.Add(Key, this);
+
+                    Interlocked.Increment(ref sender.ThreadLocker);
                     Thread.Sleep(time);
+                    Interlocked.Decrement(ref sender.ThreadLocker);
 
                     return true;
                 }
@@ -82,14 +94,17 @@ public bool EndChangeOwner(Player sender)
                         LastOwner.Cells.Remove(Key);
                     return true;
                 }
+                
             }
         }
 
-        public bool CanAttack(Player player)
+        public bool CanAttack(Player player, int thread)
         {
             if (this.State == CellState.Flicke
                 || this.Type == CellType.Null
-                || player.State == PlayerState.Defeat)
+                || player.State == PlayerState.Defeat
+                || player.Energy < 1
+                || player.ThreadLocker >= thread)
                 return false;
             else
             {

src/server/MagCore.Model/Player.cs

@@ -18,7 +18,24 @@ public Player(string name, int index, PlayerColor color)
 
         public string Token { get; set; } = Guid.NewGuid().ToString("N");
 
-        public int Energy { get; set; } = 0;
+        public int ThreadLocker = 0;
+
+        private double _energy = 10;
+        public int Energy
+        {
+            get {
+                return (int)_energy;
+            }
+        }
+        public void AddEnergy(double inc)
+        {
+            _energy += inc;
+            if (_energy < 0)
+                _energy = 0;
+            else if (_energy > 100)
+                _energy = 100;
+
+        }
 
         public PlayerColor Color { get; set; }
 
@@ -36,7 +53,8 @@ public Player(string name, int index, PlayerColor color)
         public void Reset()
         {
             State = PlayerState.Leisure;
-            Energy = 0;
+            _energy = 10;
+            ThreadLocker = 0;
             Bases = new Dictionary<string, Cell>();
             Cells = new Dictionary<string, Cell>();
         }

src/server/MagCore.Server/Controllers/GameController.cs

@@ -38,7 +38,13 @@ public ContentResult Post([FromBody]dynamic json)
             try
             {
                 var map = json.Map.ToString();
-                var game = Core.Server.NewGame(map);
+                int thread = 0;
+                if (json.Thread != null)
+                {
+                    string num = json.Thread.ToString();
+                    Int32.TryParse(num, out thread);
+                }
+                var game = Core.Server.NewGame(map, thread);
                 if (!string.IsNullOrEmpty(game))
                     return new ContentResult() { StatusCode = (int)HttpStatusCode.OK, Content = game };
                 else