From 56c1415dcabe905dc3c3b35a9079cd5a70bcdf84 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期四, 01 十一月 2018 20:12:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index f1b46b8..41543ca 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,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]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,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/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 459cb61..8daaf8b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -150,7 +150,7 @@
FamilyMatchCollect 10|10 3|3
FamilyMatchPersonalScore 12 12 {0:20, 30909004:40} 16 10
FamilyMatchPlayTime [60,1140,30]
-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]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,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]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
--
Gitblit v1.8.0