zzdxxz/Gen_Hack-and-Slash-Roguelite-zzdxxz
1
0
Fork 0
forked from Roguelite-Game-Developing-Team/Gen_Hack-and-Slash-Roguelite
Code Pull Requests Activity

(client) feat:UI更新 chore:LogUI性能更好，并且修复反复打开Log消失的bug，删除部分非预期的警告

Browse Source
This commit is contained in:
m0_75251201
2025-08-30 00:26:27 +08:00
parent 34abe845b1
commit 7252698764
58 changed files with 4849 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

223
Client/Assets/Scripts/Base/Clock.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using Utils;
using Utils; // 假设此命名空间包含MonoSingleton
namespace Base
{
@ -25,120 +25,239 @@ namespace Base
private bool _pause = false;
public bool Pause
{
get
{
return _pause;
}
get => _pause;
set
{
if (value)
if (value != _pause) // 逻辑修改说明：避免重复设置Time.timeScale
{
Time.timeScale = 0;
Time.timeScale = value ? 0 : 1;
_pause = value;
}
else
{
Time.timeScale = 1;
}
_pause = value;
}
}
public List<ITickPhysics> tickPhysics = new();
public List<ITick> ticks = new();
public List<ITickUI> tickUIs = new();
// 修改点 1.1：主列表用于迭代
private readonly List<ITick> _ticks = new();
private readonly List<ITickPhysics> _tickPhysics = new();
private readonly List<ITickUI> _tickUIs = new();
// 修改点 1.1：缓冲列表用于添加
private readonly HashSet<ITick> _ticksToAdd = new(); // 逻辑修改说明：使用HashSet避免重复添加，提高查找效率
private readonly HashSet<ITickPhysics> _tickPhysicsToAdd = new();
private readonly HashSet<ITickUI> _tickUIsToAdd = new();
// 修改点 1.1：缓冲列表用于移除
private readonly HashSet<ITick> _ticksToRemove = new(); // 逻辑修改说明：使用HashSet避免重复移除，提高查找效率
private readonly HashSet<ITickPhysics> _tickPhysicsToRemove = new();
private readonly HashSet<ITickUI> _tickUIsToRemove = new();
private void Update()
{
// 逻辑修改说明：UI部分的Tick不应受_pause影响
if (!_pause)
foreach (var tick in ticks)
{
// 逻辑修改说明：迭代时使用只读副本或确保不会被修改
// 这里是直接迭代_ticks，确保_ticks在Update生命周期内不会被Add/Remove直接修改
// 添加和移除操作通过缓冲区在LateUpdate处理
foreach (var tick in _ticks)
{
tick.Tick();
foreach (var uiTick in tickUIs) uiTick.TickUI();
//if (timer > 1)
//{
// timer -= 1;
// Debug.Log("滴答");
//}
//timer += Time.deltaTime;
}
}
// UI更新通常不受游戏暂停影响（例如菜单动画、UI计时器等），除非UI本身也需要暂停逻辑。
// 根据需求决定是否受_pause影响。此处假设UI不暂停。
foreach (var uiTick in _tickUIs)
{
uiTick.TickUI();
}
}
private void FixedUpdate()
{
if (!_pause)
foreach (var physicsTick in tickPhysics)
{
foreach (var physicsTick in _tickPhysics)
{
physicsTick.TickPhysics();
}
}
}
// 修改点 1.4：在LateUpdate应用缓冲区的更改
private void LateUpdate()
{
ApplyBufferedChanges();
}
// 修改点 3.1：OnDestroy保持不变，确保事件移除
private void OnDestroy()
{
// 移除事件监听
SceneManager.sceneLoaded -= OnSceneLoaded;
}
protected override void OnStart()
// 修改点 3.1：OnStart保持不变，负责事件注册和初始化
protected override void OnStart() // MonoSingleton的Awake后调用
{
// 注册场景加载事件
SceneManager.sceneLoaded += OnSceneLoaded;
// 初始化时调用一次
Init();
// 逻辑修改说明：Initial清理所有列表，而不是填充
Init();
}
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
// 场景加载完成后调用 Init 方法
Init();
}
/// <summary>
/// 初始化方法
/// 初始化/重置方法。清空所有注册列表和缓冲列表。
/// </summary>
// 修改点 2.1：Init() 方法不再负责FindObjectsByType
public void Init()
{
ticks.Clear();
tickPhysics.Clear();
tickUIs.Clear();
_ticks.Clear();
_tickPhysics.Clear();
_tickUIs.Clear();
_ticksToAdd.Clear();
_tickPhysicsToAdd.Clear();
_tickUIsToAdd.Clear();
_ticksToRemove.Clear();
_tickPhysicsToRemove.Clear();
_tickUIsToRemove.Clear();
// 逻辑修改说明：移除 FindObjectsByType 逻辑
// 对象应通过其各自的 OnEnable/OnDisable 生命周期来注册/反注册
foreach (var obj in FindObjectsByType<MonoBehaviour>(FindObjectsSortMode.None))
{
if (obj is ITick tickObj) ticks.Add(tickObj);
if (obj is ITickPhysics physicsObj) tickPhysics.Add(physicsObj);
if (obj is ITickUI uiObj) tickUIs.Add(uiObj);
if (obj is ITick tickObj) _ticks.Add(tickObj);
if (obj is ITickPhysics physicsObj) _tickPhysics.Add(physicsObj);
if (obj is ITickUI uiObj) _tickUIs.Add(uiObj);
}
}
// 修改点 1.2 & 1.3：将更改放入缓冲，并在LateUpdate统一处理
public static void AddTick(ITick tick)
{
if (Instance != null && !Instance.ticks.Contains(tick))
Instance.ticks.Add(tick);
if (Instance != null && tick != null) // 逻辑修改说明：添加null检查
{
Instance._ticksToAdd.Add(tick);
Instance._ticksToRemove.Remove(tick); // 逻辑修改说明：如果在待移除列表，则先移除
}
}
public static void RemoveTick(ITick tick)
{
if (Instance != null)
Instance.ticks.Remove(tick);
if (Instance != null && tick != null) // 逻辑修改说明：添加null检查
{
Instance._ticksToRemove.Add(tick);
Instance._ticksToAdd.Remove(tick); // 逻辑修改说明：如果在待添加列表，则先移除
}
}
public static void AddTickPhysics(ITickPhysics physics)
{
if (Instance != null && !Instance.tickPhysics.Contains(physics))
Instance.tickPhysics.Add(physics);
if (Instance != null && physics != null)
{
Instance._tickPhysicsToAdd.Add(physics);
Instance._tickPhysicsToRemove.Remove(physics);
}
}
public static void RemoveTickPhysics(ITickPhysics physics)
{
if (Instance != null)
Instance.tickPhysics.Remove(physics);
if (Instance != null && physics != null)
{
Instance._tickPhysicsToRemove.Add(physics);
Instance._tickPhysicsToAdd.Remove(physics);
}
}
public static void AddTickUI(ITickUI ui)
{
if (Instance != null && !Instance.tickUIs.Contains(ui))
Instance.tickUIs.Add(ui);
if (Instance != null && ui != null)
{
Instance._tickUIsToAdd.Add(ui);
Instance._tickUIsToRemove.Remove(ui);
}
}
public static void RemoveTickUI(ITickUI ui)
{
if (Instance != null)
Instance.tickUIs.Remove(ui);
if (Instance != null && ui != null)
{
Instance._tickUIsToRemove.Add(ui);
Instance._tickUIsToAdd.Remove(ui);
}
}
// 修改点 1.3：应用缓冲区的更改
private void ApplyBufferedChanges()
{
// 先处理移除
if (_ticksToRemove.Count > 0)
{
foreach (var tick in _ticksToRemove)
{
_ticks.Remove(tick);
}
_ticksToRemove.Clear();
}
if (_tickPhysicsToRemove.Count > 0)
{
foreach (var physicsTick in _tickPhysicsToRemove)
{
_tickPhysics.Remove(physicsTick);
}
_tickPhysicsToRemove.Clear();
}
if (_tickUIsToRemove.Count > 0)
{
foreach (var uiTick in _tickUIsToRemove)
{
_tickUIs.Remove(uiTick);
}
_tickUIsToRemove.Clear();
}
// 后处理添加
if (_ticksToAdd.Count > 0)
{
foreach (var tick in _ticksToAdd)
{
if (!_ticks.Contains(tick)) // 逻辑修改说明：避免重复添加到主列表
{
_ticks.Add(tick);
}
}
_ticksToAdd.Clear();
}
if (_tickPhysicsToAdd.Count > 0)
{
foreach (var physicsTick in _tickPhysicsToAdd)
{
if (!_tickPhysics.Contains(physicsTick))
{
_tickPhysics.Add(physicsTick);
}
}
_tickPhysicsToAdd.Clear();
}
if (_tickUIsToAdd.Count > 0)
{
foreach (var uiTick in _tickUIsToAdd)
{
if (!_tickUIs.Contains(uiTick))
{
_tickUIs.Add(uiTick);
}
}
_tickUIsToAdd.Clear();
}
}
}
}
}

2
Client/Assets/Scripts/Base/UIInputControl.cs
View File

@ -202,8 +202,6 @@ namespace Base
protected override void OnStart()
{
SceneManager.sceneLoaded += OnSceneLoaded;
RegisterAllWindows();
}
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)