【BUG】解决开局发牌报错

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

@@ -23,7 +23,7 @@ namespace ET.Server
                 self.Flag = false;
                 self.Time = 0;
                 self.State = 0;
-                self.Players = new Player[4];
+                self.Players = new Player[room.MaxNum];
                 self.CurrentRound = 0;
                 self.ZhuangPos = 0;
                 self.Rand = new[] { 0, 0 };
@@ -34,16 +34,7 @@ namespace ET.Server
                 self.ClickHuIds = new List<Player>();
                 self.CardList = new List<int>();
                 self.UpdateTime = 0;
-                // 初始化玩家
-                int index = 0;
-                foreach (Player player in room.GetAllPlayers().Values)
-                {
-                    if (player != null)
-                    {
-                        self.Players[index] = player;
-                        index++;
-                    }
-                }
+                
                 // 初始化牌库
                 for (int i = 0; i < 4; i++)
                 {
@@ -184,13 +175,8 @@ namespace ET.Server
         /// <param name="room"></param>
         private static void SendCard(this HGHuangHuangComponent self, Room room)
         {
-            foreach (Player player in room.GetAllPlayers().Values)
+            foreach (Player player in room.GetAllPlayers().Values.Where(player => player != null))
             {
-                if (player == null)
-                {
-                    continue;
-                }
-
                 for (int i = 0; i < 13; i++)
                 {
                     int card = self.CardList[0];
@@ -215,19 +201,14 @@ namespace ET.Server
             // 定庄
             self.ZhuangPos = (rand1 + rand2) % 4;
             // 设置当前操作玩家
-            self.CurrentPlayer = room.GetAllPlayers()[self.ZhuangPos];
+            self.CurrentPlayer = self.Players[self.ZhuangPos];
             // 设置当前摸牌玩家
-            self.DrawCardPlayer = room.GetAllPlayers()[self.ZhuangPos];
+            self.DrawCardPlayer = self.Players[self.ZhuangPos];
             // 发牌
             self.SendCard(room);
             // 广播
-            foreach (Player player in room.GetAllPlayers().Values)
+            foreach (Player player in room.GetAllPlayers().Values.Where(player => player != null))
             {
-                if (player == null)
-                {
-                    continue;
-                }
-
                 player.State = 2;
                     
                 MessageHelper.SendToClient(player, new G2C_StartPush(){info = ProtoHelper.RoomToProto(room, player, null)});
@@ -299,13 +280,8 @@ namespace ET.Server
                 drawCardPlayer.Act[4] = 0;
             }
             // 推送摸牌广播
-            foreach (Player player in room.GetAllPlayers().Values)
+            foreach (Player player in room.GetAllPlayers().Values.Where(player => player != null))
             {
-                if (player == null)
-                {
-                    continue;
-                }
-
                 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}");

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ET.Server
 {
@@ -65,7 +66,7 @@ namespace ET.Server
         /// </summary>
         /// <param name="self"></param>
         /// <returns></returns>
-        public static SortedList<long, Player> GetAllPlayers(this Room self)
+        public static Dictionary<long, Player> GetAllPlayers(this Room self)
         {
             return self.Players;
         }
@@ -78,6 +79,19 @@ namespace ET.Server
         public static void Add(this Room self, Player player)
         {
             self.Players.Add(player.Id, player);
+            HGHuangHuangComponent hgHuangHuangComponent = self.GetComponent<HGHuangHuangComponent>();
+            if (hgHuangHuangComponent == null)
+            {
+                return;
+            }
+
+            // 初始化玩家
+            int index = 0;
+            foreach (Player p in self.GetAllPlayers().Values.Where(p => p != null))
+            {
+                hgHuangHuangComponent.Players[index] = p;
+                index++;
+            }
         }
         
         /// <summary>

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

@@ -13,7 +13,7 @@ namespace ET.Server
         /** 房间最大人数 **/
         public int MaxNum { get; set; }
         /** 房间玩家集合 **/
-        public SortedList<long, Player> Players = new ();
+        public Dictionary<long, Player> Players = new ();
         /** 房间玩法类型 1:黄冈晃晃 **/
         public int Type { get; set; }
         /** 房主playerId **/