修改bug

Assets/Res/Config/ReddotConfig.json

@@ -3,6 +3,9 @@
     {
       "ID": 1,
       "GroupID": 1,
+      "LinkGroupID": [
+        14
+      ],
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
@@ -99,6 +102,13 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 14,
+      "GroupID": 14,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1443,6 +1443,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7820611370538219087}
+  - {fileID: 7203466323980298071}
   m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -7739,6 +7740,116 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
   m_PrefabInstance: {fileID: 4131293543597701602}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4794029153667740339
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4487645842108660236}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 14
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &7203466323980298071 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 4794029153667740339}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7547607250917142542
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -47,12 +47,14 @@ namespace Fort23.Mono
                 //上阵的功法可以升级显示红点
                 case 1:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
+
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
                             {
                                 if (RedDotManager.Instance.isSkillStar(_skillInfo))
@@ -62,7 +64,7 @@ namespace Fort23.Mono
                                 }
                             }
 
-                         
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
                             {
                                 if (RedDotManager.Instance.isSkillUpgradeDaYu4(_skillInfo))
@@ -75,11 +77,41 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+
+                case 14:
+                    isEnable = false;
+                    switch (EnableId)
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+
+                            int count = 0;
+                            for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
+                            {
+                                if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null &&
+                                    PlayerManager.Instance.GongFaControl.allUseSkill[i].skillConfig.SkillType == 1)
+                                {
+                                    count++;
+                                }
+                            }
+
+                            if (count < PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum)
+                            {
+                                isEnable = true;
+                            }
+
+
+                            break;
+                    }
+
                     break;
                 //境界升级
-                case 5: 
+                case 5:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);

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

@@ -183,6 +183,8 @@ namespace Fort23.Mono
                 UpdateSkillWidget();
                 ChangeFuZhuYingXiang();
                 BaoChun();
+
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Btn_ChangeOk.onClick.AddListener(() =>
@@ -385,6 +387,7 @@ namespace Fort23.Mono
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -846,7 +849,7 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
 
-
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }
@@ -1177,7 +1180,6 @@ namespace Fort23.Mono
             }
         }
 
-        
 
         List<int> yingxiang = new List<int>();
 

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

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                     for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                     {
                         bool isHave = false;
-                        for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
+                        for (var i1 = 0; i1 < breakthroughItemWidgets.Count; i1++)
                         {
                             if (breakthroughItemWidgets[i1].itemInfo != null &&
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==