From 0235acfe784345d2034d27d38924974986578edb Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 20 二月 2019 17:58:54 +0800
Subject: [PATCH] 3335 代码修改
---
System/MainInterfacePanel/MainInterfaceWin.cs | 82 +++++++++++-----------------------------
1 files changed, 23 insertions(+), 59 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index a569bdc..ea5969d 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -24,7 +24,6 @@
[SerializeField] HighSettingTip m_HighSettingTip;
[SerializeField] TaskListTip m_TaskListTip;//浠诲姟
[SerializeField] TopRightTip m_TopRightTip;
-
[SerializeField] FunctionForecastTip m_FunctionForecastTip;//鍔熻兘棰勫憡
[SerializeField] IsShowXpButton m_IsShowXp;//XP 鎶�鑳藉父鏄�
[SerializeField] SkillButtonEffects m_SkillButtonEffects;
@@ -42,32 +41,19 @@
public float _Delaytime = 0.1f;//寤惰繜鏃堕棿
- [Header("浠诲姟闈㈡澘鐨勭Щ鍔ㄩ�熷害")]
- public float Speed = 0.2f;
[Header("鎶�鑳介潰鏉垮拰鎸夐挳闈㈡澘鐨勭Щ鍔ㄩ�熷害")]
public float SwitchSkillTipAndButtonTipSpeed = 0.2f;
- public float DoFade = 0.2f;
- [SerializeField] Transform m_LowSettingTipGroup;//鎸夐挳闈㈡澘
- [SerializeField] Transform m_CastSkillTip;//鎶�鑳介潰鏉�
- [SerializeField] Transform m_position1_S;
- [SerializeField] Transform m_position2_S;
public static bool recordPositionBool = true;
- [Header("绛栧垝瑕佺殑瑙掑害")]
+ [Header("鍒囨崲鎸夐挳鏃嬭浆瑙掑害")]
public Vector3 Vec3 = new Vector3(0f, 0f, 225f);
[SerializeField] Transform m_ImageRotation;//鍒囨崲婊氬姩
[SerializeField] GameObject m_TaskAndTeamTip;
[SerializeField] GameObject LeftImage;
[SerializeField] GameObject RightImg;
- [SerializeField] Transform m_TaskAndTeamPanel;
- [SerializeField] Transform TaskListTipAnchor1;
- [SerializeField] Transform TaskListTipAnchor2;
[SerializeField] Button m_TaskSwithButton;//鍏充簬鍔熻兘棰勫憡
- [SerializeField] Transform FunctionForecastPanel;
- [SerializeField] Transform unctionForecastPosition1;
- [SerializeField] Transform unctionForecastPosition2;
[SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind;
@@ -116,13 +102,11 @@
{
m_MapSwitchingBehaviour.InitAwake();
recordPositionBool = true;
- m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
+ m_MainPositionTween.SetTaskPos(true);
+ m_MainPositionTween.SetFunctionForecastPos(true);
m_MailObj.SetActive(true);
var inst = BossShowModel.Instance;
TaskSwithBool = true;
- FunctionForecastPanel.localPosition = unctionForecastPosition1.localPosition;
LeftImage.SetActive(true);
RightImg.SetActive(false);
ListBossMapId.Clear();
@@ -153,7 +137,6 @@
}
IsUpdateBool = true;
SliderOpen = true;
- horseRidBool = false;
m_InGamePusher.Init();
m_SkillContainer.Init();
m_FunctionForecastTip.Init();
@@ -215,7 +198,7 @@
if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool))
{
- if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 3)
+ if (!m_MainPositionTween.IsTaskAndPanelShow)
{
TaskSwithButton();
}
@@ -239,10 +222,8 @@
}
if (m_AnimationFadeOut.GetIsFadeIn() && mapId != PlayerDatas.Instance.baseData.MapID)
{
- m_AnimationFadeOut.FadeAtOnce();
m_MailObj.SetActive(true);
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
+ m_MainPositionTween.SetSkillTipOrRightTipPos(true);
recordPositionBool = true;
}
}
@@ -314,7 +295,6 @@
m_FairyCallBehaviour.UnInit();
m_FairyLeagueRemind.UnInit();
m_MainButtonMisc.Unit();
- horseRidBool = false;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;
FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;
@@ -354,7 +334,7 @@
}
private void OnGuideBegin()//寮曞寮�濮�
{
- if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)
+ if (!m_MainPositionTween.IsTaskAndPanelShow)
{
TaskSwithButton();
}
@@ -392,7 +372,7 @@
if (_areaType == MapArea.E_Type.Boss && _enter)
{
- if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) < 2 && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))
+ if (m_MainPositionTween.IsTaskAndPanelShow && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))
{
TaskSwithButton();
onMainModel.IsBossAreaTask = true;
@@ -484,10 +464,6 @@
protected override void OnAfterClose()
{
}
-
- private Vector2 startPosition;
- private Vector2 endPosition;
- private bool horseRidBool = false;
protected override void LateUpdate()
{
base.LateUpdate();
@@ -539,11 +515,9 @@
}
}
m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, DoFade);
m_MailObj.SetActive(true);
- m_AnimationFadeOut.FadeOut();
recordPositionBool = true;
+ m_MainPositionTween.SetSkillTipOrRightTipPosTween(true);
}
}
void DownButton(GameObject go)
@@ -563,11 +537,10 @@
}
if (TaskSwithBool)//闅愯棌
{
- m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor2.localPosition.x, Speed);
+ m_MainPositionTween.SetTaskPosTween(false);
if (m_FunctionForecastTip.gameObject.activeSelf)
{
- FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition2.localPosition.x, Speed);
-
+ m_MainPositionTween.SetFunctionForecastPosTween(false);
}
LeftImage.SetActive(false);
RightImg.SetActive(true);
@@ -578,10 +551,10 @@
}
else//鏄剧ず
{
- m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor1.localPosition.x, Speed);
+ m_MainPositionTween.SetTaskPosTween(true);
if (m_FunctionForecastTip.gameObject.activeSelf)
{
- FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition1.localPosition.x, Speed);
+ m_MainPositionTween.SetFunctionForecastPosTween(true);
}
LeftImage.SetActive(true);
RightImg.SetActive(false);
@@ -609,11 +582,9 @@
}
}
m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(0, DoFade);
m_MailObj.SetActive(false);
- m_AnimationFadeOut.FadeIn();
_MarkRay.gameObject.SetActive(true);
+ m_MainPositionTween.SetSkillTipOrRightTipPosTween(false);
}
else//鏄剧ず榛樿
{
@@ -629,11 +600,9 @@
}
}
m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, DoFade);
m_MailObj.SetActive(true);
- m_AnimationFadeOut.FadeOut();
_MarkRay.gameObject.SetActive(false);
+ m_MainPositionTween.SetSkillTipOrRightTipPosTween(true);
}
recordPositionBool = !recordPositionBool;
}
@@ -645,7 +614,7 @@
{
onMainModel.IsBossAreaTask = false;
}
- m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
+ m_MainPositionTween.SetTaskPos(true);
TaskSwithBool = !TaskSwithBool;
}
@@ -715,8 +684,6 @@
IsCrossServerOneVsOne();
}
}
-
-
#endregion
private bool IsDungeon()
@@ -730,11 +697,11 @@
{
if (_unflod)
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//鎶�鑳介潰鏉垮睍寮�鐘舵��
+ if (m_MainPositionTween.IsRightTipPanelShow)//鎶�鑳介潰鏉垮睍寮�鐘舵��
{
ShowBtnGroup();//鏄剧ず鎸夐挳缁勯殣钘忔妧鑳界粍(寮哄埗鍒囨崲)
}
- if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)//浠诲姟闈㈡澘
+ if (!m_MainPositionTween.IsTaskAndPanelShow)//浠诲姟闈㈡澘
{
TaskSwithButton();
onMainModel.IsBossAreaTask = false;
@@ -747,7 +714,7 @@
}
else
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
+ if (m_MainPositionTween.IsRightTipPanelShow)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
ShowCastSkill();//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
@@ -763,7 +730,7 @@
{
if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
+ if (m_MainPositionTween.IsRightTipPanelShow)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
ShowCastSkill();//鏄剧ず鎶�鑳界粍闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
@@ -813,7 +780,7 @@
public void IsShowButtonGroup()
{
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//鎶�鑳介潰鏉垮睍绀�
+ if (m_MainPositionTween.IsRightTipPanelShow)//鎶�鑳介潰鏉垮睍绀�
{
ShowBtnGroup();//鏄剧ず鎸夐挳缁勯殣钘忔妧鑳界粍(寮哄埗鍒囨崲)
}
@@ -821,8 +788,7 @@
private void ShowBtnGroup()//鏄剧ず鎸夐挳缁�,闅愯棌鎶�鑳界粍(寮哄埗鍒囨崲)
{
- m_AnimationFadeOut.ImmediatelyAppear();//鎸夐挳缁勭珛鍗冲嚭鐜�
- m_CastSkillTip.localPosition = m_position2_S.localPosition;//鎶�鑳介潰鏉垮垏鍑�
+ m_MainPositionTween.SetSkillTipOrRightTipPos(false);
m_MailObj.SetActive(false);
m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
recordPositionBool = false;
@@ -830,10 +796,8 @@
}
private void ShowCastSkill()//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
{
- m_AnimationFadeOut.FadeAtOnce();//鍔熻兘闈㈡澘绔嬪埢闅愯棌
- m_CastSkillTip.localPosition = m_position1_S.localPosition;//鎶�鑳介潰鏉跨珛鍗冲嚭鐜�
+ m_MainPositionTween.SetSkillTipOrRightTipPos(true);
m_MailObj.SetActive(true);
- m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);
m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
recordPositionBool = true;
_MarkRay.gameObject.SetActive(false);
@@ -873,7 +837,7 @@
m_TaskSwithButton.gameObject.SetActive(false);
m_InGamePusher.gameObject.SetActive(false);
IsShowTaskPanel();
- if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
+ if (m_MainPositionTween.IsRightTipPanelShow)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
ShowCastSkill();//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
--
Gitblit v1.8.0