From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Message/MessageWin.cs | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/Main/System/Message/MessageWin.cs b/Main/System/Message/MessageWin.cs
index 7f6bb80..5a8224f 100644
--- a/Main/System/Message/MessageWin.cs
+++ b/Main/System/Message/MessageWin.cs
@@ -1,14 +1,9 @@
using UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
using UnityEngine.UI;
using DG.Tweening;
using Cysharp.Threading.Tasks;
-using System;
-
using System.Text.RegularExpressions;
-using DG.Tweening;
public class MessageWin : UIBase
{
@@ -50,8 +45,7 @@
// 鍒濆鍖栫粍浠�
m_ContainerNormalHint.OnWaitCompelete(OnHintDisplayComplete);
m_ContainerChatHint.OnWaitCompelete(OnHintDisplayComplete);
- m_ScrollControl.OnRefreshCell += OnRefreshGmCell;
- m_ScrollControl.OnGetDynamicSize += OnGetDynamicSize;
+
m_ScrollControl.lockType = EnhanceLockType.LockVerticalBottom;
m_GMClose.onClick.AddListener(OnGMClose);
}
@@ -63,7 +57,7 @@
m_ServerTipPrepared = true;
#if UNITY_EDITOR
- m_ContainerGM.SetActive(VersionConfig.Get().debugVersion);
+ m_ContainerGM.SetActive(VersionConfig.config.debugVersion);
#else
m_ContainerGM.SetActive(false);
#endif
@@ -72,6 +66,8 @@
ServerTipDetails.gmMessageRefresh += DisplayGM;
ServerTipDetails.gmOpenEvent += GmOpenEvent;
ServerTipDetails.chatHintRefresh += CheckChatHint;
+ m_ScrollControl.OnRefreshCell += OnRefreshGmCell;
+ m_ScrollControl.OnGetDynamicSize += OnGetDynamicSize;
CheckNormalHint();
CheckChatHint();
CheckServerHint();
@@ -102,7 +98,8 @@
ServerTipDetails.gmMessageRefresh -= DisplayGM;
ServerTipDetails.gmOpenEvent -= GmOpenEvent;
ServerTipDetails.chatHintRefresh -= CheckChatHint;
- // 绐楀彛鍏抽棴鏃剁殑閫昏緫
+ m_ScrollControl.OnRefreshCell -= OnRefreshGmCell;
+ m_ScrollControl.OnGetDynamicSize -= OnGetDynamicSize;
}
@@ -113,14 +110,6 @@
OnGMOpen();
ServerTipDetails.requireOpenGM = false;
}
- }
-
- private void OnDisable()
- {
- m_ContainerNormalHint.SetActive(false);
- m_ContainerChatHint.SetActive(false);
- DisableServerTip();
- StopAllCoroutines();
}
void CheckNormalHint()
@@ -297,11 +286,10 @@
void DisplayChatHint(SystemHintData hint)
{
- // TODO YYL
- // if (!UIManager.Instance.IsOpened<ChatWin>())
- // {
- // return;
- // }
+ if (!UIManager.Instance.IsOpened<ChatWin>())
+ {
+ return;
+ }
if (!m_ContainerChatHint.gameObject.activeInHierarchy)
{
m_ContainerChatHint.gameObject.SetActive(true);
--
Gitblit v1.8.0