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

client_linchunjie

2018-11-14 ab4e4b640d7fbc97abf7e9b4c58592d70c4358b9

 System/Compose/New/ComposeToolsWin.cs

@@ -343,15 +343,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, thirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -443,6 +434,13 @@
        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }



            SetFixedItemIndexDic();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,composeEffect,1);

        }

@@ -486,6 +484,13 @@
        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }



            List<int> composeCountlist = new List<int>();

            fixedItemIndexDict.Clear();

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