323

SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs

@@ -63,15 +63,15 @@ namespace QianHuo
         // Use this for initialization
         private void Start()
         {
-            userState = GlobalFlag.biaojiData.userState;
+            //userState = GlobalFlag.biaojiData.userState;
-            warnningType = GlobalFlag.biaojiData.warningType;
+            //warnningType = GlobalFlag.biaojiData.warningType;
-            onSite = GlobalFlag.biaojiData.onSite;
+            //onSite = GlobalFlag.biaojiData.onSite;
 
 
-            if (userState == "正常") return;
+            //if (userState == "正常") return;
             if (guimenFengYing.GetComponent<DoolsPlayer>())
                 guimenFengYing.GetComponent<DoolsPlayer>()._collider.enabled = true;
-            guimenFengYing.SetActive(false);
+            //guimenFengYing.SetActive(false);
             GameManager.Instance.YanDian = true;
             if (isGuanFu)
             {
@@ -146,7 +146,7 @@ namespace QianHuo
         /// </summary>
         public void SwitchDianLiuErrorObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.onSite;
+            string onSiteState = GlobalFlag.biaojiData.warningType;
             for (int i = 0; i < errorObjs.Length; i++)
             {
                 int index = i;
@@ -164,7 +164,7 @@ namespace QianHuo
         /// </summary>
         public void SwitchDianLiuCorrectObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.onSite;
+            string onSiteState = GlobalFlag.biaojiData.warningType;
             for (int i = 0; i < correctObjs.Length; i++)
             {
                 int index = i;
@@ -179,8 +179,8 @@ namespace QianHuo
 
         public void SwitchABC()
         {
-            if (!string.IsNullOrEmpty(GlobalFlag.biaojiData.selectInfo))
+            //if (!string.IsNullOrEmpty(GlobalFlag.biaojiData.selectInfo))
-                abc = ToolUtility.GetInfos(GlobalFlag.biaojiData.selectInfo, '_');
+            //    abc = ToolUtility.GetInfos(GlobalFlag.biaojiData.selectInfo, '_');
 
             for (int i = 0; i < currentErrorObj.objChildren.Length; i++)
             {
@@ -227,7 +227,7 @@ namespace QianHuo
 
         public void SwitchDianYaErrorObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.onSite;
+            string onSiteState = GlobalFlag.biaojiData.warningType;
             for (int i = 0; i < dianYaCorrectObjs.Length; i++)
             {
                 dianYaCorrectObjs[i].objParent.SetActive(false);
@@ -241,7 +241,7 @@ namespace QianHuo
 
         public void SwitchDianYaCorrectObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.onSite;
+            string onSiteState = GlobalFlag.biaojiData.warningType;
             for (int i = 0; i < dianYaErrorObjs.Length; i++)
             {
                 dianYaErrorObjs[i].objParent.SetActive(false);

SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs

@@ -15,19 +15,10 @@ namespace BjData
     [Serializable]
     public class BiaoJIData
     {
-        public string userState;
         /// <summary>
         /// 错误状态
         /// </summary>
         public string warningType;
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public string onSite;
-        /// <summary>
-        /// 选择信息
-        /// </summary>
-        public string selectInfo;
 
     }
 }

SXElectricalInspection/Assets/Adam/Scripts/Data/MessageData.cs

@@ -77,4 +77,33 @@ public class MessageData
     /// µçѹ
     /// </summary>
     public string voltage;
+    /// <summary>
+    /// ÁãÐòµçÁ÷
+    /// </summary>
+    public string zerosequencecurrent;
+    /// <summary>
+    /// AA
+    /// </summary>
+    public string aphasecurrent;
+    /// <summary>
+    /// BA
+    /// </summary>
+    public string bphasecurrent;
+    /// <summary>
+    /// CA
+    /// </summary>
+    public string cphasecurrent;
+    /// <summary>
+    /// AV
+    /// </summary>
+    public string aphasevoltage;
+    /// <summary>
+    /// BV
+    /// </summary>
+    public string bphasevoltage;
+    /// <summary>
+    /// CV
+    /// </summary>
+    public string cphasevoltage;
+
 }

SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs

@@ -198,10 +198,7 @@ namespace Adam
         public BiaoJIData BiaoJiData()
         {
             BiaoJIData temp = new BiaoJIData();
-            temp.userState = currentEC.UserState;
+            temp.warningType = UIManager.Instance.messageData.stubtype;
-            temp.warningType = currentEC.WarningType;
-            temp.onSite = currentEC.OnSite;
-            temp.selectInfo = currentEC.SelectCatch;
             return temp;
         }
 

SXElectricalInspection/Assets/Adam/Scripts/Views/ThreeTransformerPhotovoltaicView.cs

@@ -18,41 +18,41 @@ namespace Views
     {
         public SpriteRenderer spriteRenderer;
         public TextMesh textMesh;
-        public string isFD;
         public Sprite[] sprites;
         public List<string> infos = new List<string>();
         /// <summary>
         /// 表计信息
         /// </summary>
-        public List<ttpData.JfpgItem> ttpData = new List<ttpData.JfpgItem>();
+        public List<EnergylistItem> energylist = new List<EnergylistItem>();
         /// <summary>
         /// 是否正常
         /// </summary>
         public TrainState trainData;
-
+        private void Start()
-        // Use this for initialization
-        private void OnEnable ()
         {
-            //ttpData = ExamusersController.Instance.GetTTPDs();
+            energylist = UIManager.Instance.messageData.energylist;
-            for (int i = 0; i < ttpData.Count; i++)
+            for (int i = 0; i < energylist.Count; i++)
             {
                 int index = i;
-                if (isFD.Equals(ttpData[index].type))
+                for (int j = 0; j < energylist[index].worklist.Count; j++)
                 {
-                    infos = ttpData[index].rdj;
+                    int indexJ = j;
-                    infos.Add(ttpData[index].AA1.ToString());
+                    infos.Add(energylist[index].worklist[indexJ].valuework);
-                    infos.Add(ttpData[index].AV1.ToString());
-                    //if (GlobalFlag.sceneData.info0 == "单相")
-                    //{
-                    //    textMesh.text = infos[0];
-                    //    return;
-                    //}
-                    infos.Add(ttpData[index].BA1.ToString());
-                    infos.Add(ttpData[index].BV1.ToString());
-                    infos.Add(ttpData[index].CA1.ToString());
-                    infos.Add(ttpData[index].CV1.ToString());
                 }
             }
+            if (UIManager.Instance.messageData.scenename == "swdygpb")
+            {
+                infos.Add(UIManager.Instance.messageData.electriccurrent);
+                infos.Add(UIManager.Instance.messageData.voltage);
+                textMesh.text = infos[0];
+                return;
+            }
+            infos.Add(UIManager.Instance.messageData.aphasecurrent);
+            infos.Add(UIManager.Instance.messageData.bphasecurrent);
+            infos.Add(UIManager.Instance.messageData.cphasecurrent);
+            infos.Add(UIManager.Instance.messageData.aphasevoltage);
+            infos.Add(UIManager.Instance.messageData.bphasevoltage);
+            infos.Add(UIManager.Instance.messageData.cphasevoltage);
             textMesh.text = infos[0];
         }
 

SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab

@@ -6571,7 +6571,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1437794174185993398, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer

SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs

@@ -120,21 +120,21 @@ public class GameManager : MonoBehaviour
     }
     public void init()
     {
-        if (UIManager.Instance.Reconnection.HandGameObject)
+        //if (UIManager.Instance.Reconnection.HandGameObject)
-        {
+        //{
-            ToolsShow(UIManager.Instance.Reconnection.HandGameObject);
+        //    ToolsShow(UIManager.Instance.Reconnection.HandGameObject);
-            UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
+        //    UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
-        }
+        //}
-        Player.transform.GetComponent<FirstPersonController>().enabled = true;
+        //Player.transform.GetComponent<FirstPersonController>().enabled = true;
-        Player.transform.localPosition = UIManager.Instance.Reconnection.PlayerPos;
+        //Player.transform.localPosition = UIManager.Instance.Reconnection.PlayerPos;
-        Player.transform.localEulerAngles = UIManager.Instance.Reconnection.PlayerRot;
+        //Player.transform.localEulerAngles = UIManager.Instance.Reconnection.PlayerRot;
-        HuiFuim.gameObject.SetActive(true);
+        //HuiFuim.gameObject.SetActive(true);
-        HuiFuim.DOFade(0.8f, 0.25f);
+        //HuiFuim.DOFade(0.8f, 0.25f);
-        HuiFuim.DOFade(0, 0.25f).SetDelay(2).OnComplete(() =>
+        //HuiFuim.DOFade(0, 0.25f).SetDelay(2).OnComplete(() =>
-        {
+        //{
-            HuiFuim.gameObject.SetActive(false);
+        //    HuiFuim.gameObject.SetActive(false);
-        });
+        //});
-        UIManager.Instance.Reconnection.ison = false;
+        //UIManager.Instance.Reconnection.ison = false;
     }
     public void show(string Str)
     {
@@ -149,6 +149,7 @@ public class GameManager : MonoBehaviour
     {
         if (transform)
         {
+            if (DoolsPlayer == null) return;
             switch (interactiveEnum)
             {
                 case Interactive.none:

SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs

@@ -16,14 +16,14 @@ public class BoxPengZhuang : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        WorkingPersonnel.instance.init();
+        //WorkingPersonnel.instance.init();
-        if (UIManager.Instance.ganTanHao)
+        //if (UIManager.Instance.ganTanHao)
-        {
+        //{
-            if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)&&UIManager.Instance.isBox)
+        //    if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)&&UIManager.Instance.isBox)
-            {
+        //    {
-                gameObject.SetActive(false);
+        //        gameObject.SetActive(false);
-            }
+        //    }
-        }
+        //}
     }
 
     private async void OnTriggerEnter(Collider other)
@@ -36,11 +36,11 @@ public class BoxPengZhuang : MonoBehaviour
                 g1.init(dialogue);
                 gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
                 gameObject.SetActive(false);
-                if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
+                //if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
-                {
+                //{
-                    gameObject.SetActive(false);
+                //    gameObject.SetActive(false);
-                    UIManager.Instance.isBox = true;
+                //    UIManager.Instance.isBox = true;
-                }
+                //}
                 await FractionManager.Instance.overAsync(3, 2, "¹¤×÷Ö¤");
             }
         }

SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs

@@ -16,7 +16,7 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
     public DoolsPlayer DoolsPlayer;
     private void Awake()
     {
-        run();
+       
     }
     // Start is called before the first frame update
     void Start()
@@ -26,7 +26,8 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
     }
     IEnumerator QiDon()
     {
-        yield return new WaitForSeconds(3);
+        yield return new WaitForSeconds(1);
+        run();
     }
     /// <summary>
     /// 获取低下预设数据
@@ -42,285 +43,284 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
     {
         await Task.Delay(2000);
         float temp = 0;
-        if (Three[0].ttpData.Count >= 2)
+        //if (Three[0].ttpData.Count >= 2)
-        {
+        //{
-            Debug.Log("akjshd走：222");
+        //    Debug.Log("akjshd走：222");
-            switch (name)
+        //    switch (name)
-            {
+        //    {
-                case "用电_AA1":
+        //        case "用电_AA1":
-                    temp = Three[0].ttpData[0].AA1;
+        //            temp = Three[0].ttpData[0].AA1;
-                    break;
+        //            break;
-                case "用电_AA2":
+        //        case "用电_AA2":
-                    temp = Three[0].ttpData[0].AA2;
+        //            temp = Three[0].ttpData[0].AA2;
-                    break;
+        //            break;
-                case "用电_AA3":
+        //        case "用电_AA3":
-                    temp = Three[0].ttpData[0].AA3;
+        //            temp = Three[0].ttpData[0].AA3;
-                    break;
+        //            break;
-                case "用电_BA1":
+        //        case "用电_BA1":
-                    temp = Three[0].ttpData[0].BA1;
+        //            temp = Three[0].ttpData[0].BA1;
-                    break;
+        //            break;
-                case "用电_BA2":
+        //        case "用电_BA2":
-                    temp = Three[0].ttpData[0].BA2;
+        //            temp = Three[0].ttpData[0].BA2;
-                    break;
+        //            break;
-                case "用电_BA3":
+        //        case "用电_BA3":
-                    temp = Three[0].ttpData[0].BA3;
+        //            temp = Three[0].ttpData[0].BA3;
-                    break;
+        //            break;
-                case "用电_CA1":
+        //        case "用电_CA1":
-                    temp = Three[0].ttpData[0].CA1;
+        //            temp = Three[0].ttpData[0].CA1;
-                    break;
+        //            break;
-                case "用电_CA2":
+        //        case "用电_CA2":
-                    temp = Three[0].ttpData[0].CA2;
+        //            temp = Three[0].ttpData[0].CA2;
-                    break;
+        //            break;
-                case "用电_CA3":
+        //        case "用电_CA3":
-                    temp = Three[0].ttpData[0].CA3;
+        //            temp = Three[0].ttpData[0].CA3;
-                    break;
+        //            break;
-                case "用电_1A":
+        //        case "用电_1A":
-                case "用电_1B":
+        //        case "用电_1B":
-                case "用电_1C":
+        //        case "用电_1C":
-                    temp = show(name, Three[0].ttpData[0].AA1);
+        //            temp = show(name, Three[0].ttpData[0].AA1);
-                    break;
+        //            break;
 
-                case "用电_AV1":
+        //        case "用电_AV1":
-                    temp = Three[0].ttpData[0].AV1;
+        //            temp = Three[0].ttpData[0].AV1;
-                    break;
+        //            break;
-                case "用电_AV2":
+        //        case "用电_AV2":
-                    temp = Three[0].ttpData[0].AV2;
+        //            temp = Three[0].ttpData[0].AV2;
-                    break;
+        //            break;
-                case "用电_AV3":
+        //        case "用电_AV3":
-                    temp = Three[0].ttpData[0].AV3;
+        //            temp = Three[0].ttpData[0].AV3;
-                    break;
+        //            break;
-                case "用电_BV1":
+        //        case "用电_BV1":
-                    temp = Three[0].ttpData[0].BV1;
+        //            temp = Three[0].ttpData[0].BV1;
-                    break;
+        //            break;
-                case "用电_BV2":
+        //        case "用电_BV2":
-                    temp = Three[0].ttpData[0].BV2;
+        //            temp = Three[0].ttpData[0].BV2;
-                    break;
+        //            break;
-                case "用电_BV3":
+        //        case "用电_BV3":
-                    temp = Three[0].ttpData[0].BV3;
+        //            temp = Three[0].ttpData[0].BV3;
-                    break;
+        //            break;
-                case "用电_CV1":
+        //        case "用电_CV1":
-                    temp = Three[0].ttpData[0].CV1;
+        //            temp = Three[0].ttpData[0].CV1;
-                    break;
+        //            break;
-                case "用电_CV2":
+        //        case "用电_CV2":
-                    temp = Three[0].ttpData[0].CV2;
+        //            temp = Three[0].ttpData[0].CV2;
-                    break;
+        //            break;
-                case "用电_CV3":
+        //        case "用电_CV3":
-                    temp = Three[0].ttpData[0].CV3;
+        //            temp = Three[0].ttpData[0].CV3;
-                    break;
+        //            break;
 
-                #region 发电
+        //        #region 发电
-                case "发电_AV1":
+        //        case "发电_AV1":
-                    temp = Three[0].ttpData[1].AV1;
+        //            temp = Three[0].ttpData[1].AV1;
-                    break;
+        //            break;
-                case "发电_AV2":
+        //        case "发电_AV2":
-                    temp = Three[0].ttpData[1].AV2;
+        //            temp = Three[0].ttpData[1].AV2;
-                    break;
+        //            break;
-                case "发电_AV3":
+        //        case "发电_AV3":
-                    temp = Three[0].ttpData[1].AV3;
+        //            temp = Three[0].ttpData[1].AV3;
-                    break;
+        //            break;
-                case "发电_BV1":
+        //        case "发电_BV1":
-                    temp = Three[0].ttpData[1].BV1;
+        //            temp = Three[0].ttpData[1].BV1;
-                    break;
+        //            break;
-                case "发电_BV2":
+        //        case "发电_BV2":
-                    temp = Three[0].ttpData[1].BV2;
+        //            temp = Three[0].ttpData[1].BV2;
-                    break;
+        //            break;
-                case "发电_BV3":
+        //        case "发电_BV3":
-                    temp = Three[0].ttpData[1].BV3;
+        //            temp = Three[0].ttpData[1].BV3;
-                    break;
+        //            break;
-                case "发电_CV1":
+        //        case "发电_CV1":
-                    temp = Three[0].ttpData[1].CV1;
+        //            temp = Three[0].ttpData[1].CV1;
-                    break;
+        //            break;
-                case "发电_CV2":
+        //        case "发电_CV2":
-                    temp = Three[0].ttpData[1].CV2;
+        //            temp = Three[0].ttpData[1].CV2;
-                    break;
+        //            break;
-                case "发电_CV3":
+        //        case "发电_CV3":
-                    temp = Three[0].ttpData[1].CV3;
+        //            temp = Three[0].ttpData[1].CV3;
-                    break;
+        //            break;
 
-                case "发电_AA1":
+        //        case "发电_AA1":
-                    temp = Three[0].ttpData[1].AA1;
+        //            temp = Three[0].ttpData[1].AA1;
-                    break;
+        //            break;
-                case "发电_AA2":
+        //        case "发电_AA2":
-                    temp = Three[0].ttpData[1].AA2;
+        //            temp = Three[0].ttpData[1].AA2;
-                    break;
+        //            break;
-                case "发电_AA3":
+        //        case "发电_AA3":
-                    temp = Three[0].ttpData[1].AA3;
+        //            temp = Three[0].ttpData[1].AA3;
-                    break;
+        //            break;
-                case "发电_BA1":
+        //        case "发电_BA1":
-                    temp = Three[0].ttpData[1].BA1;
+        //            temp = Three[0].ttpData[1].BA1;
-                    break;
+        //            break;
-                case "发电_BA2":
+        //        case "发电_BA2":
-                    temp = Three[0].ttpData[1].BA2;
+        //            temp = Three[0].ttpData[1].BA2;
-                    break;
+        //            break;
-                case "发电_BA3":
+        //        case "发电_BA3":
-                    temp = Three[0].ttpData[1].BA3;
+        //            temp = Three[0].ttpData[1].BA3;
-                    break;
+        //            break;
-                case "发电_CA1":
+        //        case "发电_CA1":
-                    temp = Three[0].ttpData[1].CA1;
+        //            temp = Three[0].ttpData[1].CA1;
-                    break;
+        //            break;
-                case "发电_CA2":
+        //        case "发电_CA2":
-                    temp = Three[0].ttpData[1].CA2;
+        //            temp = Three[0].ttpData[1].CA2;
-                    break;
+        //            break;
-                case "发电_CA3":
+        //        case "发电_CA3":
-                    temp = Three[0].ttpData[1].CA3;
+        //            temp = Three[0].ttpData[1].CA3;
-                    break;
+        //            break;
-                #endregion
+        //        #endregion
-                default:
+        //        default:
-                    break;
+        //            break;
-            }
+        //    }
-        }
+        //}
-        else
+        //else
-        {
+        //{
-            Debug.Log("akjshd走：");
+        //    Debug.Log("akjshd走：");
-            switch (name)
+        //    switch (name)
-            {
+        //    {
-                case "用电_AA1":
+        //        case "用电_AA1":
-                    temp = Three[0].ttpData[0].AA1;
+        //            temp = Three[0].ttpData[0].AA1;
-                    break;
+        //            break;
-                case "用电_AA2":
+        //        case "用电_AA2":
-                    temp = Three[0].ttpData[0].AA2;
+        //            temp = Three[0].ttpData[0].AA2;
-                    break;
+        //            break;
-                case "用电_AA3":
+        //        case "用电_AA3":
-                    temp = Three[0].ttpData[0].AA3;
+        //            temp = Three[0].ttpData[0].AA3;
-                    break;
+        //            break;
-                case "用电_BA1":
+        //        case "用电_BA1":
-                    temp = Three[0].ttpData[0].BA1;
+        //            temp = Three[0].ttpData[0].BA1;
-                    break;
+        //            break;
-                case "用电_BA2":
+        //        case "用电_BA2":
-                    temp = Three[0].ttpData[0].BA2;
+        //            temp = Three[0].ttpData[0].BA2;
-                    break;
+        //            break;
-                case "用电_BA3":
+        //        case "用电_BA3":
-                    temp = Three[0].ttpData[0].BA3;
+        //            temp = Three[0].ttpData[0].BA3;
-                    break;
+        //            break;
-                case "用电_CA1":
+        //        case "用电_CA1":
-                    temp = Three[0].ttpData[0].CA1;
+        //            temp = Three[0].ttpData[0].CA1;
-                    break;
+        //            break;
-                case "用电_CA2":
+        //        case "用电_CA2":
-                    temp = Three[0].ttpData[0].CA2;
+        //            temp = Three[0].ttpData[0].CA2;
-                    break;
+        //            break;
-                case "用电_CA3":
+        //        case "用电_CA3":
-                    temp = Three[0].ttpData[0].CA3;
+        //            temp = Three[0].ttpData[0].CA3;
-                    break;
+        //            break;
-                case "用电_1A":
+        //        case "用电_1A":
-                case "用电_1B":
+        //        case "用电_1B":
-                case "用电_1C":
+        //        case "用电_1C":
-                    temp = show(name, Three[0].ttpData[0].AA1);
+        //            temp = show(name, Three[0].ttpData[0].AA1);
-                    break;
+        //            break;
 
-                case "用电_AV1":
+        //        case "用电_AV1":
-                    temp = Three[0].ttpData[0].AV1;
+        //            temp = Three[0].ttpData[0].AV1;
-                    break;
+        //            break;
-                case "用电_AV2":
+        //        case "用电_AV2":
-                    temp = Three[0].ttpData[0].AV2;
+        //            temp = Three[0].ttpData[0].AV2;
-                    break;
+        //            break;
-                case "用电_AV3":
+        //        case "用电_AV3":
-                    temp = Three[0].ttpData[0].AV3;
+        //            temp = Three[0].ttpData[0].AV3;
-                    break;
+        //            break;
-                case "用电_BV1":
+        //        case "用电_BV1":
-                    temp = Three[0].ttpData[0].BV1;
+        //            temp = Three[0].ttpData[0].BV1;
-                    break;
+        //            break;
-                case "用电_BV2":
+        //        case "用电_BV2":
-                    temp = Three[0].ttpData[0].BV2;
+        //            temp = Three[0].ttpData[0].BV2;
-                    break;
+        //            break;
-                case "用电_BV3":
+        //        case "用电_BV3":
-                    temp = Three[0].ttpData[0].BV3;
+        //            temp = Three[0].ttpData[0].BV3;
-                    break;
+        //            break;
-                case "用电_CV1":
+        //        case "用电_CV1":
-                    temp = Three[0].ttpData[0].CV1;
+        //            temp = Three[0].ttpData[0].CV1;
-                    break;
+        //            break;
-                case "用电_CV2":
+        //        case "用电_CV2":
-                    temp = Three[0].ttpData[0].CV2;
+        //            temp = Three[0].ttpData[0].CV2;
-                    break;
+        //            break;
-                case "用电_CV3":
+        //        case "用电_CV3":
-                    temp = Three[0].ttpData[0].CV3;
+        //            temp = Three[0].ttpData[0].CV3;
-                    break;
+        //            break;
 
-                #region 发电
+        //        #region 发电
-                case "发电_AV1":
+        //        case "发电_AV1":
-                    temp = Three[0].ttpData[0].AV1;
+        //            temp = Three[0].ttpData[0].AV1;
-                    break;
+        //            break;
-                case "发电_AV2":
+        //        case "发电_AV2":
-                    temp = Three[0].ttpData[0].AV2;
+        //            temp = Three[0].ttpData[0].AV2;
-                    break;
+        //            break;
-                case "发电_AV3":
+        //        case "发电_AV3":
-                    temp = Three[0].ttpData[0].AV3;
+        //            temp = Three[0].ttpData[0].AV3;
-                    break;
+        //            break;
-                case "发电_BV1":
+        //        case "发电_BV1":
-                    temp = Three[0].ttpData[0].BV1;
+        //            temp = Three[0].ttpData[0].BV1;
-                    break;
+        //            break;
-                case "发电_BV2":
+        //        case "发电_BV2":
-                    temp = Three[0].ttpData[0].BV2;
+        //            temp = Three[0].ttpData[0].BV2;
-                    break;
+        //            break;
-                case "发电_BV3":
+        //        case "发电_BV3":
-                    temp = Three[0].ttpData[0].BV3;
+        //            temp = Three[0].ttpData[0].BV3;
-                    break;
+        //            break;
-                case "发电_CV1":
+        //        case "发电_CV1":
-                    temp = Three[0].ttpData[0].CV1;
+        //            temp = Three[0].ttpData[0].CV1;
-                    break;
+        //            break;
-                case "发电_CV2":
+        //        case "发电_CV2":
-                    temp = Three[0].ttpData[0].CV2;
+        //            temp = Three[0].ttpData[0].CV2;
-                    break;
+        //            break;
-                case "发电_CV3":
+        //        case "发电_CV3":
-                    temp = Three[0].ttpData[0].CV3;
+        //            temp = Three[0].ttpData[0].CV3;
-                    break;
+        //            break;
 
 
-                case "发电_AA1":
+        //        case "发电_AA1":
-                    temp = Three[0].ttpData[0].AA1;
+        //            temp = Three[0].ttpData[0].AA1;
-                    break;
+        //            break;
-                case "发电_AA2":
+        //        case "发电_AA2":
-                    temp = Three[0].ttpData[0].AA2;
+        //            temp = Three[0].ttpData[0].AA2;
-                    break;
+        //            break;
-                case "发电_AA3":
+        //        case "发电_AA3":
-                    temp = Three[0].ttpData[0].AA3;
+        //            temp = Three[0].ttpData[0].AA3;
-                    break;
+        //            break;
-                case "发电_BA1":
+        //        case "发电_BA1":
-                    temp = Three[0].ttpData[0].BA1;
+        //            temp = Three[0].ttpData[0].BA1;
-                    break;
+        //            break;
-                case "发电_BA2":
+        //        case "发电_BA2":
-                    temp = Three[0].ttpData[0].BA2;
+        //            temp = Three[0].ttpData[0].BA2;
-                    break;
+        //            break;
-                case "发电_BA3":
+        //        case "发电_BA3":
-                    temp = Three[0].ttpData[0].BA3;
+        //            temp = Three[0].ttpData[0].BA3;
-                    break;
+        //            break;
-                case "发电_CA1":
+        //        case "发电_CA1":
-                    temp = Three[0].ttpData[0].CA1;
+        //            temp = Three[0].ttpData[0].CA1;
-                    break;
+        //            break;
-                case "发电_CA2":
+        //        case "发电_CA2":
-                    temp = Three[0].ttpData[0].CA2;
+        //            temp = Three[0].ttpData[0].CA2;
-                    break;
+        //            break;
-                case "发电_CA3":
+        //        case "发电_CA3":
-                    temp = Three[0].ttpData[0].CA3;
+        //            temp = Three[0].ttpData[0].CA3;
-                    break;
+        //            break;
-                    #endregion
+        //            #endregion
-            }
+        //    }
-        }
+        //}
-        for (int i = 0; i < gameObjects.Count; i++)
+        //for (int i = 0; i < gameObjects.Count; i++)
-        {
+        //{
-            if (gameObjects[i].name.Equals(""))
+        //    if (gameObjects[i].name.Equals(""))
-            {
+        //    {
-                gameObjects[i].SetActive(true);
+        //        gameObjects[i].SetActive(true);
-            }
+        //    }
-        }
+        //}
-        switch (name)
+        //switch (name)
-        {
+        //{
-            default:
+        //    default:
-                break;
+        //        break;
-        }
+        //}
-        Debug.Log("当前数据：" + temp);
+        //Debug.Log("当前数据：" + temp);
         return temp;
     }
     float show(string name, float dianyliu)
     {
-        if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(GlobalFlag.biaojiData.userState))
+        if (!string.IsNullOrEmpty(name))
         {
             //if (GlobalFlag.biaojiData.userState == "正常")
             //{
             //    
             //}
             dianyliu = dianyliu * GlobalFlag.Beilv;
-            if (GlobalFlag.biaojiData.userState == "异常")
+
-            {
             if (GlobalFlag.biaojiData.warningType == "电流异常")
             {
                 switch (name.Substring(3, 2))
@@ -357,7 +357,6 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
 
             }
         }
-        }
         return dianyliu;
     }
 }

SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs

@@ -11,10 +11,10 @@ public class follow : ToolBase
     // Start is called before the first frame update
     void Start()
     {
-        if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
+        //if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
-        {
+        //{
-            gameObject.SetActive(false);
+        //    gameObject.SetActive(false);
-        }
+        //}
     }
     private void Update()
     {

SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity

@@ -372,8 +372,8 @@ Transform:
   m_GameObject: {fileID: 71972313}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.2551, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1829979284}
   m_RootOrder: 0
@@ -414,8 +414,8 @@ Transform:
   m_GameObject: {fileID: 113754430}
   m_LocalRotation: {x: -0.000000059604645, y: -0, z: 3.108624e-15, w: 1}
   m_LocalPosition: {x: 0.1408, y: -0.0537, z: 0.0011}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1625442160885346181}
   m_RootOrder: 0
@@ -479,8 +479,8 @@ Transform:
   m_GameObject: {fileID: 155407218}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.3057, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 564990018}
   m_RootOrder: 0
@@ -676,8 +676,8 @@ Transform:
   m_GameObject: {fileID: 332008881}
   m_LocalRotation: {x: -0.00000005960465, y: 0.000000119209275, z: -7.549516e-15, w: 1}
   m_LocalPosition: {x: 0.145, y: 0.0285, z: 0.2507}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 4571143728998795008}
   m_RootOrder: 0
@@ -790,8 +790,8 @@ Transform:
   m_GameObject: {fileID: 369004356}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.3232, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5751304769224402108}
   m_RootOrder: 0
@@ -851,6 +851,7 @@ Transform:
   - {fileID: 5959117102879650199}
   - {fileID: 1087341792}
   - {fileID: 733495571}
+  - {fileID: 2094234371}
   - {fileID: 2354093220437440037}
   - {fileID: 2704805497856298150}
   m_Father: {fileID: 5719162887804583113}
@@ -888,7 +889,12 @@ MonoBehaviour:
     - {fileID: 5780580341436219161}
     - {fileID: 6754956116197621799}
     - {fileID: 490869716167008566}
-  errorObjs: []
+  errorObjs:
+  - objParent: {fileID: 7402999453889274404}
+    objChildren:
+    - {fileID: 8485012204340783171}
+    - {fileID: 710461924416260704}
+    - {fileID: 3793794314343371165}
   dianYaCorrectObjs:
   - objParent: {fileID: 1521410257}
     objChildren:
@@ -929,6 +935,38 @@ MonoBehaviour:
   Three: []
   gameObjects: []
   DoolsPlayer: {fileID: 7992549118181266749}
+--- !u!1 &409895322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 409895323}
+  m_Layer: 0
+  m_Name: "\u7535\u6D41"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &409895323
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 409895322}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8763366530638369553}
+  m_Father: {fileID: 2094234371}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &420870104
 GameObject:
   m_ObjectHideFlags: 0
@@ -1988,8 +2026,8 @@ Transform:
   m_GameObject: {fileID: 733798599}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0.1493, y: -0.0544, z: -0.011}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7545271383379312953}
   m_RootOrder: 0
@@ -2019,8 +2057,8 @@ Transform:
   m_GameObject: {fileID: 863351250}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.2797, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 575149951}
   m_RootOrder: 0
@@ -2341,8 +2379,8 @@ Transform:
   m_GameObject: {fileID: 1227444476}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.2963, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 13594241}
   m_RootOrder: 0
@@ -2455,8 +2493,8 @@ Transform:
   m_GameObject: {fileID: 1319583408}
   m_LocalRotation: {x: -0.000000007946617, y: 0.000000119209275, z: 0.00000002646691, w: 1}
   m_LocalPosition: {x: 0.0772, y: 0.0285, z: 0.2506}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5093658424056386145}
   m_RootOrder: 0
@@ -2882,8 +2920,8 @@ Transform:
   m_GameObject: {fileID: 1597442816}
   m_LocalRotation: {x: -0.000000059604645, y: 0.000000119209275, z: -3.9968025e-15, w: 1}
   m_LocalPosition: {x: 0.1111, y: 0.0285, z: 0.2506}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7396022841095192126}
   m_RootOrder: 0
@@ -4974,8 +5012,8 @@ Transform:
   m_GameObject: {fileID: 1693449506}
   m_LocalRotation: {x: -0.00000005960465, y: -0, z: -4.4408916e-16, w: 1}
   m_LocalPosition: {x: 0.1447, y: -0.0672, z: -0.0111}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 8089290262312860194}
   m_RootOrder: 0
@@ -5326,7 +5364,7 @@ Transform:
   m_GameObject: {fileID: 1857967997}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.2714, y: -0.0591, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6155028022115753352}
@@ -5603,8 +5641,8 @@ Transform:
   m_GameObject: {fileID: 2009462614}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.2878, y: -0.0515, z: 0.2502}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1955527956}
   m_RootOrder: 0
@@ -5691,6 +5729,38 @@ Transform:
   m_Father: {fileID: 733495571}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2094234370
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2094234371}
+  m_Layer: 0
+  m_Name: "\u9519\u8BEF\u9879\u76EE"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2094234371
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2094234370}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.38, z: -0.49}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 409895323}
+  m_Father: {fileID: 396206872}
+  m_RootOrder: 25
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2111405329 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3494590144457629244, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
@@ -7026,6 +7096,48 @@ Transform:
   m_Father: {fileID: 6141133165687585488}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &232606087692467289
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 710461924416260704}
+  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: 2100000, guid: 3d3ecbb98b43ef84da03ca7a85cce6a4, type: 2}
+  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 &250277853619319543
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -8895,6 +9007,24 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &710461924416260704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5307515818138481252}
+  - component: {fileID: 4248297214666856417}
+  - component: {fileID: 232606087692467289}
+  m_Layer: 0
+  m_Name: B
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &715766229326568984
 Transform:
   m_ObjectHideFlags: 0
@@ -13062,6 +13192,14 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1553817345131914260
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3793794314343371165}
+  m_Mesh: {fileID: -2112926511394696477, guid: 3c10a05dd7008c34d837451c78491571, type: 3}
 --- !u!33 &1562962024601389554
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -16542,11 +16680,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
       propertyPath: m_RootOrder
-      value: 25
+      value: 26
       objectReference: {fileID: 0}
     - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.09418
+      value: -0.096
       objectReference: {fileID: 0}
     - target: {fileID: 4301222307786538278, guid: eafb03293d81e8c4f87199076f4b664a, type: 3}
       propertyPath: m_LocalPosition.y
@@ -18163,7 +18301,7 @@ Transform:
   - {fileID: 5959117102471092312}
   - {fileID: 5959117102322062333}
   m_Father: {fileID: 396206872}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &2705534436311462392
 Transform:
@@ -21864,6 +22002,14 @@ PrefabInstance:
       propertyPath: FirstPersonController
       value: 
       objectReference: {fileID: 2401820165377604996}
+    - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
+      propertyPath: interactive.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
+      propertyPath: interactive.Array.data[0]
+      value: 
+      objectReference: {fileID: 5959117103680501258}
     - target: {fileID: 3497283653043674449, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: m_Name
       value: GameManager
@@ -22008,6 +22154,48 @@ Transform:
   m_Father: {fileID: 6141133165687585488}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &3518992656339743212
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3793794314343371165}
+  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: 2100000, guid: b0435b622c6f0174aad0c59ee69c3ad2, type: 2}
+  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!4 &3521488567266099060
 Transform:
   m_ObjectHideFlags: 0
@@ -22522,7 +22710,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!23 &3651405957758762212
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -23225,6 +23413,24 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &3793794314343371165
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5760074867525493492}
+  - component: {fileID: 1553817345131914260}
+  - component: {fileID: 3518992656339743212}
+  m_Layer: 0
+  m_Name: C
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!64 &3798239106189679842
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -25345,6 +25551,14 @@ Transform:
   m_Father: {fileID: 420870105}
   m_RootOrder: 95
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4248297214666856417
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 710461924416260704}
+  m_Mesh: {fileID: 5692250823686760707, guid: 3c10a05dd7008c34d837451c78491571, type: 3}
 --- !u!114 &4249131161120708695
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -30062,6 +30276,21 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2363406796129492156}
   m_Mesh: {fileID: -6930695562829251193, guid: 140dbd01f0d9bb7429f6b5362e4e3c60, type: 3}
+--- !u!4 &5307515818138481252
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 710461924416260704}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000005760116, z: 0.70710677, w: 0.000000057601163}
+  m_LocalPosition: {x: 0.08029065, y: 0.24829572, z: 0.2511}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763366530638369553}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &5309545078712920940
 Transform:
   m_ObjectHideFlags: 0
@@ -31689,6 +31918,21 @@ Transform:
   m_Father: {fileID: 3747454926657891809}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &5760074867525493492
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3793794314343371165}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000005760116, z: 0.70710677, w: 0.000000057601163}
+  m_LocalPosition: {x: 0.08029065, y: 0.24829572, z: 0.2776}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763366530638369553}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5762225953503370056
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -36761,6 +37005,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -684578622274816253, guid: 33e9e5d4eb4f5ec4e9264f35b68614a9, type: 3}
+      propertyPath: m_TagString
+      value: YanDian
+      objectReference: {fileID: 0}
     - target: {fileID: -684578622274816253, guid: 33e9e5d4eb4f5ec4e9264f35b68614a9, type: 3}
       propertyPath: m_StaticEditorFlags
       value: 0
@@ -36771,7 +37019,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 33e9e5d4eb4f5ec4e9264f35b68614a9, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 33e9e5d4eb4f5ec4e9264f35b68614a9, type: 3}
       propertyPath: m_StaticEditorFlags
@@ -43852,6 +44100,48 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7606393333585323179}
   m_Mesh: {fileID: 1780128353772234882, guid: 140dbd01f0d9bb7429f6b5362e4e3c60, type: 3}
+--- !u!23 &7286072098561334662
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8485012204340783171}
+  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: 2100000, guid: cf907e0a4dbda814194549c40f3498e5, type: 2}
+  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!23 &7290482844164010414
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -44593,6 +44883,22 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9141623028264269408}
   m_Mesh: {fileID: 2693362457415351679, guid: 140dbd01f0d9bb7429f6b5362e4e3c60, type: 3}
+--- !u!1 &7402999453889274404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8763366530638369553}
+  m_Layer: 0
+  m_Name: "\u7535\u80FD\u8868U\u578B\u73AF\u77ED\u63A5"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!23 &7411183187653298122
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -48340,6 +48646,14 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!33 &8266016220887497680
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8485012204340783171}
+  m_Mesh: {fileID: 6178732249614653945, guid: 3c10a05dd7008c34d837451c78491571, type: 3}
 --- !u!23 &8283443828879008242
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -49019,6 +49333,24 @@ Transform:
   m_Father: {fileID: 6141133166362487072}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8485012204340783171
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8626879829098925600}
+  - component: {fileID: 8266016220887497680}
+  - component: {fileID: 7286072098561334662}
+  m_Layer: 0
+  m_Name: A
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!23 &8490921530461301183
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -49796,6 +50128,21 @@ Transform:
   m_Father: {fileID: 420870105}
   m_RootOrder: 44
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &8626879829098925600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8485012204340783171}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000005760116, z: 0.70710677, w: 0.000000057601163}
+  m_LocalPosition: {x: 0.08029065, y: 0.24829572, z: 0.2269}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763366530638369553}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8631297884586284221
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -50130,6 +50477,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!4 &8763366530638369553
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7402999453889274404}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.110300064, y: -0.24000001, z: -0.0697}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8626879829098925600}
+  - {fileID: 5307515818138481252}
+  - {fileID: 5760074867525493492}
+  m_Father: {fileID: 409895323}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &8769754020226559377
 MeshRenderer:
   m_ObjectHideFlags: 0

SXElectricalInspection/Assets/StreamingAssets/Message.json

@@ -9,7 +9,7 @@
       "valuepoint": "14WQ2403130197001"
     },
     {
-      "testpoint": "供电公司",
+      "testpoint": "供电单位",
       "valuepoint": "山西某供电公司"
     },
     {
@@ -24,6 +24,10 @@
       "testpoint": "工单状态",
       "valuepoint": "已发布"
     },
+    {
+      "testpoint": "工单类型",
+      "valuepoint": "窃电"
+    },
     {
       "testpoint": "台区编号",
       "valuepoint": "0000141123"
@@ -133,7 +137,7 @@
       "valuepoint": "窃电"
     },
     {
-      "testpoint": "合同容量",
+      "testpoint": "合同容量/运行容量",
       "valuepoint": "48kW"
     },
     {
@@ -164,10 +168,6 @@
       "testpoint": "城乡类别",
       "valuepoint": "城市"
     },
-    {
-      "testpoint": "运行容量",
-      "valuepoint": "48kw"
-    },
     {
       "testpoint": "立户日期",
       "valuepoint": "2009/8/15"
@@ -329,6 +329,13 @@
     }
   ],
   "stubtype": "电流短接",
-  "electriccurrent": "电流",
+  "electriccurrent": "0",
-  "voltage": "电压"
+  "voltage": "225",
+  "zerosequencecurrent": "0",
+  "aphasecurrent": "25.999",
+  "bphasecurrent": "0",
+  "cphasecurrent": "26.153",
+  "aphasevoltage": "225",
+  "bphasevoltage": "228.8",
+  "cphasevoltage": "227.7"
 }

SXElectricalInspection/Assets/StreamingAssets/build_info.txt

@@ -1 +1 @@
-Build from ADAM at 2024/6/5 13:09:47
+Build from ADAM at 2024/6/5 20:58:25