Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidget.cs

@@ -16,8 +16,9 @@ namespace Fort23.Mono
     }
     
     [UIBinding(prefab = "HeroAttributeWidget")]
-    public partial class HeroAttributeWidget : UIComponent
+    public partial class HeroAttributeWidget : ItemWidgetBasic
     {
+        public int lanID;
         private void Init()
         {
         }
@@ -32,6 +33,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            base.AddButtonEvent();
         }
 
         public void CustomInit(HeroAttributeData data)
@@ -40,5 +42,13 @@ namespace Fort23.Mono
             Text_Value.text = data.currentValue;
             Text_NextValue.text = data.nextValue;
         }
+        
+        public void CustomInit1(int lanId ,HeroAttributeData data)
+        {
+            lanID = lanId;
+            Text_Name.text = data.name;
+            Text_Value.text = data.currentValue;
+            Text_NextValue.text = data.nextValue;
+        }
     }
 }

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -122,28 +122,32 @@ namespace Fort23.Mono
             HeroAttributeWidget heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("生命", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10712, new HeroAttributeData("生命", "",
                 PlayerManager.Instance.myHero.hp.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10713, new HeroAttributeData("攻击", "",
                 PlayerManager.Instance.myHero.attack.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("防御", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10714, new HeroAttributeData("防御", "",
                 PlayerManager.Instance.myHero.defense.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击速度", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10715, new HeroAttributeData("攻击速度", "",
                 PlayerManager.Instance.myHero.attSpeed.Value.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -151,39 +155,50 @@ namespace Fort23.Mono
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10716, new HeroAttributeData("金灵根", "",
                 PlayerManager.Instance.myHero.Metal.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10717, new HeroAttributeData("木灵根", "",
                 PlayerManager.Instance.myHero.Wood.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10718, new HeroAttributeData("水灵根", "",
                 PlayerManager.Instance.myHero.Water.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10719, new HeroAttributeData("火灵根", "",
                 PlayerManager.Instance.myHero.Fire.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10720, new HeroAttributeData("土灵根", "",
                 PlayerManager.Instance.myHero.Earth.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
         }
 
+        private void heroAttributeWidgetOnClick(ItemWidgetBasic obj)
+        {
+            HeroAttributeWidget heroAttributeWidget = obj as HeroAttributeWidget;
+            TipMessagePanel.OpenTipMessagePanel(heroAttributeWidget.lanID);
+        }
+
         private async void OnClick(ItemWidgetBasic obj)
         {
             BtnFaBaoWidget btnFaBaoWidget = obj as BtnFaBaoWidget;