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

cehua_hzl

2018-08-23 43edb6083fcfe9b87379b2c7b1d31e58542a16cf

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt

@@ -118,7 +118,7 @@
    "EVP_1_31190"    :"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",



    #火炬特殊伤害

    "EVP_1_41110"    :"max((1250-(dMinAtk+dMaxAtk)/2.0)*20,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",

    "EVP_1_41110"    :"int(max((1250-(dMinAtk+dMaxAtk)/2.0)*20,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",



}




 db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt

@@ -1,7 +1,7 @@
PrivilegeID    EffectValue    singleValue    maxValue    attr    itemAward    successList

1    0            {"6":10000,"7":200}        1001|1021|1041

2    0                    1002|1022|1042

3    0    3    180    {"7":50}        1003|1023|1043

2    0    3    180    {"7":50}        1003|1023|1043

3    0                    1002|1022|1042

4    10000                    1004|1024|1044

5    0    4    0    {"7":100}        1006|1026|1046

6    0    1    0    {"6":12000}        1005|1025|1045