From 64970a278d76d7cfab56d59aa351583ae1c5a0b6 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期二, 13 十一月 2018 17:44:31 +0800
Subject: [PATCH] 4534 【1.3】【1.2】合成界面,合成幸运草使用状态下切换别的合成条目报错

---
 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