From d1129140cb98013878dadd9749f78d597434d837 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期三, 15 八月 2018 17:26:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagStore.txt                                           |    2 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc |    0 
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index 421268f..c687688 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 14a95ba..518e542 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -24,6 +24,8 @@
 62	2	0	4004	1	0	[]	0		0	0	240	0	1	20	0	0	
 63	2	0	957	1	0	[]	0		0	0	0	0	1	50	0	0	
 64	2	0	2050	1	0	[]	0		0	0	0	0	1	50	0	0	
+65	2	0	982	1	0	[]	0		0	0	500	0	1	248	0	0	
+66	2	0	983	1	0	[]	0		0	0	500	0	1	98	0	0	
 101	3	0	181	1	0	[]	0		0	0	0	0	1	10	0	0	
 102	3	0	966	1	0	[]	0		0	0	0	0	1	88	0	0	
 103	3	0	3501	1	0	[]	0		0	0	0	0	1	10	0	0	

--
Gitblit v1.8.0