From 64424067bd1fb1539503ee9a8e98673032f46e89 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 08 一月 2019 09:34:42 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss

---
 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 278b9f4..6292b95 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: 1544496205
+timeCreated: 1546866443
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0