From 600b7e747c3e585769caf3b96cadd1a22c5f551c Mon Sep 17 00:00:00 2001 From: Victor_Wang Date: Mon, 12 Aug 2024 10:36:45 +0800 Subject: [PATCH] 1 --- Assets/Plugins/Sirenix/Demos.meta | 8 -------- Assets/Scripts/Project/Manager/ProcessManager.cs | 2 +- Assets/Scripts/Project/Manager/RunModelMgr.cs | 2 +- .../Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs | 6 +++--- .../Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs | 2 +- Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs | 1 + Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs | 2 +- 7 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 Assets/Plugins/Sirenix/Demos.meta diff --git a/Assets/Plugins/Sirenix/Demos.meta b/Assets/Plugins/Sirenix/Demos.meta deleted file mode 100644 index bdb22ec..0000000 --- a/Assets/Plugins/Sirenix/Demos.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 39584688cfac6ff44bd94124e5bc1ca7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index 360373c..4989747 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -32,7 +32,7 @@ public class ProcessManager : BaseManager public D_Scheme d_Scheme; /// - ///当前计划ID + ///当前方案ID /// public int schemeID = -1; diff --git a/Assets/Scripts/Project/Manager/RunModelMgr.cs b/Assets/Scripts/Project/Manager/RunModelMgr.cs index 734256e..812145e 100644 --- a/Assets/Scripts/Project/Manager/RunModelMgr.cs +++ b/Assets/Scripts/Project/Manager/RunModelMgr.cs @@ -18,7 +18,7 @@ public class RunModelMgr : BaseManager private E_SceneType sceneType = E_SceneType.None; /// - /// 流程/设备/方案id + /// 设备/方案id /// public int deviceId; diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs index 0d01f71..cdd4b78 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs @@ -29,7 +29,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour private void OnMouseEnter() { - if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; + if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return; if (EventSystem.current.IsPointerOverGameObject()) return; OnEnter(); //TODO: 这里写提示打开的代码 @@ -37,7 +37,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour private void OnMouseDown() { - if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; + if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return; if (EventSystem.current.IsPointerOverGameObject()) return; OnDown(); gameObject.SetActive(false); @@ -46,7 +46,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour private void OnMouseExit() { //TODO: 这里写提示关闭的代码 - if (GameManager.ProcessMgr.userData.userName != "04_ToolMaterialScene") return; + if (GameManager.RunModelMgr.SceneType!= E_SceneType.ToolRoom) return; if (EventSystem.current.IsPointerOverGameObject()) return; OnExit(); } diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs index 59e60d5..18fde00 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_Electroprobe.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; /// -/// +/// 电笔 /// public class Tool_Electroprobe : BaseToolOrDevice { diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs index 0438b91..fd5fb68 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs @@ -53,6 +53,7 @@ public class UI_MainTitlePanel : BasePanel } GetControl("modelText (TMP)").text = mode; + } private void SwitchTitleImg() diff --git a/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs b/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs index 3c887e7..c27638c 100644 --- a/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs +++ b/Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs @@ -18,8 +18,8 @@ public class OfficeTimelineControl : MonoBehaviour playerController.SetActive(false); mPlayableDirector = GetComponent(); mPlayableDirector.Stop(); - playerModel = transform.GetChild(0).gameObject; mPlayableDirector.stopped += OnPlayableDirectorStopped; + playerModel = transform.GetChild(0).gameObject; StartTimeline(); //TODO 这里先掉一下,后续应该流程控制的时候触发调用 //GameManager.EventMgr.AddEventListener(); }