Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

cehua_wcy

2018-09-13 86353b67f7314a8890acd436e14cd73a773a99aa

Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

 CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt

@@ -107,3 +107,17 @@
572    mrgame    68    0    5

573    mrgame    128    0    7

574    mrgame    168    0    8

sgsbl.18    815035927    18    101    0

sgsbl.6    815035927    6    2    0

sgsbl.30    815035927    30    103    0

sgsbl.98    815035927    98    104    0

sgsbl.128    815035927    128    105    0

sgsbl.198    815035927    198    106    0

sgsbl.328    815035927    328    107    0

sgsbl.648    815035927    648    108    0

sgsbl.1    815035927    1    110    0

sgsbl.ios.6    815035927    6    0    2

sgsbl.ios.30    815035927    30    0    4

sgsbl.ios.68    815035927    68    0    5

sgsbl.ios.128    815035927    128    0    7

sgsbl.ios.168    815035927    168    0    8