parent: 1d7d6ec8 | 补丁 | 提交 | ignore whitespace
cehua_LC
2018-10-08 29eed6221fb4cd3b2c49769266c5c4c0e1662df6 
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
5个文件已修改
70 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt


@@ -18,6 +18,7 @@


20203005    21100    int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25)))    [335,385]    40    5    2016    100    世界BOSS



20203006    21100    int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35)))    [340,390]    40    5    2017    100    世界BOSS



10903001    10090    int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25)))    [380,450]    40    5    2004    100    世界BOSS



11003001    10100    int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25)))    [380,450]    40    5    2047    100    世界BOSS



20203007    21100    int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35)))    [385,435]    40    5    2018    100    世界BOSS



11103001    10110    int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35)))    [430,500]    40    5    2004    100    世界BOSS



20303001    21110    3000    [1,500]    40    5    2040    100    世界BOSS





 db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt


@@ -1,14 +1,14 @@


ID    TotalTimes    AddPoint



1    10    25



2    10    20



3    10    5



4    2    20



1    10    10



5    3    25



6    20    1



7    3    15



8    12    5



9    1    20



8    10    5



7    3    25



4    1    20



10    10    5



11    3    10



12    2    20



13    2    20



9    1    20



12    2    25



13    2    25



11    10    5



2    10    5



3    10    2





 db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt


@@ -1,16 +1,16 @@


WorldLvNum    Index    NeedPoint    Award



0    0    140    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



0    1    260    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



0    0    120    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



0    1    240    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



0    2    320    {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}



0    3    400    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



0    4    480    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



1    0    140    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



1    1    260    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



0    3    420    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



0    4    520    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



1    0    120    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



1    1    240    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



1    2    320    {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}



1    3    400    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



1    4    480    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



2    0    140    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



2    1    260    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



1    3    420    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



1    4    520    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



2    0    120    {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}



2    1    240    {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}



2    2    320    {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}



2    3    400    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



2    4    480    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



2    3    420    {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}



2    4    520    {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}





 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt


@@ -18,6 +18,7 @@


20203005    21100    94    0    0    0    2016



20203006    21100    95    0    0    0    2017



10903001    10090    90    0    0    0    2004



11003001    10100    90    0    0    0    2047



20203007    21100    96    0    0    0    2018



11103001    10110    90    0    0    0    2004



20303001    21110    90    0    0    0    2040





 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt


@@ -26,18 +26,18 @@


10501001    0    190    1    0    [(998894,0),(999125,(3,1,107)),(999956,(3,2,107)),(1000000,(3,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:3,4002:15,4003:15,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    76    114    []    []



10501002    0    200    1    0    [(998454,0),(998685,(3,1,107)),(999932,(3,2,107)),(1000000,(3,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:3,4002:15,4003:15,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    80    120    []    []



10501003    0    210    1    0    [(998288,0),(998514,(3,1,107)),(999916,(3,2,107)),(1000000,(3,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:0,4006:0,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    84    126    []    []



10501004    0    220    1    0    [(999368,0),(999581,(4,1,107)),(999933,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:10,4006:10,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    88    132    [18,1,1,[4005]]    []



10501005    0    230    1    0    [(999328,0),(999542,(4,1,107)),(999926,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:10,4006:10,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    91    137    [18,1,1,[4006]]    []



10502001    0    240    1    0    [(998992,0),(999207,(4,1,107)),(999918,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:10,4006:10,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    95    142    [18,1,1,[4008]]    []



10601001    0    250    1    0    [(998870,0),(999085,(4,1,107)),(999912,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    98    147    [18,1,1,[4009]]    []



10601002    0    260    1    0    [(998449,0),(998664,(4,1,107)),(999905,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    101    152    []    []



10601003    0    270    1    0    [(999375,0),(999577,(5,1,107)),(999932,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    105    157    []    []



10601004    0    280    1    0    [(999337,0),(999539,(5,1,107)),(999925,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    108    161    []    []



10601005    0    290    1    0    [(999005,0),(999207,(5,1,107)),(999918,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    111    166    []    []



10602001    0    300    1    0    [(998883,0),(999085,(5,1,107)),(999912,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:5,4151:18,181:38}    {}    {}    {}    {}    1    200    111    166    []    []



10701001    0    310    1    0    [(998438,0),(998643,(5,1,107)),(999903,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:7,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10701002    0    320    1    0    [(999376,0),(999570,(6,1,107)),(999931,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:8,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10701003    0    330    1    0    [(999338,0),(999532,(6,1,107)),(999924,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:8,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10501004    0    220    1    0    [(999368,0),(999581,(4,1,107)),(999933,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:12,4006:12,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    88    132    [18,1,1,[4005]]    []



10501005    0    230    1    0    [(999328,0),(999542,(4,1,107)),(999926,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:12,4006:12,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    91    137    [18,1,1,[4006]]    []



10502001    0    240    1    0    [(998992,0),(999207,(4,1,107)),(999918,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:0,4009:0,4005:12,4006:12,4502:0,956:0,4151:18,181:34}    {}    {}    {}    {}    1    200    95    142    [18,1,1,[4008]]    []



10601001    0    250    1    0    [(998870,0),(999085,(4,1,107)),(999912,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    98    147    [18,1,1,[4009]]    []



10601002    0    260    1    0    [(998449,0),(998664,(4,1,107)),(999905,(4,2,107)),(1000000,(4,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:15,4003:15,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    101    152    []    []



10601003    0    270    1    0    [(999375,0),(999577,(5,1,107)),(999932,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    105    157    []    []



10601004    0    280    1    0    [(999337,0),(999539,(5,1,107)),(999925,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    108    161    []    []



10601005    0    290    1    0    [(999005,0),(999207,(5,1,107)),(999918,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:0,4151:18,181:38}    {}    {}    {}    {}    1    200    111    166    []    []



10602001    0    300    1    0    [(998883,0),(999085,(5,1,107)),(999912,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:4,4002:14,4003:14,4501:0,4008:2,4009:2,4005:12,4006:12,4502:0,956:5,4151:18,181:38}    {}    {}    {}    {}    1    200    111    166    []    []



10701001    0    310    1    0    [(998438,0),(998643,(5,1,107)),(999903,(5,2,107)),(1000000,(5,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:7,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10701002    0    320    1    0    [(999376,0),(999570,(6,1,107)),(999931,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:8,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10701003    0    330    1    0    [(999338,0),(999532,(6,1,107)),(999924,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:10,4006:10,4502:0,956:8,4151:19,181:40}    {}    {}    {}    {}    1    200    111    167    []    []



10701004    0    340    1    0    [(999001,0),(999195,(6,1,107)),(999917,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:13,4003:13,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:9,4151:19,181:40}    {}    {}    {}    {}    1    200    112    167    []    []



10701005    0    350    1    0    [(998876,0),(999070,(6,1,107)),(999910,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:12,4003:12,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:10,4151:19,181:40}    {}    {}    {}    {}    1    200    112    168    []    []



10702001    0    360    1    0    [(998449,0),(998643,(6,1,107)),(999903,(6,2,107)),(1000000,(6,3,107))]    1    {}    0    {}    {3:[(100,0)]}    []    []    {951:5,4002:12,4003:12,4501:0,4008:2,4009:2,4005:9,4006:9,4502:0,956:10,4151:19,181:40}    {}    {}    {}    {}    1    200    112    168    []    []