Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-HWJ35

2019-01-23 4a7a6b8a4404c4c184af58a786cbf88f43f6390a

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 db/PyMongoDataServer/PySysDB/tagActWeekParty.txt

@@ -1,2 +1,2 @@
CfgID    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    LimitLV    TemplateID    PointAward

1    8    15    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2500]]    {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}

1    8    15    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2500]]    {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}


 db/PyMongoDataServer/PySysDB/tagWeekParty.txt

@@ -20,6 +20,7 @@
1102    11    15    5    [(2427,1,1),(882,1,1)]    25

1103    11    20    5    [(2427,1,1),(882,1,1)]    25

1200    12    1    1    [(2427,1,1),(882,1,1)]    60

1201    12    30    30    [(2427,1,1),(882,1,1)]    60

1300    13    62    62    [(2427,1,1),(882,1,1)]    60

1301    13    15    15    [(2427,1,1),(882,1,1)]    60

1400    14    1    1    [(2427,1,1),(882,1,1)]    10