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

Assets/Resources/UI/UI_Panel/UI_MaskPanel.prefab

@@ -110,7 +110,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.122641504, g: 0.11280704, b: 0.11280704, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Scenes/03_OfficeScene.unity

@@ -565,6 +565,50 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1986188604
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1986188605}
+  - component: {fileID: 1986188606}
+  m_Layer: 0
+  m_Name: Responser
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1986188605
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1986188604}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.016247163, y: 0.8535463, z: -1.0612803}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1986188606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1986188604}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5acc47c41ca61b344ba11e38989c2ac8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2077977345
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1,83 +1,23 @@
 using System.Collections;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class UI_MaskPanel : BasePanel
 {
-    /// <summary>
+    private float fateInTime = 2f;
-    /// 淡入淡出速度0.5/s
+    private float intervalTime = 1f;
-    /// </summary>
+    private float fateOutTime = 2f;
-    public float fadeInSpeed = 0.5f; // 淡入速度  
 
     /// <summary>
     /// 初始化
     /// </summary>
     public void Init()
     {
-        FadeInAndOut(E_FadeInAndOut.FadeIn);
+        var img = GetControl<Image>("Mask");
-    }
+        Color color = img.color;
-
+        color.a = 0;
-    /// <summary>
+        img.color = color;
-    /// 淡入/出
-    /// </summary>
-    /// <param name="type"></param>
-    public void FadeInAndOut(E_FadeInAndOut type) 
-    {
-        switch (type)
-        {
-            case E_FadeInAndOut.FadeIn:
-                StartCoroutine(FadeInAsync());
-                break;
-            case E_FadeInAndOut.FadeOut:
-                StartCoroutine(FadeOutAsync());
-                break;
-        }
-
-        
-
-    }
-
-    /// <summary>
-    /// 隐藏蒙版
-    /// </summary>
-    private void HideMask() 
-    {
-        FadeInAndOut(E_FadeInAndOut.FadeOut);
-    }
-
-    /// <summary>
-    /// 淡入
-    /// </summary>
-    /// <returns></returns>
-    private IEnumerator FadeInAsync()
-    {
-        // 淡入  
-        float alpha = 0.0f;
-        while (alpha < 1.0f)
-        {
-            alpha += fadeInSpeed * Time.deltaTime;
-            alpha = Mathf.Clamp(alpha,0,1);
-            GetControl<Image>("Mask").color = new Color(0, 0, 0, alpha);
-            yield return null;
-        }
-    }
-
-    /// <summary>
-    /// 淡出
-    /// </summary>
-    /// <returns></returns>
-    private IEnumerator FadeOutAsync()
-    {
-        // 淡入  
-        float alpha = 1.0f;
-        while (alpha > 0.0f)
-        {
-            alpha -= fadeInSpeed * Time.deltaTime;
-            alpha = Mathf .Clamp(alpha,0,1);
-            GetControl<Image>("Mask").color = new Color(0, 0, 0, alpha);
-            yield return null;
-        }
-        UIManager.Instance.HidePanel<UI_MaskPanel>();
     }
 
     /// <summary>
@@ -85,11 +25,19 @@ public class UI_MaskPanel : BasePanel
     /// </summary>
     public override void ShowMe()
     {
-#if UNITY_EDITOR
-        EventCenter.Instance.AddEventListener(Enum_EventType.HideMask, HideMask);
-#else
         GameManager.EventMgr.AddEventListener(Enum_EventType.HideMask, HideMask);
-#endif
+    }
+
+    private void HideMask()
+    {
+        var image = GetControl<Image>("Mask");
+        Sequence mySequence = DOTween.Sequence();
+        mySequence.Append(image.DOFade(1, fateInTime).SetEase(Ease.InOutQuad));
+
+        mySequence.AppendInterval(intervalTime);
+
+        mySequence.Append(image.DOFade(0, fateOutTime).SetEase(Ease.InOutQuad))
+            .OnComplete(() => { GameManager.UIMgr.HidePanel<UI_MaskPanel>(); });
     }
 
     /// <summary>
@@ -97,11 +45,6 @@ public class UI_MaskPanel : BasePanel
     /// </summary>
     public override void HideMe()
     {
-#if UNITY_EDITOR
-        EventCenter.Instance.RemoveEventListener(Enum_EventType.HideMask, HideMask);
-#else
         GameManager.EventMgr.RemoveEventListener(Enum_EventType.HideMask, HideMask);
-#endif
-
     }
-}
+}

Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs

@@ -17,7 +17,8 @@ public class OfficeTimelineControl : MonoBehaviour
         mPlayableDirector.Stop();
         playerModel = transform.GetChild(0).gameObject;
         mPlayableDirector.stopped += OnPlayableDirectorStopped;
-        StartTimeline();//TODO 这里先掉一下,后续应该流程控制的时候触发调用
+        StartTimeline(); //TODO 这里先掉一下,后续应该流程控制的时候触发调用
+        //GameManager.EventMgr.AddEventListener();
     }
 
     public void StartTimeline()
@@ -29,10 +30,20 @@ public class OfficeTimelineControl : MonoBehaviour
     {
         if (mPlayableDirector == aDirector)
         {
-            Destroy(playerModel);
+            GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>
+            {
+                panel.Init();
+                GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
+            });
+            Invoke(nameof(DestroyPlayer), 2f);
         }
     }
 
+    private void DestroyPlayer()
+    {
+        Destroy(playerModel);
+    }
+
     void OnDestroy()
     {
         mPlayableDirector.stopped -= OnPlayableDirectorStopped;

Assets/Scripts/Wwz/OfficeScene/Responser.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Responser : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+      //  GameManager.DataMgr. GameManager.ProcessMgr.subProcessStepId
+        GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchMode,HandleEvent);
+    }
+
+    private void HandleEvent()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/Wwz/OfficeScene/Responser.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5acc47c41ca61b344ba11e38989c2ac8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 终端设备手机
+/// </summary>
+public class TerminalEquipment : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4b802178c7fb12e4e833bd98290a0ee3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: