From b68bc6b076183d0a5f9c46a3d8a2406cc5ab23fc Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期六, 01 九月 2018 15:29:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt     |    6 ++++++
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 1afb8c8..fd8104c 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -129,7 +129,7 @@
 2342	0			[[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]	1						
 2343	0		181_50								
 2344	0		181_120								
-2345	0		106_8								
+2345	0		105_8								
 2346	0			[[5000,[3504,1]],[10000,[3514,1]]]	1						
 2347	0			[[5000,[3505,1]],[10000,[3515,1]]]	1						
 2348	0			[[5000,[3506,1]],[10000,[3516,1]]]	1						
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 0170800..541bd83 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -707,6 +707,12 @@
 48410	梦魇之力	48410	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	6866	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48415	梦魇之殇	48415	1	1	0	6	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4039	30	0	0	4508	0	0	0	1011	1	1	0	74	30000	3	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	17165	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
 48420	梦魇附身	48420	1	1	0	6	0	5	0	0	0	0	10	0	0	60000	0	0	0	0	0	9	5000	3	0	10	5000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	60077	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48425	斗士之力	48425	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	7099	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48430	斗志昂扬	48430	1	1	0	6	0	16	0	0	0	0	111	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	26	30000	3	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	17747	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
+48435	不朽之身	48435	1	1	0	6	0	16	0	0	0	0	10	0	0	30000	0	0	0	0	0	28	4000	1	0	4040	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	62114	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48440	荒古之力	48440	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	16065	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48445	荒神之体	48445	1	1	0	6	0	16	0	0	0	0	10	0	0	30000	0	0	0	0	0	21	4000	1	0	4040	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	40162	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48450	荒古法身	48450	1	1	0	6	0	14	3	0	1	0	41	10	0	40000	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5000	2500	0	0	0	0	0	0	0	0	0	0	0	0	2	140567	0	0	0	3	511	511	3	0	0	0	0	0	0	0
 49000	固本	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	100	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	精准	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	14	800	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0