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

cehua-TT

2018-09-25 805d987407007d6f4a4acc96db8cce19448565c3

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

 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt

@@ -17,7 +17,7 @@
24    2    0    0

28    800    0    0

34    70    0    0

36    210    0    0

36    205    0    0

40    2    0    0

60    112    0    0

61    30    0    0

@@ -42,7 +42,7 @@
89    110    0    0

90    170    0    0

91    180    0    0

92    210    0    0

92    205    0    0

93    240    0    0

94    16    0    0

95    39    0    0

@@ -86,7 +86,7 @@
134    400    0    0

135    110    0    0

136    180    0    0

137    210    0    0

137    205    0    0

138    260    0    0

139    110    0    0

140        0    0


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -114,7 +114,7 @@
JobItemDropSets    {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],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265]}                

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,4]], 5:[[1015,1],[1131,8],[1134,4]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,4]], 5:[[1015,1],[1132,8],[1135,4]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,45]], 4:[[1016,1],[1133,6],[1136,4]], 5:[[1015,1],[1133,8],[1136,4]]}}		
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,4]], 5:[[1015,1],[1131,8],[1134,4]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,4]], 5:[[1015,1],[1132,8],[1135,4]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,4]], 5:[[1015,1],[1133,8],[1136,4]]}}		
MutexDrop    [[3803,3802,3801]]    0    0    0    0

EquipWashMaxLV    1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10    0    0    0    0

EquipWashGroup1    1|2    0    0    0    0


 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt

@@ -17,7 +17,7 @@
24    2    0    0    0

28    800    0    0    0

34    70    0    0    104060

36    210    0    0    0

36    205    0    0    0

40    2    0    0    0

60    112    0    0    0

61    30    0    0    0

@@ -42,7 +42,7 @@
89    110    0    0    0

90    170    0    0    0

91    180    0    0    0

92    210    0    0    0

92    205    0    0    0

93    240    0    0    0

94    16    0    0    0

95    39    0    0    0

@@ -86,7 +86,7 @@
134    400    0    0    0

135    110    0    0    0

136    180    0    0    0

137    210    0    0    0

137    205    0    0    0

138    260    0    0    0

139    110    0    0    0

140        0    0    0


 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt

@@ -3,7 +3,7 @@
2    1    0    2    0    {"exp":"1125*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"}    6700    {"exp":"618*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}

3    2    0    20    40    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"40"}]}    67000    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"22"}]}

4    3    0    15    0    {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]}    50000    {"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}

5    5    0    15    30    {"exp":"2880*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}    60000    {"exp":"1980*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}

5    5    0    15    30    {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}    60000    {"exp":"990*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}

6    6    1    15    50    {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]}    83000    {"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}

7    10    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"},{"ItemID":102,"ItemCount":"4"}]}    150000    {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}

8    14    0    8    0    {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}    50000    {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}