From 034f1835dbc7c282701426c8cb564f06fbc24b4f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 三月 2019 16:20:45 +0800
Subject: [PATCH] 3335 修改装备tips

---
 System/ItemTip/TipGemInfoWidget.cs |   36 ++++++++++++------------------------
 1 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/System/ItemTip/TipGemInfoWidget.cs b/System/ItemTip/TipGemInfoWidget.cs
index c07570b..b09807c 100644
--- a/System/ItemTip/TipGemInfoWidget.cs
+++ b/System/ItemTip/TipGemInfoWidget.cs
@@ -29,14 +29,16 @@
         public class GemBehaviour
         {
             public Image gemIcon;
+            public Image locked;
             public Text gemName;
-            public Text[] propertyBehaviours;
+            public Text propertyBehaviour;
             public RectTransform unLockContainer;
 
             public void Display(bool active, int gem)
             {
                 if (active)
                 {
+                    locked.gameObject.SetActive(false);
                     if (gem > 0)
                     {
                         var config = ItemConfig.Get(gem);
@@ -70,44 +72,30 @@
                             properties.Add(new Int2(config.Effect5, config.EffectValueA5));
                         }
 
-                        for (int i = 0; i < propertyBehaviours.Length; i++)
+                        var lines = new string[properties.Count];
+                        for (int i = 0; i < properties.Count; i++)
                         {
-                            var behaviour = propertyBehaviours[i];
-                            if (i < properties.Count)
-                            {
-                                var property = properties[i];
-                                behaviour.gameObject.SetActive(true);
-                                behaviour.text = string.Format("{0}+{1}", property.x, PlayerPropertyConfig.GetPropertyDescription(property.x, property.y));
-                            }
-                            else
-                            {
-                                behaviour.gameObject.SetActive(false);
-                            }
+                            var property = properties[i];
+                            lines[i] = string.Format("{0}+{1}", property.x, PlayerPropertyConfig.GetPropertyDescription(property.x, property.y));
                         }
+
+                        propertyBehaviour.text = string.Join("\r\n", lines);
                     }
                     else
                     {
                         gemIcon.gameObject.SetActive(false);
                         gemName.text = "鏈暥宓�";
-                        for (int i = 0; i < propertyBehaviours.Length; i++)
-                        {
-                            var behaviour = propertyBehaviours[i];
-                            behaviour.gameObject.SetActive(false);
-                        }
+                        propertyBehaviour.gameObject.SetActive(false);
                     }
 
                     unLockContainer.gameObject.SetActive(false);
                 }
                 else
                 {
+                    locked.gameObject.SetActive(true);
                     gemIcon.gameObject.SetActive(false);
                     gemName.text = "鏈暥宓�";
-                    for (int i = 0; i < propertyBehaviours.Length; i++)
-                    {
-                        var behaviour = propertyBehaviours[i];
-                        behaviour.gameObject.SetActive(false);
-                    }
-
+                    propertyBehaviour.gameObject.SetActive(false);
                     unLockContainer.gameObject.SetActive(true);
                 }
             }

--
Gitblit v1.8.0