Skip to content

[GFX-722] 修复加载失败场景仍被标记已加载的字典缺陷 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlianBlank merged 1 commit into from
Aug 28, 2026
Merged

[GFX-722] 修复加载失败场景仍被标记已加载的字典缺陷 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Runtime/Scene/Scene/GameSceneManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,11 @@ private void OnLoadSceneUpdate(YooAsset.SceneHandle sceneHandle)
private void OnLoadSceneCompleted(YooAsset.SceneHandle sceneOperationHandle)
{
string assetPath = sceneOperationHandle.GetAssetInfo().AssetPath;
bool loadSucceed = sceneOperationHandle.IsDone && sceneOperationHandle.Status == YooAsset.EOperationStatus.Succeed;

if (!m_LoadedSceneAssetNames.ContainsKey(assetPath))
// 状态判定前置：加载失败的场景不写入已加载字典，避免幽灵记录导致
// UnloadScene 异常分支、同名场景重试被 "already loaded" 拦截及句柄泄漏。
if (loadSucceed && !m_LoadedSceneAssetNames.ContainsKey(assetPath))
{
m_LoadedSceneAssetNames.Add(assetPath, sceneOperationHandle);
}
Expand All @@ -492,7 +495,7 @@ private void OnLoadSceneCompleted(YooAsset.SceneHandle sceneOperationHandle)

if (value != null)
{
if (sceneOperationHandle.IsDone && sceneOperationHandle.Status == YooAsset.EOperationStatus.Succeed)
if (loadSucceed)
{
LoadSceneSuccessCallback(assetPath, sceneOperationHandle.Duration, value.UserData);
}
Expand Down