From 4dc74e6ca1e8d41234c4ffb9c1c9d722b86667b5 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期二, 16 十月 2018 14:14:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinItem.txt    |   13 +++++++++++++
 db/PyMongoDataServer/PySysDB/tagAttrFruit.txt |   23 ++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 05675f9..6ec4e49 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -57,12 +57,12 @@
 4723	2	18	500
 4726	2	20	500
 4728	2	15	500
-4711	2	20	625
-4715	2	60	625
+4711	2	30	625
+4715	2	90	625
 4720	2	40	625
-4724	2	24	625
-4727	2	25	625
-4729	2	20	625
+4724	2	36	625
+4727	2	35	625
+4729	2	30	625
 4740	2	2	1000
 4730	2	2	1000
 4731	2	2	1000
@@ -78,3 +78,16 @@
 4676	2	5	10625
 4677	2	5	10625
 4741	2	50	100
+4742	2	5	100
+4780	2	45	625
+4781	2	150	625
+4782	2	50	625
+4783	2	48	625
+4784	2	50	625
+4785	2	45	625
+4786	2	60	625
+4787	2	180	625
+4788	2	60	625
+4789	2	60	625
+4790	2	60	625
+4791	2	60	625
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 7d84011..771e1bf 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -854,6 +854,19 @@
 4739	0	0	聚灵丹(守卫人皇)	9	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	150	0	1000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21230	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
 4740	0	0	炼魄丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	19	300	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4741	0	0	噬天丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	89	100	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4742	0	0	灭魄丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	19	750	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	19	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4780	0	0	七品攻击丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	7	250	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4781	0	0	七品生命丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	6	4250	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4782	0	0	七品真伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	26	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	14	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4783	0	0	七品抵抗丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	27	180	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	14	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4784	0	0	七品伤害丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	35	225	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	15	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4785	0	0	七品减伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	36	175	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	15	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4786	0	0	八品攻击丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	7	280	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	16	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4787	0	0	八品生命丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	6	4500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	16	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4788	0	0	八品真伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	26	220	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	17	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4789	0	0	八品抵抗丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	27	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	17	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4790	0	0	八品伤害丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	35	250	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4791	0	0	八品减伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	36	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5006	1	0	通用套装石(龙牙)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	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
 5007	1	0	通用套装石(玉佩)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	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
 5012	1	0	枪系套装石(防具)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	10	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

--
Gitblit v1.8.0