Merge branch 'master' into StageLoad

client_Wu Xijin

2019-02-01 514d2b11202b91274a86d3ba6367e7280385f1ef

Merge branch 'master' into StageLoad

 System/BetterItemGet/BetterEquipGetModel.cs

@@ -265,7 +265,7 @@
                    var item = playerPack.GetItemModelByIndex(_packType, _index);

                    if (item != null)

                    {

                        RemoveLowGradeItemByEquipPlace(_index, item.equipScore);

                        RemoveLowGradeItemByEquipPlace(item.chinItemModel.EquipPlace, item.equipScore);

                    }

                    break;

                default:

@@ -308,12 +308,11 @@


        private void RemoveLowGradeItemByEquipPlace(int _place, int _score)

        {

            var place = _place == 10 ? 9 : _place;

            var keys = new List<string>(betterEquipModels.Keys);

            for (int i = keys.Count - 1; i >= 0; i--)

            {

                var item = betterEquipModels[keys[i]];

                if (item != null && item.chinItemModel.EquipPlace == place && item.equipScore <= _score)

                if (item != null && item.chinItemModel.EquipPlace == _place && item.equipScore <= _score)

                {

                    betterEquipModels.Remove(keys[i]);

                }


 System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs

@@ -367,7 +367,8 @@
            openTasklist.Clear();

            for(int i = 0; i < allPeoples.Count; i++)

            {

                if(FuncOpen.Instance.IsFuncOpen(allPeoples[i].FuncID))

                var funcId = allPeoples[i].FuncID;

                if(funcId == 0 || FuncOpen.Instance.IsFuncOpen(funcId))

                {

                    openTasklist.Add(allPeoples[i]);

                }


 System/OpenServerActivity/FestivalRedpackModel.cs

@@ -84,6 +84,19 @@
            }

        }



        public int operationDay

        {

            get

            {

                OperationFestivalRedpack operation;

                if (OperationTimeHepler.Instance.TryGetOperation(Operation.FestivalRedpack, out operation))

                {

                    return IsOpen ? operation.GetIndexOfTime() : operation.totalDays;

                }

                return 0;

            }

        }



        public int grabRedpackTimes { get; private set; }



        public int grabTotalJade { get; private set; }

@@ -520,7 +533,7 @@
        private void AchievementCompletedEvent(int _achieve)

        {

            List<FestivalRedpackAchievement> list;

            if (TryGetAchievements(festivalDay + 1, out list) && IsContainsAchievement(list, _achieve))

            if (TryGetAchievements(operationDay + 1, out list) && IsContainsAchievement(list, _achieve))

            {

                if (achievementRefresh != null)

                {

@@ -533,7 +546,7 @@
        private void AchievementProgressUpdateEvent(int _achieve)

        {

            List<FestivalRedpackAchievement> list;

            if (TryGetAchievements(festivalDay + 1, out list) && IsContainsAchievement(list, _achieve))

            if (TryGetAchievements(operationDay + 1, out list) && IsContainsAchievement(list, _achieve))

            {

                if (achievementRefresh != null)

                {

@@ -592,7 +605,7 @@
                }



                List<FestivalRedpackAchievement> list;

                if (TryGetAchievements(festivalDay + 1, out list))

                if (TryGetAchievements(operationDay + 1, out list))

                {

                    foreach (var festivalRedpackAchievement in list)

                    {


 System/OpenServerActivity/FestivalRedpackWin.cs

@@ -116,7 +116,7 @@
            m_AchievementController.Refresh();

            model.displayAchievements.Clear();

            List<FestivalRedpackAchievement> list;

            if (model.TryGetAchievements(model.festivalDay + 1, out list))

            if (model.TryGetAchievements(model.operationDay + 1, out list))

            {

                model.displayAchievements.AddRange(list);

                model.displayAchievements.Sort(model.AchievementSort);


 System/OpenServerActivity/OperationFestivalRedpack.cs

@@ -33,6 +33,11 @@
            return IndexOfDays(TimeUtility.ServerNow);

        }



        public int GetIndexOfTime()

        {

            return IndexOfTime(TimeUtility.ServerNow);

        }



        public override void Reset()

        {

            base.Reset();


 System/Strengthening/GemFlauntCell.cs

@@ -34,6 +34,7 @@


        private void GemFlaunt()

        {

            WindowJumpMgr.Instance.ClearJumpData();

            WindowCenter.Instance.CloseImmediately<EquipReinforceWin>();

            WindowCenter.Instance.CloseImmediately<JadeDynastySelectGemWin>();

            WindowCenter.Instance.CloseImmediately<JadeDynastyKnapSackWin>();