Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab

@@ -8004,7 +8004,7 @@ GameObject:
   - component: {fileID: 2576541080985544079}
   - component: {fileID: 2576541080985544080}
   - component: {fileID: 2576541080985544078}
-  m_Layer: 10
+  m_Layer: 8
   m_Name: "\u7535\u80FD\u8868\u76D6\u5B50"
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Scenes/03_OfficeScene.unity

@@ -295,6 +295,22 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
+--- !u!1 &267617285 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2399593117452945565, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
+  m_PrefabInstance: {fileID: 267617284}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &267617286 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2399593117452945567, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
+  m_PrefabInstance: {fileID: 267617284}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267617285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d90ba6530d9bfda47abb4610956b2f44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &772251462
 GameObject:
   m_ObjectHideFlags: 0
@@ -488,7 +504,7 @@ Transform:
   - {fileID: 2089319124}
   - {fileID: 772251465}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1411090332
 MonoBehaviour:
@@ -502,6 +518,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5436cda1c4b71f044bcd6efe54bbfc28, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  playerController: {fileID: 267617285}
   aniCamera: {fileID: 772251462}
 --- !u!114 &1411090333
 MonoBehaviour:
@@ -820,7 +837,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1986188606
 MonoBehaviour:
@@ -835,6 +852,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mobileController: {fileID: 919132148358585193}
+  firstPersonController: {fileID: 267617286}
 --- !u!1 &2077977345
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -83,8 +83,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
         if (currentTool.name.Equals("三相四线电能表"))
         {
             tMDTips.gameObject.SetActive(false);
-            currentTool.transform.localPosition = new Vector3(currentTool.transform.localPosition.x, currentTool.transform.localPosition.y, currentTool.transform.localPosition.z + 0.1f);
-            currentTool.transform.localEulerAngles = new Vector3(-90, 180, -180);
+            currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180);
         }
     }
 

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -14,7 +14,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
     /// </summary>
     public MobileController mobileController;
     private FirstPersonController firstPersonController;
-    private void Start()
+    protected override void Awake()
     {
         firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
         firstPersonController.gameObject.SetActive(false);

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

@@ -33,11 +33,9 @@ public class UI_DisassemblyAssemblyNoticePanel : BasePanel
                 GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
                 break;
             case "Button_Define":
-                if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
-                {
-                    ScoreManager.instance.Check(triggerName, null);
-                    GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
-                }
+                GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
+                ScoreManager.instance.Check(triggerName, null);
+                GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
                 break;
         }
     }

Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Playables;
 
@@ -14,12 +13,13 @@ public class OfficeTimelineControl : MonoBehaviour
     public GameObject aniCamera;
 
     // Start is called before the first frame update
-    private async void Start()
+    void Start()
     {
-        await Task.Delay(1);
         mPlayableDirector = GetComponent<PlayableDirector>();
         if (!GameManager.RunModelMgr.isOnceOfficeAni)
         {
+            //playerController.SetActive(false);
+            mPlayableDirector.Stop();
             //mPlayableDirector.stopped += OnPlayableDirectorStopped;
             playerModel = transform.GetChild(0).gameObject;
             StartTimeline(); 
@@ -43,9 +43,7 @@ public class OfficeTimelineControl : MonoBehaviour
     {
         mPlayableDirector.Play();
     }
-    /// <summary>
-    /// 外挂到场景中得timeline
-    /// </summary>
+
     public void OnPlayableDirectorStopped()
     {
         GameManager.EventMgr.EventTrigger(Enum_EventType.OfficeTimeLineOver);
@@ -54,10 +52,10 @@ public class OfficeTimelineControl : MonoBehaviour
 
     private void DestroyPlayer()
     {
-        GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
         Destroy(playerModel);
         Destroy(aniCamera);
         //playerController.SetActive(true);
+        GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
     }
 
     void OnDestroy()

ProjectSettings/DynamicsManager.asset

@@ -18,7 +18,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0.1
   m_ClothInterCollisionStiffness: 0.2
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: fffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffff9fffffff8ffff7ef8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1

ProjectSettings/TagManager.asset

@@ -16,7 +16,7 @@ TagManager:
   - Tool
   - Deveice
   - Player
-  - Shell
+  - 
   - 
   - 
   -