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

cehua_wcy

2019-01-31 307ec11195808a40c242d7d77d273b4e47cbdf1c

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

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagAlchemy.txt

@@ -7,4 +7,4 @@
106    4611_6|4613_6|4612_6|4614_6|4615_6    746    [[3511,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[69,4732,1]]    41    []    6

107    4611_6|4613_6|4612_6|4614_6|4615_6    895    [[4164,4781,1],[1257,4780,1],[556,4782,1],[1341,4783,1],[1397,4784,1],[1257,4785,1],[28,4733,1]]        []    7

108    4611_6|4613_6|4612_6|4614_6|4615_6    1074    [[4025,4787,1],[1349,4786,1],[556,4788,1],[1349,4789,1],[1349,4790,1],[1349,4791,1],[23,4742,1]]        []    8

109    4611_8|4613_8|4612_8|4614_8|4615_8    1719    [[4031,4792,1],[1349,4793,1],[556,4794,1],[1349,4795,1],[1349,4796,1],[1349,4797,1],[17,4798,1]]        []    9

109    4611_8|4613_8|4612_8|4614_8|4615_8    1719    [[4031,4793,1],[1349,4792,1],[556,4794,1],[1349,4795,1],[1349,4796,1],[1349,4797,1],[17,4798,1]]        []    9


 db/PyMongoDataServer/PySysDB/tagCoat.txt

@@ -8,6 +8,6 @@
7    6006|6206    5806    3    1|1|1    {"1":{"6":5000,"7":170},"2":{"6":10000,"7":340},"3":{"6":15000,"7":510}}

8    6007|6207    5807    3    1|1|1    {"1":{"6":4000,"7":140},"2":{"6":8000,"7":280},"3":{"6":12000,"7":420}}

9    6008|6208    5808    3    1|1|1    {"1":{"6":6000,"7":200},"2":{"6":12000,"7":400},"3":{"6":18000,"7":600}}

10    6009|6209    5809    4    1|1|1|1    {"1":{"6":31900,"7":1070},"2":{"6":63800,"7":2140},"3":{"6":95700,"7":3210},"4":{"6":127600,"7":2580}}

11    6010|6210    5810    4    1|1|1|1    {"1":{"6":25500,"7":850},"2":{"6":51000,"7":1700},"3":{"6":76500,"7":2550},"4":{"6":102000,"7":3400}}

12    6011|6211    5811    4    1|1|1|1    {"1":{"6":38300,"7":1280},"2":{"6":76600,"7":2560},"3":{"6":114900,"7":3840},"4":{"6":153200,"7":5120}}

10    6009|6209    5809    5    1|1|1|1|1    {"1":{"6":31900,"7":1070},"2":{"6":63800,"7":2140},"3":{"6":95700,"7":3210},"4":{"6":127600,"7":4280},"5":{"6":159500,"7":5350}}

11    6010|6210    5810    5    1|1|1|1|1    {"1":{"6":25500,"7":850},"2":{"6":51000,"7":1700},"3":{"6":76500,"7":2550},"4":{"6":102000,"7":3400},"5":{"6":127500,"7":4250}}

12    6011|6211    5811    5    1|1|1|1|1    {"1":{"6":38300,"7":1280},"2":{"6":76600,"7":2560},"3":{"6":114900,"7":3840},"4":{"6":153200,"7":5120},"5":{"6":191500,"7":6400}}