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

cehua-TT

2018-10-08 036bd5c4f0ccb7a6b2c9e5687a31bf38c066af81

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

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagXBXZ.txt

@@ -1,9 +1,9 @@
ID    Type    NeedCnt    Condition    MagicWeaponID    AwardItemList    Money

3    2    1    [[3,3,0,3]]    305    []    [[3,1000000]]

4    2    1    [[3,3,0,4]]    305    []    [[3,1000000]]

5    2    1    [[3,3,0,5]]    305    []    [[3,1000000]]

6    2    1    [[3,3,0,6]]    305    []    [[3,1000000]]

7    2    1    [[3,3,0,7]]    305    []    [[3,1000000]]

3    2    1    [[3,3,0,3]]    305    []    [[3,300000]]

4    2    1    [[3,3,0,4]]    305    []    [[3,300000]]

5    2    1    [[3,3,0,5]]    305    []    [[3,300000]]

6    2    1    [[3,3,0,6]]    305    []    [[3,300000]]

7    2    1    [[3,3,0,7]]    305    []    [[3,300000]]

11    2    1    [[3,4,1,1]]    306    [[2318,1]]    []

12    2    1    [[3,4,1,2]]    306    [[2318,1]]    []

13    2    1    [[3,4,1,3]]    306    [[2318,1]]    []