From 687c2722f1f8564eac09e32171776655da83c33b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 12 四月 2019 11:43:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into HazyRegion

---
 System/SelectRole/SelectRoleBehaviour.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Fight/Actor/AI/AI_BossDSX.cs.meta b/System/SelectRole/SelectRoleBehaviour.cs.meta
similarity index 75%
copy from Fight/Actor/AI/AI_BossDSX.cs.meta
copy to System/SelectRole/SelectRoleBehaviour.cs.meta
index 232ab26..e911b59 100644
--- a/Fight/Actor/AI/AI_BossDSX.cs.meta
+++ b/System/SelectRole/SelectRoleBehaviour.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 265e7ff764601cf44991055e126d0d33
-timeCreated: 1514970107
+guid: 215e4bd908ee7314984e023ff5b3967a
+timeCreated: 1554946916
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0