增加玩家出牌逻辑

DotNet/Core/Core/Module/CoroutineLock/CoroutineLockType.cs

@@ -11,6 +11,8 @@ namespace ET
         public const int Resources = 6;
         public const int ResourcesLoader = 7;
 
+        public const int DisCard = 8;
+
         public const int Max = 100; // 这个必须最大
     }
 }

DotNet/Hotfix/Helper/CardHelper.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace ET.Server;
 
@@ -7,6 +8,47 @@ namespace ET.Server;
 /// </summary>
 public static class CardHelper
 {
+    /// <summary>
+    /// 删除数组中的元素
+    /// </summary>
+    /// <param name="target">数据源</param>
+    /// <param name="v">删除的元素</param>
+    /// <returns>新的数据源</returns>
+    public static int[] Remove(int[] target, int v)
+    {
+        int len = target.Length;
+        if (len == 0)
+        {
+            return target;
+        }
+
+        // 直接查找要删除的元素
+        for (int i = 0; i < len; i++)
+        {
+            if (target[i] == v)
+            {
+                int[] dest = new int[len - 1];
+                if (i > 0)
+                {
+                    Array.Copy(target, 0, dest, 0, i);
+                }
+                if (i != len - 1)
+                {
+                    Array.Copy(target, i + 1, dest, i, len - i - 1);
+                }
+                return dest;
+            }
+        }
+        // 如果未找到元素，返回原数组
+        return target;
+    }
+    
+    /// <summary>
+    /// 向数组添加元素
+    /// </summary>
+    /// <param name="src">数据源</param>
+    /// <param name="v">增加的元素</param>
+    /// <returns>新的数据源</returns>
     public static int[] Add(int[] src, int v) {
         List<int> list = new List<int>(src);
         list.Add(v);

DotNet/Hotfix/Scenes/Game/Room/HGHuangHuangComponentSystem.cs

@@ -27,6 +27,7 @@ namespace ET.Server
                 self.CurrentRound = 0;
                 self.ZhuangPos = 0;
                 self.Rand = new[] { 0, 0 };
+                self.GangType = -1;
                 self.AdmitDefeatList = new List<long>();
                 self.CanHuIds = new List<Player>();
                 self.CanPgIds = new List<Player>();
@@ -109,7 +110,7 @@ namespace ET.Server
                         }
                         else
                         {
-                            if (self.Time > 0)
+                            if (self.Time >= 4)
                             {
                                 self.State = 2;
                                 self.Flag = false;
@@ -129,9 +130,19 @@ namespace ET.Server
                         else
                         {
                             // 强制操作
-                            if (self.Time > 30)
+                            if (self.Time >= 15)
                             {
+                                if (self.OperableList != null && self.OperableList.Count > 0)
+                                {
+                                    // 过
+                                    
+                                }
 
+                                if (self.DrawCardPlayer.Id == self.CurrentPlayer.Id)
+                                {
+                                    // 出牌
+                                    self.DisCard(room, self.CurrentPlayer, 0, true);
+                                }
                             }
                         }
                         break;
@@ -284,10 +295,226 @@ namespace ET.Server
             {
                 MessageHelper.SendToClient(player, new G2C_DrawCardPush(){info = ProtoHelper.RoomToProto(room, player, drawCardPlayer)});
                     
-                Log.Info($"摸牌, 房间id={room.RoomId}, 玩家id={player.Id}, 玩家={player.Name}, 摸牌玩家={player.Id == drawCardPlayer.Id}, 手牌信息={player.RemainCards}, 摸的牌={card}");
+                Log.Info($"摸牌... 玩家ID:{player.Id}, 位置:{player.Pos}, 摸牌玩家:{player.Id == drawCardPlayer.Id}, 手牌大小:{player.RemainCards.Length}, 手牌信息:{string.Join(", ", player.RemainCards)}, 摸的牌:{card}");
             }
         }
 
+        /// <summary>
+        /// 出牌
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="room"></param>
+        /// <param name="player"></param>
+        /// <param name="card">出的牌(0.当前摸牌玩家自动出牌 -1.非当前摸牌玩家自动出牌 >0.玩家手动出牌)</param>
+        /// <param name="flag">是否自动出牌</param>
+        public static async void DisCard(this HGHuangHuangComponent self, Room room, Player player, int card, bool flag)
+        {
+            if (player == null)
+            {
+                Log.Error($"出牌错误，player is null.");
+                return;
+            }
+            using (await CoroutineLockComponent.Instance.Wait(CoroutineLockType.DisCard, player.Id))
+            {
+                if (self.CurrentPlayer.Id == player.Id && self.DrawCardPlayer.Id == player.Id)
+                {
+                    Log.Info($"出牌... 玩家ID:{player.Id}, 位置:{player.Pos}, 手牌大小:{player.RemainCards.Length}, 手牌信息: {string.Join(", ", player.RemainCards)}");
+                    
+                    // 自动出牌
+                    if (flag)
+                    {
+                        if (self.PengPlayer != null && self.PengPlayer.Id == player.Id)
+                        {
+                            self.PengPlayer = null;
+                            int[] tmpCard = new int[player.RemainCards.Length];
+                            Array.Copy(player.RemainCards, 0, tmpCard, 0, player.RemainCards.Length);
+                            Array.Sort(tmpCard);
+                            card = tmpCard[^1];
+                        }
+                        else
+                        {
+                            card = player.RemainCards[^1];
+                        }
+
+                        // todo 真人托管状态
+                    }
+                    
+                    if (!player.RemainCards.Contains(card))
+                    {
+                        Log.Error($"出牌错误，玩家的牌不在手中...");
+                        return;
+                    }
+                    
+                    // 玩家出牌
+                    player.RemainCards = CardHelper.Remove(player.RemainCards, card);
+                    player.DisCards = CardHelper.Add(player.DisCards, card);
+                    player.DiscardCount += 1;
+                    self.DisCard = card;
+                    self.DisCardPlayer = player;
+                    self.PengPlayer = null;
+                    
+                    // 给出牌人广播
+                    MessageHelper.SendToClient(player, new G2C_DisCardPush(){info = ProtoHelper.RoomToProto(room, player, player)});
+                    
+                    self.CanHuIds.Clear();
+                    self.ClickHuIds.Clear();
+                    self.OperableList.Clear();
+                    self.CanPgIds.Clear();
+                    self.CleanUserAct();
+                    
+                    // 检测其它三家的动作
+                    int[] nextPos = room.GetSorcPos(player.Pos);
+                    foreach (int index in nextPos)
+                    {
+                        Player otherPlayer = self.Players[index];
+                        if (otherPlayer != null)
+                        {
+                            // 吃,碰,杠,胡,过
+                            int[] act = new int[5];
+                            List<Struct.Kezi> gangs = new List<Struct.Kezi>();
+                            List<Struct.Kezi> pengs = new List<Struct.Kezi>();
+                            List<Struct.Kezi> chis = new List<Struct.Kezi>();
+                            // todo 玩家听牌状态不允许有动作
+                            // 出牌是否杠
+                            gangs = HGHuangHuangHelper.IsDiscardGang(otherPlayer, card, player.Id);
+                            // 出牌是否碰
+                            pengs = HGHuangHuangHelper.IsDiscardPeng(otherPlayer, card, player.Id);
+                            // 出牌是否吃
+                            if (otherPlayer.Pos == nextPos[0])
+                            {
+                                chis = HGHuangHuangHelper.IsDiscardChi(otherPlayer, card, player.Id);
+                            }
+                            // 游戏中才会动作
+                            if (otherPlayer.State == 2)
+                            {
+                                bool hasAct = false;
+                                
+                                int[] tmpCards = new int[otherPlayer.RemainCards.Length];
+                                Array.Copy(otherPlayer.RemainCards, 0, tmpCards, 0, otherPlayer.RemainCards.Length);
+                                tmpCards = CardHelper.Add(tmpCards, card);
+                                // 校验胡牌
+                                Struct.HuRes huType = HGHuangHuangHelper.CheckHu(tmpCards);
+
+                                if (huType.Type != HGHuangHuangConst.HU_DEFAULT)
+                                {
+                                    hasAct = true;
+                                    act[3] = 1;
+                                    // 放入可胡玩家列表
+                                    if (!self.CanHuIds.Contains(otherPlayer))
+                                    {
+                                        self.CanHuIds.Add(otherPlayer);
+                                    }
+                                    // 加入可操作玩家list
+                                    if (!self.OperableList.Contains(otherPlayer))
+                                    {
+                                        self.OperableList.Add(otherPlayer);
+                                    }
+                                }
+                                // 是否杠
+                                if (gangs.Count > 0)
+                                {
+                                    hasAct = true;
+                                    act[2] = 1;
+                                }
+                                // 是否碰
+                                if (pengs.Count > 0)
+                                {
+                                    hasAct = true;
+                                    act[1] = 1;
+                                }
+                                // 是否吃
+                                if (chis.Count > 0)
+                                {
+                                    hasAct = true;
+                                    act[0] = 1;
+                                }
+                                // 是否过
+                                if (hasAct) {
+                                    act[4] = 1;
+                                }
+                                if (act[2] == 1 || act[1] == 1) {
+                                    // 加入可操作玩家list
+                                    if (!self.OperableList.Contains(otherPlayer)) {
+                                        self.OperableList.Add(otherPlayer);
+                                    }
+                                    // 加入可碰杠玩家集合
+                                    if (!self.CanPgIds.Contains(otherPlayer)) {
+                                        self.CanPgIds.Add(otherPlayer);
+                                    }
+                                }
+                                // 设置玩家动作
+                                otherPlayer.Act = act;
+                            }
+                            
+                            // 广播其它三家
+                            MessageHelper.SendToClient(otherPlayer, new G2C_DisCardPush(){info = ProtoHelper.RoomToProto(room, otherPlayer, player)});
+                        }
+                    }
+
+                    if (self.CanHuIds.Count <= 0)
+                    {
+                        self.GangPlayer = null;
+                    }
+                    // 判断是否下家摸牌, 指定下家摸牌
+                    if (self.OperableList.Count == 0)
+                    {
+                        Player nextPlayer = null;
+                        foreach (int index in nextPos)
+                        {
+                            Player tempPlayer = self.Players[index];
+                            if (tempPlayer is { State: 2 } && tempPlayer.Id != player.Id)
+                            {
+                                nextPlayer = tempPlayer;
+                                break;
+                            }
+                        }
+                        // 有三家认输,就会有null
+                        if (nextPlayer == null)
+                        {
+                            self.GameOver(room);
+                        }
+                        else
+                        {
+                            // 设置摸牌玩家
+                            self.DrawCardPlayer = nextPlayer;
+                            // 设置操作玩家
+                            self.CurrentPlayer = nextPlayer;
+                            // 摸牌
+                            self.Flag = false;
+                        }
+                    }
+                    else
+                    {
+                        if (self.CanHuIds.Count > 0)
+                        {
+                            self.CurrentPlayer = self.Players[self.CanHuIds.First().Pos];
+                        } else if (self.CanPgIds.Count > 0)
+                        {
+                            self.CurrentPlayer = self.Players[self.CanPgIds.First().Pos];
+                        }
+                        else
+                        {
+                            self.CurrentPlayer = self.Players[self.OperableList.First().Pos];
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 清空玩家可操作动作
+        /// </summary>
+        /// <param name="self"></param>
+        private static void CleanUserAct(this HGHuangHuangComponent self) {
+            foreach (Player player in self.Players)
+            {
+                if (player != null)
+                {
+                    player.Act = new int[5];
+                }
+            }
+        }
+        
         /// <summary>
         /// 结束
         /// </summary>

DotNet/Hotfix/Scenes/Game/Room/RoomSystem.cs

@@ -85,12 +85,13 @@ namespace ET.Server
                 return;
             }
 
-            // 初始化玩家
+            // 初始化玩家座位
             int index = 0;
             foreach (Player p in self.GetAllPlayers().Values.Where(p => p != null))
             {
+                p.Pos = index;
                 hgHuangHuangComponent.Players[index] = p;
-                index++;
+                index += 1;
             }
         }
         

DotNet/Model/Scenes/Game/Player/Player.cs

@@ -43,7 +43,7 @@ namespace ET.Server
         public bool IsAuto { get; set; }
         /** 玩家手牌 **/
         public int[] RemainCards { get; set; }
-        /** 玩家打出的牌 **/
+        /** 玩家出牌堆 **/
         public int[] DisCards { get; set; }
         /** 玩家吃碰杠集合 **/
         public List<Struct.Kezi> KeZi { get; set; }
@@ -53,5 +53,7 @@ namespace ET.Server
         public List<Struct.Kezi> ActInfo { get; set; }
         /** 胡牌堆 **/
         public List<int> HuCards { get; set; }
+        /** 玩家出牌次数 **/
+        public int DiscardCount { get; set; }
     }
 }

DotNet/Model/Scenes/Game/Room/HGHuangHuangComponent.cs

@@ -23,12 +23,20 @@ namespace ET.Server
         public Player CurrentPlayer { get; set; }
         /** 当前打出的牌 **/
         public int DisCard { get; set; }
-        /** 当前出牌玩家 **/
-        public Player DisCardPlayer { get; set; }
         /** 当前摸的牌 **/
         public int DrawCard { get; set; }
+        /** 当前出牌玩家 **/
+        public Player DisCardPlayer { get; set; }
         /** 当前摸牌玩家 **/
         public Player DrawCardPlayer { get; set; }
+        /** 抢杠的杠牌 **/
+        public int GangPai { get; set; }
+        /** 当前杠牌玩家 **/
+        public Player GangPlayer { get; set; }
+        /** 当前碰牌玩家 **/
+        public Player PengPlayer { get; set; }
+        /** 当前杠类型 **/
+        public int GangType { get; set; }
         /** 认输玩家集合 **/
         public List<long> AdmitDefeatList { get; set; }
         /** 可胡玩家集合 **/