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

cehua_wcy

2018-11-23 e9c06a876f3950368333c20d2a4a71f7d47f338e

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

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -69,7 +69,7 @@
CeremonyWorldLv    {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}                

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

OperationAction    10    0    0    0    0

HelpBattleCount    5    3    2    10    0

HelpBattleRefresh    5    5    5		
HelpBattleCall    5    3    2    10    5

HelpBattlePoint    1500    {"1":[20, 10], "2":[10, 5]}            

HelpBattleCheckIn    48    3    {1:[60010], 2:[60010, 51010]}        

PlayerViewCache    100    [0,4]			

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -313,4 +313,5 @@
BindJadeWheelCfg    88    {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588}    [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)]    {1:[(6000,3),(10000,4)],30:[(10000,9)]}    [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]

BindJadeWheelNotice    150                

WishingWellCfg    14400    10    8    5    

HelpBattleRefresh    5    5    5		
HelpBattlePoint    1500    {"1":[20, 10], "2":[10, 5]}