parent: a13fade5 | 补丁 | 提交 | ignore whitespace
cehua_LC
2018-09-21 dfa5c929a64369a5d6df862fee3f3e80f8574ddc 
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
3个文件已修改
22 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt


@@ -1,6 +1,6 @@


CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    IsDayReset



1    test1    []    2018-8-30    2018-8-31    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate"]    0



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



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



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



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



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



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



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





 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt


@@ -1,6 +1,6 @@


CfgID    StartDate    EndDate    LimitLV    IsDayReset    TemplateIDList



1    2018-8-30    2018-8-31    50    0    1



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



2    2018-7-13    2018-7-15    50    0    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



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



5    5    6    50    0    1





 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt


@@ -18,22 +18,22 @@


106    2    60    7_300                



106    3    80        50300|55300|60300            



107    0    0                    



107    1    50                    1



107    1    50                    2



107    2    100                    3



107    3    110                    2



107    3    110                    4



107    4    130        50500|55500|60500            



108    0    0                    



108    1    80                    4



108    1    80    6_15000				


108    2    130                    6



108    3    160                    5



108    4    190        50600|55600|60600            



109    0    0                    



109    1    90    6_20000				


109    1    90    7_500				


109    2    120                    7



109    3    140                    8



109    4    160        50700|55700|60700            



110    0    0                    



110    1    70    7_800				


110    1    70    6_20000				


110    2    150                    10



110    3    180                    9



110    4    200        50800|55800|60800