From d930e85ecc496307fd2e1bd21add1808e44849b8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 15:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝

---
 Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lua/Gen/SnxxzUICrossServerModelWrap.cs.meta b/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs.meta
similarity index 75%
rename from Lua/Gen/SnxxzUICrossServerModelWrap.cs.meta
rename to Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs.meta
index 6ddbc99..97e61b5 100644
--- a/Lua/Gen/SnxxzUICrossServerModelWrap.cs.meta
+++ b/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: c4b4bb32d295ad84b88e554fb5d9bc10
-timeCreated: 1545374466
+guid: 287f2992ccb8c74419cbb26d17d3d040
+timeCreated: 1545806644
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0