taosuqi
/
CultivationOfBrewing-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

演示调整

This commit is contained in:
huqibin 2025-05-30 14:01:31 +08:00
parent 56ad565813
commit 851afc8ce5
3 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/Common/01_InitScene.unity
View File

@ -277,7 +277,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
systemId: 10002 systemId: 10002
startSceneName: 03_OfficeScene startSceneName: 04_ToolMaterialScene
--- !u!114 &1686064644 --- !u!114 &1686064644
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

68
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -24,7 +24,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
//firstPersonController.gameObject.SetActive(false); //firstPersonController.gameObject.SetActive(false);
//GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); //GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
//GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); //GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI); //GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
GameManager.RunModelMgr.SceneType = E_SceneType.Site; GameManager.RunModelMgr.SceneType = E_SceneType.Site;
GameManager.RunModelMgr.ModeType = E_ModeType.Study; GameManager.RunModelMgr.ModeType = E_ModeType.Study;
@ -34,7 +34,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess); GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
} }
InitializationUI(); //InitializationUI();
GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
} }
@ -71,43 +71,43 @@ public class OfficeManager : SingletonMono<OfficeManager>
}); });
} }
} }
private void InitializationUI() //private void InitializationUI()
{ //{
if (!GameManager.UIMgr.GetPanel<UI_TaskListPanel>()) // if (!GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
{ // {
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) => // GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
{ // {
panel.Init(GameManager.ProcessMgr.subProcessId); // panel.Init(GameManager.ProcessMgr.subProcessId);
}); // });
} // }
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) // if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{ // {
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); // GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); // GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
} // }
if (!GameManager.UIMgr.GetPanel<UI_MenuBar>()) // if (!GameManager.UIMgr.GetPanel<UI_MenuBar>())
{ // {
GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) => // GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
{ // {
panel.Init(); // panel.Init();
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); // GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
}); // });
} // }
if (!GameManager.UIMgr.GetPanel<UI_GrowthPeriodPanel>()) // if (!GameManager.UIMgr.GetPanel<UI_GrowthPeriodPanel>())
{ // {
GameManager.UIMgr.ShowPanel<UI_GrowthPeriodPanel>(E_UI_Layer.Mid, (panel) => // GameManager.UIMgr.ShowPanel<UI_GrowthPeriodPanel>(E_UI_Layer.Mid, (panel) =>
{ // {
panel.Init(); // panel.Init();
}); // });
} // }
//firstPersonController.gameObject.SetActive(true); // //firstPersonController.gameObject.SetActive(true);
} //}
private void OnDestroy() private void OnDestroy()
{ {
//GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver); //GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI); //GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
//GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); //GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);

63
Assets/Scripts/Project/Manager/TooRoomMannger.cs
View File

@ -4,6 +4,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
/// <summary>
/// 目前代替实验室
/// </summary>
public class TooRoomMannger : SingletonMono<TooRoomMannger> public class TooRoomMannger : SingletonMono<TooRoomMannger>
{ {
public List<BaseToolOrDevice> allTMDs; public List<BaseToolOrDevice> allTMDs;
@ -28,7 +31,10 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
{ {
allTMDs = toolParent.GetComponentsInChildren<BaseToolOrDevice>(true).ToList(); allTMDs = toolParent.GetComponentsInChildren<BaseToolOrDevice>(true).ToList();
firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>(); firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
_cancel = new List<Material>(); _cancel = new List<Material>();
_wear = new List<Material>(); _wear = new List<Material>();
_cancel = Resources.LoadAll<Material>("Materials/CharacterEquip/Cancel").ToList(); _cancel = Resources.LoadAll<Material>("Materials/CharacterEquip/Cancel").ToList();
@ -40,6 +46,7 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
} }
RemoveRepeat(); RemoveRepeat();
CheckWearByWearDic(); CheckWearByWearDic();
InitializationUI();
} }
public void SetFirstPersonTransform(Vector3 _pos, Vector3 _angle, bool isSetFOVAndUpDownView = false, float fov = 0, Vector3 _camareAngle = new Vector3(), bool isRecord = false) public void SetFirstPersonTransform(Vector3 _pos, Vector3 _angle, bool isSetFOVAndUpDownView = false, float fov = 0, Vector3 _camareAngle = new Vector3(), bool isRecord = false)
@ -202,17 +209,11 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
return tmps; return tmps;
} }
//public void ResetManWear()
//{
// headSlot.GetComponent<SkinnedMeshRenderer>().material = _cancel.SingleOrDefault(s => s.name == "国网安全帽");
// bodySlot.GetComponent<SkinnedMeshRenderer>().material = _cancel.SingleOrDefault(s => s.name == "工作服");
// handSlot.GetComponent<SkinnedMeshRenderer>().material = _cancel.SingleOrDefault(s => s.name == "编织手套");
// shoesSlot.GetComponent<MeshRenderer>().material = _cancel.SingleOrDefault(s => s.name == "绝缘靴");
//}
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
GameManager.UIMgr.toolTips.HideTips(); GameManager.UIMgr.toolTips.HideTips();
GameManager.UIMgr.imageTips.HideTips(); GameManager.UIMgr.imageTips.HideTips();
if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>()) if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
@ -223,20 +224,36 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
} }
private void InitializationUI()//在实验室中初始化UI
{
if (!GameManager.UIMgr.GetPanel<UI_TaskListPanel>())
{
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
{
panel.Init(GameManager.ProcessMgr.subProcessId);
});
}
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
}
if (!GameManager.UIMgr.GetPanel<UI_MenuBar>())
{
GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
{
panel.Init();
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
});
}
if (!GameManager.UIMgr.GetPanel<UI_GrowthPeriodPanel>())
{
GameManager.UIMgr.ShowPanel<UI_GrowthPeriodPanel>(E_UI_Layer.Mid, (panel) =>
{
panel.Init();
});
}
//firstPersonController.gameObject.SetActive(true);
}
} }
/// <summary>
/// 工具架工具配置
/// </summary>
//public class ToolRoomSettingData
//{
// public string objname;
// public Vector3 initPostion;
// public ToolRoomSettingData(string objname, Vector3 initPostion)
// {
// this.e_ToolOrDeviceOrMaterials = e_toolOrDeviceOrMaterials;
// this.initPostion = initPostion;
// }
//}