From 0cec7b20140669063ee77320e37d45b64b3219b3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 十月 2018 14:09:50 +0800
Subject: [PATCH] 382 战斗: 前期战斗断线重连翻滚图标显示出错
---
System/MainWin/SkillButton.cs | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/System/MainWin/SkillButton.cs b/System/MainWin/SkillButton.cs
index 9e9e003..b14a432 100644
--- a/System/MainWin/SkillButton.cs
+++ b/System/MainWin/SkillButton.cs
@@ -32,7 +32,13 @@
[SerializeField] Image m_Icon;
public Image icon { get { return m_Icon; } }
[SerializeField] Transform m_Locked;
- public Transform locked { get { return m_Locked; } }
+ public Transform locked
+ {
+ get
+ {
+ return m_Locked;
+ }
+ }
[SerializeField] Text m_CoolDown;
[SerializeField] Image m_CoolDownMask;
@@ -46,21 +52,27 @@
bool isExit = false;
float m_TotalCoolDown = 0f;
- public float totalCoolDown {
- get {
+ public float totalCoolDown
+ {
+ get
+ {
return m_TotalCoolDown;
}
- set {
+ set
+ {
m_TotalCoolDown = value;
}
}
float m_CoolDownCompleteTime = 0f;
- public float coolDownCompleteTime {
- get {
+ public float coolDownCompleteTime
+ {
+ get
+ {
return m_CoolDownCompleteTime;
}
- set {
+ set
+ {
m_CoolDownCompleteTime = value;
}
}
@@ -75,14 +87,15 @@
m_SkillData = _skillData;
if (m_SkillData == null)
{
- m_Locked.gameObject.SetActive(true);
+ locked.gameObject.SetActive(true);
m_Icon.gameObject.SetActive(false);
}
else
{
- if (PreFightMission.Instance.IsFinished())
+ if (PreFightMission.Instance.IsFinished()
+ || PreFightMission.Instance.s_MissionDict.ContainsKey(1002))
{
- m_Locked.gameObject.SetActive(false);
+ locked.gameObject.SetActive(false);
m_Icon.gameObject.SetActive(true);
}
var skillConfig = m_SkillData.skillCfg;
--
Gitblit v1.8.0