From d2dd33cc0ca421e276d50abc46688f5db83aa42b Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 13 十一月 2018 19:45:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Compose/New/ComposeEquipWin.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index 2a55d14..d4b0585 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/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)

--
Gitblit v1.8.0