From 04a45b20dace4d4b3a127d9b2d00edb9cba61154 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 31 八月 2018 13:39:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Compose/New/ComposeWingsWin.cs |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/System/Compose/New/ComposeWingsWin.cs b/System/Compose/New/ComposeWingsWin.cs
index 0ac146f..64beeff 100644
--- a/System/Compose/New/ComposeWingsWin.cs
+++ b/System/Compose/New/ComposeWingsWin.cs
@@ -224,8 +224,7 @@
 
             if(secondTypeDict != null)
             {
-                if (secondTypeDict.Count >= 1 && curSecondType != 0
-                    && curThirdType == 0)
+                if (secondTypeDict.Count >= 1 && curSecondType != 0)
                 {
                     cellCtrl.JumpIndex(curSecondType - 1);
                 }
@@ -257,6 +256,7 @@
                         name.text = compoundModel.secondTypeName;
                         if (curSecondType == cell.index)
                         {
+                            preSecondType = curSecondType;
                             icon.SetSprite("ComposeFirstClassChoosebtn");
                             arrowIcon.transform.localRotation = Quaternion.Euler(0,0,-90);
                             secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Wings, curSecondType);
@@ -345,8 +345,7 @@
         private void OnClickThirdType(int thirdType)
         {
             curThirdType = thirdType;
-            CreateCell();
-            //RefreshUI(thirdTypelist[0]);
+            cellCtrl.m_Scorller.RefreshActiveCellViews();
             selectModel.ClearSelectModel();
         }
 

--
Gitblit v1.8.0