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

client_Zxw

2018-09-28 a19ace42d04916b0ccaa357b7c3f66d53a23007a

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

 System/Dungeon/TrialDungeonModel.cs

@@ -277,6 +277,7 @@
                var dict = singlepack.GetPackModelIndexDict();

                if (dict != null)

                {

                    var badCompare = 1;

                    foreach (var itemModel in dict.Values)

                    {

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

@@ -285,12 +286,20 @@
                            && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict))

                        {

                            var compare = EquipCompare(itemModel, config);

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

                            if (compare == 0)

                            {

                                badCompare = compare;

                            }

                            if (compare == -1)

                            {

                                return compare;

                            }

                        }

                    }

                    if (badCompare == 0)

                    {

                        return badCompare;

                    }

                }

            }

            singlepack = packModel.GetSinglePackModel(PackType.rptEquip);