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

cehua_wcy

2018-11-27 61897d434d805b9aee313266d9d61b9380ac5334

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

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -66,9 +66,9 @@
60010    0    60010    105    500    0    0    0    0    0    0    0    [83,13]    [3,1800,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,1800,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,1800,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:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}

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:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}

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:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,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:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}

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:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}

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:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}

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

@@ -236,7 +236,7 @@
MunekadoTrialStarTime    {0:[[20],[20],[30,30,30,30]],1:[[20],[20],[20],[30,30,30,30]],2:[[20],[20],[20],[30,30,30,30]],3:[[20],[20],[30,30,30,30]],4:[[20],[20],[30,30,30,30]],5:[[20],[20],[30,30,30,30]]}                

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)]} 	
ChaosDemonReward    {}    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    {0:[20,0,20],1:[20,0,20],2:[20,0,20]}    [200,600,1200,2000,3200,4800]    

ElderBattlefieldPoint    500    500            

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