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

cehua_TRX

2018-08-29 a19ad4d3db2133bafc4b88f2ef080d79ffded9bf

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

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -263,9 +263,9 @@
OfflinePostItem    181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502                

TreasureSet    10    {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}            

TreasureSet11    [1, 10]    [248, 1984]    [[982,1], [982, 8]]    [0, 0]    [10, 100]

TreasureSet21    int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0)))    [1, 10]    300		
TreasureSet21    max(baseRate,min(curLuck,30)*0.001+min(max(curLuck-30,0),10)*0.002+min(max(curLuck-40,0),20)*0.005)    [1, 10]    1000		
TreasureSet12    [1, 10]    [98, 784]    [[983,1], [983, 8]]    [1440, 0]    [5, 50]

TreasureSet22    int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0)))    [1, 10]    300		
TreasureSet22    min(0.05,baseRate+curLuck/300.0*(0.01-baseRate)*max(1,curLuck/100.0))    [1, 10]    1000		
OpenServerRedPacketType    5                

OSRAllMoneySys    [100,300,500,800,1000,1200,1500,1800]                

OpenServerRedPacketCfg    3    10    3600    50    


 db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt

@@ -1,8 +1,8 @@
TreasureType    MinLV    GridItemInfo    JobItemList    GridItemRateListFree    GridItemRateList1    GridItemRateList2    GridItemRateList3    LuckyGridNum

1    0    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,3],"5":[181,100],"6":[2327,1],"7":[4,1],"8":[4151,100],"9":[181,20],"10":[2319,1],"11":[198,1],"12":[2328,1],"13":[2326,1],"14":[912,3]}    []    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(3333,5),(6667,8),(10000,12)]    {3:[(3333,5),(6667,8),(10000,12)]}    1

1    200    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,3],"5":[181,100],"6":[2327,1],"7":[2329,1],"8":[4151,100],"9":[181,20],"10":[2319,1],"11":[198,1],"12":[2328,1],"13":[2326,1],"14":[912,3]}    []    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(3333,5),(6667,8),(10000,12)]    {3:[(3333,5),(6667,8),(10000,12)]}    1

1    250    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,3],"5":[181,100],"6":[2327,1],"7":[2329,1],"8":[4151,100],"9":[181,20],"10":[2319,1],"11":[198,1],"12":[5303,500],"13":[2326,1],"14":[912,3]}    []    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(10,1),(992,2),(1974,3),(2956,4),(3206,5),(4188,6),(5171,7),(5421,8),(6403,9),(7385,10),(8367,11),(8617,12),(9600,13),(10000,14)]    [(3333,5),(6667,8),(10000,12)]    {3:[(3333,5),(6667,8),(10000,12)]}    1

2    0    {"1":[4370,1],"2":[4333,1],"3":[4369,1],"4":[4319,1],"5":[2332,1],"6":[4368,1],"7":[4314,1],"8":[4335,1],"9":[4334,1],"10":[2330,1],"11":[4394,1],"12":[4395,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(214,2),(214,3),(428,4),(428,5),(642,6),(857,7),(857,8),(1071,9),(9071,10),(9285,11),(9285,12),(9785,13),(10000,14)]    [(10,1),(751,2),(951,3),(1692,4),(1892,5),(2634,6),(3375,7),(3575,8),(4317,9),(7317,10),(8058,11),(8258,12),(9258,13),(10000,14)]    [(2500,3),(5000,5),(7500,8),(10000,12)]    {3:[(2500,3),(5000,5),(7500,8),(10000,12)]}    1

2    200    {"1":[4370,1],"2":[4384,1],"3":[4369,1],"4":[4354,1],"5":[2332,1],"6":[4368,1],"7":[4349,1],"8":[4335,1],"9":[4334,1],"10":[2330,1],"11":[4364,1],"12":[4355,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(214,2),(214,3),(428,4),(428,5),(642,6),(857,7),(857,8),(1071,9),(9071,10),(9285,11),(9285,12),(9785,13),(10000,14)]    [(10,1),(751,2),(951,3),(1692,4),(1892,5),(2634,6),(3375,7),(3575,8),(4317,9),(7317,10),(8058,11),(8258,12),(9258,13),(10000,14)]    [(2500,3),(5000,5),(7500,8),(10000,12)]    {3:[(2500,3),(5000,5),(7500,8),(10000,12)]}    1

2    250    {"1":[4370,1],"2":[4384,1],"3":[4369,1],"4":[4354,1],"5":[2332,1],"6":[4359,1],"7":[4354,1],"8":[4335,1],"9":[4334,1],"10":[2330,1],"11":[4389,1],"12":[4360,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(214,2),(214,3),(428,4),(428,5),(642,6),(857,7),(857,8),(1071,9),(9071,10),(9285,11),(9285,12),(9785,13),(10000,14)]    [(10,1),(751,2),(951,3),(1692,4),(1892,5),(2634,6),(3375,7),(3575,8),(4317,9),(7317,10),(8058,11),(8258,12),(9258,13),(10000,14)]    [(2500,3),(5000,5),(7500,8),(10000,12)]    {3:[(2500,3),(5000,5),(7500,8),(10000,12)]}    1

2    350    {"1":[4370,1],"2":[4359,1],"3":[4369,1],"4":[4379,1],"5":[2332,1],"6":[4374,1],"7":[4354,1],"8":[4335,1],"9":[4334,1],"10":[2330,1],"11":[4389,1],"12":[4380,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(214,2),(214,3),(428,4),(428,5),(642,6),(857,7),(857,8),(1071,9),(9071,10),(9285,11),(9285,12),(9785,13),(10000,14)]    [(10,1),(751,2),(951,3),(1692,4),(1892,5),(2634,6),(3375,7),(3575,8),(4317,9),(7317,10),(8058,11),(8258,12),(9258,13),(10000,14)]    [(2500,3),(5000,5),(7500,8),(10000,12)]    {3:[(2500,3),(5000,5),(7500,8),(10000,12)]}    1

1    0    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}    []    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(4000,5),(8000,8),(10000,12)]    {1:[(6000,5),(9000,8),(10000,12)]}    1

1    200    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}    []    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(4000,5),(8000,8),(10000,12)]    {1:[(6000,5),(9000,8),(10000,12)]}    1

1    250    {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}    []    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]    [(4000,5),(8000,8),(10000,12)]    {1:[(6000,5),(9000,8),(10000,12)]}    1

2    0    {"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]    [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]    [(1000,3),(2000,5),(6000,8),(10000,12)]    {1:[(1000,6)(7000,8),(10000,9)]}    1

2    200    {"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]    [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]    [(1000,3),(2000,5),(6000,8),(10000,12)]    {1:[(1000,6)(7000,8),(10000,9)]}    1

2    250    {"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]    [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]    [(1000,3),(2000,5),(6000,8),(10000,12)]    {1:[(1000,6)(7000,8),(10000,9)]}    1

2    300    {"1":[4425,1],"2":[4379,1],"3":[4370,1],"4":[4369,1],"5":[4400,1],"6":[4368,1],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4374,1],"11":[4304,20],"12":[4405,1],"13":[2331,1],"14":[4305,10]}    []    [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]    [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]    [(1000,3),(2000,5),(6000,8),(10000,12)]    {1:[(1000,6)(7000,8),(10000,9)]}    1