From efa5f8d07fc3321f6ac5f5d97fb422db28d0886f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 05 三月 2019 10:55:31 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
System/Dungeon/TrialSelectClassBehaviour.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/Dungeon/TrialSelectClassBehaviour.cs b/System/Dungeon/TrialSelectClassBehaviour.cs
index c9292a3..b6205af 100644
--- a/System/Dungeon/TrialSelectClassBehaviour.cs
+++ b/System/Dungeon/TrialSelectClassBehaviour.cs
@@ -1,7 +1,7 @@
锘縰sing 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;
}
}
}
--
Gitblit v1.8.0