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

cehua_wcy

2018-11-28 8b5d83a9118a8df3e6171ab3455a1c81135245ec

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

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -19,7 +19,7 @@
IceLodeSpecial    [31403002]    [23043,23044]            

ClearDevilPoint    1200    {30102001:20,30102002:50,30102003:300}    0    0    0

AI197Point    {"31040":[[16,34],[18,99]]}                 

AI198Point    {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114007":[[16,14]]} 				
AI198Point    {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]]} 				
AIRefreshPointNPCRun    {101:[[7,15]],102:[[13,22]],103:[[21,25]]}                

RuneUnlock    0|204|304|404|504|604|704|804    8_100    8_120    9    0

RuneDoubleInlayCnt    101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9                

@@ -84,7 +84,7 @@
ExpAttenuation    max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1)    0    0    0    0

AtkInterval    int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5))    0    0    0    0

MoveSpeed    max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100)    50    25    0    0

FightpowerFormula    int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700))    equipScoreTotal*4    0    0    0

FightpowerFormula    int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2805669))    equipScoreTotal*4    0    0    0

RealmFBHelpAttr    {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}    10000    6        

RealmFBHelpLimit    10                

RealmSitNPCID    10000                

@@ -100,7 +100,7 @@
GodWeapon2    104|105|106    0    0    0    0

GodWeapon3    107|108|109    0    0    0    0

GodWeapon4    110|111|112    0    0    0    0

GodWeaponActive    1    {"2":[[1,100]],  "4":[[2,100]]}    {"2":100,  "4":200}    0    0

GodWeaponActive    1    {"2":[[1,120]],  "4":[[2,120]]}    {"2":250,  "4":320}    0    0

GodWeaponSys    {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}                

GodMagicExp    {"1":[10,10],"2":[10,10],"4":[10,10]}                

MagicExterior    {"1":0,"2":0,"3":0,"4":100386}    0    2000        


 db/PyMongoDataServer/PySysDB/tagGodWeapon.txt

@@ -28,7 +28,7 @@
1    27    12    6    36317    0    

1    28    13    6    37447    0    

1    29    13    6    38587    0    

1    30    13    6    39738    0	
1    30    13    6    39738    48040    GetMagicSkill5

1    31    13    6    40891    0    

1    32    13    6    42047    0    

1    33    13    6    43212    0    

@@ -48,7 +48,7 @@
1    47    15    6    60395    0    

1    48    15    6    61681    0    

1    49    15    6    62975    0    

1    50    16    6    64276    48040    GetMagicSkill5

1    50    16    6    64276    0	
1    51    16    6    65584    0    

1    52    16    6    66899    0    

1    53    16    6    68221    0    

@@ -673,7 +673,7 @@
2    22    20    7    2598    0    

2    23    20    7    2654    0    

2    24    21    7    2711    0    

2    25    21    7    2768    0	
2    25    21    7    2768    48055    GetMagicSkill8

2    26    21    7    2827    0    

2    27    22    7    2886    0    

2    28    22    7    2946    0    

@@ -698,7 +698,7 @@
2    47    25    7    4130    0    

2    48    25    7    4193    0    

2    49    25    7    4257    0    

2    50    25    7    4320    48055    GetMagicSkill8

2    50    25    7    4320    0	
2    51    25    7    4384    0    

2    52    25    7    4448    0    

2    53    25    7    4512    0    

@@ -1729,7 +1729,7 @@
4    27    36    73|74    158|8000    0    

4    28    36    73|74    162|8000    0    

4    29    36    73|74    166|8000    0    

4    30    36    73|74    170|8000    0	
4    30    36    73|74    170|8000    48070    GetMagicSkill11

4    31    36    73|74    175|8000    0    

4    32    36    73|74    179|8000    0    

4    33    37    73|74    183|8000    0    

@@ -1749,7 +1749,7 @@
4    47    39    73|74    243|8000    0    

4    48    40    73|74    247|8000    0    

4    49    40    73|74    251|8000    0    

4    50    40    73|74    255|8000    48070    GetMagicSkill11

4    50    40    73|74    255|8000    0	
4    51    40    73|74    260|8000    0    

4    52    40    73|74    264|8000    0    

4    53    41    73|74    268|8000    0    


 db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt

@@ -1,10 +1,10 @@
type    level    notifycode

1    150    GetMagicEffect4

1    120    GetMagicEffect4

1    250    GetMagicEffect5

1    500    GetMagicEffect6

2    150    GetMagicEffect7

2    120    GetMagicEffect7

2    250    GetMagicEffect8

2    500    GetMagicEffect9

4    150    GetMagicEffect10

4    120    GetMagicEffect10

4    250    GetMagicEffect11

4    500    GetMagicEffect12