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

client_linchunjie

2018-09-19 9cb530106f4ee32d88fc06636af69c0793d4a2a3

 System/Compose/New/ComposeEquipWin.cs

@@ -114,14 +114,38 @@
            UIEventTrigger.Get(helpBtn.gameObject).OnUp = OnDownUp;

            successRate = 0;

            firstTypeDict = composeWinModel.GetFirstTypeModel((int)ComposeFuncType.Equip);

            CreateCell();

            if(curSecondType == 0)

         
            bool isJumpTo = false;

            if (composeWinModel.secondType != 0)

            {

                RefreshUI(null);

                isJumpTo = true;

                curSecondType = composeWinModel.secondType;

                curThirdType = composeWinModel.thirdType;

                secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Equip, composeWinModel.secondType);

                OnClickSecondType(curSecondType,curThirdType);

                composeWinModel.ResetJumpToModel();

            }



            CreateCell();

            if (compoundModel != null)

            {

                RefreshUI(compoundModel);

                if (isJumpTo)

                {

                    isJumpTo = false;

                    if (!composeWinModel.IsEnoughFixedMat(compoundModel) || !composeWinModel.IsEnoughUnfixedMat(compoundModel))

                    {

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

                    }

                    else if (!composeWinModel.IsEnoughMoney(compoundModel))

                    {

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

                    }

                }

            }

            else

            {

                RefreshUI(null);

            }

        }



@@ -182,7 +206,7 @@
            if (secondTypeDict != null)

            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0

                    && curThirdType == 1)

                    && curThirdType >= 1)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if(remain > 0)

@@ -254,16 +278,16 @@
            }

        }



        private void OnClickSecondType(int secondType)

        private void OnClickSecondType(int secondType,int _thirdType = 0)

        {

            curSecondType = secondType;

            secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Equip, curSecondType);



            if(_thirdType == 0)

            {

            foreach (var thirdType in secondTypeDict.Keys)

            {

                if (thirdType != 0)

                {



                    if (preSecondType == curSecondType)

                    {

                        curSecondType = 0;

@@ -277,6 +301,11 @@
                }

                break;

            }

            }

            else

            {

                curThirdType = _thirdType;

            }



            if (preSecondType != curSecondType)

            {