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

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main

This commit is contained in:
taosuqi 2024-08-12 10:58:34 +08:00
parent 1826fbc5c6 b7a988e10c
commit 3128a34d7e
6 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Plugins/Sirenix/Demos.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 39584688cfac6ff44bd94124e5bc1ca7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -32,7 +32,7 @@ public class ProcessManager : BaseManager<ProcessManager>
public D_Scheme d_Scheme; public D_Scheme d_Scheme;
/// <summary> /// <summary>
///当前计划ID ///当前方案ID
/// </summary> /// </summary>
public int schemeID = -1; public int schemeID = -1;

2
Assets/Scripts/Project/Manager/RunModelMgr.cs
View File

@ -18,7 +18,7 @@ public class RunModelMgr : BaseManager<RunModelMgr>
private E_SceneType sceneType = E_SceneType.None; private E_SceneType sceneType = E_SceneType.None;
/// <summary> /// <summary>
/// 流程/设备/方案id /// 设备/方案id
/// </summary> /// </summary>
public int deviceId; public int deviceId;

6
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
View File

@ -33,7 +33,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void OnMouseEnter() private void OnMouseEnter()
{ {
if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return;
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
OnEnter(); OnEnter();
//TODO: 这里写提示打开的代码 //TODO: 这里写提示打开的代码
@ -41,7 +41,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void OnMouseDown() private void OnMouseDown()
{ {
if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return;
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
OnDown(); OnDown();
gameObject.SetActive(false); gameObject.SetActive(false);
@ -50,7 +50,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void OnMouseExit() private void OnMouseExit()
{ {
//TODO: 这里写提示关闭的代码 //TODO: 这里写提示关闭的代码
if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return;
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
OnExit(); OnExit();
} }

1
Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs
View File

@ -53,6 +53,7 @@ public class UI_MainTitlePanel : BasePanel
} }
GetControl<TextMeshProUGUI>("modelText (TMP)").text = mode; GetControl<TextMeshProUGUI>("modelText (TMP)").text = mode;
} }
private void SwitchTitleImg() private void SwitchTitleImg()

2
Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs
View File

@ -18,8 +18,8 @@ public class OfficeTimelineControl : MonoBehaviour
playerController.SetActive(false); playerController.SetActive(false);
mPlayableDirector = GetComponent<PlayableDirector>(); mPlayableDirector = GetComponent<PlayableDirector>();
mPlayableDirector.Stop(); mPlayableDirector.Stop();
playerModel = transform.GetChild(0).gameObject;
mPlayableDirector.stopped += OnPlayableDirectorStopped; mPlayableDirector.stopped += OnPlayableDirectorStopped;
playerModel = transform.GetChild(0).gameObject;
StartTimeline(); //TODO 这里先掉一下,后续应该流程控制的时候触发调用 StartTimeline(); //TODO 这里先掉一下,后续应该流程控制的时候触发调用
//GameManager.EventMgr.AddEventListener(); //GameManager.EventMgr.AddEventListener();
} }