Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

CeHua_ZWJ

2018-09-06 a051b352d76f70a75b0fdff9f6766b6adfd61e74

Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt

@@ -1,3 +1,3 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    LimitLV    TemplateID

1    test1    []    2018-9-14    2018-9-15    {0:["BossFHOpen", []]}    {}    110    1

2    test2    []    2018-7-13    2018-7-15    {0:["BossFHOpen", []]}    {}    110    2

1    test1    [7001]    2018-9-14    2018-9-15    {0:["BossFHOpen", []]}    {}    110    1

2    test2    [7002]    2018-9-15    2018-9-16    {0:["BossFHOpen", []]}    {}    110    2


 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt

@@ -1,5 +1,5 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    LimitLV    IsDayReset    TemplateIDList

1    test1    []    2018-9-10    2018-9-11    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

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

1    test1    [7001]    2018-9-10    2018-9-11    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

2    test2    [7002]    2018-9-11    2018-9-12    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    0    1

3    NationalDay    [24]    2018-7-13    2018-7-15    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    1    1|2|3

4    NationalDay1    [24]    2018-7-16    2018-7-17    {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]}    {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]}    50    1    1


 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt

@@ -1,3 +1,3 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    Multiple    LimitLV

1    test1    []    2018-7-31    2018-8-3    {}    {}    2    110

2    test2    []    2018-9-12    2018-9-13    {}    {}    2    110

1    test1    [7001]    2018-9-12    2018-9-13    {}    {}    2    110

2    test2    [7002]    2018-9-13    2018-9-14    {}    {}    2    110