Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_hzl

2018-10-31 0dc31e1b5d4ca6ad4ba5643139fde22f7acc20b4

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -253,6 +253,7 @@
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

AutoUseGuardian    4101    300            

TJGGiftTime    36000				
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