Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

7 天以前 aee07e17664b4e598f4bc54460cffce26b8b823f

 Main/System/Battle/BattleManager.cs

@@ -632,8 +632,7 @@
        float currentTime = Time.time;
        if (currentTime - lastTime < turnCoolDown)
        {
            SysNotifyMgr.Instance.ShowTip("BattleCoolDown");
            Debug.Log("BattleCoolDown tip");
            SysNotifyMgr.Instance.ShowTip("BattleCoolDownClient");
            return;
        }
        lastTime = currentTime;