Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-12-04 31efa47c430874f95f4ff5503372f0cf6ecb53ae

 System/FairyAu/FairyLeagueModel.cs

@@ -568,7 +568,7 @@
                        FairyLeagueBattleData battleData = new FairyLeagueBattleData()

                        {

                            grade = (int)_pakData.Value1,

                            ring = (int)_pakData.Value2 - 1,

                            session = (int)_pakData.Value2 - 1,

                            fairyId1 = (int)_pakData.Value3,

                            fairyId2 = (int)_pakData.Value4,

                            winFairyId = (int)_pakData.Value5,

@@ -617,6 +617,36 @@
                            _error = 5;

                        }

                        return _fairyBattle.winFairyId == 0;

                    }

                }

            }

            return false;

        }



        public bool RequireFairyLeagueRemind(int session)

        {

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.FairyLeague))

            {

                return false;

            }

            var _fairyId = PlayerDatas.Instance.fairyData.fairy.FamilyID;

            if (!fairyLeagueBattleDict.ContainsKey(session))

            {

                return false;

            }

            var dict = fairyLeagueBattleDict[session];

            foreach (var grade in dict.Keys)

            {

                if (dict[grade] == null)

                {

                    continue;

                }

                foreach (var battleList in dict[grade])

                {

                    if (battleList.fairyId1 == _fairyId

                        || battleList.fairyId2 == _fairyId)

                    {

                        return true;

                    }

                }

            }

@@ -1404,7 +1434,7 @@
                {

                    return false;

                }

                if (time.Hour == overStage.endHour && time.Minute > overStage.endMinute)

                if (time.Hour == overStage.endHour && time.Minute >= overStage.endMinute)

                {

                    return false;

                }

@@ -1514,7 +1544,7 @@
    public class FairyLeagueBattleData

    {

        public int grade;

        public int ring;

        public int session;

        public int fairyId1;

        public int fairyId2;

        public int winFairyId;