Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 System/Dungeon/TrialSelectClassBehaviour.cs

@@ -1,7 +1,7 @@
using System;

using System.Collections;
using System.Collections.Generic;
using TableConfig;



using UnityEngine;
namespace Snxxz.UI

{

@@ -27,10 +27,10 @@
            {

                m_Controller.Refresh();

                m_Controller.AddCell(ScrollerDataType.Header, 1, SelectClass);

                for (int i = 0; i < model.trialTokens.Count; i++)

                var list = model.GetTotalClass();

                for (int i = 0; i < list.Count; i++)

                {

                    var config = ConfigManager.Instance.GetTemplate<ItemConfig>(model.trialTokens[i]);

                    m_Controller.AddCell(ScrollerDataType.Header, config.LV, SelectClass);

                    m_Controller.AddCell(ScrollerDataType.Header, list[i], SelectClass);

                }

                m_Controller.Restart();

            }

@@ -38,8 +38,8 @@


        private void SelectClass(CellView cell)

        {

            model.selectEquipClass = cell.index;

            gameObject.SetActive(false);

            model.selectEquipClass = cell.index;

        }

    }

}