From e432f2e612b213b1a262d3122363ea7d1fcebe49 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 11:52:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/SideMission.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/SideMission.cs b/System/MainInterfacePanel/SideMission.cs
index 980bb17..45d48b1 100644
--- a/System/MainInterfacePanel/SideMission.cs
+++ b/System/MainInterfacePanel/SideMission.cs
@@ -23,6 +23,7 @@
[SerializeField] Button _Btn_Forward;//鏀嚎鍓嶅線鎸夐挳
[SerializeField] Text _Text_Forward;//鎸夐挳鏂囧瓧
+ [SerializeField] Button m_FinishAtOnce;//绔嬪嵆瀹屾垚
PlayerTaskDatas m_TaskModel;
PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
ItemTipsModel _itemTipsModel;
@@ -40,6 +41,7 @@
private void Start()
{
_Btn_Forward.onClick.AddListener(ForwardButton);
+ m_FinishAtOnce.AddListener(OnClickSkillTask);
}
private void OnEnable()
{
@@ -60,6 +62,11 @@
}
+ private void OnClickSkillTask()
+ {
+ TaskAllocation.Instance.SkillTask(TaskIdNow);
+
+ }
private void ForwardButton()
{
if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)
@@ -144,7 +151,7 @@
str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);
str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);
_Text_TaskTarget.text = str;//浠诲姟鐩爣
-
+ SkillTask(taskID);
if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)//鑳藉杩涜绔嬪嵆瀹屾垚鐨勬敮绾夸换鍔�
{
_Text_Forward.text = string.Format(Language.Get("FinishAtOnce_Z"));
@@ -234,6 +241,16 @@
}
return string.Empty;
}
+
+ private void SkillTask(int TsakID)
+ {
+ if (!taskmodel.allMissionDict.ContainsKey(TsakID) || !mainModel.TaskId_Skill.Contains(TsakID))
+ {
+ m_FinishAtOnce.gameObject.SetActive(false);
+ return;
+ }
+ m_FinishAtOnce.gameObject.SetActive(true);
+ }
}
}
--
Gitblit v1.8.0