From 5fce0a34558e8bc360de457c4ebbf133d3820ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=87=AF=E9=B9=8F?= <609075410@qq.com>
Date: Fri, 25 Mar 2022 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?[Bug]=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=88=B0prefab=E6=A8=A1=E5=BC=8F=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E5=AF=BC=E8=87=B4=E7=9A=84=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#11679
---
 .../3d/facade/scene-facade-state-transition.ts    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/builtin/scene/source/script/3d/facade/scene-facade-state-transition.ts b/app/builtin/scene/source/script/3d/facade/scene-facade-state-transition.ts
index a9eb6b9e559..eda240453a9 100644
--- a/app/builtin/scene/source/script/3d/facade/scene-facade-state-transition.ts
+++ b/app/builtin/scene/source/script/3d/facade/scene-facade-state-transition.ts
@@ -52,13 +52,14 @@ class ToPrefabTransition<TState extends ISceneFacadeState> extends Transition<TS
     public async Complete() {
         super.Complete();
 
-        if (this.fromState.modeName === SceneModeType.General) {
-            // 将普通模式暂时挂起
-            this.fromState.isHold = true;
-            await this.fromState.stagingSceneState();
-            // TODO: 为了清空各个管理器的数据，发一条场景关闭消息，后面可能有更好的方式
-            this.fromState.fireCloseEvent();
-        }
+        // 从动画模式直接跳转到prefab模式的时候也需要处理一下 否则node._prefab.asset数据会丢失 #11679
+        // if (this.fromState.modeName === SceneModeType.General) {
+        // 将普通模式暂时挂起
+        this.fromState.isHold = true;
+        await this.fromState.stagingSceneState();
+        // TODO: 为了清空各个管理器的数据，发一条场景关闭消息，后面可能有更好的方式
+        this.fromState.fireCloseEvent();
+        // }
     }
 }