From 2a845f0babe52ac324b3cbe294db7dcec9346042 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 22 十二月 2025 19:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildBaseWin.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index d45e089..da9c7ed 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -87,7 +87,7 @@
ShowGuildInfo();
}
- private void OnUpdateTalkEvent(ChatChannel channel, TalkData data)
+ private void OnUpdateTalkEvent(ChatChannel channel, TalkData data, bool isSendBullet)
{
if (channel != ChatChannel.Guild)
return;
@@ -247,6 +247,7 @@
}
}
+ List<TalkData> showTalkDatas = new List<TalkData>();
void ShowTalkInfo()
{
if (!ChatManager.Instance.TryGetTalkData(ChatChannel.Guild, out List<TalkData> datas) || datas.IsNullOrEmpty())
@@ -254,15 +255,30 @@
talkInfoText.text = string.Empty;
return;
}
+ showTalkDatas.Clear();
- StringBuilder stringBuilder = new StringBuilder();
- int startIndex = Mathf.Max(datas.Count - 2, 0);
- for (int i = startIndex; i < datas.Count; i++)
+ // 浠庡悗鍚戝墠閬嶅巻锛屾壘鍒版渶鍚庝袱鏉＄帺瀹舵秷鎭紙杩囨护鎺夌郴缁熸秷鎭拰鏃ユ湡娑堟伅锛�
+ int count = 0;
+ for (int i = datas.Count - 1; i >= 0 && count < 2; i--)
{
TalkData data = datas[i];
+ // 鍙繚鐣欑帺瀹舵秷鎭細闈炵郴缁熸秷鎭笖闈炴棩鏈熸秷鎭�
+ if (!data.isSystem && !data.isDate)
+ {
+ showTalkDatas.Insert(0, data); // 鎻掑叆鍒板垪琛ㄥ紑澶翠互淇濇寔鏃堕棿椤哄簭
+ count++;
+ }
+ }
+
+ StringBuilder stringBuilder = new StringBuilder();
+ for (int i = 0; i < showTalkDatas.Count; i++)
+ {
+ TalkData data = showTalkDatas[i];
stringBuilder.Append(UIHelper.AppendColor(GetGuildChatAreaColor(data), GetGuildChatAreaContent(data)));
stringBuilder.AppendLine();
}
+
talkInfoText.text = stringBuilder.ToString();
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0