From a79ced6bac9d4fc755465e708246c5a5eb0e6422 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 27 三月 2019 16:02:29 +0800
Subject: [PATCH] 3335 调整主界面.
---
System/MainInterfacePanel/MainPositionTween.cs | 139 ++++++++++++++++++++--------------------------
1 files changed, 60 insertions(+), 79 deletions(-)
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index d5ec005..06c81c4 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -12,18 +12,24 @@
public class MainPositionTween : MonoBehaviour
{
+ [Header("鍒囨崲鎸夐挳鏃嬭浆")]
+ public Vector3 Vec3 = new Vector3(0f, 0f, 225f);//鍒囨崲鏃嬭浆鐨勮搴�
+ [SerializeField] Transform m_ImageRotation;//鍒囨崲婊氬姩
+
[Header("涓荤晫闈㈤《閮ㄤ笂涓嬪垏鎹㈡ā鍧�")]
public float CopyOfThePanelSpeed = 1f;//鍓湰闈㈡澘绉诲姩閫熷害
[SerializeField] Transform m_CopyOfThePanel;
+ [SerializeField] Transform m_ContainerBossList;
[SerializeField] Transform m_CopyOfThePosition1;
[SerializeField] Transform m_CopyOfThePosition2;
- [SerializeField] Transform m_ContainerBossList;
+
[Header("涓荤晫闈㈡妧鑳介潰鏉垮垏鎹㈡ā鍧�")]
public float SwitchSkillTipAndButtonTipSpeed = 1.2f;//鎶�鑳介潰鏉垮拰鎸夐挳闈㈡澘鐨勭Щ鍔ㄩ�熷害
[SerializeField] Transform m_CastSkillTip;//鎶�鑳介潰鏉�
[SerializeField] Transform m_position1_S;
[SerializeField] Transform m_position2_S;
[SerializeField] AnimationFadeOut m_AnimationFadeOut;//鍙充笅瑙掓寜閽粍
+
[Header("涓荤晫闈换鍔℃ā鍧�")]
public float TaskSpeed = 0.2f;//浠诲姟闈㈡澘绉诲姩鐨勯�熷害
[SerializeField] Transform m_TaskAndTeamPanel;
@@ -31,182 +37,157 @@
[SerializeField] Transform m_TaskListTipAnchor2;
[SerializeField] GameObject m_LeftImage;
[SerializeField] GameObject m_RightImg;
- [Header("鍔熻兘棰勫憡妯″潡")]
- [SerializeField] Transform m_FunctionForecastPanel;
- [SerializeField] Transform m_unctionForecastPosition1;
- [SerializeField] Transform m_unctionForecastPosition2;
- [Header("鍒囨崲鎸夐挳鏃嬭浆")]
- public Vector3 Vec3 = new Vector3(0f, 0f, 225f);//鍒囨崲鏃嬭浆鐨勮搴�
- [SerializeField] Transform m_ImageRotation;//鍒囨崲婊氬姩
- public bool IsSetCopyOfThePanelShow
- {
- get
- {
+
+ public bool IsSetCopyOfThePanelShow {
+ get {
return (m_CopyOfThePanel.position - m_CopyOfThePosition1.position).sqrMagnitude < (2.5 * 2.5);
}
}
- public void SetCopyOfThePanelPos(bool _bool)
+
+ void SetRightTopWidgetPosition(bool _bool)
{
if (_bool)
{
- m_CopyOfThePanel.localPosition = m_CopyOfThePosition1.localPosition;
+ m_CopyOfThePanel.position = m_CopyOfThePosition1.position;
}
else
{
- m_CopyOfThePanel.localPosition = m_CopyOfThePosition2.localPosition;
- }
- }
- public void SetCopyOfThePanelTweenPos(bool _bool)
- {
- if (_bool)
- {
- m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
- }
- else
- {
- m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ m_CopyOfThePanel.position = m_CopyOfThePosition2.position;
}
}
- public void SetBossListPos(bool _bool)
+
+ void SetRightTopWidgetPositionTween(bool _bool)
{
if (_bool)
{
- m_ContainerBossList.localPosition = m_CopyOfThePosition1.localPosition;
+ m_CopyOfThePanel.DOMoveY(m_CopyOfThePosition1.position.y, CopyOfThePanelSpeed);
}
else
{
- m_ContainerBossList.localPosition = m_CopyOfThePosition2.localPosition;
+ m_CopyOfThePanel.DOMoveY(m_CopyOfThePosition2.position.y, CopyOfThePanelSpeed);
}
}
- public void SetBossListTweenPos(bool _bool)
+
+ void SetBossListPos(bool _bool)
{
if (_bool)
{
- m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ m_ContainerBossList.position = m_CopyOfThePosition1.position;
}
else
{
- m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ m_ContainerBossList.position = m_CopyOfThePosition2.position;
}
}
+
+ void SetBossListTweenPos(bool _bool)
+ {
+ if (_bool)
+ {
+ m_ContainerBossList.DOMoveY(m_CopyOfThePosition1.position.y, CopyOfThePanelSpeed);
+ }
+ else
+ {
+ m_ContainerBossList.DOMoveY(m_CopyOfThePosition2.position.y, CopyOfThePanelSpeed);
+ }
+ }
+
public void SetTipAndBossPos(bool _bool)
{
if (_bool)
{
- SetCopyOfThePanelPos(true);
+ SetRightTopWidgetPosition(true);
SetBossListPos(false);
}
else
{
- SetCopyOfThePanelPos(false);
+ SetRightTopWidgetPosition(false);
SetBossListPos(true);
}
}
+
public void SetTipAndBossTweenPos(bool _bool)
{
if (_bool)
{
- SetCopyOfThePanelTweenPos(true);
+ SetRightTopWidgetPositionTween(true);
SetBossListTweenPos(false);
}
else
{
- SetCopyOfThePanelTweenPos(false);
+ SetRightTopWidgetPositionTween(false);
SetBossListTweenPos(true);
}
}
- //-----------------------------
- public bool IsRightTipPanelShow
- {
- get
- {
+
+ public bool IsRightTipPanelShow {
+ get {
return (m_CastSkillTip.position - m_position1_S.position).sqrMagnitude < 1;
}
}
+
public void SetSkillTipOrRightTipPos(bool _bool)
{
if (_bool)
{
m_AnimationFadeOut.FadeAtOnce();
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
+ m_CastSkillTip.position = m_position1_S.position;
}
else
{
m_AnimationFadeOut.ImmediatelyAppear();
- m_CastSkillTip.localPosition = m_position2_S.localPosition;
+ m_CastSkillTip.position = m_position2_S.position;
}
}
+
public void SetSkillTipOrRightTipPosTween(bool _bool)
{
if (_bool)
{
m_AnimationFadeOut.FadeOut();
- m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
+ m_CastSkillTip.DOMoveX(m_position1_S.position.x, SwitchSkillTipAndButtonTipSpeed);
}
else
{
m_AnimationFadeOut.FadeIn();
- m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
+ m_CastSkillTip.DOMoveX(m_position2_S.position.x, SwitchSkillTipAndButtonTipSpeed);
}
}
- //----------------------------
- public bool IsTaskAndPanelShow
- {
- get
- {
- return (m_TaskAndTeamPanel.localPosition - m_TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;
+
+ public bool IsTaskAndPanelShow {
+ get {
+ return (m_TaskAndTeamPanel.position - m_TaskListTipAnchor1.position).sqrMagnitude < 3 * 3;
}
}
+
public void SetTaskPos(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor1.localPosition;
+ m_TaskAndTeamPanel.position = m_TaskListTipAnchor1.position;
}
else
{
- m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor2.localPosition;
+ m_TaskAndTeamPanel.position = m_TaskListTipAnchor2.position;
}
}
+
public void SetTaskPosTween(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor1.localPosition.x, TaskSpeed);
+ m_TaskAndTeamPanel.DOMoveX(m_TaskListTipAnchor1.position.x, TaskSpeed);
m_LeftImage.SetActive(true);
m_RightImg.SetActive(false);
}
else
{
- m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor2.localPosition.x, TaskSpeed);
+ m_TaskAndTeamPanel.DOMoveX(m_TaskListTipAnchor2.position.x, TaskSpeed);
m_LeftImage.SetActive(false);
m_RightImg.SetActive(true);
}
}
- //-----------------------------
- public void SetFunctionForecastPos(bool _bool)
- {
- if (_bool)
- {
- m_FunctionForecastPanel.localPosition = m_unctionForecastPosition1.localPosition;
- }
- else
- {
- m_FunctionForecastPanel.localPosition = m_unctionForecastPosition2.localPosition;
- }
- }
- public void SetFunctionForecastPosTween(bool _bool)
- {
- if (_bool)
- {
- m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition1.localPosition.x, TaskSpeed);
- }
- else
- {
- m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition2.localPosition.x, TaskSpeed);
- }
- }
- //--------------------------------
+
public void SetRotation(bool _bool)
{
if (_bool)
--
Gitblit v1.8.0