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

client_Wu Xijin

2018-08-11 7676088fbd244f5d99ead15d035a9023226f3a9e

 System/KnapSack/Logic/PlayerPackModels.cs

@@ -1099,6 +1099,7 @@
                RefreshColorSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }



        public void SetLvSelect(EquipLvType type)

@@ -1123,6 +1124,7 @@
                RefreshLvSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }

       

        public void SetStarSelect(EquipStarType type)

@@ -1133,6 +1135,7 @@
                RefreshStarSelectAct(type);

            }

            SendEquipDevourRecordQuest();

            EquipDecomRedCtrl();

        }



        public List<int> devourPlacelist { get; private set; }

@@ -1279,11 +1282,20 @@
        public void GetSelectDevourList()

        {

            GetCanDevourModellist();

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

            selectDevourlist.Clear();

            selectDevourlist.AddRange(canDevourModellist);

        }



        public void RefreshGetNewItem(ItemModel model)

        {

            if (model == null) return;



            if(CheckIsReachDevourCondi(model))

            {

                if(!selectDevourlist.Contains(canDevourModellist[i]))

                selectDevourlist.Add(model);

                if (RefreshEquipDecomNumAct != null)

                {

                    selectDevourlist.Add(canDevourModellist[i]);

                    RefreshEquipDecomNumAct();

                }

            }

        }

@@ -1296,6 +1308,27 @@
                RefreshEquipDecomNumAct();

            }

        }



        public bool CheckIsReachDevourCondi(ItemModel model)

        {

            if (model.chinItemModel.Type == 29)

            {

                if (!defaultUnSelectlist.Contains(model.itemId))

                {

                    return true;

                }

                return false;

            }

            else

            {

                if (IsCanDevour(model))

                {

                    return true;

                }



            }

            return false;

        }

        

        public void RemoveSelectDevourModellist(ItemModel model)

        {