فهرست منبع

修改小红点

(cherry picked from commit 1df6fbf50e1232eed0cc6ddf970dc73b510899bf)
DBJ 16 ساعت پیش
والد
کامیت
6f455007a3

+ 7 - 1
Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -53,7 +54,7 @@ namespace Fort23.Mono
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
-                            
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
                             {
                                 if (RedDotManager.Instance.isSkillStar(_skillInfo))
@@ -66,6 +67,11 @@ namespace Fort23.Mono
 
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
                             {
+                                if (!PlayerManager.Instance.GongFaControl.allUseSkill.Contains(_skillInfo))
+                                {
+                                    continue;
+                                }
+
                                 if (RedDotManager.Instance.isSkillUpgradeDaYu4(_skillInfo))
                                 {
                                     isEnable = true;

+ 4 - 3
Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -201,9 +201,6 @@ public class RedDotManager : Singleton<RedDotManager>
                     }
                 }
             }
-
-      
-            
         }
         else
         {
@@ -304,6 +301,10 @@ public class RedDotManager : Singleton<RedDotManager>
         if (_skillInfo == null)
             return false;
 
+        if (_skillInfo.SkillData.level == 1)
+        {
+            return false;
+        }
 
         var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
 

+ 3 - 0
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -190,6 +190,7 @@ namespace Fort23.Mono
                 BaoChun();
 
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
+                
             });
 
             Btn_ChangeOk.onClick.AddListener(() =>
@@ -395,6 +396,7 @@ namespace Fort23.Mono
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
+                RedDotManager.Instance.TarGetRedDotUpDate(17);
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -866,6 +868,7 @@ namespace Fort23.Mono
                 BaoChun();
 
                 RedDotManager.Instance.TarGetRedDotUpDate(14);
+                RedDotManager.Instance.TarGetRedDotUpDate(17);
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }