From a2adef47d18448d1e9f45fc2c79f6990b1a19eb0 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 30 十月 2018 20:51:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 26 +++++++++++++-------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 93f657f..42cb1df 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 [(26,12800,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
+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]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index f26c92e..94b8e6b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -137,7 +137,7 @@
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 [(26,12800,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
+PartyReward [(26,12800,1),(28,25,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
FamilyPartySitAward int(min((max(worldLV-reLV,0)*0.05+1),6)*18000*reExp) int(min(max(worldLV-reLV,0)*0.25,10))
FamilyPartyAreaAward {"Exp":"int(reExp*300)"} 5 60
FamilyPartyDesk 3200 10 [(3901,150,1)]
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f093444..81e7ce3 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -65,20 +65,20 @@
252 6 0 902 100 1 [] 0 0 0 0 0 0 3 6000 0 0
253 6 0 903 100 1 [] 0 0 0 0 0 0 3 15000 0 0
254 6 0 904 100 1 [] 0 0 0 0 0 0 3 30000 0 0
-351 8 0 4611 1 1 [] 0 6 0 0 10 0 15 5 0 4
-352 8 0 4612 1 1 [] 0 6 0 0 10 0 15 5 0 4
-353 8 0 4613 1 1 [] 0 6 0 0 10 0 15 5 0 4
-354 8 0 4614 1 1 [] 0 6 0 0 10 0 15 5 0 4
-355 8 0 4615 1 1 [] 0 6 0 0 10 0 15 5 0 4
-356 8 0 4609 1 1 [] 0 6 0 0 2 0 15 50 0 5
-357 8 0 4610 1 1 [] 0 6 0 0 2 0 15 100 0 6
-358 8 0 4608 1 1 [] 0 6 0 0 1 0 15 250 0 8
-359 8 0 4606 1 1 [] 0 6 0 0 1 0 15 500 0 9
-360 8 0 912 1 1 [] 0 6 0 0 3 0 15 75 0 4
+351 8 0 4611 1 1 [] 0 6 0 0 10 0 15 2 0 1
+352 8 0 4612 1 1 [] 0 6 0 0 10 0 15 2 0 1
+353 8 0 4613 1 1 [] 0 6 0 0 10 0 15 2 0 1
+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
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 1000 0 5
-363 8 0 252 1 1 [] 0 6 0 0 1 0 15 1000 0 7
-364 8 0 4217 1 1 [] 0 6 0 0 1 0 15 2500 0 10
+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
+364 8 0 4217 1 1 [] 0 6 0 0 1 0 15 3000 0 10
401 9 0 191 1 1 [] 0 6 0 0 1 0 15 40 0 4
402 9 0 192 1 1 [] 0 6 0 0 1 0 15 60 0 6
403 9 0 193 1 1 [] 0 6 0 0 1 0 15 115 0 8
--
Gitblit v1.8.0