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

cehua_wcy

2018-08-30 4db69559139f368ea15756c94aa5a7ef4352fcdb

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

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -64,4 +64,4 @@
BossRebornNotify    [50,80]    [0,20,40]            

ServerActivePlayerCnt    100    max(20,min(yesterdayPlayerCnt,150))            

CeremonyWorldLv    {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}                

FairyGrabBossID    [50103001,50103002,50103003,50103004,50103005,50103006,50103007]    14000			
FairyGrabBossID    [50103001,50103002,50103003,50103004,50103005,50103006,50103007]    [[26,14000,1]]			

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/PyGameData.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -288,5 +288,5 @@
FlashGiftbagMailItem    [(181,1,1)]                

SpringSaleMailItem    [(181,1,1)]                

OSSaleMailItem    [(181,1,1)]                

FairyGrabBossID    [50103001,50103002,50103003,50103004,50103005,50103006,50103007]    14000			
FairyGrabBossID    [50103001,50103002,50103003,50103004,50103005,50103006,50103007]    [[26,14000,1]]			
FairyGrabBoss    {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}}    10    {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]}    [[50, "FairyGrabBossWillKill"], [30, "FairyGrabBossWillKill"], [10, "FairyGrabBossWillKill"]]    


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -143,7 +143,7 @@
801    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

802    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

803    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

901    30    0    2342    1    1    []    0        7    0    0    0    27    50    0    0	
901    30    0    2342    1    1    []    0        7    0    0    50    27    50    0    0	
902    30    0    4658    1    1    []    0        7    0    0    2    27    500    0    0    

903    30    0    4738    1    1    []    0        7    0    0    3    27    800    0    0    

904    30    0    4735    1    1    []    0        7    0    0    1    27    1000    0    0