WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

科目2

This commit is contained in:
陈向学 2024-09-05 15:10:19 +08:00
parent d39c8b7683
commit 8f905f2787
17 changed files with 8654 additions and 13234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/ArtRes/Prefabs/杂物.meta Normal file
View File

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

2182
Assets/ArtRes/Prefabs/杂物/杂物.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/ArtRes/Prefabs/杂物/杂物.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 470bef2fcfcd2c945aba83ad9dff030c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/ArtRes/Prefabs/计量柜.meta Normal file
View File

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

1146
Assets/ArtRes/Prefabs/计量柜/计量柜.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/ArtRes/Prefabs/计量柜/计量柜.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c606f7c90fb68e84caacf9185e9b0d44
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

10
Assets/Resources/Prefabs/Objects/Tools/扳手.prefab
View File

@ -28,7 +28,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7175692158753146328} m_GameObject: {fileID: 7175692158753146328}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 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_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -67,8 +67,8 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.061399538, y: 0.005925794, z: 0.24038354} m_Size: {x: 0.05782919, y: 0.005925794, z: 0.2420358}
m_Center: {x: 0.0004428625, y: -0.00012303382, z: -0.1198405} m_Center: {x: -0.0013423121, y: -0.00012303391, z: -0.099823736}
--- !u!114 &6231094815727103799 --- !u!114 &6231094815727103799
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -271,7 +271,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3} - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -0 value: -0.0028
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3} - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@ -279,7 +279,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3} - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0.1199 value: -0.1005
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3} - target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

16844
Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity → Assets/Scenes/05_LiveScene 2科目.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity.meta → Assets/Scenes/05_LiveScene 2科目.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e03324296c27db9448e70ee74b8cd8ff guid: ca7590092a98eb14d96ead9ca2fd243d
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

1640
Assets/Scenes/05_LiveScene.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/CXX/Devices/Device_Base.cs
View File

@ -24,14 +24,14 @@ public class Device_Base : PermanentTriggerBase
protected override void OnAwake() protected override void OnAwake()
{ {
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site) if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
{ {
base.OnAwake(); base.OnAwake();
} }
} }
protected override void OnStart() protected override void OnStart()
{ {
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site) if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
{ {
base.OnStart(); base.OnStart();
AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID); AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);

4
Assets/Scripts/CXX/Devices/现场控制/Device_Control_2001.cs
View File

@ -25,8 +25,8 @@ public class Device_Control_2001 : Device_Control
private void Awake() private void Awake()
{ {
//设置控制脚本 //设置控制脚本
StepStateControl.instance.SetDeviceControl(2001, this); StepStateControl.instance?.SetDeviceControl(2001, this);
ScoreManager.instance.SetDeviceControl(2001, this); ScoreManager.instance?.SetDeviceControl(2001, this);
EventCenter.Instance.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, OnHandTool); EventCenter.Instance.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, OnHandTool);
//添加互感器触发点击回调 //添加互感器触发点击回调

2
Assets/Scripts/CXX/Tools/Tool_Base.cs
View File

@ -37,7 +37,7 @@ public class Tool_Base : PermanentTriggerBase
} }
protected override void OnStart() protected override void OnStart()
{ {
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site) if (GameManager.RunModelMgr?.SceneType == E_SceneType.Site)
{ {
base.OnStart(); base.OnStart();
AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID); AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);

2
Assets/Scripts/CXX/Tools/Tool_Spanner.cs
View File

@ -25,7 +25,7 @@ public class Tool_Spanner : Tool_Base
transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f); transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f);
transform.DOMove(screw.installPos.position, 1).OnComplete(() => transform.DOMove(screw.installPos.position, 1).OnComplete(() =>
{ {
//screw.BeInstalled(this); screw.BeInstalled(this);
}); });
} }
} }

8
Assets/Scripts/CXX/Tools/Tool_SpannerScrew.cs
View File

@ -73,10 +73,10 @@ public class Tool_SpannerScrew : Tool_Base
public void BeInstalled(Tool_Spanner screwdriver) public void BeInstalled(Tool_Spanner screwdriver)
{ {
//¶¯»­ //¶¯»­
transform.DOLocalMoveY(initPostionY, 1) transform.DOLocalMoveY(initPostionY, 3)
.OnUpdate(() => .OnUpdate(() =>
{ {
transform.RotateAroundLocal(Vector3.up, 10); transform.RotateAroundLocal(Vector3.up, -Time.deltaTime * 360);
}) })
.OnComplete(() => .OnComplete(() =>
{ {
@ -98,10 +98,10 @@ public class Tool_SpannerScrew : Tool_Base
public void BeUnInstalled(Tool_Spanner screwdriver) public void BeUnInstalled(Tool_Spanner screwdriver)
{ {
//¶¯»­ //¶¯»­
transform.DOLocalMoveY(initPostionY - 0.02f, 1) transform.DOLocalMoveY(initPostionY - 0.02f, 3)
.OnUpdate(() => .OnUpdate(() =>
{ {
transform.RotateAroundLocal(Vector3.up, 10); transform.RotateAroundLocal(Vector3.up, Time.deltaTime*360);
}) })
.OnComplete(() => .OnComplete(() =>
{ {

12
Assets/Scripts/Project/Manager/LiveSceneManager.cs
View File

@ -21,9 +21,9 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
base.Awake(); base.Awake();
firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>(); firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
tMDTips.gameObject.SetActive(false); tMDTips.gameObject.SetActive(false);
GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); GameManager.EventMgr?.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
firstPersonController.zoomAction += OnZoom; 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()); device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
} }
@ -115,13 +115,13 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
private void OnDestroy() private void OnDestroy()
{ {
firstPersonController.zoomAction -= OnZoom; firstPersonController.zoomAction -= OnZoom;
GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); GameManager.EventMgr?.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr?.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
} }
private void OnDisable() private void OnDisable()
{ {
firstPersonController.zoomAction -= OnZoom; firstPersonController.zoomAction -= OnZoom;
GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo); GameManager.EventMgr?.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove); GameManager.EventMgr?.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
} }
} }

2
Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
View File

@ -68,7 +68,7 @@ public class PermanentTriggerBase : MonoBehaviour
{ {
if (GetComponent<HighlightEffect>()) if (GetComponent<HighlightEffect>())
_highlight = 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); GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
/// <summary> /// <summary>