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

client_Hale

2018-08-31 5cb5ee1728cd9c6566aef8e43a12c36234e89713

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

 System/Compose/New/ComposeToolsWin.cs

@@ -1,5 +1,6 @@
using Snxxz.UI;

using System;

using System.Collections;

using System.Collections.Generic;

using TableConfig;

using UnityEngine;

@@ -185,6 +186,7 @@
        protected override void OnAfterOpen()

        {

            this.transform.SetAsLastSibling();

            StartCoroutine(SetOffestPos());

        }



        protected override void OnPreClose()

@@ -249,6 +251,14 @@
            }

        }



        private IEnumerator SetOffestPos()

        {

            yield return null;

            if (curThirdType != 0)

            {

                cellCtrl.JumpIndex(curThirdType*50, 0, EnhancedUI.EnhancedScroller.EnhancedScroller.TweenType.immediate);

            }

        }

        private void RefreshCell(ScrollerDataType type, CellView cell)

        {

            Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();