From 17c684a98dd8811fd22ced8da1590e08d3bc4831 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:32:26 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer

---
 Core/GameEngine/Model/Config/ActorShowConfig.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/Config/ActorShowConfig.cs.meta b/Core/GameEngine/Model/Config/ActorShowConfig.cs.meta
index b8684a4..a1d230e 100644
--- a/Core/GameEngine/Model/Config/ActorShowConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ActorShowConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ef8ad14c092549545a7623899eb26c2a
-timeCreated: 1550121904
+timeCreated: 1556351379
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0