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

cehua-HWJ35

2019-01-23 9e1408a7809bf0c18b159e05631f1a9db8409116

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

 CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt

@@ -1,7 +1,7 @@
WorldLvNum    Rank    Award

0    1    {"1":[[2446,1,0],"2":[[2446,1,0]]}

0    2    {"1":[[2447,1,0],"2":[[2447,1,0]]}

0    3    {"1":[[2448,1,0],"2":[[2448,1,0]]}

0    1    {"1":[[2446,1,0]],"2":[[2446,1,0]]}

0    2    {"1":[[2447,1,0]],"2":[[2447,1,0]]}

0    3    {"1":[[2448,1,0]],"2":[[2448,1,0]]}

1    1    {"1":[[2278,1,0]],"2":[[2278,1,0]]}

1    2    {"1":[[10771,1,0]],"2":[[20771,1,0]]}

1    3    {"1":[[10772,1,0]],"2":[[20772,1,0]]}


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt

@@ -50,6 +50,6 @@
49    2019-1-23    2019-1-23                110    0    [[130]]    SellMail3    

50    2019-1-27    2019-1-27                110    0    [[131]]    SellMail3    

51    2019-1-28    2019-1-28                110    0    [[132]]    SellMail3    

52    2019-1-29    2019-1-29                110    0    [[133],[134]]    SellMail3	
52    2019-1-29    2019-1-29                110    0    [[133,134]]    SellMail3	
53    2019-1-31    2019-1-31                110    0    [[135]]    SellMail3    

54    2019-2-2    2019-2-2                110    0    [[136]]    SellMail3    


 db/PyMongoDataServer/PySysDB/tagChests.txt

@@ -249,7 +249,6 @@
2457    0    0    0    0    1

2458    0    0    0    0    1

2459    0    0    0    0    1

2460    0    0    0    0    1

2461    0    0    0    0    1

2462    0    0    0    0    1

2463    0    0    300    0    1


 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -246,7 +246,6 @@
2457        3506_1|3516_1                                        

2458        3504_1|3514_1                                        

2459        3503_1|3513_1                                        

2460            5800_1|5801_1|5802_1									
2461        7204_1|7209_1|7214_1|7219_1|7224_1|7229_1|7234_1|7239_1|7244_1|7249_1|7254_1|7259_1                                        

2462            142_60|2463_1                                    

2463            2464_1                                    


 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -101,7 +101,7 @@
32010    2    32012    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]            

32010    3    32013    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]            

32010    4    32014    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]            

31370    0    31370    0    500    0    0    0    0    0    0    0    [18,18]    [3,180,10, [120,60,2,1]]    101		
31370    0    31370    0    500    0    0    0    0    0    0    0    [18,18]    [3,180,10, [179,178,120,60]]    101		
31380    0    31380    235    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1]]

31380    1    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1]]

31380    2    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1]]


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -170,15 +170,15 @@
StrengthenLevelLimit    1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_2|9_3|10_3    1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2            

StrengthenLevelBroadCast    20|35|50|70|90|110|130|150|170|190                

SkillPlusAttrID    {102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]}                

EquipZhuXian    {"122":2, "125":4, "124":6, "127":8, "128":10, "126":13}    {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}    {"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"3":[121,122,123,124,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"3":[121,122,123,124,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"3":[121,122,123,124,125,126,127,128]}}		
LegendAttrRandRule    {1:[109,110,111,112,113,114,115],2:[102,103,104,105,106,107,108]}    {(128,129,130):[1], (131,132,133):[2], (134,135,136,137):[1,2]}    {(1,0):[1,2], (2,0):[1,3], (3,0):[1,4],(4,0):[2,5],(5,0):[2,6],(6,0):[2,7]}    {102:[937,468,234],103:[875,437,218],104:[833,416,208],105:[833,416,208],106:[833,416,208],107:[833,416,208],108:[1250,625,312],109:[937,468,234],110:[875,437,218],111:[833,416,208],112:[833,416,208],113:[833,416,208],114:[833,416,208],115:[1250,625,312]}    {(2,0):0, (3,0):1}

EquipZhuXian    {"122":2, "125":4, "124":6, "127":8, "128":10, "126":13}    {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}    {"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"4":[121,122,123,124,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"4":[121,122,123,124,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"4":[121,122,123,124,125,126,127,128]}}		
LegendAttrRandRule    {1:[109,110,111,112,113,114,115],2:[102,103,104,105,106,107,108]}    {(128,129,130):[1], (131,132,133):[2], (134,135,136,137):[1,2]}    {(1,0):[1,2], (2,0):[1,3], (3,0):[1,4],(4,0):[2,5],(5,0):[2,6],(6,0):[2,7]}    {102:[1000,500,250],103:[2000,1000,500],104:[1500,750,375],105:[2500,1250,625],106:[3000,1500,750],107:[3750,1875,937],108:[7500,3750,1875],109:[1000,500,250],110:[2000,1000,500],111:[1500,750,375],112:[2500,1250,625],113:[3000,1500,750],114:[3750,1875,937],115:[7500,3750,1875]}    {(2,0):0, (3,0):0}

LegendAttrCount    {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]}    {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,0]}    0    0    0

LegendAttrRule    {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[9,10,52,53,25,55],[30,26,27],0],102:[[9,10,52,53,25,55],[14,26,27],0],103:[[9,10,52,53,25,55],[14,70,29],0],104:[[9,10,52,53,25,55],[30,70,29],0],105:[[9,10,52,53,25,55],[30,70,26],0]}    0    0    0    0

LegendAttrValueByColor    {51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}    0    0    0    0

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|128|129|130|131|132|133|134|135|136|137    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+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)    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

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,9,10,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)    int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+Hit/10000.0+Miss/10000.0+SkillAddPer1/10000.0+SkillAddPer2/10000.0+SkillAddPer3/10000.0+SkillAddPer4/10000.0+SkillAddPer5/10000.0+SkillAddPer6/10000.0+SkillAddPer7/10000.0+SkillReducePer1/10000.0+SkillReducePer2/10000.0+SkillReducePer3/10000.0+SkillReducePer4/10000.0+SkillReducePer5/10000.0+SkillReducePer6/10000.0+SkillReducePer7/10000.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)}                

@@ -337,4 +337,4 @@
ShareUseCntItem    [[2387,2428,2430],[2388,2429]]                 

ChangeOldItem    {102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}                

ZhuXianBossCntCfg    3    8    5        

ZhuXianTowerBossTime    min(max((playerPower/4+needPower)/(playerPower)*48,10),119)    8    5		
ZhuXianTowerBossTime    min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48-1,10),119)    8    5		

 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -221,7 +221,7 @@
794    128    1    4606    1    1    [[2213,50,1]]    4606        0    0    0    1    0    1    388    1625    0    LimitGift6    

795    129    1    912    1    1    [[2213,15,1]]    912        0    0    0    1    0    1    88    338    0    LimitGift6    

796    130    1    106    3    1    [[104,60,1]]    106        0    0    0    1    0    1    88    300    0    LimitGift6    

797    131    1    2460    1    1    []    0        0    0    0    1    0    1    588    1500    0    LimitGift6	
797    131    1    5700    6    1    []    0        0    0    0    1    0    1    588    1500    0    LimitGift6	
798    132    1    913    1    1    [[4694,12,1]]    913        0    0    0    1    0    1    388    1600    0    LimitGift6    

799    133    1    912    1    1    [[5303,200,1]]    912        0    0    0    1    0    1    88    350    0    LimitGift6    

800    134    1    4607    1    1    [[2213,50,1]]    4607        0    0    0    1    0    1    588    2625    0    LimitGift6