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

cehua_LC

2018-09-21 37d2775fd8a284d501daa160d10b05ad45ece70a

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

 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -215,13 +215,13 @@
20302005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:500000,2000:80000,2001:20000,2002:0}    {}    {}    0    0    0    0    []    []

20302006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:500000,2000:80000,2001:20000,2002:0}    {}    {}    0    0    0    0    []    []

20302007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:500000,2000:80000,2001:20000,2002:0}    {}    {}    0    0    0    0    []    []

20303001    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1123    1685    []    [958]

20303002    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1123    1685    []    [958]

20303001    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:1000000,2001:800000,2002:200000,3001:300000,3002:240000,3003:60000}    {}    {}    25    800    1123    1685    []    [958]

20303002    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:900000,2001:720000,2002:180000,3001:400000,3002:320000,3003:80000}    {}    {}    25    800    1123    1685    []    [958]

20303003    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1129    1694    []    [958]

20303004    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,102):1000000,(6,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1129    1694    []    [958]

20303005    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1129    1694    []    [958]

20303006    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1356    1824    []    [958]

20303007    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:500000,3002:400000,3003:100000}    {}    {}    25    800    1356    1824    []    [958]

20303005    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:600000,3002:480000,3003:120000}    {}    {}    25    800    1129    1694    []    [958]

20303006    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:700000,3002:560000,3003:140000}    {}    {}    25    800    1356    1824    []    [958]

20303007    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,102):1000000,(7,5,102):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:3000000,2000:750000,2001:600000,2002:150000,3001:800000,3002:640000,3003:160000}    {}    {}    25    800    1356    1824    []    [958]

50103001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4202:62500,4253:1000000,4151:1000000,2379:1000000}    {4253:3,4151:30,2379:2}    {}    {}    {}    0    0    0    0    []    [1023]

50103002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {250:31250,224:1000000,181:1000000,2380:1000000}    {224:5,181:40,2380:3}    {}    {}    {}    0    0    0    0    []    [1023]

50103003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4213:31250,4252:1000000,4151:1000000,2379:1000000}    {4252:5,4151:40,2379:3}    {}    {}    {}    0    0    0    0    []    [1023]


 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt

@@ -9,6 +9,6 @@
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"}]}

9    8    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]}    150000    {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}

10    7    0    50    0    {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}    167000    {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}

11    11    0    25    50    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}    33000    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}

11    11    0    25    50    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*7+max(min(7,extraData)-6,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}    33000    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}

12    9    0    25    0    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}    200000    {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}

13    12    0    20    0    {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"}    200000    {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}