From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/MainInterfacePanel/FlyingShoesTask.cs | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 0821dc5..4e37de3 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -123,19 +123,27 @@
if (mainModel.TaskId_Skill1.Contains(Task_ID))
{
- int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
- if (itemNumber >= mainModel.ItemNumber)
+ if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
{
- taskmodel.CompletionOfTask(Task_ID);
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+
+ int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
+ if (itemNumber >= mainModel.ItemNumber)
+ {
+ taskmodel.CompletionOfTask(Task_ID);
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+ }
+ else
+ {
+ StateDetermination();
+ var mapModel = ModelCenter.Instance.GetModel<MapModel>();
+ var point = mapModel.GetRecommendHangPoint();
+ var config = Config.Instance.Get<MapEventPointConfig>(point);
+ MapTransferUtility.Instance.MoveToNPC(config.NPCID);
+ }
}
else
{
- StateDetermination();
- var mapModel = ModelCenter.Instance.GetModel<MapModel>();
- var point = mapModel.GetRecommendHangPoint();
- var config = Config.Instance.Get<MapEventPointConfig>(point);
- MapTransferUtility.Instance.MoveToNPC(config.NPCID);
+ WindowCenter.Instance.Open<HoistingWin>();
}
return;
}
@@ -322,21 +330,40 @@
{
m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";
}
+ int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
+ if (mainModel.TaskId_Skill1.Contains(TaskID))
+ {
+ if (itemNumber >= mainModel.ItemNumber)
+ {
+ m_TitleText.text = "<color=#109d06>" + TaskTitle(TaskID) + "</color>";
+ }
+ else
+ {
+ m_TitleText.text = "<color=#feed28>" + TaskTitle(TaskID) + "</color>";
+ }
+ }
string str = taskmodel.allMissionDict[TaskID].InforList;
var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
if (mainModel.TaskId_Skill1.Contains(TaskID))//鐗规畩浠诲姟
{
- int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
- string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
- string Str_B = Language.Get("PassiveSkillTask2");
- if (itemNumber >= mainModel.ItemNumber)
+ if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
{
- m_ContentText.text = Str_B;
+ string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
+ string Str_B = Language.Get("PassiveSkillTask2");
+ if (itemNumber >= mainModel.ItemNumber)
+ {
+ m_ContentText.text = Str_B;
+ }
+ else
+ {
+ m_ContentText.text = Str_A;
+ }
}
else
{
- m_ContentText.text = Str_A;
- }
+ string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
+ m_ContentText.text = Str_C;
+ }
}
else
{
--
Gitblit v1.8.0