From a119b86a194113f256bcd5703b831b33099bed99 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 15 五月 2019 20:11:42 +0800
Subject: [PATCH] 3589 【2.0】【bug】跳跃点附近使用筋斗云人物卡住无法移动
---
System/MainInterfacePanel/FlyingShoesTask.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 6459804..7775d9a 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -142,7 +142,7 @@
foreach (var key in BackpackDic.Keys)
{
var item = BackpackDic[key];
- if (item.config.Type == 111 && item.config.ExpireTime == 0
+ if (item.config.Type == 111 && item.config.ExpireTime == 0
&& ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId))
{
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//璺冲埌鑳屽寘
@@ -168,7 +168,7 @@
{
return;
}
- }
+ }
if (mainModel.TaskId_Skill.Contains(Task_ID))
{
mainModel.TaskSkillID = Task_ID;
@@ -181,11 +181,11 @@
TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
OpenPanel(Task_ID);
}
-
+
break;
case 1:
var taskPower = TaskPowerConfig.Get(Task_ID);
- if (taskPower!=null && taskPower.FabaoID!=0)
+ if (taskPower != null && taskPower.FabaoID != 0)
{
var _treasureId = taskPower.FabaoID;
var treasureConfig = TreasureConfig.Get(_treasureId);
@@ -258,7 +258,7 @@
{
npcConfig = mapnpcConfig.GetValues();
}
- // var npcConfig = mapnpcConfig.GetValues();
+ // var npcConfig = mapnpcConfig.GetValues();
foreach (var value in npcConfig)
{
if (value.NPCID == npcId && value.MapID != mapID)
@@ -286,7 +286,6 @@
{
return;
}
-
//--------------鐗规畩浠诲姟鐨勪紶閫侀�昏緫
mainModel.FlyShoseTaskID = Task_ID;
string _FlyID = FuncConfigConfig.Get("TransportPay").Numerical1;
@@ -295,8 +294,9 @@
if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)
{
HeroAIRecorder.ClearRecord();
- TaskAllocation.Instance.TaskTime= TimeUtility.ServerNow;
+ TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
m_ContentText.ExcuteHref(1);
+ MapTransferUtility.Instance.StopMovetoNpc();
return;
}
if (itemNumber > 0)
@@ -304,6 +304,7 @@
HeroAIRecorder.ClearRecord();
TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
m_ContentText.ExcuteHref(1);
+ MapTransferUtility.Instance.StopMovetoNpc();
}
else
{
@@ -315,6 +316,7 @@
HeroAIRecorder.ClearRecord();
TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
m_ContentText.ExcuteHref(1);
+ MapTransferUtility.Instance.StopMovetoNpc();
}
else
{
@@ -329,8 +331,6 @@
}
}
-
-
public void FlyingShoes_Task(int TaskID)
{
@@ -374,12 +374,12 @@
m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";
}
string str = taskmodel.allMissionDict[TaskID].InforList;
- var taskinfo = TASKINFOConfig.Get(str);
+ var taskinfo = TASKINFOConfig.Get(str);
if (taskinfo != null)
{
var taskPower = TaskPowerConfig.Get(TaskID);
- string StrText= taskinfo.show_writing;
- if (taskPower != null && taskPower.ISJUMP!=0)
+ string StrText = taskinfo.show_writing;
+ if (taskPower != null && taskPower.ISJUMP != 0)
{
if (PlayerDatas.Instance.baseData.FightPoint >= taskPower.Power)
{
@@ -395,7 +395,7 @@
{
m_ContentText.text = StrText;
}
-
+
}
else
{
@@ -594,7 +594,7 @@
DemonMissionTypeList.Add(DemonMissionType[i]);
DemonMissionTypeListKey.Add(DemonMissionType1[i]);
}
- var TransportTaskConfig= FuncConfigConfig.Get("TransportTask").Numerical1;
+ var TransportTaskConfig = FuncConfigConfig.Get("TransportTask").Numerical1;
int[] TransportTaskList = ConfigParse.GetMultipleStr<int>(TransportTaskConfig);
TransportTask.Clear();
for (int i = 0; i < TransportTaskList.Length; i++)
@@ -622,7 +622,7 @@
if (taskmodel.FairyAuDic.ContainsKey(_taskID))
{
int FairyNumber = TaskAllocation.Instance.FairyAuNumber();
- if (FairyNumber == 10 )
+ if (FairyNumber == 10)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<FairyAuTaskWin>();
--
Gitblit v1.8.0