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

Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-09-05 13:23:44 +08:00
parent ee0bc2049b 9beaa384cd
commit 670d9947d4
4 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,8 +111,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 503926570506812806} m_GameObject: {fileID: 503926570506812806}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.061267853, y: -0.020126343, z: -0.10964799} m_LocalPosition: {x: 0.061267853, y: 0.020126343, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -772,8 +772,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 811983711441613308} m_GameObject: {fileID: 811983711441613308}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.0001373291, y: 0.049438477, z: 0.091278076} m_LocalPosition: {x: -0.0001373291, y: -0.049438477, z: 0.091278076}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -2694,8 +2694,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2537738450205131575} m_GameObject: {fileID: 2537738450205131575}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.06092453, y: -0.020126343, z: -0.10964799} m_LocalPosition: {x: -0.06092453, y: 0.020126343, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -3667,8 +3667,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2638763987231761498} m_GameObject: {fileID: 2638763987231761498}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.06092453, y: -0.020126343, z: -0.10964799} m_LocalPosition: {x: -0.06092453, y: 0.020126343, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -4523,8 +4523,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3491577929125647534} m_GameObject: {fileID: 3491577929125647534}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -6696,7 +6696,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4675619581299266311} m_GameObject: {fileID: 4675619581299266311}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.14690018, y: -0.17933655, z: 0.5191498} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -6987,8 +6987,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4689876117537848694} m_GameObject: {fileID: 4689876117537848694}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.069568634, y: -0.02281189, z: -0.021592975} m_LocalPosition: {x: -0.069568634, y: 0.02281189, z: -0.021592975}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -7271,8 +7271,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4920122536138912573} m_GameObject: {fileID: 4920122536138912573}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.015167236, y: -0.025436401, z: 0.030426025} m_LocalPosition: {x: -0.015167236, y: 0.025436401, z: 0.030426025}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -7932,8 +7932,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5739074963520473130} m_GameObject: {fileID: 5739074963520473130}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.040023804, y: -0.02696228, z: 0.037261963} m_LocalPosition: {x: 0.040023804, y: 0.02696228, z: 0.037261963}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -8018,8 +8018,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6044607018453959887} m_GameObject: {fileID: 6044607018453959887}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.00012207031, y: 0.011123657, z: -0.09854126} m_LocalPosition: {x: -0.00012207031, y: -0.011123657, z: -0.09854126}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -8981,8 +8981,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6764219220802548366} m_GameObject: {fileID: 6764219220802548366}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.039993286, y: -0.02696228, z: 0.048858643} m_LocalPosition: {x: 0.039993286, y: 0.02696228, z: 0.048858643}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -9064,8 +9064,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6776581396377010381} m_GameObject: {fileID: 6776581396377010381}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.00012207031, y: 0.011383057, z: -0.011633396} m_LocalPosition: {x: -0.00012207031, y: -0.011383057, z: -0.011633396}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -10224,8 +10224,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7847778419808227353} m_GameObject: {fileID: 7847778419808227353}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: 0.012374878, y: -0.02468872, z: 0.066101074} m_LocalPosition: {x: -0.012374878, y: 0.02468872, z: 0.066101074}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -10935,8 +10935,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8569168921652152456} m_GameObject: {fileID: 8569168921652152456}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
m_LocalPosition: {x: -0.061267853, y: -0.020126343, z: -0.10964799} m_LocalPosition: {x: 0.061267853, y: 0.020126343, z: -0.10964799}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:

12
Assets/Scenes/05_LiveScene.unity
View File

@ -1704,7 +1704,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 478648692} m_GameObject: {fileID: 478648692}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalPosition: {x: 0.14690018, y: -0.17933655, z: 0.5191498} m_LocalPosition: {x: 0.14690018, y: -0.17933655, z: 0.5191498}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -1712,7 +1712,7 @@ Transform:
- {fileID: 238725084} - {fileID: 238725084}
m_Father: {fileID: 543450652271447145} m_Father: {fileID: 543450652271447145}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
--- !u!65 &478648694 --- !u!65 &478648694
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -8078,7 +8078,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@ -8086,11 +8086,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -8102,7 +8102,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 180
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: m_RemovedComponents:
- {fileID: 2921358948653541, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - {fileID: 2921358948653541, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}

2
Assets/Scripts/CXX/Devices/现场控制/Device_Control_1002.cs
View File

@ -70,7 +70,7 @@ public class Device_Control_1002 : Device_Control
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>() != null) if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>() != null)
{ {
meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>(); meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent<Device_3Phase4WireMeter>();
meteringDevice.Add(this); meteringDevice.Add(this, dianTrigger.transform.localPosition, dianTrigger.transform.localEulerAngles);
//接线完好关联螺丝重新赋值 //接线完好关联螺丝重新赋值
check_JieXian.tool_Screws = meteringDevice.jieXian_screws; check_JieXian.tool_Screws = meteringDevice.jieXian_screws;

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

@ -204,7 +204,7 @@ public class Device_3Phase4WireMeter : Device_Base
/// <summary> /// <summary>
/// 安装电能表到柜子上 /// 安装电能表到柜子上
/// </summary> /// </summary>
public void Add(Device_Control control) public void Add(Device_Control control,Vector3 localPos,Vector3 localAng)
{ {
transform.parent = control.transform; transform.parent = control.transform;
transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake()); transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
@ -212,10 +212,8 @@ public class Device_3Phase4WireMeter : Device_Base
Init(false); Init(false);
hand_out_action?.Invoke(); hand_out_action?.Invoke();
//从手里飞过去 //从手里飞过去
transform.DOLocalMove(new Vector3(0.1469002f, -0.1793365f, 0.5191498f), 2).OnStart(() => transform.localEulerAngles= localAng;
{ transform.DOLocalMove(localPos, 2).OnComplete(() =>
transform.localEulerAngles = Vector3.zero;
}).OnComplete(() =>
{ {
LiveSceneManager.Instance.OnCheckSubProcess(false); LiveSceneManager.Instance.OnCheckSubProcess(false);