From 7edbc1870c503dde5729672f4cddc44ee02fd472 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 28 八月 2018 17:40:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FlyingShoesTask.cs | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 96a6751..ed258ca 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -166,7 +166,7 @@
foreach (var key in BackpackDic.Keys)
{
ItemModel ItemM = BackpackDic[key];
- if (ItemM.chinItemModel.Type == 111 && ItemM.chinItemModel.ExpireTime == 0 && ItemM.chinItemModel.JobLimit/100 == job)
+ if (ItemM.chinItemModel.Type == 111 && ItemM.chinItemModel.ExpireTime == 0 && ItemM.chinItemModel.JobLimit / 100 == job)
{
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//璺冲埌鑳屽寘
return;
@@ -243,7 +243,7 @@
}
}
-
+
private void StateDetermination()//鐘舵�佸垽瀹�
{
@@ -278,6 +278,25 @@
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));//鑾峰彇椋為瀷鐨勬暟閲�
@@ -298,6 +317,8 @@
int NeedMoney = (int)UIHelper.GetMoneyCnt(1) + (int)UIHelper.GetMoneyCnt(2);
if (NeedMoney >= 1)
{
+
+
m_ContentText.ExcuteHref(1);
}
else
@@ -315,6 +336,9 @@
}
}
+
+
+
public void FlyingShoes_Task(int TaskID)
{
Task_ID = TaskID;
@@ -392,7 +416,7 @@
{
string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
m_ContentText.text = Str_C;
- }
+ }
}
else
{
@@ -405,7 +429,7 @@
DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
return;
}
- }
+ }
bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc");
if (isOPenTransferButton && !IsKaJiBool)
{
--
Gitblit v1.8.0