WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
YangHua 2024-09-06 19:08:00 +08:00
parent 9ed10b2a47
commit b92213307b
4 changed files with 247 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset
View File

File diff suppressed because one or more lines are too long

2
Assets/Scenes/04_ToolMaterialScene.unity
View File

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

24
Assets/Scripts/Project/Manager/GameManager.cs
View File

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

4
Assets/Scripts/ProjectBase/UIManager/UIManager.cs
View File

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