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

cehua_LC

2018-09-28 996ccd92eea5eb680799aaf3de957713a556873d

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

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt

@@ -4,7 +4,7 @@
5    3    200    1    [(7002,1,0),(4608,2,0)]    7002    LimitGift3

7    4    320    1    [(4214,1,0),(4151,200,0)]    4214    LimitGift3

8    5    600    1    [(4606,2,0),(4607,2,0)]    4606    LimitGift3

4    6    70    1    [(4215,1,1),(4608,40,1)]    4215    LimitGift3

4    6    70    1    [(4215,1,1),(4151,40,1)]    4215    LimitGift3

6    7    210    1    [(263,1,1),(181,120,1)]    263    LimitGift3

5    8    140    1    [(4220,1,1),(4608,80,1)]    4220    LimitGift3

5    8    140    1    [(4220,1,1),(4151,80,1)]    4220    LimitGift3

8    9    360    1    [(4215,1,1),(262,200,1)]    4215    LimitGift3