From 2ca5e5d62e58e9dfee480b64cb6d49c3553202ea Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 27 三月 2019 18:02:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainPositionTween.cs | 163 ++++++++++++++++++++++++------------------------------
1 files changed, 72 insertions(+), 91 deletions(-)
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index d5ec005..988f06d 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -12,210 +12,191 @@
public class MainPositionTween : MonoBehaviour
{
- [Header("涓荤晫闈㈤《閮ㄤ笂涓嬪垏鎹㈡ā鍧�")]
- public float CopyOfThePanelSpeed = 1f;//鍓湰闈㈡澘绉诲姩閫熷害
- [SerializeField] Transform m_CopyOfThePanel;
- [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;
- [SerializeField] Transform m_TaskListTipAnchor1;
- [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
- {
- return (m_CopyOfThePanel.position - m_CopyOfThePosition1.position).sqrMagnitude < (2.5 * 2.5);
+
+ [Header("涓荤晫闈㈤《閮ㄤ笂涓嬪垏鎹㈡ā鍧�")]
+ public float rightTopSwitchTime = 1f;
+ [SerializeField] Transform m_RightTopFunction;
+ [SerializeField] Transform m_ContainerBossList;
+ [SerializeField] Transform m_RightTopPosition1;
+ [SerializeField] Transform m_RightTopPosition2;
+
+ [Header("涓荤晫闈㈡妧鑳介潰鏉垮垏鎹㈡ā鍧�")]
+ public float rightBottomSwitchTime = 1.2f;
+ [SerializeField] Transform m_ContainerSkill;//鎶�鑳介潰鏉�
+ [SerializeField] Transform m_SkillPosition1;
+ [SerializeField] Transform m_SkillPosition2;
+ [SerializeField] AnimationFadeOut m_AnimationFadeOut;//鍙充笅瑙掓寜閽粍
+
+ [Header("涓荤晫闈换鍔℃ā鍧�")]
+ public float leftMiddleSwitchTime = 0.5f;//浠诲姟闈㈡澘绉诲姩鐨勯�熷害
+ [SerializeField] Transform m_ContainerLeftMiddle;
+ [SerializeField] Transform m_LeftMiddlePosition1;
+ [SerializeField] Transform m_LeftMiddlePosition2;
+ [SerializeField] GameObject m_LeftImage;
+ [SerializeField] GameObject m_RightImg;
+
+ public bool IsSetCopyOfThePanelShow {
+ get {
+ return (m_RightTopFunction.localPosition - m_RightTopPosition1.localPosition).sqrMagnitude < (2.5 * 2.5);
}
}
- public void SetCopyOfThePanelPos(bool _bool)
+
+ void SetRightTopWidgetPosition(bool _bool)
{
if (_bool)
{
- m_CopyOfThePanel.localPosition = m_CopyOfThePosition1.localPosition;
+ m_RightTopFunction.localPosition = m_RightTopPosition1.localPosition;
}
else
{
- m_CopyOfThePanel.localPosition = m_CopyOfThePosition2.localPosition;
+ m_RightTopFunction.localPosition = m_RightTopPosition2.localPosition;
}
- }
- public void SetCopyOfThePanelTweenPos(bool _bool)
+ }
+
+ void SetRightTopWidgetPositionTween(bool _bool)
{
if (_bool)
{
- m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ m_RightTopFunction.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
}
else
{
- m_CopyOfThePanel.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ m_RightTopFunction.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
}
}
- public void SetBossListPos(bool _bool)
+
+ void SetBossListPos(bool _bool)
{
if (_bool)
{
- m_ContainerBossList.localPosition = m_CopyOfThePosition1.localPosition;
+ m_ContainerBossList.localPosition = m_RightTopPosition1.localPosition;
}
else
{
- m_ContainerBossList.localPosition = m_CopyOfThePosition2.localPosition;
+ m_ContainerBossList.localPosition = m_RightTopPosition2.localPosition;
}
}
- public void SetBossListTweenPos(bool _bool)
+
+ void SetBossListTweenPos(bool _bool)
{
if (_bool)
{
- m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ m_ContainerBossList.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
}
else
{
- m_ContainerBossList.DOLocalMoveY(m_CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ m_ContainerBossList.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
}
}
+
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
- {
- return (m_CastSkillTip.position - m_position1_S.position).sqrMagnitude < 1;
+
+ public bool IsRightTipPanelShow {
+ get {
+ return (m_ContainerSkill.localPosition - m_SkillPosition1.localPosition).sqrMagnitude < 1;
}
}
+
public void SetSkillTipOrRightTipPos(bool _bool)
{
if (_bool)
{
m_AnimationFadeOut.FadeAtOnce();
- m_CastSkillTip.localPosition = m_position1_S.localPosition;
+ m_ContainerSkill.localPosition = m_SkillPosition1.localPosition;
}
else
{
m_AnimationFadeOut.ImmediatelyAppear();
- m_CastSkillTip.localPosition = m_position2_S.localPosition;
+ m_ContainerSkill.localPosition = m_SkillPosition2.localPosition;
}
}
+
public void SetSkillTipOrRightTipPosTween(bool _bool)
{
if (_bool)
{
m_AnimationFadeOut.FadeOut();
- m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
+ m_ContainerSkill.DOLocalMoveX(m_SkillPosition1.localPosition.x, rightBottomSwitchTime);
}
else
{
m_AnimationFadeOut.FadeIn();
- m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);
+ m_ContainerSkill.DOLocalMoveX(m_SkillPosition2.localPosition.x, rightBottomSwitchTime);
}
}
- //----------------------------
- public bool IsTaskAndPanelShow
- {
- get
- {
- return (m_TaskAndTeamPanel.localPosition - m_TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;
+
+ public bool IsTaskAndPanelShow {
+ get {
+ return (m_ContainerLeftMiddle.localPosition - m_LeftMiddlePosition1.localPosition).sqrMagnitude < 3 * 3;
}
}
+
public void SetTaskPos(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor1.localPosition;
+ m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition1.localPosition;
}
else
{
- m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor2.localPosition;
+ m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition2.localPosition;
}
}
+
public void SetTaskPosTween(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor1.localPosition.x, TaskSpeed);
+ m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition1.localPosition.x, leftMiddleSwitchTime);
m_LeftImage.SetActive(true);
m_RightImg.SetActive(false);
}
else
{
- m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor2.localPosition.x, TaskSpeed);
+ m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition2.localPosition.x, leftMiddleSwitchTime);
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)
{
- m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
+ m_ImageRotation.DOLocalRotate(Vec3, rightBottomSwitchTime);
}
else
{
- m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
+ m_ImageRotation.DOLocalRotate(Vector3.zero, rightBottomSwitchTime);
}
}
}
--
Gitblit v1.8.0