From cee20486508d18e24963efbdf89f255f0282fc70 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Thu, 23 Jan 2025 01:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E7=B1=BB?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=20ToString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Character/Character.cs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Entity/Character/Character.cs b/Entity/Character/Character.cs
index f8eb1ff..b61706b 100644
--- a/Entity/Character/Character.cs
+++ b/Entity/Character/Character.cs
@@ -1196,17 +1196,12 @@ namespace Milimoe.FunGame.Core.Entity
         }
 
         /// <summary>
-        /// 获取角色实例的名字、昵称以及所属玩家
+        /// 获取角色实例的昵称以及所属玩家，如果没有昵称，则用名字代替
         /// </summary>
         /// <returns></returns>
         public override string ToString()
         {
-            string str = GetName();
-            if (NickName != "")
-            {
-                if (str != "") str += ", ";
-                str += NickName;
-            }
+            string str = NickName != "" ? NickName : GetName();
             if (User != null && User.Username != "")
             {
                 str += "(" + User.Username + ")";
@@ -1229,6 +1224,25 @@ namespace Milimoe.FunGame.Core.Entity
             return str;
         }
 
+        /// <summary>
+        /// 获取角色实例的名字、昵称以及所属玩家
+        /// </summary>
+        /// <returns></returns>
+        public string ToStringWithUser()
+        {
+            string str = GetName();
+            if (NickName != "")
+            {
+                if (str != "") str += ", ";
+                str += NickName;
+            }
+            if (User != null && User.Username != "")
+            {
+                str += "（" + User.Username + "）";
+            }
+            return str;
+        }
+
         /// <summary>
         /// 获取角色实例的名字、昵称以及所属玩家，包含等级
         /// </summary>