From 9e0d49a6765034128f122c541aab5102a2116d30 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 21 二月 2019 17:01:21 +0800
Subject: [PATCH] 3335 代码修改
---
System/MainInterfacePanel/MainPositionTween.cs | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index 60068e2..d5ec005 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -27,12 +27,17 @@
[Header("涓荤晫闈换鍔℃ā鍧�")]
public float TaskSpeed = 0.2f;//浠诲姟闈㈡澘绉诲姩鐨勯�熷害
[SerializeField] Transform m_TaskAndTeamPanel;
- [SerializeField] Transform TaskListTipAnchor1;
- [SerializeField] Transform TaskListTipAnchor2;
+ [SerializeField] Transform m_TaskListTipAnchor1;
+ [SerializeField] Transform m_TaskListTipAnchor2;
+ [SerializeField] GameObject m_LeftImage;
+ [SerializeField] GameObject m_RightImg;
[Header("鍔熻兘棰勫憡妯″潡")]
- [SerializeField] Transform FunctionForecastPanel;
- [SerializeField] Transform unctionForecastPosition1;
- [SerializeField] Transform unctionForecastPosition2;
+ [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
@@ -149,29 +154,33 @@
{
get
{
- return (m_TaskAndTeamPanel.localPosition - TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;
+ return (m_TaskAndTeamPanel.localPosition - m_TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;
}
}
public void SetTaskPos(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;
+ m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor1.localPosition;
}
else
{
- m_TaskAndTeamPanel.localPosition = TaskListTipAnchor2.localPosition;
+ m_TaskAndTeamPanel.localPosition = m_TaskListTipAnchor2.localPosition;
}
}
public void SetTaskPosTween(bool _bool)
{
if (_bool)
{
- m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor1.localPosition.x, TaskSpeed);
+ m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor1.localPosition.x, TaskSpeed);
+ m_LeftImage.SetActive(true);
+ m_RightImg.SetActive(false);
}
else
{
- m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor2.localPosition.x, TaskSpeed);
+ m_TaskAndTeamPanel.DOLocalMoveX(m_TaskListTipAnchor2.localPosition.x, TaskSpeed);
+ m_LeftImage.SetActive(false);
+ m_RightImg.SetActive(true);
}
}
//-----------------------------
@@ -179,22 +188,34 @@
{
if (_bool)
{
- FunctionForecastPanel.localPosition = unctionForecastPosition1.localPosition;
+ m_FunctionForecastPanel.localPosition = m_unctionForecastPosition1.localPosition;
}
else
{
- FunctionForecastPanel.localPosition = unctionForecastPosition2.localPosition;
+ m_FunctionForecastPanel.localPosition = m_unctionForecastPosition2.localPosition;
}
}
public void SetFunctionForecastPosTween(bool _bool)
{
if (_bool)
{
- FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition1.localPosition.x, TaskSpeed);
+ m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition1.localPosition.x, TaskSpeed);
}
else
{
- FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition2.localPosition.x, TaskSpeed);
+ m_FunctionForecastPanel.DOLocalMoveX(m_unctionForecastPosition2.localPosition.x, TaskSpeed);
+ }
+ }
+ //--------------------------------
+ public void SetRotation(bool _bool)
+ {
+ if (_bool)
+ {
+ m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
+ }
+ else
+ {
+ m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
}
}
}
--
Gitblit v1.8.0