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

Compare commits

base: WangWeiZhi:f36b14dcc6e18aadb7287fe6e5a45e6680bb841f
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:e9827be83ffba0881a23da51dc8f2a98a841e52e
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "f36b14dcc6e18aadb7287fe6e5a45e6680bb841f" and "e9827be83ffba0881a23da51dc8f2a98a841e52e" have entirely different histories.
f36b14dcc6 ... e9827be83f

8 changed files with 41 additions and 39 deletions
Show Stats Expand all files Collapse all files

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

@ -6229,7 +6229,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6589deeaefa4a17428d6c3ce0d699c77, type: 3}
m_Name:
m_EditorClassIdentifier:
device_Control: {fileID: 1723332379}
device_Control: {fileID: 0}
--- !u!114 &1577392988 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5948617165317844720, guid: c80ccdb516dbab94083bd57fa1650eda, type: 3}
@ -6493,7 +6493,7 @@ MonoBehaviour:
- {fileID: 302277748}
- {fileID: 302277752}
- {fileID: 1352022184}
dianTrigger: {fileID: 0}
dianCollider: {fileID: 478648694}
sundries: {fileID: 737359439}
inSwitchScrews:
- {fileID: 1775693151}

2
Assets/Scenes/05_LiveScene.unity
View File

@ -5469,7 +5469,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6589deeaefa4a17428d6c3ce0d699c77, type: 3}
m_Name:
m_EditorClassIdentifier:
device_Control: {fileID: 1723332379}
device_Control: {fileID: 0}
--- !u!114 &1577392988 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5948617165317844720, guid: c80ccdb516dbab94083bd57fa1650eda, type: 3}

2
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
View File

@ -2,7 +2,6 @@ using DG.Tweening;
using Sirenix.Utilities;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
/// <summary>
@ -203,7 +202,6 @@ public class Device_3Phase4WireMeter : Device_Base
{
transform.parent = device_MeasuringCabinet.transform;
device_MeasuringCabinet.meteringDevice = this;
transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
//默认是拆除的状态
Init(false);
hand_out_action?.Invoke();

13
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
View File

@ -134,14 +134,12 @@ public class Device_Cover : Device_Base
if (obj == null)
{
//收回
Debug.Log("收回");
cover_seal_left_Trigger.gameObject.SetActive(false);
cover_seal_left_Trigger.gameObject.SetActive(false);
cover_seal_right_Trigger.gameObject.SetActive(false);
}
else
{
//拿出
Debug.Log("拿出");
if (obj.name == "盒装封印")
{
if (!isOpen && cover_seal_Left.isCut && cover_screw_Left.isInstall)
@ -202,4 +200,13 @@ public class Device_Cover : Device_Base
});
}
}
private void OnDestroy()
{
EventCenter.Instance.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
}
private void OnDisable()
{
EventCenter.Instance.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, CheckTriggerShow);
}
}

30
Assets/Scripts/CXX/Devices/计量柜/Device_Control_1002.cs
View File

@ -49,13 +49,12 @@ public class Device_Control_1002 : Device_Control
private void Awake()
{
//设置控制脚本
StepStateControl.instance.SetDeviceControl(1002,this);
ScoreManager.instance.SetDeviceControl(1002,this);
AddActions();
//if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
// GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
sundries.gameObject.SetActive(false);
check_JieXian.tool_Lines = jieXian_lines;
check_JieXian.tool_Screws = meteringDevice.jieXian_screws;
@ -132,7 +131,17 @@ public class Device_Control_1002 : Device_Control
});
});
}
//private void SwitchSubProcessStepTriggerID(string arg0)
//{
// if (dianTrigger.triggerName == arg0)
// {
// dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(true);
// }
// else
// {
// dianTrigger.GetComponent<HighlightEffect>().SetHighlighted(false);
// }
//}
/// <summary>
/// »¹Ô­¼ÆÁ¿¹ñ״̬
/// </summary>
@ -277,4 +286,15 @@ public class Device_Control_1002 : Device_Control
}
}
}
//private void OnDestroy()
//{
// if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
// GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
//}
//private void OnDisable()
//{
// if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
// GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
//}
}

10
Assets/Scripts/CXX/Score/ScoreManager.cs
View File

@ -23,16 +23,6 @@ public class ScoreManager : MonoBehaviour
a.Init();
});
}
/// <summary>
/// 设置控制脚本
/// </summary>
/// <param name="subejctid"></param>
/// <param name="control"></param>
public void SetDeviceControl(int subejctid, Device_Control control)
{
scoreSubjectList.Find(a => a.schemeId == subejctid).SetDeviceControl(control);
}
/// <summary>
/// 检测分数
/// </summary>

3
Assets/Scripts/CXX/SiteManager.cs
View File

@ -1,7 +1,6 @@
using Cysharp.Threading.Tasks.Triggers;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
/// <summary>
@ -18,7 +17,5 @@ public class SiteManager : MonoBehaviour
private void Awake()
{
instance = this;
//基类全部初始化
device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a=>a.Awake());
}
}

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

@ -4,7 +4,6 @@ using UnityEngine;
using HighlightPlus;
using UnityEngine.EventSystems;
using System;
using Unity.VisualScripting;
/// <summary>
/// 常驻交互
@ -27,20 +26,11 @@ public class PermanentTriggerBase : MonoBehaviour
/// 收回手里的回调
/// </summary>
protected Action hand_back_action;
/// <summary>
/// 是否初始化了
/// </summary>
private bool isInit;
public void Awake()
private void Awake()
{
if (!isInit)
{
isInit = true;
OnAwake();
AddScoreAction(ScoreManager.instance.Check);
}
OnAwake();
AddScoreAction(ScoreManager.instance.Check);
}
private void Start()