From 9d33d28b51ed57887ef39b8e2b65f84b3ded8b1b Mon Sep 17 00:00:00 2001
From: Mili <mili@mili.cyou>
Date: Wed, 22 Mar 2023 22:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E5=BE=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FunGame.Core/Api/Factory/RoomFactory.cs | 2 +-
 FunGame.Core/Api/Utility/Factory.cs     | 7 +++++--
 FunGame.Core/Entity/System/Room.cs      | 2 +-
 FunGame.Desktop/UI/Main/Main.cs         | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/FunGame.Core/Api/Factory/RoomFactory.cs b/FunGame.Core/Api/Factory/RoomFactory.cs
index 4ab36a1..f82f35f 100644
--- a/FunGame.Core/Api/Factory/RoomFactory.cs
+++ b/FunGame.Core/Api/Factory/RoomFactory.cs
@@ -5,7 +5,7 @@ namespace Milimoe.FunGame.Core.Api.Factory
 {
     internal class RoomFactory
     {
-        internal static Room GetInstance(DataSet? DsRoom, DataSet? DsUser, int Index)
+        internal static Room GetInstance(DataSet? DsRoom, DataSet? DsUser, int Index = 0)
         {
             return new Room(DsRoom, DsUser, Index);
         }
diff --git a/FunGame.Core/Api/Utility/Factory.cs b/FunGame.Core/Api/Utility/Factory.cs
index 2341c31..e80fca6 100644
--- a/FunGame.Core/Api/Utility/Factory.cs
+++ b/FunGame.Core/Api/Utility/Factory.cs
@@ -10,8 +10,9 @@ namespace Milimoe.FunGame.Core.Api.Utility
         /// <summary>
         /// 获取Room实例
         /// </summary>
-        /// <param name="DrRoom">RoomRow</param>
-        /// <param name="DrUser">UserRow(RoomMaster)</param>
+        /// <param name="DsRoom">Room</param>
+        /// <param name="DsUser">User(RoomMaster)</param>
+        /// <param name="Index">取指定行</param>
         /// <returns></returns>
         public static Room GetRoom(DataSet? DsRoom, DataSet? DsUser, int Index = 0)
         {
@@ -23,6 +24,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         /// </summary>
         /// <param name="DataSet">SkillRow</param>
         /// <param name="SkillType">Skill类型</param>
+        /// <param name="Index">取指定行</param>
         /// <returns></returns>
         public static Skill GetSkill(DataSet? DataSet, SkillType SkillType = SkillType.Passive, int Index = 0)
         {
@@ -33,6 +35,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         /// 获取User实例
         /// </summary>awaa
         /// <param name="DataSet">UserRow</param>
+        /// <param name="Index">取指定行</param>
         /// <returns></returns>
         public static User GetUser(DataSet? DataSet, int Index = 0)
         {
diff --git a/FunGame.Core/Entity/System/Room.cs b/FunGame.Core/Entity/System/Room.cs
index 98b8573..b65bbb6 100644
--- a/FunGame.Core/Entity/System/Room.cs
+++ b/FunGame.Core/Entity/System/Room.cs
@@ -28,7 +28,7 @@ namespace Milimoe.FunGame.Core.Entity
         public string Password { get; set; } = "";
         public GameStatistics? Statistics { get; set; } = null;
 
-        internal Room(DataSet? DsRoom, DataSet? DsUser, int Index)
+        internal Room(DataSet? DsRoom, DataSet? DsUser, int Index = 0)
         {
             if (DsRoom != null && DsRoom.Tables[0].Rows.Count > 0)
             {
diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs
index 9ad5f8e..b14c5bf 100644
--- a/FunGame.Desktop/UI/Main/Main.cs
+++ b/FunGame.Desktop/UI/Main/Main.cs
@@ -149,6 +149,7 @@ namespace Milimoe.FunGame.Desktop.UI
                             break;
 
                         case MainInvokeType.Disconnected:
+                            RoomList.Items.Clear();
                             Config.FunGame_isRetrying = false;
                             Config.FunGame_isConnected = false;
                             SetServerStatusLight((int)LightType.Red);
@@ -159,6 +160,7 @@ namespace Milimoe.FunGame.Desktop.UI
                             break;
 
                         case MainInvokeType.Disconnect:
+                            RoomList.Items.Clear();
                             Config.FunGame_isAutoRetry = false;
                             Config.FunGame_isRetrying = false;
                             Config.FunGame_isAutoConnect = false;