Assets/Plugins/Sirenix/Demos.meta

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

Assets/Scripts/Project/Manager/ProcessManager.cs

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

Assets/Scripts/Project/Manager/RunModelMgr.cs

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

Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs

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

Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs

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

Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs

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