From b010718dbb8efdc9031570ddebe152e6890f80ae Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期三, 12 六月 2019 11:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackFuncWin.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackFuncWin.cs b/System/MainInterfacePanel/TaskFeedbackFuncWin.cs
index 36bfea8..623bac4 100644
--- a/System/MainInterfacePanel/TaskFeedbackFuncWin.cs
+++ b/System/MainInterfacePanel/TaskFeedbackFuncWin.cs
@@ -18,6 +18,8 @@
[SerializeField] Text m_Category;
[SerializeField] TaskFeedbackFunc[] m_Funcs;
+ public static string funcTitle = string.Empty;
+
public static event Action<int> onSelectTask;
TaskFeedbackModel model { get { return ModelCenter.Instance.GetModel<TaskFeedbackModel>(); } }
@@ -67,6 +69,7 @@
void Display()
{
+ m_Category.text = funcTitle;
for (int i = 0; i < m_Funcs.Length; i++)
{
m_Funcs[i].button.gameObject.SetActive(i < model.taskFeedbackFuncs.Count);
@@ -76,11 +79,6 @@
if (config != null)
{
m_Funcs[i].label.text = config.name;
-
- if (i == 0)
- {
- m_Category.text = config.category;
- }
}
}
}
--
Gitblit v1.8.0