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

cehua-TT

2018-11-06 0a2804cc1c6a983a57680c1953a31e219d378f44

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

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_514.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_515.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_516.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_517.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_518.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_519.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_803.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_806.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_808.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4061.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagVIPAward.txt

@@ -1,10 +1,10 @@
VIPLV    VIPgift    GiftPrice    OldPrice

1    {"1":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"2":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"3":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]]}    88    500

2    {"1":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]],"2":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]],"3":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]]}    188    800

2    {"1":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"2":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"3":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]]}    188    800

3    {"1":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]],"2":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]],"3":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]]}    388    1500

4    {"1":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]]}    588    2000

5    {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]]}    1288    4000

6    {"1":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]],"2":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]],"3":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]]}    1888    6000

6    {"1":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,2,1]],"2":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,2,1]],"3":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,2,1]]}    1888    6000

7    {"1":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]],"2":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]],"3":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]]}    2888    10000

8    {"1":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]],"2":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]],"3":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]]}    6888    15000

9    {"1":[[6602,1,0],[200,1,1],[3507,1,1],[3517,1,1],[181,200,1]],"2":[[6614,1,0],[200,1,1],[3507,1,1],[3517,1,1],[181,200,1]],"3":[[6608,1,0],[200,1,1],[3507,1,1],[3517,1,1],[181,200,1]]}    12888    50000