Browse Source

增加设备列表选择项高光

Void_F 2 weeks ago
parent
commit
d1da2a24bc

+ 83 - 4
Assets/Prefabs/UI/Item/GongChengLieBiaoItem.prefab

@@ -31,7 +31,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7830826681739327045}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -80,6 +80,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 01
+--- !u!1 &2373972370528126243
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4147933727859733054}
+  - component: {fileID: 65336521409888475}
+  - component: {fileID: 8000737478587591301}
+  m_Layer: 5
+  m_Name: highLight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4147933727859733054
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2373972370528126243}
+  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: []
+  m_Father: {fileID: 7830826681739327045}
+  m_RootOrder: 0
+  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_SizeDelta: {x: 360, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &65336521409888475
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2373972370528126243}
+  m_CullTransparentMesh: 1
+--- !u!114 &8000737478587591301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2373972370528126243}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 1, b: 0.47177935, a: 0.34117648}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4816396286836267061
 GameObject:
   m_ObjectHideFlags: 0
@@ -111,7 +187,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7830826681739327045}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -191,7 +267,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7830826681739327045}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -272,6 +348,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 4147933727859733054}
   - {fileID: 6632141197071719297}
   - {fileID: 1054542583436602538}
   - {fileID: 1168908816225050994}
@@ -338,6 +415,8 @@ MonoBehaviour:
     name: 
     state: 0
     type: 0
+    gid: 
+    sid: 
 --- !u!114 &6183096527794626195
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -360,7 +439,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}

+ 22 - 1
Assets/Scripts/UI/Item/GongChengLieBiaoItem.cs

@@ -14,12 +14,14 @@ public class GongChengLieBiaoItem : MonoBehaviour
 
     private Button _button;
 
+    private Image _highLightImg;
+    
     public void Init()
     {
         _indexText = this.transform.Find("index").GetComponent<Text>();
         _nameText = this.transform.Find("type").GetComponent<Text>();
         _stateText = this.transform.Find("state").GetComponent<Text>();
-
+        _highLightImg = this.transform.Find("highLight").GetComponent<Image>();
         _button = this.GetComponent<Button>();
         _button.onClick.AddListener(ItemClick);
     }
@@ -31,11 +33,30 @@ public class GongChengLieBiaoItem : MonoBehaviour
             case GongChengType.shuiWei:
             case GongChengType.shuiYa:
             case GongChengType.weiYi:
+                if (GCJKLayer._Instance.currentSelectItem != null)
+                {
+                    GCJKLayer._Instance.currentSelectItem.SetHighLight(false);
+                }
+                GCJKLayer._Instance.currentSelectItem = this;
+                SetHighLight(true);
                 GCJKLayer._Instance._DeviceTrendPanel.Show(_currentData.name,_currentData.type,_currentData.gid,_currentData.sid);
                 break;
         }
     }
 
+    private void OnDestroy()
+    {
+        if (GCJKLayer._Instance.currentSelectItem != null && GCJKLayer._Instance.currentSelectItem == this)
+        {
+            GCJKLayer._Instance.currentSelectItem = null;
+        }
+    }
+
+    public void SetHighLight(bool show)
+    {
+        _highLightImg.enabled = show;
+    }
+
     public void SetData(GongChengLieBiaoData data)
     {
         _currentData = data;

+ 9 - 1
Assets/Scripts/UI/UIView/GCJK/DeviceTrendPanel.cs

@@ -44,7 +44,15 @@ public class DeviceTrendPanel : MonoBehaviour
         tipsText = this.transform.Find("tipsText").GetComponent<Text>();
         tipsText.enabled = false;
         checkButton.onClick.AddListener(() => { GetData(); });
-        closeButton.onClick.AddListener(() => { Hide(); });
+        closeButton.onClick.AddListener(() =>
+        {
+            Hide();
+            if (GCJKLayer._Instance.currentSelectItem != null)
+            {
+                GCJKLayer._Instance.currentSelectItem.SetHighLight(false);
+                GCJKLayer._Instance.currentSelectItem = null;
+            }
+        });
     }
 
     private void Start()

+ 1 - 0
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -255,6 +255,7 @@ public class GCJKLayer : YZTRootLayer
 
 
     public DeviceTrendPanel _DeviceTrendPanel;
+    public GongChengLieBiaoItem currentSelectItem;
 
     private void Awake()
     {