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

cehua_LC

2018-09-29 8733421a68c4e7c324f520fffc4067caddbdfab6

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

 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt

@@ -2,3 +2,4 @@
1    test1    []    2    3    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

2    test2    []    5    6    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

3    test3    []    8    9    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

4    tast4    [7001,7002,7003,8002,8003,8004]    2018-9-29    2018-9-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0


 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt

@@ -2,3 +2,4 @@
1    2    3    50    0    2

2    5    6    50    0    3

3    8    9    50    0    3

4    2018-9-29    2018-9-30    50    0    3