From e51fb514ae0eeb4a505eff8d8d2ea6384cfb15ea Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期五, 11 一月 2019 14:54:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index d9ab69b..dfddeb8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index c32d3c3..b0c90e6 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -2,17 +2,17 @@
 1	0	0	0	0	0	[]	0		0	0	0	0	0	0	0	0	0		
 2	0	0	0	0	0	[]	0		0	0	0	0	0	0	0	0	0		
 3	1	0	4741	1	1	[]	0		7	1	125	1	0	1	30	0	0		
-5	1	0	2213	1	1	[]	0		7	0|1|2|3|4|5|6|7|8|9|10	105	10|15|20|25|30|35|40|50|60|70|80	0	1	15	0	0		
+5	1	0	2213	1	1	[]	0		7	0|1|2|3|4|5|6|7|8|9|10	120	10|15|20|25|30|35|40|50|60|70|80	0	1	15	0	0		
 6	1	0	3504	1	1	[]	0		7	2	0	2	0	1	135	0	0		
 7	1	0	3514	1	1	[]	0		7	2	0	2	0	1	135	0	0		
 8	1	0	2204	1	1	[]	0		7	3	155	6	0	1	60	0	0		
 9	1	0	2203	1	1	[]	0		7	4|6|8	180	2|3|4	0	1	60	0	0		
-10	1	0	4187	1	1	[]	0		7	9	120	1	0	1	1000	0	0		
-11	1	0	4188	1	1	[]	0		7	9	120	1	0	1	1000	0	0		
+10	1	0	4187	1	1	[]	0		7	9	200	1	0	1	1000	0	0		
+11	1	0	4188	1	1	[]	0		7	9	200	1	0	1	1000	0	0		
 12	1	0	2325	1	1	[]	0		7	0	110	1	0	2	0	0	0		
 13	0	0	0	0	0	[]	0		0	0	0	0	0	0	0	0	0		
 14	1	0	2389	1	1	[]	0		7	0	260	2	0	1	100	0	0		
-15	1	0	1129	1	1	[]	0		7	3	110	3	0	1	99	0	0		
+15	1	0	1129	1	1	[]	0		7	3	135	3	0	1	99	0	0		
 16	1	0	2413	1	1	[]	0		7	0	110	2	0	1	60	0	0		
 17	0	0	0	0	0	[]	0		0	0	0	0	0	0	0	0	0		
 18	0	0	0	0	0	[]	0		0	0	0	0	0	0	0	0	0		

--
Gitblit v1.8.0