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

client_Hale

2019-01-10 7fdcf29617dad7d6ebc29489ae55fd815ec72e83

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

 System/Compose/New/ComposeTicketWin.cs

@@ -142,7 +142,7 @@
                {

                    isJumpTo = false;

                    bool isCanCompose = true;

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))

                    {

                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));

                        isCanCompose = false;


 System/Compose/New/ComposeToolsWin.cs

@@ -169,7 +169,7 @@
                {

                    isJumpTo = false;

                    bool isCanCompose = true;

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))

                    {

                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));

                        isCanCompose = false;


 System/Compose/New/ComposeWin.cs

@@ -69,9 +69,7 @@


        protected override void OnPreOpen()

        {

            DebugEx.Log("是否跳转打开界面：" + WindowJumpMgr.Instance.IsJumpState);

            ComposeModel.ResetModel();



            if (WindowJumpMgr.Instance.IsJumpState && ComposeModel.secondType == 0)

            {

                if (ComposeModel.CurComposeModel != null)

@@ -111,6 +109,7 @@
        protected override void OnActived()

        {

            base.OnActived();

          
            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)

            {

                if(ComposeModel.composeToolRed.state == RedPointState.Simple)

@@ -157,7 +156,7 @@


        protected override void OnAfterOpen()

        {

            
           
        }



        protected override void OnPreClose()

@@ -275,7 +274,6 @@


        private void GatherSoulCompose()

        {

            ComposeModel.SetCurComposeModel(null);

            CloseSubWindows();

            if (windowState == WindowState.Opened)

            {

@@ -301,6 +299,10 @@


        public void OnClickCloseBtn()

        {

            if(ComposeModel.CurComposeModel != null)

            {

                ComposeModel.SetCurComposeModel(null);

            }

            CloseSubWindows();

            CloseImmediately();

        }


 System/Compose/New/ComposeWingsWin.cs

@@ -170,7 +170,7 @@
                {

                    isJumpTo = false;

                    bool isCanCompose = true;

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound) || !composeWinModel.IsEnoughUnfixedMat(thirdTypeData.itemCompound))

                    if (!composeWinModel.IsEnoughFixedMat(thirdTypeData.itemCompound))

                    {

                        MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));

                        isCanCompose = false;


 System/FashionDress/FashionDressModel.cs

@@ -17,6 +17,9 @@
        const int FASHIONDRESS_REDPOINT_BASE = 10105;

        const int FASHIONDRESS_FUNC_ID = 160;



        readonly List<int> fashionDressTypeSort = new List<int>() { 1, 2, 3 };

        readonly List<int> fashionDressQualitySort = new List<int>() { 0, 1, 2 };



        public readonly Redpoint redpoint = new Redpoint(101, FASHIONDRESS_REDPOINT_BASE);

        public readonly Redpoint levelUpRedpoint = new Redpoint(FASHIONDRESS_REDPOINT_BASE, 1010501);



@@ -24,6 +27,7 @@
        public int cabinetExp { get; private set; }

        public int cabinetMaxLevel { get; private set; }

        public bool serverInited { get; private set; }

        public int jumpFashionDress { get; set; }

        public int fashoinDressCount

        {

            get

@@ -489,20 +493,34 @@
            {

                return;

            }

            foreach (var fashionDress in fashionDressDict.Values)

            foreach (var type in fashionDressTypeSort)

            {

                var level = GetFashionDressLevel(fashionDress.id);

                if (level >= fashionDress.maxLevel)

                foreach (var quality in fashionDressQualitySort)

                {

                    continue;

                }

                var levelUpRequireCount = fashionDress.GetLevelUpRequireCount(level);

                var count = packModel.GetItemCountByID(PackType.rptItem, fashionDress.requireLevelUpItem);

                if (count >= levelUpRequireCount)

                {

                    fashionDressRedpointId = fashionDress.id;

                    levelUpRedpoint.state = RedPointState.Simple;

                    return;

                    List<int> list;

                    if (TryGetFashionDresses(type, quality, out list))

                    {

                        foreach (var id in list)

                        {

                            FashionDress fashionDress;

                            if (TryGetFashionDress(id, out fashionDress))

                            {

                                var level = GetFashionDressLevel(fashionDress.id);

                                if (level >= fashionDress.maxLevel)

                                {

                                    continue;

                                }

                                var levelUpRequireCount = fashionDress.GetLevelUpRequireCount(level);

                                var count = packModel.GetItemCountByID(PackType.rptItem, fashionDress.requireLevelUpItem);

                                if (count >= levelUpRequireCount)

                                {

                                    fashionDressRedpointId = fashionDress.id;

                                    levelUpRedpoint.state = RedPointState.Simple;

                                    return;

                                }

                            }

                        }

                    }

                }

            }

        }


 System/FashionDress/FashionDressWin.cs

@@ -80,6 +80,17 @@
                m_FashionDressQualitys[i].Display();

            }

            Display();



            List<int> list;

            if (model.TryGetFashionDresses(model.selectType, model.selectQuality, out list))

            {

                if (model.jumpFashionDress != 0 && list.Contains(model.jumpFashionDress))

                {

                    m_ScrollerControl.JumpIndex(list.IndexOf(model.jumpFashionDress));

                }

            }



            model.jumpFashionDress = 0;

        }



        protected override void OnAfterOpen()

@@ -135,6 +146,17 @@
                {

                    model.selectQuality = i;

                    break;

                }

            }



            if (model.jumpFashionDress != 0)

            {

                FashionDress fashionDress;

                if (model.TryGetFashionDress(model.jumpFashionDress, out fashionDress))

                {

                    model.selectType = fashionDress.fashionDressType;

                    var config = Config.Instance.Get<FashionDressConfig>(model.jumpFashionDress);

                    model.selectQuality = config.quality;

                }

            }

        }

@@ -214,6 +236,7 @@
                }

            }

            DisplayFashionDress();

            DisplayViewDetail();

        }



        private void SelectQualityRefresh()


 System/HappyXB/HappyXBGetItemWin.cs

@@ -347,23 +347,30 @@
                isMoneyEnough = UIHelper.GetMoneyCnt(1) >= (ulong)manyMoney;

            }



            if (isMoneyEnough)

            switch(costType)

            {

                switch (XBModel.title)

                {

                    case HappXBTitle.Best:

                        XBModel.SendXBQuest(1, xbNum, costType);

                        break;

                    case HappXBTitle.Rune:

                        XBModel.SendXBQuest(2, xbNum, costType);

                        break;

                }

                case 0:

                    if (!isMoneyEnough)

                    {

                        WindowCenter.Instance.Open<RechargeTipWin>();

                        return;

                    }

                    break;

                case 1:

                case 2:



                    break;

            }

            else



            switch (XBModel.title)

            {

                WindowCenter.Instance.Open<RechargeTipWin>();

                case HappXBTitle.Best:

                    XBModel.SendXBQuest(1, xbNum, costType);

                    break;

                case HappXBTitle.Rune:

                    XBModel.SendXBQuest(2, xbNum, costType);

                    break;

            }

           
        }



        private void OnStartXB(int oneOrMany)


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -681,12 +681,17 @@
            useItemModel = singlePack.GetItemModelByIndex(itemIndex);

            if (useItemModel == null) return;



            if(useItemModel.chinItemModel.Type == (int)ItemType.Box)

            switch(useItemModel.chinItemModel.Type)

            {

                BoxModel.SetModel(useItemModel.itemInfo.ItemGUID, useItemModel.itemInfo.ItemID);

                return;

                case (int)ItemType.Box:

                    BoxModel.SetModel(useItemModel.itemInfo.ItemGUID, useItemModel.itemInfo.ItemID);

                    return;

                case 83:

                    var fashionModel = ModelCenter.Instance.GetModel<FashionDressModel>();

                    fashionModel.jumpFashionDress = useItemModel.chinItemModel.EffectValueA1;

                    WindowCenter.Instance.Open<RolePanel>(false,5);

                    return;

            }



            if (useItemModel.itemId == 951)

            {

                int startLockIndex = singlePack.openGridCount - playerPack.InitBagGridCnt;


 System/Skill/SkillBehaviour.cs

@@ -1,6 +1,7 @@
using System;

using System.Collections;
using System.Collections.Generic;
using System.Text;

using TableConfig;

using UnityEngine;
using UnityEngine.UI;

@@ -47,6 +48,35 @@
            if (m_SkillDescription != null)

            {

                m_SkillDescription.text = string.Empty;

                if (ActivateShow.activateType == ActivateShow.ActivateFunc.GodWeaponEffect)

                {

                    DisplayGodWeaponEffectProperty(config);

                }

            }

        }



        void DisplayGodWeaponEffectProperty(GodWeaponEffectConfig config)

        {

            var _model = ModelCenter.Instance.GetModel<MagicianModel>();

            Dictionary<int, int> dict;

            if (_model.TryGetEffectProperty(config.type, config.level, out dict))

            {

                var sb = new StringBuilder();

                foreach (var property in dict.Keys)

                {

                    var propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(property);

                    if (propertyConfig != null)

                    {

                        sb.Append(propertyConfig.Name);

                        sb.Append(StringUtility.Contact("+", UIHelper.ReplaceLargeNum(

                            UIHelper.ReplacePercentage(dict[property], propertyConfig.ISPercentage,

                            UIHelper.GetPropertyDecimalCount(property))),

                            propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                        sb.Append("\n");

                    }

                }

                m_SkillDescription.text = sb.ToString();

                m_SkillDescription.color = UIHelper.GetUIColor(TextColType.DarkGreen);

            }

        }



@@ -61,6 +91,7 @@
                m_SkillIcon.SetSprite(config.IconName);

                m_SkillName.text = config.SkillName;

                m_SkillDescription.text = config.Description;

                m_SkillDescription.color = UIHelper.GetUIColor(TextColType.LightYellow);

            }

        }