From a5ffe703e89542a24b8c2f1dd2faeb67cc9e742b Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 30 八月 2018 19:57:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index a024171..c062e24 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -29,7 +29,7 @@
FamilyRedRacketOutNum max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 2))))
FamilyBossOpen 31210 7000 20|22 5 0
FamilyStoreSpace 139 0 0 0 0
-PartyReward 0 [100,0] ["PartyKing",1,[(28,25,1)]] 1
+PartyReward 12800 [200,0] ["PartyKing",1,[(28,25,1)]] 1
FamilyMatchRankReward {1:[[28,80,1,0],[26,60000,1,1]],4:[[28,64,1,0],[26,45000,1,1]],10:[[28,56,1,0],[26,30000,1,1]],20:[[28,48,1,0],[26,18000,1,1]],21:[[28,40,1,0],[26,12000,1,1]]} [40,50,60,80,100] [[103,5,1],[26,40000,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
FamilyMatchOtherReward [[28,60,1],[26,28000,1]] [60,70,80,90,100] 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 779ddd8..23f7af1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -129,9 +129,9 @@
FamilyStoreItemRule1 1|2|3|4|5|6|7 0|1|0 0 0 0
FamilyStoreItemRule2 8|9|10 4|0|3 0 0 0
PetFoodExchange 1130 1 50 999 0
-PartyReward 0 [100,0] ["PartyKing",1,[(28,25,1)]] 1
+PartyReward 12800 [200,0] ["PartyKing",1,[(28,25,1)]] 1
FamilyPartyAreaAward {"Exp":"int(reExp*300)"} 5 60
-FamilyPartyDesk 1000 10
+FamilyPartyDesk 3200 10
FamilyActive 40|80|120|160|220 10|10|15|25|30
FamilyMatchSpawnPoint [[18,74,4],[216,74,4]] [[40,66,40,83], [190,66,190,81]]
FamilyMatchResourcePoint [[(170,18,5)],[(56,131,5)],[(170,132,5)],[(111,74,5)],[(56,18,5)]] [30909001,30909002,30909003,30909004,30909005] [[2,5,4,3,1],[1,3,4,5,2]] 0 6000
--
Gitblit v1.8.0