Merge branch 'master' into builtinmove

client_Wu Xijin

2018-11-15 a08989bee578f43a2a9b1724366fdea969e9405e

 System/Compose/New/ComposeTicketWin.cs

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

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Ticket, 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;

            CreateTypeCell();

        }

@@ -469,6 +460,13 @@
            fixedItemIndexDict.Clear();

            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>();

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

            int[] fixedIds = compoundModel.itemID;

@@ -504,6 +502,12 @@
        {

            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,GetPlayMatEffect(),1);

        }