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

cehua_LC

2018-09-07 392b3bef611ba6e1d90ba72ed68f3021ec0fbc5a

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

 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt

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

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

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

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/tagActExpRate.txt

@@ -1,3 +1,4 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    StartTime    EndTime    NotifyInfoStart    NotifyInfoEnd    LimitLV    AddExpRate

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

2    OpenServer    [7002]    2018-9-14    2018-9-14    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    110    10000

3    OpenServer    [7003]    2018-9-15    2018-9-15    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    110    10000


 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt

@@ -12,3 +12,8 @@
11    2OpenServer03    [7002]    7    2018-9-12    2018-9-12            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    50    1    [[1]]

12    2OpenServer04    [7002]    7    2018-9-13    2018-9-13            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    180    1    [[3]]

13    2OpenServer05    [7002]    7    2018-9-16    2018-9-16            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    280    1    [[5]]

14    3OpenServer01    [7003]    7    2018-9-9    2018-9-9            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    50    1    [[2]]

15    3OpenServer02    [7003]    7    2018-9-11    2018-9-11            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    50    1    [[4]]

16    3OpenServer03    [7003]    7    2018-9-13    2018-9-13            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    50    1    [[1]]

17    3OpenServer04    [7003]    7    2018-9-14    2018-9-14            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    180    1    [[3]]

18    3OpenServer05    [7003]    7    2018-9-17    2018-9-17            {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    280    1    [[5]]


 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt

@@ -12,3 +12,8 @@
11    2018-9-12    2018-9-12            50    1    [[1]]

12    2018-9-13    2018-9-13            180    1    [[3]]

13    2018-9-16    2018-9-16            280    1    [[5]]

14    2018-9-9    2018-9-9            50    1    [[2]]

15    2018-9-11    2018-9-11            50    1    [[4]]

16    2018-9-13    2018-9-13            50    1    [[1]]

17    2018-9-14    2018-9-14            180    1    [[3]]

18    2018-9-17    2018-9-17            280    1    [[5]]