From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/MainInterfacePanel/SkillTaskWin.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/SkillTaskWin.cs b/System/MainInterfacePanel/SkillTaskWin.cs
index f477aec..33be1b8 100644
--- a/System/MainInterfacePanel/SkillTaskWin.cs
+++ b/System/MainInterfacePanel/SkillTaskWin.cs
@@ -22,6 +22,7 @@
[SerializeField] Button m_OpenNowBtn;
[SerializeField] Button m_GoToBtn;
[SerializeField] Button m_ClaoseBtn;
+ [SerializeField] Image m_Image;//瀛旀暟
PlayerMainDate m_MainModel;
PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
PlayerTaskDatas m_TaskModel;
@@ -51,11 +52,20 @@
if (taskinfo != null)
{
m_Text_Condition_1.text = taskinfo.show_writing;
+ if (taskmodel._DicTaskInformation.ContainsKey(mainModel.TaskSkillID))
+ {
+ Dictionary<string, string> SkillDic = new Dictionary<string, string>();
+ SkillDic = taskmodel._DicTaskInformation[mainModel.TaskSkillID];
+ string strA = "on_kill_" + mainModel.TaskSkillID.ToString();
+ string strB = "get_byid_" + mainModel.TaskSkillID.ToString();
+ m_Text_Condition_1.SetReplaceInfo(SkillDic);
+ }
}
if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))
{
int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);
m_Text_Reward_1.text = string.Format(Language.Get("PassiveSkillTask1"), (mainModel.SkillIndex[Index] + 1));
+ SetImageSprite(mainModel.SkillIndex[Index] + 1);
m_NeedMoney_Text.text = string.Format(Language.Get("PassiveSkillTask2"), mainModel.NeedFairyJade[Index]);
}
}
@@ -97,7 +107,7 @@
if (Gold >= NeedMoney)
{
taskmodel.CompletionOfTask(mainModel.TaskSkillID);
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2Type2);
}
else
{
@@ -118,6 +128,32 @@
m_Text_Condition_1.ExcuteHref();
// Close();
+ }
+
+ private void SetImageSprite(int Index)
+ {
+ switch (Index)
+ {
+ case 1:
+ m_Image.SetSprite("Slot_1");
+ break;
+ case 2:
+ m_Image.SetSprite("Slot_2");
+ break;
+ case 3:
+ m_Image.SetSprite("Slot_3");
+ break;
+ case 4:
+ m_Image.SetSprite("Slot_4");
+ break;
+ case 5:
+ m_Image.SetSprite("Slot_5");
+ break;
+ case 6:
+ m_Image.SetSprite("Slot_6");
+ break;
+
+ }
}
#endregion
--
Gitblit v1.8.0