From 5aa137c407d3996cf67c6903cfe982a550f8f92e Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 13 九月 2018 15:12:42 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 4 +++-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 8c6a3b4..4ca0a6d 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -124,7 +124,7 @@
2337 0 [[1428,[10551,1]],[2856,[10552,1]],[4284,[10553,1]],[5712,[10554,1]],[7140,[10555,1]],[8568,[10556,1]],[10000,[10557,1]]] 1 [[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]] [10551,10552,10553,10554,10555,10556,10557]
2338 0 [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]] 1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]
2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1
-2340 0 [[3000,[181,20]],[6000,[181,25]],[8000,[181,30]],[9000,[181,35]],[10000,[181,40]]] 1
+2340 0 [[3000,[181,10]],[6000,[181,15]],[8000,[181,20]],[9000,[181,25]],[10000,[181,30]]] 1
2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2100,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14]
2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
2343 0 181_50
@@ -165,3 +165,5 @@
2378 0 4151_10 [[10000,[4251,1]]] [[7500,0],[10000,1]]
2379 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1
2380 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1
+2381 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[10000,[4609,1]]] 1
+2382 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[9995,[4609,1]],[10000,[4610,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index a77a965..b180824 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -208,7 +208,7 @@
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","51010":"50"}
-FBEncourageBuff {31080:20051,52010:20051}
+FBEncourageBuff {31080:20051,52010:20081}
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
@@ -238,7 +238,7 @@
SealDemonFirstPos [20,16]
UnblockTreasure 101|102|103 {301:'UnblockTreasure301',302:'UnblockTreasure302',303:'UnblockTreasure303',304:'UnblockTreasure304',305:'UnblockTreasure305',306:'UnblockTreasure306',307:'UnblockTreasure307',308:'UnblockTreasure308'}
MWSignDayAttr {"7":100} 304
-DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2211,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2211,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2211,8]}}
+DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2381,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2381,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2382,8]}}
DiceFreeNum 5
DiceRandomList {0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}
TJG int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times 300 72000 {1:[50900, 50902],2:[55900,55902]} 48215|48235|48245|48260|48275|48320|48290
@@ -292,4 +292,4 @@
SpringSaleMailItem [(181,1,1),(4151,1,1)]
OSSaleMailItem [(181,1,1),(4151,1,1)]
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]]
-FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 1 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
+FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
--
Gitblit v1.8.0