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

client_Wu Xijin

2019-01-09 1361b5bbc02a140ce850eb9dcd7db0e71b25f085

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

 System/FairyAu/FairyFeastModel.cs

@@ -168,7 +168,7 @@
            }

            if (!fairyFeastPlayers.Contains(fairyMember.PlayerID))

            {

                SysNotifyMgr.Instance.ShowTip("FairyFeastPlayerFarfrom");

                SysNotifyMgr.Instance.ShowTip("PartySitFail");

                return;

            }

            transmitPlayer = fairyMember.PlayerID;


 System/FashionDress/FashionAttrBeh.cs

@@ -27,25 +27,25 @@
            if(star == curStar

                && curStar < maxStar)

            {

                titleText.text = StringUtility.Contact("当前效果（该件时装最多可升至",maxStar,"星）");

                titleText.text = Language.Get("FashionDress101",maxStar);

            }

            else if(star == curStar

                && curStar >= maxStar)

            {

                titleText.text = StringUtility.Contact("已升至最高级");

                titleText.text = Language.Get("FashionDress105");

            }

            else

            {

                titleText.text = StringUtility.Contact(star,"星效果");

                titleText.text = Language.Get("FashionDress102",star);

            }



            if (star == curStar)

            {

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

                starDesText.text = Language.Get("FashionDress103",star);

            }

            else

            {

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

                starDesText.text = Language.Get("FashionDress104",star);

            }



            Dictionary<int, int> attrDict = null;


 System/FashionDress/FashionDressQualityBehaviour.cs

@@ -29,6 +29,7 @@
        public void Display()

        {

            model.selectQualityRefresh += SelectQualityRefresh;

            model.selectTypeRefresh += SelectTypeRefresh;

            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            DisplaySelect();

            DisplayRedpoint();

@@ -58,6 +59,7 @@
        public void Dispose()

        {

            model.selectQualityRefresh -= SelectQualityRefresh;

            model.selectTypeRefresh -= SelectTypeRefresh;

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

        }



@@ -74,6 +76,11 @@
            DisplaySelect();

        }



        private void SelectTypeRefresh()

        {

            DisplayRedpoint();

        }



        private void OnSelect()

        {

            model.selectQuality = m_Quality;


 System/FashionDress/FashionSumAttrWin.cs

@@ -166,7 +166,7 @@
            {

                wardrobeLevelSB = UIHelper.AppendStringColor(TextColType.Red, wardrobeLevel.ToString());

            }

            wardrobeLvText.text = StringUtility.Contact(wardrobeLevelSB, "级");

            wardrobeLvText.text = Language.Get("FashionDress106",wardrobeLevelSB);

            Dictionary<int, int> attrDict = null;

            fashionModel.TryGetCabinetProperty(fashionModel.cabinetLevel, out attrDict);

            if (attrDict != null && attrDict.Count > 0)


 System/FashionDress/FashiongDecomposeWin.cs

@@ -79,7 +79,7 @@
        private void UpdateCabinetLv()

        {

            int wardrobeLv = model.cabinetLevel;

            wardrobeLvText.text = StringUtility.Contact(wardrobeLv, "级");

            wardrobeLvText.text = Language.Get("FashionDress106",wardrobeLv);

            int curWardrobeExp = model.cabinetExp;

            bool isCabinetMax = wardrobeLv >= model.cabinetMaxLevel ? true : false;

            int upgradeLv = isCabinetMax ? model.cabinetMaxLevel : wardrobeLv + 1;

@@ -90,7 +90,7 @@
                int upgradeWardrobeExp = cabinetConfig.NeedExp;

                if (isCabinetMax)

                {

                    upgradeExpText.text = StringUtility.Contact("(已升至最高等级)");

                    upgradeExpText.text = StringUtility.Contact("(", Language.Get("FashionDress105"),")");

                }

                else

                {

@@ -110,6 +110,7 @@
            int getDecomposeExp = FashionDecomposeModel.Instance.GetSumDecomposeExp();

            if(getDecomposeExp <= 0)

            {

                SysNotifyMgr.Instance.ShowTip("FashionDecomposeRemind");

                return;

            }

            FashionDecomposeModel.Instance.SendDecomposeFashion();