From 6149e7ca1c3351a906d8560747c8862f4f12479c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 27 八月 2018 17:19:35 +0800
Subject: [PATCH] Fixed #1708 新旧号切换造成新手流程卡住
---
Fight/PreFightMission.cs | 10 +++++++---
System/MainInterfacePanel/MainInterfaceWin.cs | 23 +++++++++++++++++------
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index d618391..cb2a276 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -917,6 +917,8 @@
private IEnumerator LookNpcBorn()
{
GA_Hero.s_MapSwitching = true;
+
+
// 鎽勫儚鏈虹Щ鍔ㄨ嚦鐭冲ご浜哄嚭鐜板尯鍩�
CameraController.Instance.SetLookTarget(null);
CameraController.Instance.transform.position = PlayerDatas.Instance.hero.Pos;
@@ -940,11 +942,13 @@
// 鍥炲埌鐜╁韬笂
CameraController.Instance.SetLookTarget(PlayerDatas.Instance.hero.Root);
- yield return WaitingForSecondConst.WaitMS500;
-
// 鏄剧ず浠诲姟鐣岄潰
Transform _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip");
_temp.gameObject.SetActive(true);
+
+ WindowCenter.Instance.Get<MainInterfaceWin>().ForceShowTaskPanel();
+
+ yield return WaitingForSecondConst.WaitMS500;
// 鎵撳紑寮曞鐣岄潰
NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>();
@@ -1438,7 +1442,7 @@
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/CopyOfThePanel/HighSettingTip/Container_Treasure");
_temp.gameObject.SetActive(true);
-
+
_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress");
_temp.localScale = Vector3.one;
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index e92c5e9..598edef 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -238,7 +238,7 @@
}
protected override void OnAfterOpen()
- {
+ {
bool IsBossBool = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool))
{
@@ -286,7 +286,7 @@
}
}
else
- {
+ {
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (isNeutralMap)
@@ -448,7 +448,7 @@
private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter)
{
- // DesignDebug.LogError(_areaType + ".." + _enter);
+ // DesignDebug.LogError(_areaType + ".." + _enter);
if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter)
{
if (Buffmodel.PkType != onMainModel.AreaState)
@@ -653,7 +653,7 @@
if (!recordPositionBool)
{
if (inDungeon || IsBossBool || isNeutralMap)
- {
+ {
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(false);
@@ -664,12 +664,12 @@
}
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
- m_BossBriefInfos.Unfold(false);
+ m_BossBriefInfos.Unfold(false);
}
if (!IsBossBool)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)
- {
+ {
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(true);
@@ -814,6 +814,17 @@
recordPositionBool = !recordPositionBool;
}
+ // 鍓嶆湡鎴樻枟鐢ㄥ己鍒惰缃换鍔′綅缃�昏緫
+ public void ForceShowTaskPanel()
+ {
+ if (onMainModel.IsBossAreaTask)
+ {
+ onMainModel.IsBossAreaTask = false;
+ }
+ m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
+ TaskSwithBool = !TaskSwithBool;
+ }
+
void ArticleExperience()//鍏充簬缁忛獙鏉�
{
int NowLv = (int)PlayerDatas.Instance.baseData.LV;
--
Gitblit v1.8.0