From 23ba3671159851d84555270f5a0e77d4dd5d5c52 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 30 十月 2018 21:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 8 ++++----
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 14 ++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 42cb1df..f1b46b8 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -32,7 +32,7 @@
PartyReward [(26,12800,1),(28,25,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
FairyCorrectAnswer 30
FamilyMatchSet 2 0 0 0 0
-FamilyMatchRankReward {1:[[28,80,1,0],[26,59400,1,0]],4:[[28,64,1,0],[26,49500,1,0]],10:[[28,56,1,0],[26,39600,1,0]],20:[[28,48,1,0],[26,29700,1,0]],21:[[28,40,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,100,1,0],[26,59400,1,0]],4:[[28,80,1,0],[26,49500,1,0]],10:[[28,70,1,0],[26,39600,1,0]],20:[[28,60,1,0],[26,29700,1,0]],21:[[28,50,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
FamilyMatchOtherReward [[28,60,1],[26,28000,1]] [60,70,80,90,100] 5
MailDefaultCount 50 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 1092407..f289ff9 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -176,9 +176,9 @@
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
2391 [[20,[3803,1]],[170,[3802,1]],[220,[4186,1]],[270,[199,1]],[320,[4606,1]],[370,[4608,1]],[570,[3504,1]],[770,[3514,1]],[1370,[4304,12]],[1570,[5303,60]],[3400,[2324,2]],[4700,[3503,1]],[6000,[3513,1]],[6300,[141,60]],[6600,[142,40]],[6900,[143,30]],[7200,[144,20]],[8600,[4151,8]],[10000,[181,8]]] 1 [3803,3802,4186,199,4606,4608,3504,3514]
-2392 4184_2|1145_15|952_3|913_1
+2392 4184_2|1145_15|952_3|913_1 [913]
2393 [[100,[3803,1]],[120,[8067,1]],[140,[4607,1]],[190,[5206,1]],[290,[4606,1]],[540,[5006,2]],[690,[3505,1]],[840,[3515,1]],[1440,[4305,5]],[1740,[5303,60]],[3000,[2324,2]],[4400,[3503,1]],[5800,[3513,1]],[6100,[142,40]],[6400,[143,30]],[6700,[144,20]],[7000,[153,10]],[8500,[4151,8]],[10000,[181,8]]] 1 [3803,8067,4607,5206,4606,5006,3505,3515]
-2394 4184_2|1146_15|952_3|913_1
+2394 4184_2|1146_15|952_3|913_1 [913]
2395 [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 [3803,5408,5409,4607,4606,4608,3506,3516]
-2396 4184_2|1147_15|952_3|913_1
+2396 4184_2|1147_15|952_3|913_1 [913]
2397 [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 94b8e6b..22d7441 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -149,7 +149,7 @@
FamilyMatchCollect 10|10 3|3
FamilyMatchPersonalScore 12 12 {0:20, 30909004:40} 16 10
FamilyMatchPlayTime [60,1140,30]
-FamilyMatchRankReward {1:[[28,80,1,0],[26,59400,1,0]],4:[[28,64,1,0],[26,49500,1,0]],10:[[28,56,1,0],[26,39600,1,0]],20:[[28,48,1,0],[26,29700,1,0]],21:[[28,40,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,100,1,0],[26,59400,1,0]],4:[[28,80,1,0],[26,49500,1,0]],10:[[28,70,1,0],[26,39600,1,0]],20:[[28,60,1,0],[26,29700,1,0]],21:[[28,50,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
FamilyMatchRankOneReward {215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index dcd6597..6c7a830 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -256,3 +256,17 @@
com.snyjjpg.11 jisusnyjjios 68 0 5
com.snyjjpg.12 jisusnyjjios 128 0 7
com.snyjjpg.13 jisusnyjjios 168 0 8
+mbxml.18 1030013326 18 101 0
+mbxml.6 1030013326 6 2 0
+mbxml.30 1030013326 30 103 0
+mbxml.98 1030013326 98 104 0
+mbxml.128 1030013326 128 105 0
+mbxml.198 1030013326 198 106 0
+mbxml.328 1030013326 328 107 0
+mbxml.648 1030013326 648 108 0
+mbxml.ios.test1 1030013326 1 110 0
+mbxml.ios.6 1030013326 6 0 2
+mbxml.ios.30 1030013326 30 0 4
+mbxml.ios.68 1030013326 68 0 5
+mbxml.ios.128 1030013326 128 0 7
+mbxml.ios.168 1030013326 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 81e7ce3..ed02522 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -71,10 +71,10 @@
354 8 0 4614 1 1 [] 0 6 0 0 10 0 15 2 0 1
355 8 0 4615 1 1 [] 0 6 0 0 10 0 15 2 0 1
356 8 0 4609 1 1 [] 0 6 0 0 2 0 15 50 0 2
-357 8 0 4610 1 1 [] 0 6 0 0 2 0 15 100 0 3
-358 8 0 4608 1 1 [] 0 6 0 0 1 0 15 250 0 4
-359 8 0 4606 1 1 [] 0 6 0 0 1 0 15 500 0 6
-360 8 0 912 1 1 [] 0 6 0 0 3 0 15 75 0 8
+357 8 0 4610 1 1 [] 0 6 0 0 2 0 15 100 0 4
+358 8 0 4608 1 1 [] 0 6 0 0 1 0 15 250 0 6
+359 8 0 4606 1 1 [] 0 6 0 0 1 0 15 500 0 8
+360 8 0 912 1 1 [] 0 6 0 0 3 0 15 75 0 3
361 8 0 913 1 1 [] 0 6 0 0 1 0 15 250 0 9
362 8 0 4218 1 1 [] 0 6 0 0 1 0 15 1500 0 5
363 8 0 252 1 1 [] 0 6 0 0 1 0 15 1500 0 7
--
Gitblit v1.8.0