From af4f2091e55b1aae8e7937e1bf6765769ba2b4dc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 01 十月 2019 11:37:25 +0800
Subject: [PATCH] 0312 优化技能栏表现
---
System/MainWin/SkillTurnplate.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/System/MainWin/SkillTurnplate.cs b/System/MainWin/SkillTurnplate.cs
index c9fbb81..1030bfb 100644
--- a/System/MainWin/SkillTurnplate.cs
+++ b/System/MainWin/SkillTurnplate.cs
@@ -9,11 +9,14 @@
{
public class SkillTurnplate : SkillButtonInterface
{
- [SerializeField] Button m_SkillGroupSign;
[SerializeField] GameObject m_UpImg;
[SerializeField] GameObject m_DownImg;
- [SerializeField] GameObject m_SkillGroup2;
+ [SerializeField] Button m_SkillSwitch;
+ [Header("涓荤晫闈㈢浜屾壒鎶�鑳藉垏鎹㈡ā鍧�")]
+ [SerializeField] Transform m_SkillGroup2;
+ [SerializeField] Transform m_SG2Position1;
+ [SerializeField] Transform m_SG2Position2;
//Vector2 startPoint = Vector2.zero;
//Vector2 endPoint = Vector2.zero;
@@ -41,13 +44,21 @@
public void Init()
{
- if (m_SkillGroupSign != null)
- {
- m_SkillGroupSign.AddListener(ShowSkillGroup);
- m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow());
- SwitchGroup(groupIndex);
- }
+ m_SkillSwitch.AddListener(ShowSkillGroup);
+ SwitchGroup(groupIndex);
+
+
+ }
+ public void UnInit()
+ {
+
+ m_SkillSwitch.RemoveAllListeners();
+ }
+
+ public void ShowSkillGroup2Immedidately(bool show)
+ {
+ m_SkillGroup2.localPosition = show ? m_SG2Position1.localPosition : m_SG2Position2.localPosition;
}
public void ShowSkillGroup()
@@ -92,7 +103,7 @@
{
return;
}
-
+ m_SkillSwitch.gameObject.SetActive(IsSecondPanelAllow());
StopAllCoroutines();
groupIndex = _groupIndex;
//m_SkillContainer.transform.localEulerAngles = groupIndex == 1 ? Vector3.zero : new Vector3(0, 0, 180);
@@ -100,10 +111,9 @@
m_UpImg.SetActive(groupIndex == 1);
m_DownImg.SetActive(groupIndex == 2);
- if (IsSecondPanelAllow())
- {
- m_SkillGroup2.SetActive(groupIndex == 2);
- }
+ //m_SkillGroup2.SetActive(IsSecondPanelAllow()&&groupIndex == 2);
+ ShowSkillGroup2Immedidately(IsSecondPanelAllow() && groupIndex == 2);
+
}
public bool Turn(GestureType _type = GestureType.Down)
--
Gitblit v1.8.0