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

client_linchunjie

2018-09-21 171b4e4bdf6e68391bfb2a22f4c71c751e7021ea

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

 System/Dogz/DogzModel.cs

@@ -543,13 +543,13 @@
        }



        public List<ItemModel> selectEquipPlacelist { get; private set; }

        public List<ItemModel> GetDogzItemListByIndex(int index)

        public List<ItemModel> GetDogzItemListByIndex(int dogzId,int index)

        {

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptDogzItem);

            selectEquipPlacelist.Clear();

            if (singlePack == null) return selectEquipPlacelist;



            var _itemColor = GetDogzEquipLimitByIndex(presentSelectDogz, index);

            var _itemColor = GetDogzEquipLimitByIndex(dogzId, index);

            var _equipPlace = GetDogzEquipPlaceByIndex(index);

            Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict();

            foreach (var value in pairs.Values)

@@ -762,7 +762,7 @@
                        bool _equiped = TryGetDogzEquip(spaceDogzId, i + 101, out _data);

                        if(!_equiped)

                        {

                            GetDogzItemListByIndex(i);

                            GetDogzItemListByIndex(spaceDogzId,i);

                            if (selectEquipPlacelist.Count > 0)

                            {

                                Redpoint equipPlaceRedpoint = GetDogzEquipPlaceRedpointById(spaceDogzId,i);

@@ -802,7 +802,7 @@
                            bool _equiped = TryGetDogzEquip(dogzId, i + 101, out _data);

                            if (!_equiped)

                            {

                                GetDogzItemListByIndex(i);

                                GetDogzItemListByIndex(dogzId,i);

                                if (selectEquipPlacelist.Count < 1)

                                {

                                    isBetterDogz = false;


 System/Dogz/DogzPackWin.cs

@@ -127,7 +127,7 @@


        private void ClickEquipIndex(int index)

        {

            dogzModel.GetDogzItemListByIndex(index);

            dogzModel.GetDogzItemListByIndex(dogzModel.presentSelectDogz,index);

            if(dogzModel.selectEquipPlacelist.Count > 0)

            {

                WindowCenter.Instance.Open<SelectDogzItemWin>();