From 7ee6d174dc7360c169cda88085916dacc514c51e Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 13 八月 2018 13:48:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index f086b89..38a9822 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -44,7 +44,7 @@
RuneAwardCntRate [(6000,2),(8000,3),(10000,4)] [(6000,0),(9000,1),(10000,2)] 0 0 0
TowerRuneType {"1":[2],"2":[1],"3":[5],"4":[17],"5":[15],"6":[11],"7":[9],"8":[8],"9":[10],"10":[16],"11":[14],"12":[13]} 8
RuneAwardColor {(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21):[(1000000,1)]} 0 0 0 0
-PreFourAward {101:[(4316,3)],102:[(4316,3)],103:[(4316,3)],104:[(4316,2),(4317,1)],105:[(4316,2),(4317,1)],106:[(4316,1),(4317,2)],107:[(4316,1),(4317,2)],108:[(4317,3)]}
+PreFourAward {101:[(4316,3)],102:[(4316,3)],103:[(4316,2),(4317,1)],104:[(4316,2),(4317,1)]}
RuneTowerSweepBuy 2 25
ComposeAddonsType 101|102|103|104|105|106|107 0 0 0 0
ComposeAddonsQuality 1|2 0 0 0 0
@@ -104,7 +104,7 @@
MapItemDisappearTime 60000 0 0 0 0
EquipDropBindingRule 0 [108] 0 0
MonsterDropBindingRule [4003,4002,4005,4006,956,4501,4502,5012,5022] 0 0 0 0
-BossDropBindingRule [959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181] 0 0 0 0
+BossDropBindingRule [959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339] 0 0 0 0
MapDropBindRule {52010:1} 0 0 0 0
MapDropItemNoBind {52010:[3801,4606,4608]} 0 0 0 0
MapDropItemBind {} 0 0 0 0
@@ -196,13 +196,13 @@
GodAreaExpAward {"Exp":"int(reExp*10)"} 5 0
AngryAdd 60 1 20 100 0
BossHomeCost 1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200 0 0 0 0
-BossShunt 10030|10040|10050|10060|21070 2 4
-MapLine 10030_5|10040_5|10050_5|10060_5|21070_1
+BossShunt 10040|21070 2 5
+MapLine 10040_10|21070_1
DungeonDeliver 31020|31030|31150
DungeonIntegral 10000
BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}
FBEncourageBuff {31080:20051,52010:20051}
-DropRecordValue 3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078
+DropRecordValue 2339|3802|983|982|3803|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|5302|5206|5207|5202|5006|5007|4182
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
@@ -221,7 +221,7 @@
ElderBattlefieldTopAward [[2214,1,1]]
ElderBattlefieldBuff [23001,23002,23003,23004] 31609001 [102,105,106,107,108] 3
CornerPresentedMoney 0 1
-SetWorldPosShunt {10010:20, 10020:25, 10030:25, 10040:25, 10050:25, 10060:25} 160
+SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
TransportPay 954 1
GuardFBCageNPCID 32502001 32504001 3
FBCntRegainInterval 7200
@@ -254,9 +254,9 @@
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet 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, 1968] [1000, 1001] [0, 0] [10, 100]
-TreasureSet21 min(100,baseRate+curLuck/300.0*max(100-baseRate,0)) [1, 10] 300
+TreasureSet21 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
TreasureSet12 [1, 10] [98, 788] [1003, 1004] [1440, 0] [5, 50]
-TreasureSet22 min(100,baseRate+curLuck/300.0*max(100-baseRate,0)) [1, 10] 300
+TreasureSet22 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50
@@ -268,7 +268,7 @@
GeTuiTJG 离线挂机已开始托管角色挂机,角色当前经验效率:%s经验/分,剩余离线挂机时间:%s小时%s分钟 您被[%s]杀死,剩余离线挂机时间:%s小时%s分钟 当前背包已满,赶快上线查收战利品吧 您的离线挂机时间已不足1个小时
EquipDecomposeAward 10 [4611,4612,4613,4614,4615]
ReloadQuests 0
-DownReward [(3,1,1),(13,1,1),(14,1,1),(5,1,1)] 70
+DownReward [(14,1,1),(911,1,1)] 70
FreeGoodsOpenTime 259200
CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
CeremonyRecharge {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}
--
Gitblit v1.8.0