Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

CeHua_TRX

2018-12-11 935b218494edfdfdbd760f87e95c2f5d7aa0e600

Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

 db/PyMongoDataServer/PySysDB/tagAppointItem.txt

@@ -3,22 +3,22 @@
6502    1    1    20|50|49    400|400|500        

6601    0    0    11|51|19    1500|750|900    79    132141

6602    0    0    11|51|19    1500|750|900    80    79285

6603    0    0    11|51|19    1500|750|900    79    132141

6604    0    0    11|51|19    1500|750|900    80    79285

6605    0    0    11|51|19    1500|750|900    79    132141

6606    0    0    11|51|19    1500|750|900    80    79285

6603    0    0    11|51|19    1500|750|900    79    198211

6604    0    0    11|51|19    1500|750|900    80    118927

6605    0    0    11|51|19    1500|750|900    79    297316

6606    0    0    11|51|19    1500|750|900    80    178390

6607    0    0    11|51|19    1500|750|900    79    132141

6608    0    0    11|51|19    1500|750|900    80    79285

6609    0    0    11|51|19    1500|750|900    79    132141

6610    0    0    11|51|19    1500|750|900    80    79285

6611    0    0    11|51|19    1500|750|900    79    132141

6612    0    0    11|51|19    1500|750|900    80    79285

6609    0    0    11|51|19    1500|750|900    79    198211

6610    0    0    11|51|19    1500|750|900    80    118927

6611    0    0    11|51|19    1500|750|900    79    297316

6612    0    0    11|51|19    1500|750|900    80    178390

6613    0    0    11|51|19    1500|750|900    79    132141

6614    0    0    11|51|19    1500|750|900    80    79285

6615    0    0    11|51|19    1500|750|900    79    132141

6616    0    0    11|51|19    1500|750|900    80    79285

6617    0    0    11|51|19    1500|750|900    79    132141

6618    0    0    11|51|19    1500|750|900    80    79285

6615    0    0    11|51|19    1500|750|900    79    198211

6616    0    0    11|51|19    1500|750|900    80    118927

6617    0    0    11|51|19    1500|750|900    79    297316

6618    0    0    11|51|19    1500|750|900    80    178390

3799    0    0    0    0    0    0

3798    0    0    0    0    0    0

6700    0    1    20|50|49    600|600|750        


 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -66,9 +66,9 @@
60010    0    60010    105    500    0    0    0    0    0    0    0    [83,13]    [3,360,30,10]    [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]        {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}

60010    1    60010    165    500    0    0    0    0    0    0    0    [208,24]    [3,360,30,10]    [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]        {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}

60010    2    60010    200    500    0    0    0    0    0    0    0    [317,21]    [3,360,30,10]    [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]        {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}

31160    0    31160    110    230    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311601,311603]        {1:[], 2:[],3 :[[4151,5]], 4:[], 5:[], 6:[[4151,5]]}

31160    1    31160    231    300    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311604,311605]        {1:[], 2:[],3 :[[4151,5]], 4:[], 5:[], 6:[[4151,5]]}

31160    2    31160    301    500    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311606,311607]        {1:[], 2:[],3 :[[4151,5]], 4:[], 5:[], 6:[[4151,5]]}

31160    0    31160    110    230    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311601,311603]        {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}

31160    1    31160    231    300    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311604,311605]        {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}

31160    2    31160    301    500    0    0    0    0    0    0    0    [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]    1200    [311606,311607]        {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}

31250    0    31250    0    0    0    0    0    0    0    0    0    [30,18]    [0,300,10]    [312501,312502,312503]        [0,4235]

52010    0    52020    20    0    0    0    0    0    0    0    0    [17,19,8]    10    [520101,520102,520103,520104]        

52010    1    52020    40    0    0    0    0    0    0    0    0    [17,19,8]    10    [520105,520106,520107,520108]        


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -175,7 +175,7 @@
LegendAttrValueByColor2    {30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}                

LegendAttrValueByClassLV    {29:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:1200,9:1800,10:2400,11:2640,12:2850,13:3000,14:3150},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:1000,9:1500,10:2000,11:2200,12:2375,13:2500,14:2625},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14: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

EquipGSFormula    int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0))    [67,68,6,7,8,11,20,19,23]    int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)    0    0

EquipGSFormula    int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0))    [67,68,6,7,8,11,20,19,23]    int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)    0    0

HorseUpItem    181    100    0    0    0

HorseSuperRate    {}    0    0    0    0

NeedSysHorseLV    {100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}                

@@ -263,7 +263,7 @@
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))))				
OutOfPrintValue    int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4))))				
BossStoneDelayTime    1500                

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,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]}    20303001    [20302002, 20302003]