From 5ba7f9215e6128710d0016783679427df6964978 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 27 十二月 2018 15:18:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 48 ++++++++++++------------
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 12 +++---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 3ff2f15..4e649ce 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -117,12 +117,12 @@
2327 0 3502_2|3512_2
2328 0 3504_2|3514_2
2329 0 5012_20 [[5012,5022]]
-2333 0 [[1428,[10351,1]],[2856,[10352,1]],[4284,[10353,1]],[5712,[10354,1]],[7140,[10355,1]],[8568,[10356,1]],[10000,[10357,1]]] 1 [[10351,20351,30351],[10352,20352,30352],[10353,20353,30353],[10354,20354,30354],[10355,20355,30355],[10356,20356,30356],[10357,20357,30357]] [10351,10352,10353,10354,10355,10356,10357]
-2334 0 [[1428,[10341,1]],[2856,[10342,1]],[4284,[10343,1]],[5712,[10344,1]],[7140,[10345,1]],[8568,[10346,1]],[10000,[10347,1]]] 1 [[10341,20341,30341],[10342,20342,30342],[10343,20343,30343],[10344,20344,30344],[10345,20345,30345],[10346,20346,30346],[10347,20347,30347]]
-2335 0 [[1428,[10451,1]],[2856,[10452,1]],[4284,[10453,1]],[5712,[10454,1]],[7140,[10455,1]],[8568,[10456,1]],[10000,[10457,1]]] 1 [[10451,20451,30451],[10452,20452,30452],[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457]] [10451,10452,10453,10454,10455,10456,10457]
-2336 0 [[1428,[10441,1]],[2856,[10442,1]],[4284,[10443,1]],[5712,[10444,1]],[7140,[10445,1]],[8568,[10446,1]],[10000,[10447,1]]] 1 [[10441,20441,30441],[10442,20442,30442],[10443,20443,30443],[10444,20444,30444],[10445,20445,30445],[10446,20446,30446],[10447,20447,30447]]
-2337 0 [[1428,[10551,1]],[2856,[10552,1]],[4284,[10553,1]],[5712,[10554,1]],[7140,[10555,1]],[8568,[10556,1]],[10000,[10557,1]]] 1 [[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]] [10551,10552,10553,10554,10555,10556,10557]
-2338 0 [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]] 1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]
+2333 0 10351_1|10352_1|10353_1|10354_1|10355_1|10356_1|10357_1 [[10351,20351,30351],[10352,20352,30352],[10353,20353,30353],[10354,20354,30354],[10355,20355,30355],[10356,20356,30356],[10357,20357,30357]] [10351,10352,10353,10354,10355,10356,10357]
+2334 0 10341_1|10342_1|10343_1|10344_1|10345_1|10346_1|10347_1 [[10341,20341,30341],[10342,20342,30342],[10343,20343,30343],[10344,20344,30344],[10345,20345,30345],[10346,20346,30346],[10347,20347,30347]]
+2335 0 10451_1|10452_1|10453_1|10454_1|10455_1|10456_1|10457_1 [[10451,20451,30451],[10452,20452,30452],[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457]] [10451,10452,10453,10454,10455,10456,10457]
+2336 0 10441_1|10442_1|10443_1|10444_1|10445_1|10446_1|10447_1 [[10441,20441,30441],[10442,20442,30442],[10443,20443,30443],[10444,20444,30444],[10445,20445,30445],[10446,20446,30446],[10447,20447,30447]]
+2337 0 10551_1|10552_1|10553_1|10554_1|10555_1|10556_1|10557_1 [[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]] [10551,10552,10553,10554,10555,10556,10557]
+2338 0 10541_1|10542_1|10543_1|10544_1|10545_1|10546_1|10547_1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]
2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1 [19]
2340 0 [[3000,[181,10]],[6000,[181,15]],[8000,[181,20]],[9000,[181,25]],[10000,[181,30]]] 1
2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2100,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index a8c838a..765e5ec 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -323,7 +323,7 @@
HelpBattleRobot 50105026 baseHurt*hpCoefficient
CrossRealmCfg 5
CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"10":[[2139,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2139,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2139,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
-CrossRealmPKMatchCount 10 10 (todayBuyCount+1)*20
+CrossRealmPKMatchCount 10 10 10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*20+min(max(todayBuyCount-5,0),1)*40+min(max(todayBuyCount-7,0),1)*40
CrossRealmPKFB [30, 3, 30,30,10] [[15,20,20,15,0], [33,25,25,33,0]] 2
GatherSoulHole 0_300|1_300|2_305|3_310|4_315|5_320|6_330 0_62|1_62|2_62|3_62|4_62|5_62|6_63
GatherSoulMaxLevel 1_50|2_50|3_50|4_50|5_50
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index d978de4..f39d361 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -1,25 +1,25 @@
id exchangeItemID exchangeItemCount exchangeItemIsBind tokenId tokenCount
-1 2334 1 0 1131 12
-2 10331|20331 1 1 1134 6
-3 10332|20332 1 1 1134 5
-4 10334|20334 1 1 1134 5
-5 10336|20336 1 1 1134 4
-6 10333|20333 1 1 1134 4
-7 10337|20337 1 1 1134 3
-8 10335|20335 1 1 1134 3
-9 2335 1 0 1132 12
-10 10431|20431 1 1 1135 6
-11 10432|20432 1 1 1135 5
-12 10434|20434 1 1 1135 5
-13 10436|20436 1 1 1135 4
-14 10433|20433 1 1 1135 4
-15 10437|20437 1 1 1135 3
-16 10435|20435 1 1 1135 3
-17 2337 1 0 1133 12
-18 10531|20531 1 1 1136 6
-19 10532|20532 1 1 1136 5
-20 10534|20534 1 1 1136 5
-21 10536|20536 1 1 1136 4
-22 10533|20533 1 1 1136 4
-23 10537|20537 1 1 1136 3
-24 10535|20535 1 1 1136 3
+1 2334 1 1 1131 12
+2 10331|20331 1 0 1134 6
+3 10332|20332 1 0 1134 5
+4 10334|20334 1 0 1134 5
+5 10336|20336 1 0 1134 4
+6 10333|20333 1 0 1134 4
+7 10337|20337 1 0 1134 3
+8 10335|20335 1 0 1134 3
+9 2335 1 1 1132 12
+10 10431|20431 1 0 1135 6
+11 10432|20432 1 0 1135 5
+12 10434|20434 1 0 1135 5
+13 10436|20436 1 0 1135 4
+14 10433|20433 1 0 1135 4
+15 10437|20437 1 0 1135 3
+16 10435|20435 1 0 1135 3
+17 2337 1 1 1133 12
+18 10531|20531 1 0 1136 6
+19 10532|20532 1 0 1136 5
+20 10534|20534 1 0 1136 5
+21 10536|20536 1 0 1136 4
+22 10533|20533 1 0 1136 4
+23 10537|20537 1 0 1136 3
+24 10535|20535 1 0 1136 3
--
Gitblit v1.8.0