From c55f3402d58f05229834d46e2fd53dc006ecf7cb Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 6 Jun 2024 14:26:19 +0800 Subject: [PATCH] 1233 --- .../Assets/Adam/Scripts/Data/BiaoJIData.cs | 9 + .../Adam/Scripts/ExamusersController.cs | 16 +- .../GuYuan/AmmeterManager/Multimeter.cs | 5 +- .../Interactive/ClampAmmetersInteractive.cs | 6 +- .../Interactive/ClampAmmetersManager.cs | 400 +++++--------- .../室内型高供高计/室内型高供高计.unity | 514 +++++++++++++++++- .../Assets/StreamingAssets/build_info.txt | 2 +- 7 files changed, 672 insertions(+), 280 deletions(-) diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs b/SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs index b9d8b4dd..12388b79 100644 --- a/SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs +++ b/SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs @@ -19,6 +19,15 @@ namespace BjData /// 错误状态 /// public string warningType; + public string oneWayAA; + public string oneWayAV; + public string AA; + public string BA; + public string CA; + public string AV; + public string BV; + public string CV; + public string N; } } diff --git a/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs b/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs index 6cc95eb4..a6a119c4 100644 --- a/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs +++ b/SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs @@ -23,8 +23,9 @@ namespace Adam private void Start() { - string json = FileUtil.ReadFromLocal("Local/通用数据接口.json"); - root = JsonConvert.DeserializeObject(json); + //string json = FileUtil.ReadFromLocal("Local/通用数据接口.json"); + //root = JsonConvert.DeserializeObject(json); + Init(); } @@ -49,7 +50,7 @@ namespace Adam //string _url = url + userNub; //root = await AsyncWebReq.Get(_url); - currentEC = GetDateItemByUserID(null); + //currentEC = GetDateItemByUserID(null); GlobalFlag.biaojiData = BiaoJiData(); GlobalFlag.Beilv = currentEC.Beilv; @@ -199,6 +200,15 @@ namespace Adam { BiaoJIData temp = new BiaoJIData(); temp.warningType = UIManager.Instance.messageData.stubtype; + temp.oneWayAA = UIManager.Instance.messageData.electriccurrent; + temp.oneWayAV = UIManager.Instance.messageData.voltage; + temp.N = UIManager.Instance.messageData.zerosequencecurrent; + temp.AA = UIManager.Instance.messageData.aphasecurrent; + temp.BA = UIManager.Instance.messageData.bphasecurrent; + temp.CA = UIManager.Instance.messageData.cphasecurrent; + temp.AV = UIManager.Instance.messageData.aphasevoltage; + temp.BV = UIManager.Instance.messageData.bphasevoltage; + temp.CV = UIManager.Instance.messageData.cphasevoltage; return temp; } diff --git a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs index db1d9b1f..7cce6940 100644 --- a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs +++ b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs @@ -15,10 +15,9 @@ public class Multimeter : MonoBehaviour public string VV; public bool isok = false; - private async void Start() + private void Start() { - float tempFloat = await ClampAmmetersManager.Instance.Init(name); - activation = tempFloat.ToString(); + activation = ClampAmmetersManager.Instance.Init(name); } private void OnMouseDown() diff --git a/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersInteractive.cs b/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersInteractive.cs index 2ec85aca..001e3ee8 100644 --- a/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersInteractive.cs +++ b/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersInteractive.cs @@ -13,21 +13,21 @@ public class ClampAmmetersInteractive : MonoBehaviour public List floats; public string Fuan; public string unit; - private async void Start() + private void Start() { if (!transform.GetComponent()) { transform.AddComponent(); } - float tempFloat = await ClampAmmetersManager.Instance.Init(name); - Fuan = tempFloat.ToString(); + Fuan = ClampAmmetersManager.Instance.Init(name); } [ContextMenu("")] void init() { g1 = transform.GetChild(0).GetComponent().gameObject; name = g1.name; + Fuan = ClampAmmetersManager.Instance.Init(name); } private void OnMouseDown() { diff --git a/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs b/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs index 4c3879d9..318414e9 100644 --- a/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs +++ b/SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs @@ -1,3 +1,4 @@ +using BjData; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -14,14 +15,16 @@ public class ClampAmmetersManager : MonoSingleton public List Three; [SerializeField] List gameObjects = new List(); public DoolsPlayer DoolsPlayer; + public BiaoJIData biaoJiData = new BiaoJIData(); private void Awake() { - + } // Start is called before the first frame update void Start() { //init(); + biaoJiData = GlobalFlag.biaojiData; StartCoroutine(QiDon()); } IEnumerator QiDon() @@ -39,276 +42,143 @@ public class ClampAmmetersManager : MonoSingleton Multimeter = GetComponentsInChildren().ToList(); Three = GetComponentsInChildren().ToList(); } - public async Task Init(string name) + public string Init(string name) { - await Task.Delay(2000); - float temp = 0; - //if (Three[0].ttpData.Count >= 2) - //{ - // Debug.Log("akjshdߣ222"); - // switch (name) - // { - // case "õ_AA1": - // temp = Three[0].ttpData[0].AA1; - // break; - // case "õ_AA2": - // temp = Three[0].ttpData[0].AA2; - // break; - // case "õ_AA3": - // temp = Three[0].ttpData[0].AA3; - // break; - // case "õ_BA1": - // temp = Three[0].ttpData[0].BA1; - // break; - // case "õ_BA2": - // temp = Three[0].ttpData[0].BA2; - // break; - // case "õ_BA3": - // temp = Three[0].ttpData[0].BA3; - // break; - // case "õ_CA1": - // temp = Three[0].ttpData[0].CA1; - // break; - // case "õ_CA2": - // temp = Three[0].ttpData[0].CA2; - // break; - // case "õ_CA3": - // temp = Three[0].ttpData[0].CA3; - // break; - // case "õ_1A": - // case "õ_1B": - // case "õ_1C": - // temp = show(name, Three[0].ttpData[0].AA1); - // break; + string temp = ""; - // case "õ_AV1": - // temp = Three[0].ttpData[0].AV1; - // break; - // case "õ_AV2": - // temp = Three[0].ttpData[0].AV2; - // break; - // case "õ_AV3": - // temp = Three[0].ttpData[0].AV3; - // break; - // case "õ_BV1": - // temp = Three[0].ttpData[0].BV1; - // break; - // case "õ_BV2": - // temp = Three[0].ttpData[0].BV2; - // break; - // case "õ_BV3": - // temp = Three[0].ttpData[0].BV3; - // break; - // case "õ_CV1": - // temp = Three[0].ttpData[0].CV1; - // break; - // case "õ_CV2": - // temp = Three[0].ttpData[0].CV2; - // break; - // case "õ_CV3": - // temp = Three[0].ttpData[0].CV3; - // break; + Debug.Log("akjshdߣ222"); + switch (name) + { + case "õ_AA1": + temp = biaoJiData.AA; + break; + case "õ_AA2": + temp = biaoJiData.AA; + break; + case "õ_AA3": + temp = biaoJiData.AA; + break; + case "õ_BA1": + temp = biaoJiData.BA; + break; + case "õ_BA2": + temp = biaoJiData.BA; + break; + case "õ_BA3": + temp = biaoJiData.BA; + break; + case "õ_CA1": + temp = biaoJiData.CA; + break; + case "õ_CA2": + temp = biaoJiData.CA; + break; + case "õ_CA3": + temp = biaoJiData.CA; + break; + case "õ_1A": + case "õ_1B": + case "õ_1C": + temp = biaoJiData.AA; + break; - // #region - // case "_AV1": - // temp = Three[0].ttpData[1].AV1; - // break; - // case "_AV2": - // temp = Three[0].ttpData[1].AV2; - // break; - // case "_AV3": - // temp = Three[0].ttpData[1].AV3; - // break; - // case "_BV1": - // temp = Three[0].ttpData[1].BV1; - // break; - // case "_BV2": - // temp = Three[0].ttpData[1].BV2; - // break; - // case "_BV3": - // temp = Three[0].ttpData[1].BV3; - // break; - // case "_CV1": - // temp = Three[0].ttpData[1].CV1; - // break; - // case "_CV2": - // temp = Three[0].ttpData[1].CV2; - // break; - // case "_CV3": - // temp = Three[0].ttpData[1].CV3; - // break; + case "õ_AV1": + temp = biaoJiData.AV; + break; + case "õ_AV2": + temp = biaoJiData.AV; + break; + case "õ_AV3": + temp = biaoJiData.AV; + break; + case "õ_BV1": + temp = biaoJiData.BV; + break; + case "õ_BV2": + temp = biaoJiData.BV; + break; + case "õ_BV3": + temp = biaoJiData.BV; + break; + case "õ_CV1": + temp = biaoJiData.CV; + break; + case "õ_CV2": + temp = biaoJiData.CV; + break; + case "õ_CV3": + temp = biaoJiData.CV; + break; - // case "_AA1": - // temp = Three[0].ttpData[1].AA1; - // break; - // case "_AA2": - // temp = Three[0].ttpData[1].AA2; - // break; - // case "_AA3": - // temp = Three[0].ttpData[1].AA3; - // break; - // case "_BA1": - // temp = Three[0].ttpData[1].BA1; - // break; - // case "_BA2": - // temp = Three[0].ttpData[1].BA2; - // break; - // case "_BA3": - // temp = Three[0].ttpData[1].BA3; - // break; - // case "_CA1": - // temp = Three[0].ttpData[1].CA1; - // break; - // case "_CA2": - // temp = Three[0].ttpData[1].CA2; - // break; - // case "_CA3": - // temp = Three[0].ttpData[1].CA3; - // break; - // #endregion - // default: - // break; - // } - //} - //else - //{ - // Debug.Log("akjshdߣ"); - // switch (name) - // { - // case "õ_AA1": - // temp = Three[0].ttpData[0].AA1; - // break; - // case "õ_AA2": - // temp = Three[0].ttpData[0].AA2; - // break; - // case "õ_AA3": - // temp = Three[0].ttpData[0].AA3; - // break; - // case "õ_BA1": - // temp = Three[0].ttpData[0].BA1; - // break; - // case "õ_BA2": - // temp = Three[0].ttpData[0].BA2; - // break; - // case "õ_BA3": - // temp = Three[0].ttpData[0].BA3; - // break; - // case "õ_CA1": - // temp = Three[0].ttpData[0].CA1; - // break; - // case "õ_CA2": - // temp = Three[0].ttpData[0].CA2; - // break; - // case "õ_CA3": - // temp = Three[0].ttpData[0].CA3; - // break; - // case "õ_1A": - // case "õ_1B": - // case "õ_1C": - // temp = show(name, Three[0].ttpData[0].AA1); - // break; + #region + case "_AV1": + temp = biaoJiData.AV; + break; + case "_AV2": + temp = biaoJiData.AV; + break; + case "_AV3": + temp = biaoJiData.AV; + break; + case "_BV1": + temp = biaoJiData.BV; + break; + case "_BV2": + temp = biaoJiData.BV; + break; + case "_BV3": + temp = biaoJiData.BV; + break; + case "_CV1": + temp = biaoJiData.CV; + break; + case "_CV2": + temp = biaoJiData.CV; + break; + case "_CV3": + temp = biaoJiData.CV; + break; - // case "õ_AV1": - // temp = Three[0].ttpData[0].AV1; - // break; - // case "õ_AV2": - // temp = Three[0].ttpData[0].AV2; - // break; - // case "õ_AV3": - // temp = Three[0].ttpData[0].AV3; - // break; - // case "õ_BV1": - // temp = Three[0].ttpData[0].BV1; - // break; - // case "õ_BV2": - // temp = Three[0].ttpData[0].BV2; - // break; - // case "õ_BV3": - // temp = Three[0].ttpData[0].BV3; - // break; - // case "õ_CV1": - // temp = Three[0].ttpData[0].CV1; - // break; - // case "õ_CV2": - // temp = Three[0].ttpData[0].CV2; - // break; - // case "õ_CV3": - // temp = Three[0].ttpData[0].CV3; - // break; + case "_AA1": + temp = biaoJiData.AA; + break; + case "_AA2": + temp = biaoJiData.AA; + break; + case "_AA3": + temp = biaoJiData.AA; + break; + case "_BA1": + temp = biaoJiData.BA; + break; + case "_BA2": + temp = biaoJiData.BA; + break; + case "_BA3": + temp = biaoJiData.BA; + break; + case "_CA1": + temp = biaoJiData.CA; + break; + case "_CA2": + temp = biaoJiData.CA; + break; + case "_CA3": + temp = biaoJiData.CA; + break; + #endregion + default: + break; + } - // #region - // case "_AV1": - // temp = Three[0].ttpData[0].AV1; - // break; - // case "_AV2": - // temp = Three[0].ttpData[0].AV2; - // break; - // case "_AV3": - // temp = Three[0].ttpData[0].AV3; - // break; - // case "_BV1": - // temp = Three[0].ttpData[0].BV1; - // break; - // case "_BV2": - // temp = Three[0].ttpData[0].BV2; - // break; - // case "_BV3": - // temp = Three[0].ttpData[0].BV3; - // break; - // case "_CV1": - // temp = Three[0].ttpData[0].CV1; - // break; - // case "_CV2": - // temp = Three[0].ttpData[0].CV2; - // break; - // case "_CV3": - // temp = Three[0].ttpData[0].CV3; - // break; - - - // case "_AA1": - // temp = Three[0].ttpData[0].AA1; - // break; - // case "_AA2": - // temp = Three[0].ttpData[0].AA2; - // break; - // case "_AA3": - // temp = Three[0].ttpData[0].AA3; - // break; - // case "_BA1": - // temp = Three[0].ttpData[0].BA1; - // break; - // case "_BA2": - // temp = Three[0].ttpData[0].BA2; - // break; - // case "_BA3": - // temp = Three[0].ttpData[0].BA3; - // break; - // case "_CA1": - // temp = Three[0].ttpData[0].CA1; - // break; - // case "_CA2": - // temp = Three[0].ttpData[0].CA2; - // break; - // case "_CA3": - // temp = Three[0].ttpData[0].CA3; - // break; - // #endregion - // } - //} - //for (int i = 0; i < gameObjects.Count; i++) - //{ - // if (gameObjects[i].name.Equals("")) - // { - // gameObjects[i].SetActive(true); - // } - //} - //switch (name) - //{ - // default: - // break; - //} - //Debug.Log("ǰݣ" + temp); + for (int i = 0; i < gameObjects.Count; i++) + { + if (gameObjects[i].name.Equals("")) + { + gameObjects[i].SetActive(true); + } + } + Debug.Log("ǰݣ" + temp); return temp; } float show(string name, float dianyliu) diff --git a/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity b/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity index 60c30c9b..a127ce44 100644 --- a/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity +++ b/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity @@ -765,6 +765,122 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 352088018} m_Mesh: {fileID: 4473592180156338104, guid: 4330e55d19067f246bddb2258b24ba35, type: 3} +--- !u!1 &359155033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 359155034} + - component: {fileID: 359155038} + - component: {fileID: 359155037} + - component: {fileID: 359155036} + - component: {fileID: 359155035} + m_Layer: 0 + m_Name: "\u7528\u7535_N" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &359155034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359155033} + m_LocalRotation: {x: -0.53898555, y: -0.19617465, z: -0.28016648, w: 0.76975125} + m_LocalPosition: {x: 0.18, y: -0, z: 6.39} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 629576740} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -70, y: 0, z: -40} +--- !u!114 &359155035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359155033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: "\u7528\u7535_N" + isBlack: 1 + VV: V + isok: 0 +--- !u!65 &359155036 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359155033} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &359155037 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359155033} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &359155038 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359155033} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &369004356 GameObject: m_ObjectHideFlags: 0 @@ -850,6 +966,7 @@ Transform: - {fileID: 3852754502446951921} - {fileID: 5959117102879650199} - {fileID: 1087341792} + - {fileID: 629576740} - {fileID: 733495571} - {fileID: 2094234371} - {fileID: 2354093220437440037} @@ -1737,6 +1854,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616437588} m_Mesh: {fileID: 5021887119654122849, guid: 4330e55d19067f246bddb2258b24ba35, type: 3} +--- !u!1 &629576739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629576740} + m_Layer: 0 + m_Name: "\u7535\u538B\u89E6\u78B0\u70B9" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &629576740 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629576739} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.0010986328, y: 1.3907001, z: -0.30270004} + m_LocalScale: {x: 0.006627655, y: 0.006627655, z: 0.006627653} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1913865654} + - {fileID: 1419972691} + - {fileID: 1401229156} + - {fileID: 359155034} + m_Father: {fileID: 396206872} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1 &633433862 GameObject: m_ObjectHideFlags: 0 @@ -1999,7 +2151,7 @@ Transform: - {fileID: 2062495795} - {fileID: 1724770194} m_Father: {fileID: 396206872} - m_RootOrder: 24 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &733798599 GameObject: @@ -2510,6 +2662,238 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1401229155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1401229156} + - component: {fileID: 1401229160} + - component: {fileID: 1401229159} + - component: {fileID: 1401229158} + - component: {fileID: 1401229157} + m_Layer: 0 + m_Name: "\u7528\u7535_CV1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1401229156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401229155} + m_LocalRotation: {x: -0.53898555, y: -0.19617465, z: -0.28016648, w: 0.76975125} + m_LocalPosition: {x: 0.18, y: -0, z: 2.63} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 629576740} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -70, y: 0, z: -40} +--- !u!114 &1401229157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401229155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: "\u7528\u7535_CV1" + isBlack: 0 + VV: V + isok: 0 +--- !u!65 &1401229158 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401229155} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1401229159 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401229155} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1401229160 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401229155} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1419972690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419972691} + - component: {fileID: 1419972695} + - component: {fileID: 1419972694} + - component: {fileID: 1419972693} + - component: {fileID: 1419972692} + m_Layer: 0 + m_Name: "\u7528\u7535_BV1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1419972691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419972690} + m_LocalRotation: {x: -0.53898555, y: -0.19617465, z: -0.28016648, w: 0.76975125} + m_LocalPosition: {x: 0.18, y: -0, z: -1.36} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 629576740} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -70, y: 0, z: -40} +--- !u!114 &1419972692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419972690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: "\u7528\u7535_BV1" + isBlack: 0 + VV: V + isok: 0 +--- !u!65 &1419972693 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419972690} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1419972694 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419972690} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1419972695 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419972690} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1454340110 GameObject: m_ObjectHideFlags: 0 @@ -5381,6 +5765,122 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1913865653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1913865654} + - component: {fileID: 1913865658} + - component: {fileID: 1913865657} + - component: {fileID: 1913865656} + - component: {fileID: 1913865655} + m_Layer: 0 + m_Name: "\u7528\u7535_AV1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1913865654 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913865653} + m_LocalRotation: {x: -0.53898555, y: -0.19617465, z: -0.28016648, w: 0.76975125} + m_LocalPosition: {x: 0.18, y: -0, z: -5.15} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 629576740} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -70, y: 0, z: -40} +--- !u!114 &1913865655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913865653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3} + m_Name: + m_EditorClassIdentifier: + electricity: 0 + activation: 0 + name: "\u7528\u7535_AV1" + isBlack: 0 + VV: V + isok: 0 +--- !u!65 &1913865656 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913865653} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1913865657 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913865653} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1913865658 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913865653} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1923923336 GameObject: m_ObjectHideFlags: 0 @@ -5759,7 +6259,7 @@ Transform: m_Children: - {fileID: 409895323} m_Father: {fileID: 396206872} - m_RootOrder: 25 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2111405329 stripped MonoBehaviour: @@ -16680,7 +17180,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3} propertyPath: m_RootOrder - value: 26 + value: 27 objectReference: {fileID: 0} - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3} propertyPath: m_LocalPosition.x @@ -18301,7 +18801,7 @@ Transform: - {fileID: 5959117102471092312} - {fileID: 5959117102322062333} m_Father: {fileID: 396206872} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2705534436311462392 Transform: @@ -22710,7 +23210,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!23 &3651405957758762212 MeshRenderer: m_ObjectHideFlags: 0 @@ -42930,6 +43430,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7987186903484630082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 32 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3} --- !u!4 &6986068372559492066 diff --git a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt index f3cc5560..bfd5661c 100644 --- a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt +++ b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt @@ -1 +1 @@ -Build from ADAM at 2024/6/5 20:58:25 \ No newline at end of file +Build from ADAM at 2024/6/6 13:46:52 \ No newline at end of file