From 699bd1888a005d00efbe7641dde50b5d924e46f5 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Wed, 13 Dec 2023 22:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FunGame.Desktop/Controller/MainController.cs | 12 ++++++------
 FunGame.Desktop/UI/Main/Main.cs              |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/FunGame.Desktop/Controller/MainController.cs b/FunGame.Desktop/Controller/MainController.cs
index b329f27..c390dbe 100644
--- a/FunGame.Desktop/Controller/MainController.cs
+++ b/FunGame.Desktop/Controller/MainController.cs
@@ -97,11 +97,11 @@ namespace Milimoe.FunGame.Desktop.Controller
 
             try
             {
-                List<Room> list = new();
+                List<Room> list = [];
                 await UpdateRoomRequest.SendRequestAsync();
                 if (UpdateRoomRequest.Result == RequestResult.Success)
                 {
-                    list = UpdateRoomRequest.GetResult<List<Room>>("rooms") ?? new();
+                    list = UpdateRoomRequest.GetResult<List<Room>>("rooms") ?? [];
                     Main.UpdateUI(MainInvokeType.UpdateRoom, list);
                 }
                 else throw new CanNotIntoRoomException();
@@ -145,9 +145,9 @@ namespace Milimoe.FunGame.Desktop.Controller
                         Config.FunGame_isInRoom = true;
                         Main.GetMessage("[ " + Usercfg.LoginUser.Username + " ] 准备完毕。");
                     }
-                    List<User> ReadyPlayerList = SetReadyRequest.GetResult<List<User>>("ready") ?? new();
+                    List<User> ReadyPlayerList = SetReadyRequest.GetResult<List<User>>("ready") ?? [];
                     if (ReadyPlayerList.Count > 0) Main.GetMessage("已准备的玩家：" + string.Join(", ", ReadyPlayerList.Select(u => u.Username)));
-                    List<User> NotReadyPlayerList = SetReadyRequest.GetResult<List<User>>("notready") ?? new();
+                    List<User> NotReadyPlayerList = SetReadyRequest.GetResult<List<User>>("notready") ?? [];
                     if (NotReadyPlayerList.Count > 0) Main.GetMessage("仍未准备的玩家：" + string.Join(", ", NotReadyPlayerList.Select(u => u.Username)));
                 }
                 return result;
@@ -175,9 +175,9 @@ namespace Milimoe.FunGame.Desktop.Controller
                         Config.FunGame_isInRoom = false;
                         Main.GetMessage("[ " + Usercfg.LoginUser.Username + " ] 已取消准备。");
                     }
-                    List<User> ReadyPlayerList = CancelReadyRequest.GetResult<List<User>>("ready") ?? new();
+                    List<User> ReadyPlayerList = CancelReadyRequest.GetResult<List<User>>("ready") ?? [];
                     if (ReadyPlayerList.Count > 0) Main.GetMessage("已准备的玩家：" + string.Join(", ", ReadyPlayerList.Select(u => u.Username)));
-                    List<User> NotReadyPlayerList = CancelReadyRequest.GetResult<List<User>>("notready") ?? new();
+                    List<User> NotReadyPlayerList = CancelReadyRequest.GetResult<List<User>>("notready") ?? [];
                     if (NotReadyPlayerList.Count > 0) Main.GetMessage("仍未准备的玩家：" + string.Join(", ", NotReadyPlayerList.Select(u => u.Username)));
                 }
                 return result;
diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs
index c2eb77d..f7dc7e4 100644
--- a/FunGame.Desktop/UI/Main/Main.cs
+++ b/FunGame.Desktop/UI/Main/Main.cs
@@ -256,7 +256,7 @@ namespace Milimoe.FunGame.Desktop.UI
                                 if (r.RoomMaster != null)
                                 {
                                     string msg = $"房间 [ {r.Roomid} ] 的房主已变更为" + (r.RoomMaster.Username != Usercfg.LoginUserName ? $" [ {r.RoomMaster.Username} ]" : "您") + "。";
-                                    GetMessage(msg, TimeType.TimeOnly);
+                                    GetMessage(msg, TimeType.LongTimeOnly);
                                 }
                             }
                             break;
@@ -304,7 +304,7 @@ namespace Milimoe.FunGame.Desktop.UI
         /// </summary>
         /// <param name="msg"></param>
         /// <param name="timetype"></param>
-        public void GetMessage(string msg, TimeType timetype = TimeType.TimeOnly)
+        public void GetMessage(string msg, TimeType timetype = TimeType.LongTimeOnly)
         {
             void action()
             {
@@ -442,7 +442,7 @@ namespace Milimoe.FunGame.Desktop.UI
         /// <param name="msg"></param>
         private void WritelnSystemInfo(string msg)
         {
-            msg = DateTimeUtility.GetDateTimeToString(TimeType.TimeOnly) + " >> " + msg;
+            msg = DateTimeUtility.GetDateTimeToString(TimeType.LongTimeOnly) + " >> " + msg;
             WritelnGameInfo(msg);
         }