wangxi 1 year ago
parent
commit
d1137218b3

+ 6 - 13
Assets/Scenes/Scene1.unity

@@ -38933,7 +38933,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -14}
   m_SizeDelta: {x: 84, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &586946196
@@ -71795,7 +71795,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -5}
   m_SizeDelta: {x: 106, y: 15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1044247552
@@ -111642,7 +111642,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -5}
   m_SizeDelta: {x: 25, y: 15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1591620060
@@ -114900,13 +114900,6 @@ 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:
@@ -135968,7 +135961,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 44
+    m_Left: 0
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
@@ -144076,8 +144069,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2098232022}
   m_HandleRect: {fileID: 2098232021}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 1
+  m_Value: 0
+  m_Size: 0.5
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

+ 8 - 10
Assets/Scripts/UI/SwitchsController.cs

@@ -68,18 +68,16 @@ public class SwitchsController : MonoBehaviour
                     var yxDatas = syDataRoot.result.resultData.telesignalisations;
                     if(yxDatas != null&& yxDatas.Count>0)
                     {
-                        foreach (var yxData in yxDatas)
+                        var yxData = yxDatas[0];
+                        if (yxData != null)
                         {
-                            if (yxData.name == "·ÖºÏ״̬")
+                            if (yxData.resultValue == 1)
                             {
-                                if (yxData.resultValue == 1)
-                                {
-                                    state = c_state_off;
-                                }
-                                else
-                                {
-                                    state = c_state_on;
-                                }
+                                state = c_state_off;
+                            }
+                            else
+                            {
+                                state = c_state_on;
                             }
                         }
                     }

+ 5 - 7
Assets/TextMesh Pro/Resources/TMP Settings.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_GetFontFeaturesAtRuntime: 1
   m_missingGlyphCharacter: 0
   m_warningsDisabled: 0
-  m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_defaultFontAsset: {fileID: 11400000, guid: 4868c03278f77eb4783a9c16b851c5f9, type: 2}
   m_defaultFontAssetPath: Fonts & Materials/
   m_defaultFontSize: 36
   m_defaultAutoSizeMinRatio: 0.5
@@ -29,18 +29,16 @@ MonoBehaviour:
   m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
   m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
   m_autoSizeTextContainer: 0
+  m_IsTextObjectScaleStatic: 0
   m_fallbackFontAssets: []
   m_matchMaterialPreset: 1
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
-    type: 2}
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
   m_defaultSpriteAssetPath: Sprite Assets/
   m_enableEmojiSupport: 1
   m_MissingCharacterSpriteUnicode: 0
   m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
-    type: 2}
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
   m_StyleSheetsResourcePath: 
   m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
-    type: 3}
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
   m_UseModernHangulLineBreakingRules: 0