From c3b885131a8cdd7ca56dffece3f8c9efbc246a40 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期六, 18 八月 2018 14:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt |   34 ++++++++--------
 db/PyMongoDataServer/SysDB/tagChinItem.txt     |   28 +++++++-------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 1a80dae..5f26af9 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -1,26 +1,26 @@
 ID	RelatedType	RelatedID	UnLockFuncID	OnceActivityTime	OnceActivity	TotalActiveValue
-1	1	1	34	1	1	20
-2	2	31140	83	1	15	0
-3	2	31230	84	1	20	20
+1	1	1	34	1	3	60
+2	2	31140	83	1	20	0
+3	2	31230	84	1	30	30
 4	1	6	87	1	1	0
-5	2	31190	85	1	10	0
-6	2	31080	86	1	25	0
-7	2	31170	89	1	50	50
+5	2	31190	85	1	15	0
+6	2	31080	86	1	30	0
+7	2	31170	89	1	100	100
 8	2	31180	98	1	30	30
-9	2	60010	88	1	15	30
+9	2	60010	88	1	20	60
 10	2	31160	101	1	30	30
-11	2	51010	103	1	15	20
-12	1	7	114	1	1	10
+11	2	51010	103	1	20	40
+12	1	7	114	1	2	20
 13	2	31220	111	1	50	50
 14	2	31010	74	1	10	30
 15	1	8	61	1	5	0
-16	1	9	21	1	15	0
-17	1	10	76	1	5	0
-18	1	2	16	1	2	140
-19	1	11	80	1	5	0
+16	1	9	21	1	30	0
+17	1	10	76	1	10	0
+18	1	2	16	1	4	280
+19	1	11	80	1	15	0
 21	1	13	80	1	10	0
-22	1	14	0	1	10	0
+22	1	14	0	1	20	0
 23	1	15	88	1	10	30
-24	1	16	23	1	30	0
-25	2	31240	20	1	50	0
-26	2	31150	92	1	25	0
+24	1	16	23	1	20	0
+25	2	31240	20	1	30	0
+26	2	31150	92	1	30	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 189e09b..56e9437 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1241,13 +1241,13 @@
 10445	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10446	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10447	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10451	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	411	0	0	68	763	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10452	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	274	0	0	68	508	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10453	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	2287	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10454	4	0	奔雷战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	3087	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10455	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10456	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10457	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10451	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	411	0	0	68	763	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10452	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	274	0	0	68	508	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10453	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	2287	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10454	4	0	奔雷战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	3087	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10455	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10456	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10457	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10461	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12384	0	0	0	0	67	692	0	0	68	1284	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10462	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12256	0	0	0	0	67	461	0	0	68	855	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10463	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	9776	0	0	0	0	6	4122	0	0	8	229	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
@@ -1943,13 +1943,13 @@
 20445	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20446	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20447	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20451	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	436	0	0	68	810	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20452	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	291	0	0	68	540	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20453	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	1975	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20454	4	0	青云道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	2666	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20455	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20456	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20457	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20451	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	436	0	0	68	810	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20452	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	291	0	0	68	540	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20453	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	1975	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20454	4	0	青云道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	2666	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20455	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20456	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20457	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20461	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12384	0	0	0	0	67	727	0	0	68	1351	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20462	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12256	0	0	0	0	67	485	0	0	68	901	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20463	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	9776	0	0	0	0	6	3664	0	0	8	229	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0

--
Gitblit v1.8.0