From 900b1e420d7ee91cc4683790b714447854b42d7a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 十二月 2018 12:22:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 484cd9d..1a8f2d9 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -17,7 +17,7 @@
         public event Action UpdateDayAwardsEvent;
         public const int CrossServerDataMapId = 32010;
         DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
-
+        public bool isClickCoolTime { get; set; }
         public event Action UpdateMatchStateEvent;
         private bool _isMatching;
         public bool IsMatching {

--
Gitblit v1.8.0