From 89343a7a0909e5244a3b69c4db1294de4536243b Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 15 十二月 2025 18:15:22 +0800
Subject: [PATCH] 262 幻境阁系统-客户端 新增仅适用武将解锁的头像和形象的红点移除规则

---
 Main/System/Guild/GuildBaseWin.cs |   92 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index 8584a57..d45e089 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -1,7 +1,9 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Cysharp.Threading.Tasks;
 using DG.Tweening;
+using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -19,8 +21,9 @@
     [SerializeField] Text guildMemberCountText;
     [SerializeField] Button rankBtn;
     [SerializeField] Button storeBtn;
-
-
+    [SerializeField] RichText talkInfoText;
+    [SerializeField] Button talkBtn;
+    [SerializeField] Button talkBtn1;
     [SerializeField] Button requestBtn;
 
 
@@ -55,6 +58,8 @@
             UIManager.Instance.OpenWindow<StoreBaseWin>();
         });
         InitHawker();
+        talkBtn.AddListener(OnClickTalkButton);
+        talkBtn1.AddListener(OnClickTalkButton);
     }
 
 
@@ -64,7 +69,8 @@
             return;
         GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
         GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
-
+        ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
         Display();
     }
 
@@ -72,13 +78,27 @@
     {
         GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
         GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
+        ChatManager.Instance.OnUpdateTalkEvent -= OnUpdateTalkEvent;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
     }
 
+    void OnRefreshFairyInfo()
+    {
+        ShowGuildInfo();
+    }
+
+    private void OnUpdateTalkEvent(ChatChannel channel, TalkData data)
+    {
+        if (channel != ChatChannel.Guild)
+            return;
+        ShowTalkInfo();
+    }
 
     void Display()
     {
         ShowGuildInfo();
         ShowHawkerTime();
+        ShowTalkInfo();
     }
 
     void OnSecondEvent()
@@ -123,7 +143,7 @@
             if (modelPlay)
                 HawkerMove(true);
         }
-        
+
 
     }
 
@@ -137,7 +157,7 @@
         {
             hawkerRect.localPosition = pos2.localPosition;
         }
-        hawkerModel.PlayAnimation("idle", true);
+        // hawkerModel.PlayAnimation("zoulu", true);
     }
 
     //isShow true璧板嚭鏉�,false璧板嚭鍘�
@@ -150,7 +170,7 @@
         FuncNPCManager.Instance.isHawkerShowNow = isShow;
         hawkerModel.PlayAnimation("zoulu", true);
         FuncNPCManager.Instance.isHawkerStandBy = false;
-        hawkerModel.transform.localScale = new Vector3(isShow ? hawkerModel.transform.localScale.x : -hawkerModel.transform.localScale.x, hawkerModel.transform.localScale.y, hawkerModel.transform.localScale.z);
+        hawkerModel.transform.localScale = new Vector3(isShow ? Math.Abs(hawkerModel.transform.localScale.x) : -Math.Abs(hawkerModel.transform.localScale.x), hawkerModel.transform.localScale.y, hawkerModel.transform.localScale.z);
         hawkerRect.DOLocalMove(isShow ? pos1.localPosition : pos2.localPosition, 1f).onComplete = () =>
         {
             hawkerModel.PlayAnimation("idle", true);
@@ -158,8 +178,8 @@
             FuncNPCManager.Instance.isHawkerStandBy = isShow;
         };
     }
-    
-    
+
+
 
 
     //NPC瀵硅瘽鐩稿叧
@@ -189,4 +209,60 @@
         var npc = funcNPCs[index].GetModel();
         npc.PlayAnimation("idle", true);
     }
+
+    public void OnClickTalkButton()
+    {
+        ChatManager.Instance.nowChatTab = ChatTab.Guild;
+        ChatManager.Instance.nowChatChannel = ChatChannel.Guild;
+        UIManager.Instance.OpenWindow<ChatWin>();
+    }
+
+    public string GetGuildChatAreaContent(TalkData talkData)
+    {
+        int type = ChatManager.Instance.GetTalkDataType(talkData);
+        if (type == 0)
+        {
+            return Language.Get("L1100", Language.Get("Chat13"), talkData.Content);
+        }
+        else if (type == 1)
+        {
+            return Language.Get("L1100", Language.Get("Chat13"), talkData.Content);
+        }
+        else
+        {
+            return Language.Get("L1100", talkData.Name, talkData.Content);
+        }
+    }
+
+    public Color32 GetGuildChatAreaColor(TalkData talkData)
+    {
+        int type = ChatManager.Instance.GetTalkDataType(talkData);
+        if (type == 2)
+        {
+            return ChatManager.Instance.areaMyColor;
+        }
+        else
+        {
+            return ChatManager.Instance.areaOtherColor;
+        }
+    }
+
+    void ShowTalkInfo()
+    {
+        if (!ChatManager.Instance.TryGetTalkData(ChatChannel.Guild, out List<TalkData> datas) || datas.IsNullOrEmpty())
+        {
+            talkInfoText.text = string.Empty;
+            return;
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        int startIndex = Mathf.Max(datas.Count - 2, 0);
+        for (int i = startIndex; i < datas.Count; i++)
+        {
+            TalkData data = datas[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