From bfae745a714d24d63846bb823e589a4146857f32 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 10:36:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Compose/New/ComposeDogzEquipWin.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/System/Compose/New/ComposeDogzEquipWin.cs b/System/Compose/New/ComposeDogzEquipWin.cs
index d9201be..a9cfd02 100644
--- a/System/Compose/New/ComposeDogzEquipWin.cs
+++ b/System/Compose/New/ComposeDogzEquipWin.cs
@@ -1,6 +1,7 @@
 锘縰sing Snxxz.UI;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using TableConfig;
 using UnityEngine;
 using UnityEngine.UI;
@@ -172,13 +173,28 @@
             if (secondTypeDict != null)
             {
                 if (secondTypeDict.Count >= 1 && curSecondType != 0
-                    && curThirdType == 1)
+                    && curThirdType >= 1)
                 {
-                    cellCtrl.JumpIndex(curSecondType - 1);
+                    cellCtrl.JumpIndex(GetCurIndex(curSecondType));
                 }
             }
         }
 
+        private int GetCurIndex(int secondType)
+        {
+            int curIndex = 0;
+            List<int> secondlist = firstTypeDict.Keys.ToList();
+            for (int i = 0; i < secondlist.Count; i++)
+            {
+                if (secondType == secondlist[i])
+                {
+                    curIndex = i;
+                    break;
+                }
+            }
+            return curIndex;
+        }
+
         private void RefreshCell(ScrollerDataType type, CellView cell)
         {
             Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();

--
Gitblit v1.8.0