Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dungeon/TrialDungeonModel.cs

@@ -113,9 +113,17 @@


        private void RefreshItemCountAct(PackType packType, int arg2, int itemId)

        {

            if (packType == PackType.rptItem && trialTokens.Contains(itemId))

            var config = Config.Instance.Get<ItemConfig>(itemId);

            if (config == null)

            {

                UpdateRedpoint();

                return;

            }

            if (packType == PackType.rptItem)

            {

                if (trialTokens.Contains(itemId) || config.EquipPlace > 0)

                {

                    UpdateRedpoint();

                }

            }

            else if (packType == PackType.rptEquip)

            {

@@ -263,7 +271,29 @@
            {

                return 0;

            }

            var singlepack = packModel.GetSinglePackModel(PackType.rptEquip);

            var singlepack = packModel.GetSinglePackModel(PackType.rptItem);

            if (singlepack != null)

            {

                var dict = singlepack.GetPackModelIndexDict();

                if (dict != null)

                {

                    foreach (var itemModel in dict.Values)

                    {

                        if (itemModel.chinItemModel.EquipPlace == config.EquipPlace

                            && (itemModel.chinItemModel.JobLimit / 100 == PlayerDatas.Instance.baseData.Job

                            || itemModel.chinItemModel.JobLimit == 0)

                            && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict))

                        {

                            var compare = EquipCompare(itemModel, config);

                            if (compare == -1 || compare == 0)

                            {

                                return compare;

                            }

                        }

                    }

                }

            }

            singlepack = packModel.GetSinglePackModel(PackType.rptEquip);

            if (singlepack == null)

            {

                return 1;

@@ -273,7 +303,12 @@
            {

                return 1;

            }

            var compareConfig = Config.Instance.Get<ItemConfig>(equipItem.itemId);

            return EquipCompare(equipItem, config);

        }



        int EquipCompare(ItemModel compareItem, ItemConfig config)

        {

            var compareConfig = Config.Instance.Get<ItemConfig>(compareItem.itemId);

            if (compareConfig == null)

            {

                return 1;