From 56091a5a2b3df0681996731982f812003daf85e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 九月 2018 15:52:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FlyingShoesTask.cs | 117 ++++++++--------------------------------------------------
1 files changed, 16 insertions(+), 101 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 6fbc547..611917d 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -120,33 +120,6 @@
m_ImgSelected.SetActive(true);
taskmodel.GetNowTaskID = Task_ID;
-
- if (mainModel.TaskId_Skill1.Contains(Task_ID))//鐗规畩鏀嚎浠诲姟瑙ｉ攣琚姩鎶�鑳界殑
- {
- if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
- {
-
- 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
- {
- WindowCenter.Instance.Open<HoistingWin>();
- }
- return;
- }
if (mainModel.WingTask == Task_ID && ((int)taskmodel.GetTaskStatus(Task_ID) == 0 || (int)taskmodel.GetTaskStatus(Task_ID) == -5))//鍏充簬鐗规畩缈呰唨浠诲姟
{
if (playerPack.GetSinglePackModel(PackType.rptItem) == null)
@@ -181,8 +154,17 @@
case -5:
case 0:
StateDetermination();
- ContentText.ExcuteHref();
- OpenPanel(Task_ID);
+ if (mainModel.TaskId_Skill.Contains(Task_ID))
+ {
+ mainModel.TaskSkillID = Task_ID;
+ WindowCenter.Instance.Open<SkillTaskWin>();
+ }
+ else
+ {
+ ContentText.ExcuteHref();
+ OpenPanel(Task_ID);
+ }
+
break;
case 1:
@@ -279,24 +261,6 @@
private void OnClickDeliveryButton()//浼犻�佺
{
//--------------鐗规畩浠诲姟鐨勪紶閫侀�昏緫
- if (mainModel.TaskId_Skill1.Contains(Task_ID))
- {
- var mapModel = ModelCenter.Instance.GetModel<MapModel>();
- var point = mapModel.GetRecommendHangPoint();
- var config = Config.Instance.Get<MapEventPointConfig>(point);
-
- var flyBootOwn = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId);
- var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;
- if (isVipFreeTransfer || flyBootOwn > 0)
- {
- MapTransferUtility.Instance.MissionFlyTo(config.MapID, config.NPCID);
- }
- else
- {
- MapTransferUtility.Instance.MoveToNPC(config.NPCID);
- }
- return;
- }
mainModel.FlyShoseTaskID = Task_ID;
string _FlyID = Config.Instance.Get<FuncConfigConfig>("TransportPay").Numerical1;
int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_FlyID));//鑾峰彇椋為瀷鐨勬暟閲�
@@ -380,52 +344,16 @@
{
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))//鐗规畩浠诲姟
+ var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
+ if (taskinfo != null)
{
- if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
- {
- 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
- {
- string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
- m_ContentText.text = Str_C;
- }
+ m_ContentText.text = taskinfo.show_writing;
}
else
{
- if (taskinfo != null)
- {
- m_ContentText.text = taskinfo.show_writing;
- }
- else
- {
- DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
- return;
- }
+ DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
+ return;
}
bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc");
if (isOPenTransferButton && !IsKaJiBool)
@@ -436,20 +364,7 @@
{
m_DeliveryButton.gameObject.SetActive(false);
}
- //----------------鐗规畩閲囬泦榄斿洟浠诲姟鐨勪紶閫佷簯澶勭悊
- if (mainModel.TaskId_Skill1.Contains(TaskID))//鐗规畩浠诲姟
- {
- if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
- {
- m_DeliveryButton.gameObject.SetActive(true);
- }
- else
- {
- m_DeliveryButton.gameObject.SetActive(false);
- }
- }
m_ContentText.raycastTarget = false;
-
if (taskmodel._DicTaskInformation.ContainsKey(TaskID))
{
Dictionary<string, string> SkillDic = new Dictionary<string, string>();
--
Gitblit v1.8.0