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

client_Wu Xijin

2018-10-26 bfae745a714d24d63846bb823e589a4146857f32

 System/Compose/New/ComposeToolsWin.cs

@@ -2,6 +2,7 @@
using System;

using System.Collections;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -220,19 +221,26 @@
            {

                if (secondTypeDict.Count >= 1 && curSecondType != 0)

                {

                    int remain = curSecondType - firstTypeDict.Count;

                    if (remain > 0)

                    {

                        cellCtrl.JumpIndex(curSecondType - remain);

                    }

                    else

                    {

                        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 IEnumerator SetOffestPos()

        {

            yield return null;