From a1f0653ec48d7787e0d57cabef0600b2a07355eb Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 17:03:14 +0800
Subject: [PATCH] 解决冲突

---
 Assets/Scripts/Guide/GuidePanel.cs |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index 10148de..ee3dbad 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -508,7 +508,6 @@
     #endregion
 
     #region 拖动效果
-    private float dragTimer = 1f;
     private void ShowDragPath(Vector2 startP, RectTransform endP)
     {
         if (!dragHandImg.gameObject.activeSelf)

--
Gitblit v1.9.1