From 5a02a5f84d8a18ce113b2198094ebfd1b9fb0629 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 28 十二月 2018 21:39:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinItem.txt                        |    6 +++---
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc          |    0 
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index f0acd4f..6cbb1b5 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index e6b5828..af6626f 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 174c69c..44f70d2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -56,9 +56,9 @@
 56	1	0	仙魔最强者	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	26	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 57	1	0	凌波微步	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	27	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 58	1	0	烈焰战神	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	28	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-59	1	0	赛季十强	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	29	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-60	1	0	百强精英	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	30	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-61	1	0	赛季百强	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	31	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+59	1	0	绝骑武神	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	29	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+60	1	0	万服飞将	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	30	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+61	1	0	独步猛士	4	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	1	0	0	204	31	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 101	1	0	初级生命神兵石	20	0	0	0	0	999	110	1	1	0	1	0	0	0	0	0	1	2	0	10	0	1	0	0	206	20	0	0	0	0	0	0	0	0	0	0	0	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	0	0	0	0
 102	2	0	中级生命神兵石	20	0	0	0	0	999	110	1	1	0	1	0	0	0	0	0	1	12	0	20	0	1	0	0	206	120	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 103	3	0	高级生命神兵石	20	0	0	0	0	999	110	1	1	0	1	0	0	0	0	0	1	60	0	50	0	1	0	0	206	600	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0