From f0ab0ddbc2633f5d8ebc96ed07de1bb2986e2e5d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 27 九月 2019 23:02:32 +0800
Subject: [PATCH] 0312 1. 小地图改成常显 需测试副本（联赛）和跨服显示 2. 切换时 首充改成左右移动 3. 优化小地图箭头坐标 4. 优化界面关闭时 依然显示功能模式，切换副本立即显示为副本图标
---
System/MainInterfacePanel/TopRightTip.cs | 25 ++++++++++++++++++-------
System/MainInterfacePanel/MainPositionTween.cs | 16 ++++++++++++++--
Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs | 2 +-
System/MainInterfacePanel/MainInterfaceWin.cs | 2 ++
4 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
index 02d7662..1f4554d 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
@@ -112,7 +112,7 @@
}
//GA_Hero.startAutoHazyRegion = false;
-
+ MainPositionTween.resetToDefaultTimer = 0f;
}
}
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 3f77630..2e8d480 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -537,6 +537,7 @@
m_HeadPortraitTip.gameObject.SetActive(false);
CopyOfThePanel.gameObject.SetActive(false);
_SwitchShowBtn.gameObject.SetActive(false);
+ m_TopRightTip.ShowMiniMap(false);
m_ChatTip.gameObject.SetActive(false);
m_FunctionForecastTip.gameObject.SetActive(false);
m_TaskSwithButton.gameObject.SetActive(false);
@@ -558,6 +559,7 @@
m_HeadPortraitTip.gameObject.SetActive(true);
CopyOfThePanel.gameObject.SetActive(true);
_SwitchShowBtn.gameObject.SetActive(true);
+ m_TopRightTip.ShowMiniMap(true);
m_ChatTip.gameObject.SetActive(true);
m_FunctionForecastTip.gameObject.SetActive(true);
m_TaskSwithButton.gameObject.SetActive(true);
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index 98dfa41..36bae20 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -24,6 +24,11 @@
[SerializeField] Transform m_RightTopPosition1;
[SerializeField] Transform m_RightTopPosition2;
+ [Header("涓荤晫闈㈤《閮ㄥ乏鍙冲垏鎹㈡ā鍧�")]
+ [SerializeField] Transform m_TRightFunction;
+ [SerializeField] Transform m_RightTopPosition3;
+ [SerializeField] Transform m_RightTopPosition4;
+
[Header("涓荤晫闈㈡妧鑳介潰鏉垮垏鎹㈡ā鍧�")]
public float rightBottomSwitchTime = 1.2f;
[SerializeField] Transform m_ContainerSkill;//鎶�鑳介潰鏉�
@@ -132,7 +137,7 @@
public static bool isDefaultState { get; private set; }
public static event Action<bool> switchFunctionStateEvent;
- static float resetToDefaultTimer = 0;
+ public static float resetToDefaultTimer = 0;
public static void SetRecoverToSkillTimer()
{
resetToDefaultTimer = 8f;
@@ -161,7 +166,10 @@
if ((isDungeon || isNeutralMap || isBossArea || AdventureStage.Instance.IsInAdventureStage)
&& !isGuiding && switchParams.showDefault)
{
- rightTopState = RightTopState.Boss;
+ if (resetToDefaultTimer >0)
+ { rightTopState = RightTopState.Function; }
+ else
+ rightTopState = RightTopState.Boss;
}
else
{
@@ -175,11 +183,13 @@
{
m_RightTopFunction.localPosition = m_RightTopPosition1.localPosition;
m_ContainerBossList.localPosition = m_RightTopPosition2.localPosition;
+ m_TRightFunction.localPosition = m_RightTopPosition3.localPosition;
}
else
{
m_RightTopFunction.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
m_ContainerBossList.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
+ m_TRightFunction.DOLocalMoveX(m_RightTopPosition3.localPosition.x, rightTopSwitchTime);
}
break;
case RightTopState.Boss:
@@ -187,11 +197,13 @@
{
m_ContainerBossList.localPosition = m_RightTopPosition1.localPosition;
m_RightTopFunction.localPosition = m_RightTopPosition2.localPosition;
+ m_TRightFunction.localPosition = m_RightTopPosition4.localPosition;
}
else
{
m_ContainerBossList.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
m_RightTopFunction.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
+ m_TRightFunction.DOLocalMoveX(m_RightTopPosition4.localPosition.x, rightTopSwitchTime);
}
break;
}
diff --git a/System/MainInterfacePanel/TopRightTip.cs b/System/MainInterfacePanel/TopRightTip.cs
index 21a064d..591373c 100644
--- a/System/MainInterfacePanel/TopRightTip.cs
+++ b/System/MainInterfacePanel/TopRightTip.cs
@@ -91,18 +91,25 @@
var mapHeight = mapResConfig.MapScale.y;
var uiMapWidth = mapWidth * mapResConfig.MapShowScale;
var uiMapHeight = mapHeight * mapResConfig.MapShowScale;
+ m_MapName.text = mapResConfig.Name;
this.mapMatrix = new LocalMap(this.dataMapId, mapWidth, mapHeight, uiMapWidth, uiMapHeight);
-
m_MapImage.SetSprite(mapResConfig.BigMap);
m_MapImage.SetNativeSize();
- var hPos = mapMatrix.WorldToLocalPosition(PlayerDatas.Instance.hero.Pos);
- heroPrePosition = hPos;
- m_MapName.text = mapResConfig.Name;
+
+ if (mapWidth == 0)
+ {
+ heroPrePosition = Vector3.zero;
+ }
+ else
+ {
+ var hPos = mapMatrix.WorldToLocalPosition(PlayerDatas.Instance.hero.Pos);
+ heroPrePosition = hPos;
+ }
}
//鏇存柊鍧愭爣
- if (dataMapId == PlayerDatas.Instance.baseData.MapID && PlayerDatas.Instance.hero.IsRun())
+ if (heroPrePosition != Vector3.zero && dataMapId == PlayerDatas.Instance.baseData.MapID && PlayerDatas.Instance.hero.IsRun())
{
var heroPos = mapMatrix.WorldToLocalPosition(PlayerDatas.Instance.hero.Pos);
if (Vector3.Distance(heroPrePosition, heroPos) > 1f)
@@ -115,9 +122,8 @@
m_MapHero.transform.eulerAngles = _mapHeroEular;
}
}
- if (m_MapImage.transform.localPosition != heroPrePosition)
+ if (heroPrePosition != Vector3.zero)
m_MapImage.transform.localPosition = heroPrePosition;
-
}
@@ -147,6 +153,11 @@
}
}
+
+ public void ShowMiniMap(bool show)
+ {
+ m_Map.gameObject.SetActive(show);
+ }
}
}
--
Gitblit v1.8.0