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

cehua_wcy

2018-12-08 de68251ce9844a56108359317d65d2cf8ba58a75

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -46,12 +46,12 @@
31150    0    31150    0    0    0    4007    1|2|2|3|3|4    80    0    0    0    [132,45]    [30,12]            

31170    0    31170    110    0    0    0    0    0    0    0    0    [76,15]                [(26,33000,33000)]

31180    0    31180    110    500    0    0    0    0    0    0    0    [112,24]    [5,600,15, [340,260,200,150]]            

31190    0    31190    60    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]]        [(4151,2,2),(1143,1,1)]

31190    1    31190    100    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]]        [(4151,3,4),(1142,1,1)]

31190    2    31190    140    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]]        [(4151,5,6),(1142,1,1)]

31190    3    31190    170    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]]        [(4151,7,8),(1142,1,1)]

31190    4    31190    200    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]]        [(4151,9,10),(1142,1,1)]

31190    5    31190    230    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]]        [(4151,12,13),(1142,1,1)]

31190    0    31190    60    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201000,2),(102,30201010,1),(105,30201020,1),(103,30201000,2)], [(104,30203000,1)]]        [(4151,3,3),(1143,1,1)]

31190    1    31190    100    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201001,2),(102,30201011,1),(105,30201021,1),(103,30201001,2)], [(104,30203001,1)]]        [(4151,4,4),(1142,1,1)]

31190    2    31190    140    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201002,2),(102,30201012,1),(105,30201022,1),(103,30201002,2)], [(104,30203002,1)]]        [(4151,5,5),(1142,1,1)]

31190    3    31190    170    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201003,2),(102,30201013,1),(105,30201023,1),(103,30201003,2)], [(104,30203003,1)]]        [(4151,6,7),(1142,1,1)]

31190    4    31190    200    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]]        [(4151,8,9),(1142,1,1)]

31190    5    31190    230    500    0    0    0    0    120    0    0    [24,3]    [3,480,10,5,15]    [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]]        [(4151,10,11),(1142,1,1)]

31220    0    31220    110    0    0    0    0    0    0    0    0    [12,23]                

31230    0    31230    0    0    0    0    0    0    0    0    0    [12,6]    [900,[30,20,10,9,8,7,6,5,4,3,2,1]]            

31240    0    31240    0    0    0    4010    2    80    0    0    0    [32,16]    [3,1800,15,101]