From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/MainInterfacePanel/TaskAllocation.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/TaskAllocation.cs b/System/MainInterfacePanel/TaskAllocation.cs
index ff37b06..87b4f0b 100644
--- a/System/MainInterfacePanel/TaskAllocation.cs
+++ b/System/MainInterfacePanel/TaskAllocation.cs
@@ -9,9 +9,11 @@
using System.Text.RegularExpressions;
using System.Collections.Generic;
//鐢ㄤ簬浠诲姟鍒嗛厤
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
- public class TaskAllocation:Singleton<TaskAllocation> {
+ public class TaskAllocation : Singleton<TaskAllocation>
+ {
private static StringBuilder textBuilder = new StringBuilder();
private const string Info_Pattern = "{([a-zA-Z0-9_]+)}";
@@ -23,7 +25,7 @@
return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>());
}
}
- public string GetTaskInfo(string val, int _item)//鐢ㄤ簬0820涓瓧鍏哥殑鍊兼浛鎹紙1瀛楃涓�2浠诲姟ID锛�
+ public string GetTaskInfo(string val, int _item)//鐢ㄤ簬0820涓瓧鍏哥殑鍊兼浛鎹紙1瀛楃涓�2浠诲姟ID锛�
{
textBuilder.Length = 0;
int index = 0;
@@ -56,7 +58,7 @@
}
}
- public int ForRingNumber()//鑾峰彇璧忛噾鐜暟
+ public int ForRingNumber()//鑾峰彇璧忛噾鐜暟
{
if (taskmodel.ReplaceDic.ContainsKey(1))
{
@@ -114,7 +116,42 @@
}
return 0;
}
-
+ PlayerMainDate m_MainModel;
+ PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
+ public void SkillTask(int TaskID)//鐢ㄤ簬瑙ｉ攣琚姩鎶�鑳戒换鍔�
+ {
+ int Gold = (int)UIHelper.GetMoneyCnt(1);//浠欑帀
+ if (mainModel.TaskId_Skill.Contains(TaskID))
+ {
+ int Index = mainModel.TaskId_Skill.IndexOf(TaskID);
+ int NeedMoney = mainModel.NeedFairyJade[Index];
+ string strNull = string.Format(Language.Get("PassiveSkillTask3"), NeedMoney);
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>
+ {
+ if (isOk)
+ {
+ if (Gold >= NeedMoney)
+ {
+ taskmodel.CompletionOfTask(TaskID);
+ if (WindowCenter.Instance.CheckOpen<SkillPanel>())
+ {
+ return;
+ }
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+ }
+ else
+ {
+ if (VersionConfig.Get().isBanShu)
+ {
+ SysNotifyMgr.Instance.ShowTip("GoldErr");
+ return;
+ }
+ WindowCenter.Instance.Open<RechargeTipWin>();
+ }
+ }
+ });
+ }
+ }
}
}
--
Gitblit v1.8.0