From fbe2f4266b248870e0cfeb1cb6caebec009f707f Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 09 十一月 2018 10:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagCTG.txt                                                                |   32 ++++++++++++++++----------------
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                              |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt |   14 +++++++-------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                                          |    0 
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
index b53ba13..b1586cd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
@@ -2,12 +2,12 @@
 #{职业:[等级]}
 (
 {
-	0:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	1:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	2:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	3:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	4:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	5:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
-	6:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	0:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	1:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	2:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	3:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	4:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	5:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
+	6:[65,70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],
 }
 )
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 830865a..780332a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 91a7e61..cf2e6b3 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,23 +1,23 @@
 RecordID	DailyBuyCount	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList
 101	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102	0	100	0	0	[]
-103	0	300	0	0	[]
-104	0	980	60	0	[]
-105	0	1280	108	0	[]
-106	0	1980	198	0	[]
-107	0	3280	388	0	[]
-108	0	6480	888	0	[]
-109	0	30000	5888	0	[]
+102	0	100	0	100	[]
+103	0	300	0	300	[]
+104	0	980	60	980	[]
+105	0	1280	108	1280	[]
+106	0	1980	198	1980	[]
+107	0	3280	388	3280	[]
+108	0	6480	888	6480	[]
+109	0	30000	5888	30000	[]
 110	0	10	1	0	[]
 2	0	60	0	0	[]
 201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-202	0	60	0	0	[]
-203	0	300	0	0	[]
-204	0	980	60	0	[]
-205	0	1280	108	0	[]
-206	0	1980	198	0	[]
-207	0	3280	388	0	[]
-208	0	6480	888	0	[]
-209	0	30000	5888	0	[]
+202	0	60	0	60	[]
+203	0	300	0	300	[]
+204	0	980	60	980	[]
+205	0	1280	108	1280	[]
+206	0	1980	198	1980	[]
+207	0	3280	388	3280	[]
+208	0	6480	888	6480	[]
+209	0	30000	5888	30000	[]
 210	0	1	0	0	[]
 211	0	1	0	0	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f52bc71..c64fa36 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -140,7 +140,7 @@
 714	15	0	4186	1	1	[[5006,5,1]]	4186		0	0	106	1	0	1	688	3200	7	OpenTakePreferential2	
 715	15	0	4608	1	1	[[2213,15,1]]	4608		0	0	106	1	0	1	38	680	8	OpenTakePreferential1	
 716	15	0	982	10	1	[]	982		0	0	106	1	0	1	888	2500	8	OpenTakePreferential2	
-717	15	0	153	38	1	[[147,6,1]]	153		0	0	106	1	0	1	38	630	9	OpenTakePreferential1	
+717	15	0	153	80	1	[[147,6,1]]	153		0	0	106	1	0	1	38	630	9	OpenTakePreferential1	
 718	15	0	2213	150	1	[[4606,1,1]]	4606		0	0	106	1	0	1	688	2875	9	OpenTakePreferential2	
 719	15	0	2389	3	1	[]	2389		0	0	106	1	0	1	38	540	10	OpenTakePreferential1	
 720	15	0	2390	3	1	[[8354,50,1]]	2390		0	0	106	1	0	1	688	2800	10	OpenTakePreferential2	

--
Gitblit v1.8.0