From a08c5bf246caa43a12025f619ba491c4194ef2fa Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 14 十二月 2025 02:00:38 +0800
Subject: [PATCH] 0312 区分战斗频繁消息提示; 修复盛典任务红点
---
Main/System/Battle/BattleManager.cs | 3 +--
Main/System/OSActivity/OSGalaMissionWin.cs | 8 ++++----
Main/System/Achievement/AchievementManager.cs | 9 +++++++++
Main/System/Message/SysNotifyMgr.cs | 4 ++++
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Main/System/Achievement/AchievementManager.cs b/Main/System/Achievement/AchievementManager.cs
index dd399e9..655bbc5 100644
--- a/Main/System/Achievement/AchievementManager.cs
+++ b/Main/System/Achievement/AchievementManager.cs
@@ -163,6 +163,8 @@
};
+ public static int[] galaTypes = new int[] { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
+
void UpdateRedpoint(List<int> _types)
{
if (_types.IsNullOrEmpty())
@@ -171,6 +173,13 @@
}
bool isGalaRed = false;
+ if (_types.Count == 1)
+ {
+ if (galaTypes.Contains(_types[0]))
+ {
+ _types = galaTypes.ToList();
+ }
+ }
foreach (var type in _types)
{
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index 0ca113b..2bc46a9 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -632,8 +632,7 @@
float currentTime = Time.time;
if (currentTime - lastTime < turnCoolDown)
{
- SysNotifyMgr.Instance.ShowTip("BattleCoolDown");
- Debug.Log("BattleCoolDown tip");
+ SysNotifyMgr.Instance.ShowTip("BattleCoolDownClient");
return;
}
lastTime = currentTime;
diff --git a/Main/System/Message/SysNotifyMgr.cs b/Main/System/Message/SysNotifyMgr.cs
index 9da1a2f..60ff176 100644
--- a/Main/System/Message/SysNotifyMgr.cs
+++ b/Main/System/Message/SysNotifyMgr.cs
@@ -154,6 +154,10 @@
SysInfoConfig cfg = SysInfoConfig.Get(key);
if (cfg != null)
{
+ if (string.IsNullOrEmpty(cfg.richText))
+ {
+ return;
+ }
tipInfoList.Clear();
tipInfoList.AddRange(msg);
AnalysisSysmsg(cfg);
diff --git a/Main/System/OSActivity/OSGalaMissionWin.cs b/Main/System/OSActivity/OSGalaMissionWin.cs
index 39d15df..d477633 100644
--- a/Main/System/OSActivity/OSGalaMissionWin.cs
+++ b/Main/System/OSActivity/OSGalaMissionWin.cs
@@ -9,12 +9,12 @@
using UnityEngine.UI;
-////寮�鏈嶆椿鍔�-涓荤嚎鍏冲崱娲诲姩
+////寮�鏈嶆椿鍔�-搴嗗吀
public class OSGalaMissionWin : UIBase
{
[SerializeField] ScrollerController scroller;
- int[] types = new int[] { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
+
List<int> ids = new List<int>();
protected override void OnPreOpen()
@@ -38,14 +38,14 @@
// -1 涓烘墍鏈夌被鍨�
if (type >= 2 && type <= 19 || type == -1)
{
- ids = AchievementManager.Instance.GetAchievementIDsByTypes(types);
+ ids = AchievementManager.Instance.GetAchievementIDsByTypes(AchievementManager.galaTypes);
scroller.m_Scorller.RefreshActiveCellViews();
}
}
void CreateScroller()
{
- ids = AchievementManager.Instance.GetAchievementIDsByTypes(types);
+ ids = AchievementManager.Instance.GetAchievementIDsByTypes(AchievementManager.galaTypes);
var count = ids.Count;
scroller.Refresh();
for (int i = 0; i < count; i++)
--
Gitblit v1.8.0