From 42e8bf4cf1ed3f5e249b7ae50e3cefca487652fc Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 22 八月 2018 14:57:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FlyingShoesTask.cs | 108 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 33 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 067699e..66291d4 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -120,36 +120,27 @@
m_ImgSelected.SetActive(true);
taskmodel.GetNowTaskID = Task_ID;
+
+ if (mainModel.TaskId_Skill1.Contains(Task_ID))
+ {
+ int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//鑾峰彇鐗规畩鐗╁搧
+ if (itemNumber >= mainModel.ItemNumber)
+ {
+ taskmodel.CompletionOfTask(Task_ID);
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+ }
+ else
+ {
+ StateDetermination();
+ ContentText.ExcuteHref();
+ }
+ return;
+ }
switch ((int)taskmodel.GetTaskStatus(Task_ID))
{
case -5:
case 0:
- DropItemManager.StopMissionPickup = true;//涓诲姩鍋滄鎷惧彇鐗╁搧
- if (PlayerDatas.Instance.extersion.bossState == 1)
- {
- string strNpc = string.Empty;
- strNpc = ContentText.GetHrefMessage("movenpc");
- int npcId = 0;
- int mapID = PlayerDatas.Instance.baseData.MapID;
- if (int.TryParse(strNpc, out npcId))
- {
- var npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();
- foreach (var value in npcConfig)
- {
- if (value.NPCID == npcId && value.MapID != mapID)
- {
- SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
- return;
- }
- }
- var MonsterConfig = Config.Instance.Get<MonsterRefreshPointConfig>(npcId);
- if (MonsterConfig != null && MonsterConfig.MapId != mapID)
- {
- SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
- return;
- }
- }
- }
+ StateDetermination();
ContentText.ExcuteHref();
OpenPanel(Task_ID);
break;
@@ -202,12 +193,47 @@
break;
case 3:
taskmodel.CompletionOfTask(Task_ID);
+ if (mainModel.TaskId_Skill.Contains(Task_ID))
+ {
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
+ }
break;
default:
break;
-
}
}
+
+ private void StateDetermination()//鐘舵�佸垽瀹�
+ {
+ DropItemManager.StopMissionPickup = true;//涓诲姩鍋滄鎷惧彇鐗╁搧
+ if (PlayerDatas.Instance.extersion.bossState == 1)
+ {
+ string strNpc = string.Empty;
+ strNpc = ContentText.GetHrefMessage("movenpc");
+ int npcId = 0;
+ int mapID = PlayerDatas.Instance.baseData.MapID;
+ if (int.TryParse(strNpc, out npcId))
+ {
+ var npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();
+ foreach (var value in npcConfig)
+ {
+ if (value.NPCID == npcId && value.MapID != mapID)
+ {
+ SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
+ return;
+ }
+ }
+ var MonsterConfig = Config.Instance.Get<MonsterRefreshPointConfig>(npcId);
+ if (MonsterConfig != null && MonsterConfig.MapId != mapID)
+ {
+ SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
+ return;
+ }
+ }
+ }
+
+ }
+
private void OnClickDeliveryButton()//浼犻�佺
{
mainModel.FlyShoseTaskID = Task_ID;
@@ -293,16 +319,32 @@
}
string str = taskmodel.allMissionDict[TaskID].InforList;
var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
- if (taskinfo != null)
+ if (mainModel.TaskId_Skill1.Contains(TaskID))//鐗规畩浠诲姟
{
- m_ContentText.text = taskinfo.show_writing;
+ 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)
+ {
+ m_ContentText.text = Str_B;
+ }
+ else
+ {
+ m_ContentText.text = Str_A;
+ }
}
else
{
- DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
- return;
- }
-
+ if (taskinfo != null)
+ {
+ m_ContentText.text = taskinfo.show_writing;
+ }
+ else
+ {
+ DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
+ return;
+ }
+ }
bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc");
if (isOPenTransferButton && !IsKaJiBool)
{
--
Gitblit v1.8.0