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

client_Zxw

2018-11-13 d2dd33cc0ca421e276d50abc46688f5db83aa42b

 System/Compose/New/ComposeEquipWin.cs

@@ -323,6 +323,7 @@


            if (preSecondType != curSecondType)

            {

                isIncreaseRate = false;

                preSecondType = curSecondType;

                curComposeEquipIndex = -1;

                selectModel.ClearSelectModel();

@@ -352,6 +353,7 @@


            if (preThirdType != curThirdType)

            {

                isIncreaseRate = false;

                preThirdType = curThirdType;

            }

            curComposeEquipIndex = -1;

@@ -572,13 +574,14 @@
                composeBtn.gameObject.SetActive(true);

                onekeyPutBtn.gameObject.SetActive(true);

                UpdateComposeMat();

                RefreshComposeSuccessRate();

            }



            RefreshComposeSuccessRate();

        }



        public void RefreshComposeSuccessRate()

        {

            if (compoundModel == null) return;



            successRate = 0;

            int increaseRate = 0;

            if (compoundModel != null)