From 99ade926b1eddfa6da7a3ed085e2bab1acd09723 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 03 九月 2018 14:50:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/TrialExchangeWin.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/System/Dungeon/TrialExchangeWin.cs b/System/Dungeon/TrialExchangeWin.cs
index 6d1ca53..fb8858b 100644
--- a/System/Dungeon/TrialExchangeWin.cs
+++ b/System/Dungeon/TrialExchangeWin.cs
@@ -18,8 +18,8 @@
[SerializeField] Text m_SelectClass;
[SerializeField] Button m_SelectClassUp;
[SerializeField] TrialSelectClassBehaviour m_SelectClassBehaviour;
- [SerializeField] ItemBehaviour[] m_Tokens;
- [SerializeField] Text[] m_TokenCounts;
+ //[SerializeField] ItemBehaviour[] m_Tokens;
+ //[SerializeField] Text[] m_TokenCounts;
[SerializeField] Button m_Close;
TrialDungeonModel model { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }
@@ -189,23 +189,23 @@
void DisplayTokens()
{
- var list = model.trialClassTokens.ContainsKey(model.selectEquipClass) ? model.trialClassTokens[model.selectEquipClass] : null;
- for (int i = 0; i < m_Tokens.Length; i++)
- {
- if (list != null && i < list.Count)
- {
- m_Tokens[i].gameObject.SetActive(model.selectEquipClass != 1);
- if (model.selectEquipClass != 1)
- {
- m_Tokens[i].SetItem(list[i], 0);
- m_TokenCounts[i].text = model.GetTrialTokenCount(list[i]).ToString();
- }
- }
- else
- {
- m_Tokens[i].gameObject.SetActive(false);
- }
- }
+ //var list = model.trialClassTokens.ContainsKey(model.selectEquipClass) ? model.trialClassTokens[model.selectEquipClass] : null;
+ //for (int i = 0; i < m_Tokens.Length; i++)
+ //{
+ // if (list != null && i < list.Count)
+ // {
+ // m_Tokens[i].gameObject.SetActive(model.selectEquipClass != 1);
+ // if (model.selectEquipClass != 1)
+ // {
+ // m_Tokens[i].SetItem(list[i], 0);
+ // m_TokenCounts[i].text = model.GetTrialTokenCount(list[i]).ToString();
+ // }
+ // }
+ // else
+ // {
+ // m_Tokens[i].gameObject.SetActive(false);
+ // }
+ //}
}
private void SelectEquipClassEvent()
--
Gitblit v1.8.0