From 0c73f16c6761278fcdaea764ac837e1d14fb46a1 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 29 八月 2018 13:41:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagRune.txt   |    5 +++++
 db/PyMongoDataServer/SysDB/tagChinItem.txt |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagRune.txt b/db/PyMongoDataServer/PySysDB/tagRune.txt
index b2779fc..cf698f9 100644
--- a/db/PyMongoDataServer/PySysDB/tagRune.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRune.txt
@@ -89,3 +89,8 @@
 4368	11
 4369	11
 4370	11
+4421	11|15
+4422	11|15
+4423	11|15
+4424	11|15
+4425	11|15
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b372523..e3367d8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -643,11 +643,11 @@
 4418	1	0	利刃克敌	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100	0	20	0	0	0	0	22	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	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4419	1	0	利刃克敌	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	500	0	50	0	0	0	0	22	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	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4420	1	0	利刃克敌	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1000	0	100	0	0	0	0	22	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	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4421	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	22	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	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4422	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	50	0	10	0	0	0	0	22	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	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4423	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100	0	20	0	0	0	0	22	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	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4424	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	500	0	50	0	0	0	0	22	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	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4425	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1000	0	100	0	0	0	0	22	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	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4421	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	23	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	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4422	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	50	0	10	0	0	0	0	23	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	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4423	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100	0	20	0	0	0	0	23	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	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4424	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	500	0	50	0	0	0	0	23	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	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4425	1	0	疾风会心	30	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1000	0	100	0	0	0	0	23	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	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4501	1	0	真元丹	19	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	30	0	20	0	1	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	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4502	1	0	造化丹	19	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	500	0	50	0	1	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	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4503	1	0	减时卡	19	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	10	0	50	0	1	0	0	0	60	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

--
Gitblit v1.8.0