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

cehua-TT

2018-08-21 5ab43c739d06567f63657a9f28ed40e0bd7d03e0

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_NPCCnt.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -217,7 +217,7 @@
MunekadoTrialStarTime    {0:[[20],[40],[60,60,60,60]],1:[[20],[35],[30],[60,60,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}                

MunekadoLockLimit    5                

ChaosDemonCfg    [[(31801001,10)],[(31801004,10)],[(31803001,1)]]    [101,102,103,104,105]            

ChaosDemonReward    {103:1,102:3}    5_100|4_90|3_80|2_70|1_60    30000*reExp    {5:[(181,10,1)],4:[(181,8,1)],3:[(181,6,1)],2:[(181,4,1)],1:[(181,2,1)]} 	
ChaosDemonReward    {103:1,102:3}    5_100|4_90|3_80|2_70|1_60    12000*reExp    {5:[(181,10,1)],4:[(181,8,1)],3:[(181,6,1)],2:[(181,4,1)],1:[(181,2,1)]} 	
ElderBattlefieldCfg    {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}    300    20    [200,600,1200,2000,3200,4800]    

ElderBattlefieldSys    ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6']    20    10        

ElderBattlefieldExp    {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}