parent: 42d22763 | 补丁 | 提交 | ignore whitespace
cehua_LC
2018-09-20 86332d3e0a6275ab91ddd67e2c45c1485a758615 
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
4个文件已修改
8 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActExpRate.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt


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


2    test2    [24,30]    2018-7-13    2018-7-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate4"]    1



3    NationalDay    []    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate4"]    1



4    NationalDay1    [24]    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate4"]    1



5    test3    []    5    6    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate4"]    1





 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt


@@ -1,4 +1,2 @@


CfgID    ActMark    ServerIDList    StartDate    EndDate    StartTime    EndTime    NotifyInfoStart    NotifyInfoEnd    LimitLV    AddExpRate



1    test1    []    2018-7-14    2018-7-15    12:00|18:00    13:00|19:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    110    10000



2    test2    []    2018-9-13    2018-9-15    12:00|18:00    13:00|19:00    { 0:["ExpActivity_Start", [3]]}    {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}    110    20000



3    NationalDay    []    2018-7-18    2018-7-18    12:00    13:00    { 0:["ExpActivity_Start", [5]]}    {-5:["ExpActivity_End", [5]], 0:["ExpActivity_Close", [5]]}    110    40000



1    OpenServer    []    7    7    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    110    10000





 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt


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


2    2018-7-13    2018-7-15    50    1    3



3    2018-9-13    2018-9-15    50    1    1|2|3



4    2018-9-13    2018-9-15    50    1    1



5    5    6    50    1    1





 db/PyMongoDataServer/PySysDB/tagActExpRate.txt


@@ -1,4 +1,2 @@


CfgID    LimitLV    AddExpRate



1    110    10000



2    110    20000



3    110    40000