Merge branch 'FashionDress' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_linchunjie

2019-01-08 fea3ed6ffe989f766139a4d9f6047f0ea49892f0

Merge branch 'FashionDress' of http://192.168.0.87:10010/r/snxxz_scripts into FashionDress

 System/FashionDress/FashionAttrBeh.cs

@@ -18,8 +18,11 @@


        public void SetDisplay(int star,int curStar)

        {

            int curFashionId = fashionModel.viewFashionDressId;

            FashionDress fashionDress = null;

            fashionModel.TryGetFashionDress(curFashionId,out fashionDress);

            int minStar = 1;

            int maxStar = 3;

            int maxStar = fashionDress.maxLevel;



            if(star == curStar

                && curStar < maxStar)

@@ -38,14 +41,13 @@


            if (star == curStar)

            {

                starDesText.text = StringUtility.Contact("升至",minStar, "星时获得属性（已获得）");

                starDesText.text = StringUtility.Contact("升至",star, "星时获得属性（已获得）");

            }

            else

            {

                starDesText.text = StringUtility.Contact("升至", minStar, "星时获得属性");

                starDesText.text = StringUtility.Contact("升至", star, "星时获得属性");

            }



            int curFashionId = fashionModel.viewFashionDressId;

            Dictionary<int, int> attrDict = null;

            fashionModel.TryGetFashionDressProperty(curFashionId,star,out attrDict);

            if(attrDict != null)


 System/FashionDress/FashionDecomposeLineBeh.cs

@@ -26,7 +26,7 @@
                    var guid = decomposeGuids[index];

                    FashionDecomposeModel.DecomposeItem decomposeItem = null;

                    decomposeModel.TryGetDecomposeItem(guid,out decomposeItem);

                    itemBeh.SetDisplay(decomposeItem.itemModel);

                    itemBeh.SetDisplay(decomposeItem.itemModel,decomposeItem.isSelect);

                }

                else

                {

@@ -42,7 +42,7 @@
            [SerializeField] CommonItemBaisc itemBaisc;

            [SerializeField] GameObject selectObj;

           

            public void SetDisplay(ItemModel itemModel)

            public void SetDisplay(ItemModel itemModel,bool _isSelect = false)

            {

                if (itemModel == null)

                {

@@ -51,6 +51,8 @@
                }

                else

                {

                    itemBaisc.gameObject.SetActive(true);

                    selectObj.SetActive(_isSelect);

                    var decomposeModel = FashionDecomposeModel.Instance;

                    itemBaisc.Init(itemModel);

                    itemBaisc.cellBtn.RemoveAllListeners();


 System/FashionDress/FashionDecomposeModel.cs

@@ -52,6 +52,10 @@
            if (isItem)

            {

                decomposeItem.SetIsSelect(_isSelect);

                if(UpdateDecomposeExpEvent != null)

                {

                    UpdateDecomposeExpEvent();

                }

            }

        }



@@ -114,7 +118,7 @@
                itemModel = _model;

                if(itemModel.chinItemModel.Effect1 == 243)

                {

                    decomposeExp = itemModel.chinItemModel.EffectValueB1;

                    decomposeExp = itemModel.chinItemModel.EffectValueB1 * itemModel.itemInfo.ItemCount;

                }

                else

                {


 System/FashionDress/FashiongDecomposeWin.cs

@@ -30,7 +30,7 @@


        protected override void OnPreOpen()

        {

            model.cabinetRefresh += UpdateCabinetLv;

            model.cabinetRefresh += UpdateCabinetInfo;

            FashionDecomposeModel.Instance.UpdateDecomposeExpEvent += UpdateGetExp;

            SetDisplay();

        }

@@ -41,7 +41,7 @@


        protected override void OnPreClose()

        {

            model.cabinetRefresh += UpdateCabinetLv;

            model.cabinetRefresh -= UpdateCabinetInfo;

            FashionDecomposeModel.Instance.UpdateDecomposeExpEvent -= UpdateGetExp;

        }

        protected override void OnAfterClose()

@@ -58,6 +58,13 @@
            UpdateCabinetLv();

        }



        private void UpdateCabinetInfo()

        {

            FashionDecomposeModel.Instance.GetDecomposeItem();

            UpdateCabinetLv();

            lineCtrl.m_Scorller.RefreshActiveCellViews();

        }



        private void CreateLineCell()

        {

            int line = initGrid / 5;