科目2

2024-09-05 15:10:19 +08:00 · 2024-09-05 15:10:19 +08:00 · 8f905f2787
parent d39c8b7683
commit 8f905f2787
17 changed files with 8654 additions and 13234 deletions
--- a/Assets/ArtRes/Prefabs/杂物.meta
+++ b/Assets/ArtRes/Prefabs/杂物.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a9783990697bf048adb5f94caddfac7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ArtRes/Prefabs/杂物/杂物.prefab
+++ b/Assets/ArtRes/Prefabs/杂物/杂物.prefab
--- a/Assets/ArtRes/Prefabs/杂物/杂物.prefab.meta
+++ b/Assets/ArtRes/Prefabs/杂物/杂物.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 470bef2fcfcd2c945aba83ad9dff030c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ArtRes/Prefabs/计量柜.meta
+++ b/Assets/ArtRes/Prefabs/计量柜.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b581b509d36dd5c4ebf4c99deb81d1d3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ArtRes/Prefabs/计量柜/计量柜.prefab
+++ b/Assets/ArtRes/Prefabs/计量柜/计量柜.prefab
--- a/Assets/ArtRes/Prefabs/计量柜/计量柜.prefab.meta
+++ b/Assets/ArtRes/Prefabs/计量柜/计量柜.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c606f7c90fb68e84caacf9185e9b0d44
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Prefabs/Objects/Tools/扳手.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/扳手.prefab
@ -28,7 +28,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7175692158753146328}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.263, y: -0.8240001, z: -2.3841999}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -67,8 +67,8 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 0.061399538, y: 0.005925794, z: 0.24038354}
-  m_Center: {x: 0.0004428625, y: -0.00012303382, z: -0.1198405}
+  m_Size: {x: 0.05782919, y: 0.005925794, z: 0.2420358}
+  m_Center: {x: -0.0013423121, y: -0.00012303391, z: -0.099823736}
 --- !u!114 &6231094815727103799
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -271,7 +271,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0
+      value: -0.0028
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
      propertyPath: m_LocalPosition.y
@ -279,7 +279,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.1199
+      value: -0.1005
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
      propertyPath: m_LocalRotation.w
--- a/经互感器接入式低压电能计量装置.unity
+++ b/经互感器接入式低压电能计量装置.unity
--- a/经互感器接入式低压电能计量装置.unity.meta
+++ b/经互感器接入式低压电能计量装置.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e03324296c27db9448e70ee74b8cd8ff
+guid: ca7590092a98eb14d96ead9ca2fd243d
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
--- a/Assets/Scripts/CXX/Devices/Device_Base.cs
+++ b/Assets/Scripts/CXX/Devices/Device_Base.cs
@ -24,14 +24,14 @@ public class Device_Base : PermanentTriggerBase

    protected override void OnAwake()
    {
-        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
        {
            base.OnAwake();
        }
    }
    protected override void OnStart()
    {
-        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
        {
            base.OnStart();
            AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
--- a/Assets/Scripts/CXX/Devices/现场控制/Device_Control_2001.cs
+++ b/Assets/Scripts/CXX/Devices/现场控制/Device_Control_2001.cs
@ -25,8 +25,8 @@ public class Device_Control_2001 : Device_Control
    private void Awake()
    {
        //设置控制脚本
-        StepStateControl.instance.SetDeviceControl(2001, this);
-        ScoreManager.instance.SetDeviceControl(2001, this);
+        StepStateControl.instance?.SetDeviceControl(2001, this);
+        ScoreManager.instance?.SetDeviceControl(2001, this);

        EventCenter.Instance.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, OnHandTool);
        //添加互感器触发点击回调
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@ -37,7 +37,7 @@ public class Tool_Base : PermanentTriggerBase
    }
    protected override void OnStart()
    {
-        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
        {
            base.OnStart();
            AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
--- a/Assets/Scripts/CXX/Tools/Tool_Spanner.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Spanner.cs
@ -25,7 +25,7 @@ public class Tool_Spanner : Tool_Base
            transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f);
            transform.DOMove(screw.installPos.position, 1).OnComplete(() =>
            {
-                //screw.BeInstalled(this);
+                screw.BeInstalled(this);
            });
        }
    }
--- a/Assets/Scripts/CXX/Tools/Tool_SpannerScrew.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_SpannerScrew.cs
@ -73,10 +73,10 @@ public class Tool_SpannerScrew : Tool_Base
    public void BeInstalled(Tool_Spanner screwdriver)
    {
        //¶¯»
-        transform.DOLocalMoveY(initPostionY, 1)
+        transform.DOLocalMoveY(initPostionY, 3)
            .OnUpdate(() =>
            {
-                transform.RotateAroundLocal(Vector3.up, 10);
+                transform.RotateAroundLocal(Vector3.up, -Time.deltaTime * 360);
            })
            .OnComplete(() =>
            {
@ -98,10 +98,10 @@ public class Tool_SpannerScrew : Tool_Base
    public void BeUnInstalled(Tool_Spanner screwdriver)
    {
        //¶¯»
-        transform.DOLocalMoveY(initPostionY - 0.02f, 1)
+        transform.DOLocalMoveY(initPostionY - 0.02f, 3)
            .OnUpdate(() =>
            {
-                transform.RotateAroundLocal(Vector3.up, 10);
+                transform.RotateAroundLocal(Vector3.up, Time.deltaTime*360);
            })
            .OnComplete(() =>
            {
--- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs
+++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs
@ -21,9 +21,9 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
        base.Awake();
        firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
        tMDTips.gameObject.SetActive(false);
-        GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
+        GameManager.EventMgr?.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
        firstPersonController.zoomAction += OnZoom;
-        GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
+        GameManager.EventMgr?.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
        //»ùÀàÈ«²¿³õÊ¼»¯
        device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
    }
@ -115,13 +115,13 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
    private void OnDestroy()
    {
        firstPersonController.zoomAction -= OnZoom;
-        GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
-        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
+        GameManager.EventMgr?.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
+        GameManager.EventMgr?.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
    }
    private void OnDisable()
    {
        firstPersonController.zoomAction -= OnZoom;
-        GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
-        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
+        GameManager.EventMgr?.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
+        GameManager.EventMgr?.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
    }
 }
--- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
+++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
@ -68,7 +68,7 @@ public class PermanentTriggerBase : MonoBehaviour
    {
        if (GetComponent<HighlightEffect>())
            _highlight = GetComponent<HighlightEffect>();
-        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        if (GameManager.RunModelMgr?.ModeType == E_ModeType.Study)
            GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
    }
    /// <summary>