From 35578d649a7aa913c6914d6c97e6dbc80e9c9ca0 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 23 八月 2018 22:54:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FlyingShoesTask.cs | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 5c95f60..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;
}
@@ -338,17 +346,24 @@
var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
if (mainModel.TaskId_Skill1.Contains(TaskID))//鐗规畩浠诲姟
{
-
- 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