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

cehua_wcy

2018-11-12 f096834555630c25126b095b8031ae8b4d6b4b64

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -234,10 +234,11 @@
MunekadoLockLimit    5                

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

ChaosDemonReward    {103:1,102:3,101:5}    5_100|4_90|3_80|2_70|1_60    0*reExp    {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}     

ElderBattlefieldCfg    {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}    300    20    [200,600,1200,2000,3200,4800]	
ElderBattlefieldCfg    {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}    300    {0:[12,8,20],1:[20,5,20],2:[20,5,20]}    [200,600,1200,2000,3200,4800]	
ElderBattlefieldPoint    500    500            

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'}                

ElderBattlefieldRobot    20    {0:60103010,1:60103010,2:60103010}    20051    5    [111,112,113,114,115,116,117,118]

ElderBattlefieldTopAward    [[2214,1,1]]                

ElderBattlefieldBuff    [23001,23002,23003,23004]    31609001    [102,105,106,107,108]    3    

CornerPresentedMoney    0    1