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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.56224924
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.00092924875
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.3860619
+    - _Alpha: 0.24745238
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.00906992
+    - _MainTexOffsetU: 0.156618
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1822,7 +1822,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 55.200012, y: -168.2185}
-  m_SizeDelta: {x: 72.46, y: 30}
+  m_SizeDelta: {x: 72, y: 30}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -3168,7 +3168,7 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2347182967128371605}
   - {fileID: 50435170631078031}

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

@@ -782,7 +782,7 @@ namespace Fort23.Mono
                 Sort(type1, type2);
                 return;
             }
-
+            Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
             Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = skillKongWidget.SkillInfo;
@@ -905,6 +905,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
+                    Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
                     Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
                     Btn_Info.gameObject.SetActive(true);
                     SelectSkill(skillKongWidget.SkillInfo, false, false);
@@ -1369,6 +1370,7 @@ namespace Fort23.Mono
             else if (infoType == 2)
             {
                 CloseSelect();
+                Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(98, 36);
                 Btn_Info.transform.SetParent(ContentRoot);
                 Btn_Info.transform.position = skillWidget.InfoPos.position;
                 Btn_Info.gameObject.SetActive(true);

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

@@ -428,8 +428,11 @@ namespace Fort23.Mono
                 using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
                        new CTaskAwaitBuffer<BreakthroughItemWidget>())
                 {
+                    int dujieItemCount = heroPowerUpConfig.DujieItemIDs == null
+                        ? 0
+                        : heroPowerUpConfig.DujieItemIDs.Length;
                     for (int i = 0;
-                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
                          i++)
                     {
                         cTaskAwaitBuffer.AddTask(
@@ -448,7 +451,7 @@ namespace Fort23.Mono
                     }
 
                     //可选道具
-                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
@@ -545,7 +548,11 @@ namespace Fort23.Mono
             else
             {
                 //提示需要什么道具
-                string tips = "需要 破除心魔 ";
+                string tips = "需要";
+                if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
+                {
+                    tips +=  " 破除心魔";
+                }
                 foreach (var dujieMustItemID in hero.powerUpConfig.DujieMustItemIDs)
                 {
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dujieMustItemID);
@@ -705,7 +712,7 @@ namespace Fort23.Mono
                    new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
                 for (int i = 0;
-                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs?.Length;
                      i++)
                 {
                     cTaskAwaitBuffer.AddTask(
@@ -724,7 +731,7 @@ namespace Fort23.Mono
                 }
 
                 //可选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                 {
                     breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                         .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);