From b7900cd1efc6e62e709baa82e9eb672996a5913d Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 22 九月 2018 02:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1335329..3abeaa0 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -126,7 +126,7 @@
FamilyRedPacketGoldLimit 1000 0 0 0 0
FamilyBossWeekNum 5 0 0 0 0
FamilyBossNeedFood 6000 0 0 0 0
-SWRHFamilyLV 2
+SWRHFamilyLV 3
TechFamilyLV 3
FamilyStoreItemRule1 1|2|3|4|5|6|7 0|1|0 0 0 0
FamilyStoreItemRule2 8|9|10 4|0|3 0 0 0
@@ -147,8 +147,8 @@
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
WingLV {"5":1,"6":2,"8":3,"10":4,"12":5}
-WingLegendAttrCount {6:1,8:1,10:2,12:2} 0 0 0
-WingLegendAttrValue {6:{30:[400,800,1200,1600],33:[200,400,600,800]},8:{30:[1600,2000,2400,2800],33:[800,1000,1200,1400]},10:{30:[2800,3200],33:[1400,1600]},12:{30:[3200,4000],33:[1600,2000]}} 0 0 0 0
+WingLegendAttrCount {5:1,6:1,8:1,10:2,12:2} 0 0 0
+WingLegendAttrValue {5:{30:[400,800],33:[200,400]},6:{30:[400,800,1200,1600],33:[200,400,600,800]},8:{30:[1600,2000,2400,2800],33:[800,1000,1200,1400]},10:{30:[2800,3200],33:[1400,1600]},12:{30:[3200,4000],33:[1600,2000]}} 0 0 0 0
WingRealmLimit 3711_1|3712_4|3713_8|3714_12|3715_16|3721_1|3722_4|3723_8|3724_12|3725_16
WingInitialWashValue [[6190,0],[7142,7],[7857,15],[8476,25],[9047,43],[10000,52]] 3711|3721
FightHappenRate 150
@@ -160,7 +160,7 @@
StrengthenLevelBroadCast 20|35|50|70|90|110|130|150|170|190
LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} 0 0 0
LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[15,25,44,52,54,55],[11,51,19],0],102:[[15,25,44,52,54,55],[11,51,19],0],103:[[22,45,44,53,54,55],[20,50,69],18],104:[[22,45,44,53,54,55],[20,50,69],30],105:[[22,45,44,53,54,55],[20,50,11],29]} 0 0 0 0
-LegendAttrValueByColor {51:{3:320,4:400,5:500,6:500},19:{3:300,4:480,5:600,6:600},11:{3:500,4:800,5:1000,6:1000},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},49:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
+LegendAttrValueByColor {51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
LegendAttrValueByColor2 {51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}
LegendAttrValueByClassLV {29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123 0 0 0 0
@@ -189,6 +189,7 @@
ExpPray 10+min(max(cnt-2,0),2)*5+min(max(cnt-4,0),4)*10+min(max(cnt-8,0),12)*20 min(exp,(21600*reExp))
FreeExpPrayItem 986 1127
DailyQuestMailLvLimit 110
+DailyQuestKillMonster 60
FBEnterCD 31080_300 31080_35
FairylandNPC [[(0,60),30801001], [(61,120),30801002], [(121,180),30801003]] max(min(2000-(heroCnt-1)*400,2000),800) 25
FairylandNPCCnt min(max(10+(heroCnt-1)*10,12+(heroCnt-1)*12-npcCnt),40+(heroCnt-1)*10-npcCnt)
@@ -211,7 +212,7 @@
FBEncourageBuff {31080:20051,52010:20081} 31080_10|52010_10 31080_10|52010_10
DropRecordValue 4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
-DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251
+DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8206|8219|8232|8245|8258|8207|8220|8233|8246|8259
DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007
PKConfig [[22,00], [8,00]] 50 10 10 110
FamilyKilledNotify {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}
@@ -219,10 +220,10 @@
BossHurtValue 30 0 0 0 0
FamilyInvadeCfg [180,1500,10,31170, [84,85,86,87], [101,31704003], {102:31704002,103:31704001}] {1:0.5,3:0.6,4:0.8,5:1} int(48000*reExp*starPer*min(passWheel/8.0,1)) [21010,21011] [31704001,31704002,31704003]
SwrhMonsterExp reExp*baseExp
-MunekadoTrialStarTime {0:[[20],[40],[60,60,60,60]],1:[[20],[35],[30],[60,60,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
+MunekadoTrialStarTime {0:[[20],[40],[40,80,60,60]],1:[[20],[35],[30],[40,80,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 12000*reExp {5:[(181,10,1)],4:[(181,8,1)],3:[(181,6,1)],2:[(181,4,1)],1:[(181,2,1)]}
+ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(181,10,1),(1141,1,1)],4:[(181,8,1),(1140,1,1)],3:[(181,6,1),(1139,1,1)],2:[(181,4,1),(1138,1,1)],1:[(181,2,1),(1137,1,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
@@ -246,9 +247,9 @@
ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688]}
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))
BossStoneDelayTime 1500
-DogzAssist 3|10 3511 2|3|4|5 1_10|2_20|3_30|4_40|5_50|6_50 8351
-DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
-DogzFBCollect {20302001:1,20302002:1} {20302001:1,20302002:1}
+DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]} 20303001 [20302002, 20302003]
+DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:3}
XMZZBetCfg {}
XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003] 30403001
@@ -265,9 +266,9 @@
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
-TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
+TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 10]] [0, 0] [10, 100]
TreasureSet21 max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10)) [1, 10] 1000
-TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
+TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 10]] [1440, 0] [5, 50]
TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
--
Gitblit v1.8.0