修复 重新学习 不能进行下一步得bug

Assets/ArtRes/Models/man@拿着木板和纸讨论.fbx.meta

@@ -86,7 +86,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0

Assets/Scenes/01_InitScene.unity

@@ -98,7 +98,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 464ccf2deb006e540bd7417308d4687b, type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2

Assets/Scenes/03_OfficeScene.unity

@@ -537,7 +537,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1751720605
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -839,7 +839,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &2077900028
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/04_ToolMaterialScene.unity

@@ -1196,7 +1196,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &983777793
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/Project/Manager/GameManager.cs

@@ -102,7 +102,7 @@ public class GameManager : SingletonAutoMono<GameManager>
     /// 数据重连管理类
     /// </summary>
     public static ReconnectMgr ReconnectMgr { get; private set; }
-    
+
     /// <summary>
     /// 工单管理类
     /// </summary>
@@ -215,12 +215,11 @@ public class GameManager : SingletonAutoMono<GameManager>
             EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
             ScenesMgr.LoadSceneAsyn("03_OfficeScene", () =>
              {
-                 UIMgr.HidePanel<UI_SelectDevicePanel>();
-                 UIMgr.HidePanel<UI_BGPanel>();
+                 if (UIMgr.GetPanel<UI_SelectDevicePanel>())
+                     UIMgr.HidePanel<UI_SelectDevicePanel>();
+                 if (UIMgr.GetPanel<UI_BGPanel>())
+                     UIMgr.HidePanel<UI_BGPanel>();
                  EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
-                 Debug.Log("重置开始时间");
-                 GameManager.RunModelMgr.startTime = DateTime.Now;
-                 ScoreManager.instance.ReInit();
              });
         });
     }
@@ -229,11 +228,18 @@ public class GameManager : SingletonAutoMono<GameManager>
     /// </summary>
     private void ResetStateAndEvent()
     {
-        UIMgr.HidePanel<UI_TopTipPanel>();
-        UIMgr.HidePanel<UI_TaskListPanel>();
-        UIMgr.HidePanel<UI_MenuBar>();
+        UIMgr.imageTips.HideTips();
+        if (UIMgr.GetPanel<UI_TopTipPanel>())
+            UIMgr.HidePanel<UI_TopTipPanel>();
+        if (UIMgr.GetPanel<UI_TaskListPanel>())
+            UIMgr.HidePanel<UI_TaskListPanel>();
+        if (UIMgr.GetPanel<UI_MenuBar>())
+            UIMgr.HidePanel<UI_MenuBar>();
         PacksackBagMgr.ClearAllData();
         EventMgr.Clear();
+        ScoreManager.instance.ReInit();
+        RunModelMgr.startTime = DateTime.Now;
+        Debug.Log("重置开始时间");
         RunModelMgr.isOnceOfficeAni = false;
     }
 

Assets/Scripts/Project/Objects/Other/NPCController.cs

@@ -35,6 +35,7 @@ public class NPCController : PermanentTriggerBase
     protected override void OnMEnter()
     {
         base.OnMEnter();
+        if (!isClose) return;
         if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
         {
             _highlight.SetHighlighted(true);
@@ -49,7 +50,14 @@ public class NPCController : PermanentTriggerBase
     protected override void OnMDown()
     {
         base.OnMDown();
-        if (!isClose) return;
+        if (!isClose)
+        {
+            GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
+            {
+                p.Init($"提示:请靠近交互对象");
+            });
+            return;
+        }
         if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0)
         {
             GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>

Assets/Scripts/ProjectBase/UIManager/UIManager.cs

@@ -55,12 +55,12 @@ public class UIManager : BaseManager<UIManager>
     /// <summary>
     /// 提示ui预制体和实列化
     /// </summary>
-    public ImageTips imageTipsPrefab;
+    private ImageTips imageTipsPrefab;
     public ImageTips imageTips;
     /// <summary>
     /// 工具提示预制体和实列化
     /// </summary>
-    public ToolInfoTips toolTipsPrefab;
+    private ToolInfoTips toolTipsPrefab;
     public ToolInfoTips toolTips;
 
     /// <summary>