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

Assets/Res/UI/DaoYouPanel/DaoYouaaFfixWidget.prefab

@@ -271,6 +271,7 @@ GameObject:
   - component: {fileID: 7869838569737806745}
   - component: {fileID: 7982240772326421710}
   - component: {fileID: 6374737024246323474}
+  - component: {fileID: 41904762996154385}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: DaoYouaaFfixWidget
@@ -377,7 +378,61 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: DaoYouaaFfixWidget
+    gameObject: {fileID: 41904762996154385}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_DaoYouaaFfixWidget
+    gameObject: {fileID: 41904762996154385}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &41904762996154385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3054950519963356202}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  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_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}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7982240772326421710}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4690716534689735017
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -30,7 +30,6 @@ namespace GameLogic.Hero
 
         // public List<int> ImmortalBond = new List<int>();
 
-      
 
         public HeroInfo()
         {
@@ -96,25 +95,25 @@ namespace GameLogic.Hero
                 foreach (var i1 in daoyouModelConfig.daolvSkillID)
                 {
                     daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(i1);
-                    // //唯一只加一次
-                    // if (daolvSkill.type == 1)
-                    // {
-                    //     if (!daolvBlMap.ContainsKey(i1))
-                    //     {
-                    //         daolvBlMap.Add(i1, daolvSkill.para[0]);
-                    //     }
-                    // }
-                    // else
-                    // {
-                    //     if (!daolvBlMap.ContainsKey(i1))
-                    //     {
-                    //         daolvBlMap.Add(i1, daolvSkill.para[0]);
-                    //     }
-                    //     else
-                    //     {
-                    //         daolvBlMap[i1] += daolvSkill.para[0];
-                    //     }
-                    // }
+                    //唯一只加一次
+                    if (daolvSkill.type == 1)
+                    {
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                    }
+                    else
+                    {
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                        else
+                        {
+                            daolvBlMap[i1] += daolvSkill.para[0];
+                        }
+                    }
 
 
                     DaoLVBiData daoLvBiData;
@@ -131,18 +130,27 @@ namespace GameLogic.Hero
                     }
                     else
                     {
-                        daoLvBiData = new DaoLVBiData();
-                        daoLvBiData.id = i1;
-                        daoLvBiData.value = daolvSkill.para[0];
-                        daolvBl.Add(daoLvBiData);
-                        // if (!daolvBlMap.ContainsKey(i1))
-                        // {
-                        //     daolvBlMap.Add(i1, daolvSkill.para[0]);
-                        // }
-                        // else
-                        // {
-                        //     daolvBlMap[i1] += daolvSkill.para[0];
-                        // }
+                        daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
+                        if (daoLvBiData == null)
+                        {
+                            daoLvBiData = new DaoLVBiData();
+                            daoLvBiData.id = i1;
+                            daoLvBiData.value = daolvSkill.para[0];
+                            daolvBl.Add(daoLvBiData);
+                        }
+                        else
+                        {
+                            daoLvBiData.value += daolvSkill.para[0];
+                        }
+
+                        if (!daolvBlMap.ContainsKey(i1))
+                        {
+                            daolvBlMap.Add(i1, daolvSkill.para[0]);
+                        }
+                        else
+                        {
+                            daolvBlMap[i1] += daolvSkill.para[0];
+                        }
                     }
                 }
             }
@@ -314,8 +322,5 @@ namespace GameLogic.Hero
                     break;
             }
         }
-
-       
-
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -32,6 +32,8 @@ namespace Fort23.Mono
 
         private int currenRoadSkilId;
 
+        private SkillInfo currentOnclickskillWidget;
+
         /// <summary>
         /// 1.执行升级逻辑 2.执行更换逻辑
         /// </summary>
@@ -388,6 +390,8 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
                 showSkillInfo.Sort(Sort);
+       
+              
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
@@ -670,7 +674,15 @@ namespace Fort23.Mono
 
             CloseSelect();
             showSkillInfo.Sort(Sort);
-            Content.Init(this, showSkillInfo.Count);
+            int startIndex = 0;
+            for (int i = 0; i < showSkillInfo.Count; i++)
+            {
+                if (showSkillInfo[i] == currentOnclickskillWidget)
+                {
+                    startIndex = i;
+                }
+            }
+            Content.Init(this, showSkillInfo.Count,startIndex);
         }
 
         private int Sort(SkillInfo type1, SkillInfo type2)
@@ -1374,6 +1386,7 @@ namespace Fort23.Mono
             SkillWidget skillWidget = obj as SkillWidget;
             if (infoType == 1)
             {
+                currentOnclickskillWidget = skillWidget.skillConfigId;
                 GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(skillWidget.skillConfigId);
                 await gongFaUpgradePanel.UIClosed();
                 Sort(type1, type2);
@@ -1508,6 +1521,7 @@ namespace Fort23.Mono
             Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
+            currentOnclickskillWidget = null;
             // ChangeInfoType(1);
             await base.Close();
         }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidget.cs

@@ -5,39 +5,46 @@ using GameLogic.Hero;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouaaFfixWidget"  )]
-	public partial class DaoYouaaFfixWidget : UIComponent
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "DaoYouaaFfixWidget")]
+    public partial class DaoYouaaFfixWidget : UIComponent
+    {
+        private daolvSkill daolvSkill;
+        private float value;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void DelEvent()
+        {
+        }
 
-		}
+        public override void AddButtonEvent()
+        {
+            Btn_DaoYouaaFfixWidget.onClick.AddListener(() =>
+            {
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(daolvSkill.des, value));
+            });
+        }
 
-		public void CustomInit(int configId)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
-		
-		public void CustomInit(DaoLVBiData daoLVBiData)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
+        public void CustomInit(int configId)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
+            value = daolvSkill.para[0];
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
 
-	}
-}
+        public void CustomInit(DaoLVBiData daoLVBiData)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
+            value = daoLVBiData.value;
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
+    }
+}

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidgetData.cs

@@ -30,6 +30,28 @@ namespace Fort23.Mono
 	      return _Icon_Weiyi;
 	     }
 	   }
+	  private Button _DaoYouaaFfixWidget;
+	  public Button DaoYouaaFfixWidget
+	   {
+	   get{
+	      if (_DaoYouaaFfixWidget == null)
+	       {
+	         _DaoYouaaFfixWidget  = GetUIUnit<Button>("DaoYouaaFfixWidget"); 
+	       }
+	      return _DaoYouaaFfixWidget;
+	     }
+	   }
+	  private Button _Btn_DaoYouaaFfixWidget;
+	  public Button Btn_DaoYouaaFfixWidget
+	   {
+	   get{
+	      if (_Btn_DaoYouaaFfixWidget == null)
+	       {
+	         _Btn_DaoYouaaFfixWidget  = GetUIUnit<Button>("Btn_DaoYouaaFfixWidget"); 
+	       }
+	      return _Btn_DaoYouaaFfixWidget;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{