From f6798e937d12e2e4ccb9c2bc4a6625cd1ace6557 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期四, 08 十一月 2018 11:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt | 28 +++++++++++++++-------------
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 5 +++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 12 ++++++------
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 67be505..e5ed0e7 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/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index fe456d5..20a7665 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -1,18 +1,20 @@
FuncId Award
-1 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-76 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-9 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-6 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-8 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
+1 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
+76 {"1":[[1,1]],"2":[[1,1]],"3":[[1,1]]}
+9 {"1":[[4302,3]],"2":[[4302,3]],"3":[[4302,3]]}
+6 {"1":[[4151,2]],"2":[[4151,2]],"3":[[4151,2]]}
+8 {"1":[[181,5]],"2":[[181,5]],"3":[[181,5]]}
12 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-88 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-143 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-82 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-97 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-91 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-36 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-93 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
-138 {"1":[[922,1]],"2":[[922,1]],"3":[[922,1]]}
+88 {"1":[[1130,5]],"2":[[1130,5]],"3":[[1130,5]]}
+143 {"1":[[2211,5]],"2":[[2211,5]],"3":[[2211,5]]}
+82 {"1":[[145,1]],"2":[[145,1]],"3":[[145,1]]}
+97 {"1":[[952,1]],"2":[[952,1]],"3":[[952,1]]}
+91 {"1":[[5303,10]],"2":[[5303,10]],"3":[[5303,10]]}
+36 {"1":[[5012,10]],"2":[[5022,10]],"3":[[5012,10]]}
+145 {"1":[[106,1]],"2":[[106,1]],"3":[[106,1]]}
+93 {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
+138 {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
+28 {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
103
140
141
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 54468f1..7ff06a0 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -19,12 +19,12 @@
10302001 0 110 1 0 [] 1 {} 0 {} {} [] [] {} {} {} {} {} 1 0 0 0 [12,1,1,[10216,20216,30216]] []
10401001 0 130 1 0 [(999475,0),(999826,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:0,4003:0,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:0} {} {} {} {} 1 0 0 0 [14,1,1,[4002]] []
10401002 0 140 1 0 [(999405,0),(999756,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [14,1,1,[4003]] []
-10401003 0 150 1 0 [(999335,0),(999686,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [] []
-10401004 0 160 1 0 [(999404,0),(999638,(3,1,107)),(1000000,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 50 58 100 [] []
-10401005 0 170 1 0 [(999355,0),(999589,(3,1,107)),(999983,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 100 69 104 [] []
-10402001 0 180 1 0 [(999027,0),(999258,(3,1,107)),(999973,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:34} {} {} {} {} 1 200 72 108 [] []
-10501001 0 190 1 0 [(998894,0),(999125,(3,1,107)),(999956,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:3,4002:29,4003:29,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 76 114 [] []
-10501002 0 200 1 0 [(998454,0),(998685,(3,1,107)),(999932,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:3,4002:29,4003:29,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 80 120 [] []
+10401003 0 150 1 0 [(999335,0),(999686,(2,1,107)),(1000000,(2,2,107)),(1000000,(2,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 0 0 0 [18,1,1,[4002]] []
+10401004 0 160 1 0 [(999404,0),(999638,(3,1,107)),(1000000,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 50 58 100 [18,1,1,[4003]] []
+10401005 0 170 1 0 [(999355,0),(999589,(3,1,107)),(999983,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:35} {} {} {} {} 1 100 69 104 [22,1,1,[4002]] []
+10402001 0 180 1 0 [(999027,0),(999258,(3,1,107)),(999973,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {} [] [] {951:3,4002:31,4003:31,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:17,181:34} {} {} {} {} 1 200 72 108 [22,1,1,[4003]] []
+10501001 0 190 1 0 [(998894,0),(999125,(3,1,107)),(999956,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:3,4002:29,4003:29,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 76 114 [30,1,1,[4002]] []
+10501002 0 200 1 0 [(998454,0),(998685,(3,1,107)),(999932,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:3,4002:29,4003:29,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 80 120 [30,1,1,[4003]] []
10501003 0 210 1 0 [(998288,0),(998514,(3,1,107)),(999916,(3,2,107)),(1000000,(3,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:4,4002:27,4003:27,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 84 126 [] []
10501004 0 220 1 0 [(999368,0),(999581,(4,1,107)),(999933,(4,2,107)),(1000000,(4,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:4,4002:27,4003:27,4501:0,4008:0,4009:0,4005:20,4006:20,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 88 132 [18,1,1,[4005]] []
10501005 0 230 1 0 [(999328,0),(999542,(4,1,107)),(999926,(4,2,107)),(1000000,(4,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:4,4002:24,4003:24,4501:0,4008:0,4009:0,4005:20,4006:20,4502:0,956:0,4151:18,181:34} {} {} {} {} 1 200 91 137 [18,1,1,[4006]] []
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 252119c..f9f4d7e 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -15,10 +15,11 @@
49 26 20 0 0 3_10000 0 0 103 10
71 36 28 10202001 0 3_50000 0 0
72 42 1 102 0 3_50000 0 0 104 10
-73 39 5 1|2 0 3_50000 0 0 104 10
+73 39 5 1|2 0 3_50000 0 0
74 42 1 104 0 3_50000 0 0 104 10
75 44 1 2 0 3_50000 0 0
76 36 16 10202001 0 3_50000 0 0 104 10
+77 36 1 60203002 0 3_50000 0 0 104 10
101 42 1 106 0 3_50000 0 0 105 10
102 36 40 10301003 0 3_50000 0 0
103 60 1 1 0 3_50000 0 0
@@ -29,7 +30,7 @@
109 36 18 10301003 0 3_50000 0 0 105 10
201 1 70 0 0 3_50000 0 0 106 10
202 36 1 60203003 0 3_50000 0 0 106 10
-221 114 450 0 0 3_50000 0 0 106 10
+221 114 450 0 0 3_50000 0 0
222 50 1 0 0 3_50000 0 0 106 10
223 46 1 0 0 3_50000 0 0 106 10
224 39 3 3|3 0 3_50000 0 0 106 10
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 2fd1c82..bd2d4f3 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -15,7 +15,7 @@
105 3 20 6_10000
106 0 0
106 1 20
-106 2 60 7_300
+106 2 50 7_300
106 3 80 50300|55300|60300
107 0 0
107 1 50 2
--
Gitblit v1.8.0