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

cehua-TT

2018-11-05 d3e0f850a0825ea91bc5bab1d57b63a19a7aa973

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

 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt

New file
@@ -0,0 +1,5 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    IsDayReset

1    test1    []    2018-5-29    2018-5-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

2    test2    []    2018-5-31    2018-5-1    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

3    test3    []    2018-5-2    2018-5-3    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0

4    tast4    [7001,7002,7003,8002,8003,8004]    2018-9-29    2018-9-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0


 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt

New file
@@ -0,0 +1,5 @@
CfgID    StartDate    EndDate    LimitLV    IsDayReset    TemplateIDList

1    2018-5-29    2018-5-30    50    0    2

2    2018-5-31    2018-5-1    50    0    3

3    2018-5-2    2018-5-3    50    0    3

4    2018-9-29    2018-9-30    50    0    3


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -269,7 +269,7 @@
XMZZRobotSkill    {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}                

XMZZPKAward    [0,10,20,30,40,50,60,70,80,90]    addPer+100 + int(math.ceil(HPPer/10.0))    50    reExp*216*(100+addPer)/100    reExp*108

PayRMB    10                

OSCBillboardOpen    {"2":[20,1,2],"7":[40,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}    10			
OSCBillboardOpen    {"2":[20,1,2],"7":[50,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}    10			
OSCRankRedpackAward    {1:80,(2,5):81}                

WeekResetSuccType    []                

InvestCost    {"1":[300],"2":[98],"3":[300,680,1280,1880]}                


 db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt

@@ -1,8 +1,8 @@
RangListType    Condition    Gift

2    15    {"1":[[181,15],[4303,2]],"2":[[181,15],[4303,2]],"3":[[181,15],[4303,2]]}

2    10    {"1":[[181,10],[4303,1]],"2":[[181,10],[4303,1]],"3":[[181,10],[4303,1]]}

7    30    {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}

7    20    {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}

7    40    {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}

7    30    {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}

3    9    {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}

3    6    {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}

4    190    {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}


 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt

New file
@@ -0,0 +1,13 @@
TemplateID    NeedRechargeGold    AwardIndex    AwardItem    NotifyKey

1    128    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

1    588    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

1    1588    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

1    5000    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2

2    60    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

2    150    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

2    300    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

2    1500    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2

3    60    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

3    150    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

3    300    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3

3    1500    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2