parent: cc3092a9 | 补丁 | 提交 | show whitespace
cehua_LC
2018-12-03 9a115f3559e9dd44ad0903d20198d81fe3bc1cb6 
Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
3个文件已修改
8 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt


@@ -4,3 +4,5 @@


3    test3    []    []    2018-5-2    2018-5-3    {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



5    test5    []    []    2018-11-22    2018-11-23    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



6    tast6    []    []    2018-12-8    2018-12-8    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



7    test7    []    []    2018-12-9    2018-12-9    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0





 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt


@@ -4,3 +4,5 @@


3    2018-5-2    2018-5-3    50    0    3



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



5    2018-11-22    2018-11-23    50    0    4



6    2018-12-8    2018-12-8    50    0    5



7    2018-12-9    2018-12-9    50    0    6





 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt


@@ -16,3 +16,7 @@


4    300    2    [(4007,4,1),(2213,10,1)]    ConsumptionRebate3



4    1500    3    [(4010,8,1),(30,500,1)]    ConsumptionRebate3



4    3000    4    [(4681,1,1),(30,1000,1)]    ConsumptionRebate2



5    100    0    [(912,1,1),(4694,2,1)]    ConsumptionRebate3



5    300    1    [(9131,1,1),(4694,2,1)]    ConsumptionRebate2



6    100    0    [(4609,1,1),(2213,10,1)]    ConsumptionRebate3



6    300    1    [(4610,1,1),(2213,20,1)]    ConsumptionRebate2