From 44a6c70b96e021c75c44888dde361d79e4053712 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 11 十二月 2018 13:54:35 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server

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

diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs.meta b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs.meta
index 62bc44b..278b9f4 100644
--- a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c7a22e75f9a0eed49aed26e8171f8172
-timeCreated: 1542943278
+timeCreated: 1544496205
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0