From 40beae8380dc59e5f5bc7f29b202ed2ed4ea839e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 13 四月 2019 10:47:52 +0800
Subject: [PATCH] 6498 【前端】【2.0】主界面技能转盘修改

---
 Fight/Actor/Skill/Skill.cs |   54 +++++++++++++++++++-----------------------------------
 1 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/Fight/Actor/Skill/Skill.cs b/Fight/Actor/Skill/Skill.cs
index ec6b5b9..34e6194 100644
--- a/Fight/Actor/Skill/Skill.cs
+++ b/Fight/Actor/Skill/Skill.cs
@@ -13,27 +13,23 @@
 
     public static event System.Action<int> OnSkillCDFinished;
     public static event System.Action<uint, int> OnSkillCast;
-    public UnityEngine.Events.UnityAction<float, float> RefreshCD;
+    public static UnityEngine.Events.UnityAction<int, float, float> RefreshCD;
     public event System.Action<uint> OnPreparingEnd;
     public event System.Action<uint> OnPreparingFail;
     public event System.Action OnPreparingCast;
 
     public uint OwnerID { get; private set; }
 
-    public int id
-    {
+    public int id {
         get; private set;
     }
 
     private float m_Cd;
-    public float cd
-    {
-        get
-        {
+    public float cd {
+        get {
             return m_Cd;
         }
-        set
-        {
+        set {
             m_Cd = value;
         }
     }
@@ -54,14 +50,11 @@
     public List<Vector3> warnPosList = new List<Vector3>();// 棰勮鏃跺�欑殑浣嶇疆
 
     private bool m_CSkillPrepareEnd;
-    public bool CSkillPrepareEnd
-    {
-        get
-        {
+    public bool CSkillPrepareEnd {
+        get {
             return m_CSkillPrepareEnd;
         }
-        set
-        {
+        set {
             m_CSkillPrepareEnd = value;
         }
     }
@@ -75,40 +68,31 @@
     }
 
     private E_SkillPrepareStatus m_SSkillPrepareStatus = E_SkillPrepareStatus.None;
-    public E_SkillPrepareStatus SSkillPrepareStatus
-    {
-        get
-        {
+    public E_SkillPrepareStatus SSkillPrepareStatus {
+        get {
             return m_SSkillPrepareStatus;
         }
-        set
-        {
+        set {
             m_SSkillPrepareStatus = value;
         }
     }
 
     private bool m_SkillPreparing = false;
-    public bool SkillPreparing
-    {
-        get
-        {
+    public bool SkillPreparing {
+        get {
             return m_SkillPreparing;
         }
-        set
-        {
+        set {
             m_SkillPreparing = value;
         }
     }
 
     private bool m_SkillCompelete = true;
-    public bool SkillCompelete
-    {
-        get
-        {
+    public bool SkillCompelete {
+        get {
             return m_SkillCompelete;
         }
-        set
-        {
+        set {
             m_SkillCompelete = value;
             //if (id == 251)
             //{
@@ -201,7 +185,7 @@
             {
                 if (RefreshCD != null)
                 {
-                    RefreshCD(cd, cd);
+                    RefreshCD(id, cd, cd);
                 }
             }
         }
@@ -216,7 +200,7 @@
             cd = skillInfo.config.CoolDownTime * Constants.F_GAMMA;
             if (RefreshCD != null)
             {
-                RefreshCD(cd, cd);
+                RefreshCD(id,cd, cd);
             }
         }
     }

--
Gitblit v1.8.0