From 6fc305e2b59c946a444ed884f1d3a3d82ac0e987 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 03 九月 2018 20:09:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/FairyAu/PlayerMethodData.cs |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/System/FairyAu/PlayerMethodData.cs b/System/FairyAu/PlayerMethodData.cs
index e303133..6ccd648 100644
--- a/System/FairyAu/PlayerMethodData.cs
+++ b/System/FairyAu/PlayerMethodData.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using System;
 //蹇冩硶绉戞妧
-public  class SkillsInformation
+public class SkillsInformation
 {
     public int id;//鍗曚綅鏁癷d
     public int SkillID;//鎶�鑳絀D
@@ -14,7 +14,7 @@
 
 public class PlayerMethodData : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
 {
-  public  Dictionary<int, SkillsInformation> _DicSkill = new Dictionary<int, SkillsInformation>();//瀛樺偍蹇冩硶
+    public Dictionary<int, SkillsInformation> _DicSkill = new Dictionary<int, SkillsInformation>();//瀛樺偍蹇冩硶
 
     public Dictionary<int, Redpoint> MethodRedPointDic = new Dictionary<int, Redpoint>();//蹇冩硶鍒楄〃绾㈢偣
     public Dictionary<int, Redpoint> MethodRedPointBtnDic = new Dictionary<int, Redpoint>();//蹇冩硶鎸夐挳绾㈢偣
@@ -32,18 +32,18 @@
     {
         string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;
         MethodDataNeedLVDic = ConfigParse.GetDic<int, int>(str);
-       
-      
+
+
     }
 
     public override void UnInit()
     {
-      
+
     }
 
     public void OnBeforePlayerDataInitialize()
     {
-      
+
         _ContributionNumber = 0;
     }
 
@@ -74,14 +74,14 @@
             }
         }
     }
-    private const int RedPoint_key1= 1070101;//蹇冩硶绾㈢偣
+    private const int RedPoint_key1 = 1070101;//蹇冩硶绾㈢偣
     private Redpoint redPointStre1 = new Redpoint(MainRedDot.FAIRY_REDPOINT_KEY2, RedPoint_key1);
     public Redpoint fairyHeartRedpoint { get { return redPointStre1; } }
     private const int RedPoint_key2 = 1070104;//浠欑洘澶у巺绾㈢偣
     private Redpoint redPointStre2 = new Redpoint(MainRedDot.FAIRY_REDPOINT_KEY2, RedPoint_key2);
     private void FairyAuMethodDic()//浠欑洘蹇冩硶鍒楄〃绾㈢偣
     {
-        if ( MethodRedPointDic.Count!=0)
+        if (MethodRedPointDic.Count != 0)
         {
             return;
         }
@@ -98,9 +98,9 @@
             }
         }
     }
-    private void  FairyAuMethodRedPoint()//浠欑洘蹇冩硶绾㈢偣
+    private void FairyAuMethodRedPoint()//浠欑洘蹇冩硶绾㈢偣
     {
-        if (!fairyModel.fairyMethodToOpen || MethodRedPointBtnDic.Count == 0)
+        if (MethodRedPointBtnDic.Count == 0)
         {
             return;
         }
@@ -108,7 +108,10 @@
         {
             MethodRedPointBtnDic[key].state = RedPointState.None;
         }
-
+        if (!fairyModel.fairyMethodToOpen)
+        {
+            return;
+        }
         foreach (var key in _DicSkill.Keys)
         {
             if (MethodDataNeedLVDic.ContainsKey(_DicSkill[key].id) && PlayerDatas.Instance.baseData.LV >= MethodDataNeedLVDic[_DicSkill[key].id])
@@ -116,7 +119,7 @@
                 var familyTechConfig = Config.Instance.Get<FamilyTechConfig>(_DicSkill[key].SkillID + 1);
                 if (_DicSkill[key].SkillLV > 0)
                 {
-                  
+
                     if (familyTechConfig == null)
                     {
                         continue;
@@ -162,16 +165,16 @@
     {
         for (int i = 0; i < info.TechCnt; i++)
         {
-           
+
             if (!_DicSkill.ContainsKey(info.TechInfoList[i].TechID))
             {
-                
+
                 SkillsInformation _skill = new SkillsInformation();
                 _skill.id = info.TechInfoList[i].TechID;
                 _skill.SkillID = Skill_ID(info.TechInfoList[i].TechID, info.TechInfoList[i].TechLV);
                 _skill.SkillLV = info.TechInfoList[i].TechLV;
                 _DicSkill.Add(info.TechInfoList[i].TechID, _skill);
-              
+
             }
             else
             {
@@ -181,10 +184,10 @@
                 _DicSkill[info.TechInfoList[i].TechID].SkillLV = info.TechInfoList[i].TechLV;
                 if (EventHA504 != null)
                     EventHA504();
-               
+
             }
         }
-      
+
         FairyAuMethodRedPoint();
         FairyAuMethodDic();
     }
@@ -217,5 +220,5 @@
             Event_CepaContribution();
     }
 
- 
+
 }

--
Gitblit v1.8.0