From 36c65beb6c84c93b8d690d6702c365722bf3c23b Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 13 九月 2018 11:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 60 +++++++++++++++---------------
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 3 +
db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 30 +++++++++++++++
db/PyMongoDataServer/PySysDB/tagStore.txt | 4 ++
db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 20 +++++-----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
6 files changed, 78 insertions(+), 41 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0141811..1f37e30 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -290,5 +290,5 @@
SuperGiftTimeList [[651,2],[652,2],[653,2]] [(181,1,1),(4151,1,1)]
OSSaleOpenMail [1,2,3,4,5,6,7] [(181,1,1),(4151,1,1)]
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
-FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 5 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
+FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 1 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
SamboSpecialUnlock 6601|6602|6603|6604|6605|6606|6607|6608|6609|6610|6611|6612|6613|6614|6615|6616|6617|6618
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 257b233..5a380e2 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -429,33 +429,33 @@
306 48 24677 6|7|23 203605|10180|80 0
306 49 25511 6|7|23 211008|10550|80 0
306 50 0 6|7|23 218656|10932|80 0
-307 1 431 6|7|23 1058|52|40 0
-307 2 468 6|7|23 1749|87|40 0
-307 3 509 6|7|23 2476|123|40 0
-307 4 552 6|7|23 3239|161|40 49180
-307 5 598 6|7|23 4040|202|40 0
-307 6 647 6|7|23 4878|243|40 0
-307 7 699 6|7|23 5775|288|40 0
-307 8 755 6|7|23 6735|336|40 0
-307 9 813 6|7|23 7761|388|40 0
-307 10 875 6|7|23 8854|442|40 49185
-307 11 939 6|7|23 10018|500|40 0
-307 12 1007 6|7|23 11237|561|40 0
-307 13 1077 6|7|23 12510|625|40 0
-307 14 1151 6|7|23 13837|691|40 0
-307 15 1228 6|7|23 15217|760|40 0
-307 16 1308 6|7|23 16648|832|40 0
-307 17 1391 6|7|23 18129|906|40 0
-307 18 1477 6|7|23 19658|982|40 0
-307 19 1566 6|7|23 21233|1061|40 0
-307 20 1658 6|7|23 22851|1142|40 49190
-307 21 1753 6|7|23 24509|1225|40 0
-307 22 1851 6|7|23 26219|1310|40 0
-307 23 1953 6|7|23 27978|1398|40 0
-307 24 2057 6|7|23 29785|1489|40 0
-307 25 2164 6|7|23 31637|1581|40 0
-307 26 2275 6|7|23 33531|1676|40 0
-307 27 2388 6|7|23 35465|1773|40 0
-307 28 2505 6|7|23 37436|1871|40 0
-307 29 2705 6|7|23 39440|1972|40 0
-307 30 0 6|7|23 41475|2073|40 0
+307 1 431 6|7|23 698|34|40 0
+307 2 468 6|7|23 1389|69|40 0
+307 3 509 6|7|23 2116|105|40 0
+307 4 552 6|7|23 2879|143|40 49180
+307 5 598 6|7|23 3680|184|40 0
+307 6 647 6|7|23 4518|225|40 0
+307 7 699 6|7|23 5415|270|40 0
+307 8 755 6|7|23 6375|318|40 0
+307 9 813 6|7|23 7401|370|40 0
+307 10 875 6|7|23 8494|424|40 49185
+307 11 939 6|7|23 9658|482|40 0
+307 12 1007 6|7|23 10877|543|40 0
+307 13 1077 6|7|23 12150|607|40 0
+307 14 1151 6|7|23 13477|673|40 0
+307 15 1228 6|7|23 14857|742|40 0
+307 16 1308 6|7|23 16288|814|40 0
+307 17 1391 6|7|23 17769|888|40 0
+307 18 1477 6|7|23 19298|964|40 0
+307 19 1566 6|7|23 20873|1043|40 0
+307 20 1658 6|7|23 22491|1124|40 49190
+307 21 1753 6|7|23 24149|1207|40 0
+307 22 1851 6|7|23 25859|1292|40 0
+307 23 1953 6|7|23 27618|1380|40 0
+307 24 2057 6|7|23 29425|1471|40 0
+307 25 2164 6|7|23 31277|1563|40 0
+307 26 2275 6|7|23 33171|1658|40 0
+307 27 2388 6|7|23 35105|1755|40 0
+307 28 2505 6|7|23 37076|1853|40 0
+307 29 2705 6|7|23 39080|1954|40 0
+307 30 0 6|7|23 41115|2055|40 0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index b092a18..cb23ec8 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -579,3 +579,33 @@
50106307 18 633 1645
50106307 19 681 1787
50106307 20 0 1936
+50106311 1 987 139
+50106311 2 1071 277
+50106311 3 1163 425
+50106311 4 1261 582
+50106311 5 1367 749
+50106311 6 1480 927
+50106311 7 1599 1116
+50106311 8 1726 1318
+50106311 9 1859 1532
+50106311 10 2000 1759
+50106311 11 2147 1999
+50106311 12 2302 2254
+50106311 13 2463 2526
+50106311 14 2632 2814
+50106311 15 2807 3120
+50106311 16 2990 3443
+50106311 17 3180 3784
+50106311 18 3376 4143
+50106311 19 3580 4521
+50106311 20 3790 4918
+50106311 21 4008 5335
+50106311 22 4232 5764
+50106311 23 4464 6205
+50106311 24 4702 6655
+50106311 25 4948 7116
+50106311 26 5200 7586
+50106311 27 5460 8065
+50106311 28 5726 8551
+50106311 29 5980 9043
+50106311 30 0 9541
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 07b4994..b11f980 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -30,6 +30,8 @@
101 3 0 181 1 0 [] 0 0 0 0 0 1 10 0 0
103 3 0 3501 1 0 [] 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 1 10 0 0
+106 3 0 4219 1 1 [] 0 0 0 0 1 1 348 0 0
+107 3 0 261 1 1 [] 0 0 0 0 1 1 348 0 0
108 3 0 4205 1 1 [] 0 0 0 0 1 1 1268 0 0
109 3 0 256 1 1 [] 0 0 0 0 1 1 1268 0 0
110 3 0 4207 1 1 [] 0 0 0 150 1 1 5888 0 0
@@ -40,6 +42,8 @@
152 4 0 952 1 1 [] 0 0 0 0 0 2 25 0 0
153 4 0 4101 1 1 [] 0 0 0 0 0 2 688 0 0
154 4 0 911 1 1 [] 0 0 0 0 0 2 15 0 0
+155 4 0 4219 1 1 [] 0 0 0 0 1 2 388 0 0
+156 4 0 261 1 1 [] 0 0 0 0 1 2 388 0 0
157 4 0 4205 1 1 [] 0 0 0 0 1 2 1588 0 0
158 4 0 256 1 1 [] 0 0 0 0 1 2 1588 0 0
159 4 0 4207 1 1 [] 0 0 0 150 1 2 8888 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index 4cc07a1..c51215d 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -6,14 +6,14 @@
5 10337|20337 1 0 1134 3
6 10335|20335 1 0 1134 2
7 2335 1 0 1132 12
-8 10444|20444 1 0 1135 6
-9 10446|20446 1 0 1135 5
-10 10443|20443 1 0 1135 4
-11 10447|20447 1 0 1135 3
-12 10445|20445 1 0 1135 2
+8 10434|20434 1 0 1135 6
+9 10436|20436 1 0 1135 5
+10 10433|20433 1 0 1135 4
+11 10437|20437 1 0 1135 3
+12 10435|20435 1 0 1135 2
13 2337 1 0 1133 12
-14 10544|20544 1 0 1136 6
-15 10546|20546 1 0 1136 5
-16 10543|20543 1 0 1136 4
-17 10547|20547 1 0 1136 3
-18 10545|20545 1 0 1136 2
+14 10534|20534 1 0 1136 6
+15 10536|20536 1 0 1136 5
+16 10533|20533 1 0 1136 4
+17 10537|20537 1 0 1136 3
+18 10535|20535 1 0 1136 2
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index d6ac262..803d95d 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -756,6 +756,9 @@
49165 坚韧 49165 1 1 0 5 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 2000 0 13 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 7239 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49170 健体 49170 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 304 6 1500 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 18097 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49175 潜心 49175 1 1 0 5 0 7 3 0 0 0 0 0 0 0 0 0 0 0 0 4002 2000 3000 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 63339 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+49180 旺盛 49180 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 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 3656 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49185 强攻 49185 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 4 6 500 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 9140 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4007 100 0 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 31990 0 0 0 0 0 0 0 0 0 0 0 0 0 0
50000 金箍幻灭 50000 1 1 2 1 0 1 0 0 2 8 40 4 0 8000 0 0 0 0 0 1010 25000 0 0 1200 4 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 692 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50100 皓月腾空 50100 1 1 2 1 0 1 0 0 2 6 41 10 0 16000 0 0 0 0 0 1010 30000 0 0 1200 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 50101 0 0 0 0 0 0 0 0 0 0 2 879 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50101 加速 50101 1 1 0 0 0 5 0 0 0 0 10 0 0 0 0 0 0 0 0 16 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 50100 0 0 0 0
--
Gitblit v1.8.0