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

client_linchunjie

2018-08-15 e81f57397c46e4b066e9171a4db492cc519b8df4

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

 System/KnapSack/Logic/PackModelInterface.cs

@@ -39,6 +39,7 @@
        PlayerPetDatas petDatas { get { return ModelCenter.Instance.GetModel<PlayerPetDatas>(); } }

        PlayerStrengthengDatas strengthDatas { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }

        MagicianModel magicianModel { get { return ModelCenter.Instance.GetModel<MagicianModel>(); } }

        TrialDungeonModel trialModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }



        private int[] pushItemIds;

        public int[] pushBuffTypeIds;

@@ -468,6 +469,15 @@
                }

            }



            if(trialModel.trialTokens.Contains(itemModel.itemId))

            {

                if(!trialModel.IsAnySatisfyExchangeBetter(itemModel.itemId))

                {

                    isReach = false;

                    return isReach;

                }

            }



            switch (itemModel.chinItemModel.Type)

            {

                case 8:

@@ -561,6 +571,7 @@
                        return isReach;

                    }

                    break;



            }



            return isReach;