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

cehua_wcy

2019-02-26 e6217f1f10d521f38fc36a707fdb1a6ef4c5b840

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

 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt

@@ -19,4 +19,4 @@
19    []    []    2019-2-12    2019-2-14    1    {0:["BossFHOpen", []]}    {}    110    1

20    []    []    2019-2-17    2019-2-20    1    {0:["BossFHOpen", []]}    {}    110    1

21    []    []    2019-2-22    2019-2-24    1    {0:["BossFHOpen", []]}    {}    110    1

22    []    []    Mix1    Mix1    1    {0:["BossFHOpen", []]}    {}    110    1

22    []    []    Mix1    Mix2    1    {0:["BossFHOpen", []]}    {}    110    1


 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt

@@ -102,3 +102,5 @@
60303004    31380    480    []    0    0    0    100    诛仙Boss

60303005    31380    720    []    0    0    0    100    诛仙Boss

60303006    31380    900    []    0    0    0    100    诛仙Boss

60303007    31380    1200    []    0    0    0    100    诛仙Boss

60303008    31380    1440    []    0    0    0    100    诛仙Boss


 CoreServerGroup/GameServer/PySysDB/tagFBLine.txt

@@ -112,3 +112,4 @@
31380    7    31380

31380    8    31380

31380    9    31380

1000    0    1000


 CoreServerGroup/GameServer/Script/GameWorld.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt

@@ -19,4 +19,4 @@
19    2019-2-12    2019-2-14    1    110    1

20    2019-2-17    2019-2-20    1    110    1

21    2019-2-22    2019-2-24    1    110    1

22    Mix1    Mix1    1    110    1

22    Mix1    Mix2    1    110    1


 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt

@@ -102,3 +102,5 @@
60303004    31380    90    0    0    0    0

60303005    31380    90    0    0    0    0

60303006    31380    90    0    0    0    0

60303007    31380    90    0    0    0    0

60303008    31380    90    0    0    0    0


 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -108,7 +108,8 @@
31380    3    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1],[5500,4,1]]

31380    4    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    5    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    6    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    7    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    8    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    9    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    6    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,5,1],[1158,1,1],[5500,6,1]]

31380    7    31380    560    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,5,1],[1158,1,1],[5500,6,1]]

31380    8    31380    600    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    9    31380    600    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

1000    0    1000    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]			

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -126,7 +126,7 @@
MapDropBindRule    {52010:1,31340:1}    0    0    0    0

MapDropItemNoBind    {52010:[3801,4606,4608]}    0    0    0    0

MapDropItemBind    {}    0    0    0    0

JobItemDropSets    {2:[5012,5022]}    {2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}    {3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]]}		
JobItemDropSets    {2:[5012,5022]}    {2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}    {3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]],8441:[[5000,8441],[10000,8442]],8442:[[3500,8441],[7000,8442],[9000,8444],[10000,8445]]}		
EquipDropPartSets    {102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}                

FamilyBOSSDropRule    6000+grade*800    min(2*playerCount,50)            

FBGradeEquipDropRate    {}    {}    {30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}        


 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -277,3 +277,5 @@
60303004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:13,5500:5}    {8422:1000000}    {}    {}    0    0    0    0    []    []

60303005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:16,5500:5}    {8431:1000000}    {}    {}    0    0    0    0    []    []

60303006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:16,5500:5}    {8432:1000000}    {}    {}    0    0    0    0    []    []

60303007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:25,5500:5}    {8441:1000000}    {}    {}    0    0    0    0    []    []

60303008    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:25,5500:5}    {8442:1000000}    {}    {}    0    0    0    0    []    []


 db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt

@@ -5,3 +5,5 @@
60303004    3    540    0    168000

60303005    4    660    0    226000

60303006    5    780    0    226000

60303007    6    840    0    345000

60303008    7    900    0    345000