wangxi 1 vuosi sitten
vanhempi
commit
acd81092e8

+ 11 - 4
Assets/Scenes/Scene1.unity

@@ -114900,6 +114900,13 @@ MonoBehaviour:
   m_NowVersion: 2.5.0-20211127
   m_NewVersion: 
   m_ChartList:
+  - {fileID: 452472117}
+  - {fileID: 484911378}
+  - {fileID: 702884691}
+  - {fileID: 863014041}
+  - {fileID: 983293810}
+  - {fileID: 1313742874}
+  - {fileID: 1564199711}
   - {fileID: 1817738267}
   - {fileID: 1888476322}
   m_ThemeNames:
@@ -144069,8 +144076,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2098232022}
   m_HandleRect: {fileID: 2098232021}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 0.5
+  m_Value: 1
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -413891,7 +413898,7 @@ GameObject:
   - component: {fileID: 2582947137332354003}
   m_Layer: 0
   m_Name: "110KV \u7535\u6D41\u4E92\u611F\u5668"
-  m_TagString: LH
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1186974,7 +1186981,7 @@ GameObject:
   - component: {fileID: 8738464034571894177}
   m_Layer: 0
   m_Name: "110KV \u7535\u6D41\u4E92\u611F\u5668"
-  m_TagString: LH
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

+ 3 - 2
Assets/Scripts/UI/ConfigWndController.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using TMPro;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityEngine.Windows;
 using static DevDataInfo;
@@ -118,9 +119,9 @@ public class ConfigWndController : MonoBehaviour
     /// </summary>
     void GetObject()
     {
-        if (ConfigWnd.activeSelf/*&&!isSelected*/)
+        if (ConfigWnd.activeSelf && !isSelected)
         {
-            //currentObject = null;
+            currentObject = null;
             if (Input.GetMouseButtonDown(0))
             {
                 x = Input.mousePosition.x;

+ 1 - 1
Assets/Scripts/UI/SwitchsController.cs

@@ -71,7 +71,7 @@ public class SwitchsController : MonoBehaviour
                         var yxData = yxDatas[0];
                         if (yxData != null)
                         {
-                            if (yxData.resultValue == 1)
+                            if (yxData.resultValue == 0)
                             {
                                 state = c_state_off;
                             }

+ 4 - 0
Assets/Scripts/UI/VideoPlayerController.cs

@@ -138,9 +138,13 @@ public class VideoPlayerController : MonoBehaviour
                     brand = info.manufacturerInfo.manufacturerCode;
                     ip = info.ip;
                     devNo=info.devNo.ToString();
+                    return;
                 }
             }
         }
+        brand = "";
+        ip = "";
+        devNo = "";
     }
     /// <summary>
     /// ʵʱ²¥·Å