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

hch

2019-01-11 f4fce049573a6420239702e414ddebbe6c96c0af

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt

@@ -816,6 +816,7 @@
CollectNPCFuncTimeLimit    \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeLimit    1bd32d796ae8425bebb215c6a6e4989d    采集NPC次数配置

CollectNPCIDTimeLimit    \NPCLogic\NPCLogic_Collect\CollectNPCIDTimeLimit    1bd32d796ae8425bebb215c6a6e4989d    采集NPCID对应次数限制配置

CollectNPCFuncTimeBuyCost    \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeBuyCost    945df5a93caa521a952cf7cdaa4ed9c6    购买采集NPC次数消耗配置

CollectNPCLostHP    \NPCLogic\NPCLogic_Collect\CollectNPCLostHP    945df5a93caa521a952cf7cdaa4ed9c6    采集掉血配置

CollectItemInfo_20302001    \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302001    bc900f3f565ff8957aba7229b0c09912    采集获得物品模板20302001配置

CollectItemInfo_20302002    \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302002    bc900f3f565ff8957aba7229b0c09912    采集获得物品模板20302002配置

CollectItemInfo_40108001    \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302001    bc900f3f565ff8957aba7229b0c09912    采集获得物品模板40108001配置


 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCLostHP.txt

New file
@@ -0,0 +1,18 @@
# 采集掉血设置 {npcID:[每X秒掉一次血, 掉血百分比], ...}



(



{



# 神兽副本

20302001:[2, 2],

20302001:[2, 4],



# 蓬莱仙境

40108001:[2, 2],

40108002:[2, 4],





}



)

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -239,18 +239,16 @@
33402005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:333333,13202:166666,13203:1388,13204:0,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []

33402006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:333333,13202:166666,13203:1388,13204:0,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []

33403006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:333333,7102:300000,7103:80000,7104:20000,7105:8000,701:166666}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:2000000,13202:1000000,13203:100000,13204:20000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666}    {}    {}    0    0    0    0    []    []

40102001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40102007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:700000,2000:50000,2001:0,2002:0}    {}    {}    0    0    0    0    []    []

40103001    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,107):1000000,(6,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0}    {}    {}    25    800    1123    1685    []    [1144]

40103002    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,107):1000000,(6,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0}    {}    {}    25    800    1123    1685    []    [1144]

40103003    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,107):1000000,(6,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1750000,2001:1000000,2002:250000,3001:100000,3002:0,3003:0}    {}    {}    25    800    1123    1685    []    [1144]

40103004    0    0    0    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    20    {(6,4,107):1000000,(6,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1700000,2001:1000000,2002:300000,3001:112500,3002:37500,3003:0}    {}    {}    25    800    1129    1694    []    [1144]

40103005    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,107):1000000,(7,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1650000,2001:1000000,2002:350000,3001:150000,3002:50000,3003:0}    {}    {}    25    800    1129    1694    []    [1144]

40103006    0    0    0    0    [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))]    20    {(7,4,107):1000000,(7,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1600000,2001:1000000,2002:400000,3001:210000,3002:75000,3003:15000}    {}    {}    25    800    1129    1694    []    [1144]

40103007    0    0    0    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    20    {(8,4,107):1000000,(8,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1550000,2001:1000000,2002:450000,3001:280000,3002:100000,3003:20000}    {}    {}    25    800    1356    1824    []    [1144]

40103008    0    0    0    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    20    {(8,4,107):1000000,(8,5,107):2000}    1    {4:2,5:1}    {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]}    []    []    {}    {}    {1000:0,2000:1500000,2001:1000000,2002:500000,3001:350000,3002:125000,3003:25000}    {}    {}    25    800    1356    1824    []    [1144]

40102001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:1000000,2000:150000,2001:75000,2002:25000}    {}    {}    0    0    0    0    []    []

40102002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:1000000,2000:180000,2001:90000,2002:30000}    {}    {}    0    0    0    0    []    []

40102003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:1000000,2000:210000,2001:105000,2002:35000}    {}    {}    0    0    0    0    []    []

40102004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:1000000,2000:240000,2001:120000,2002:40000}    {}    {}    0    0    0    0    []    []

40102005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:1000000,2000:270000,2001:135000,2002:45000}    {}    {}    0    0    0    0    []    []

40103001    0    0    0    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):30000,(7,2,108):0,(7,3,108):0,(7,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5200,1),(10000,2)],5:[(10000,2)]}    []    []    {}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:150000,3002:300000,3003:50000,4002:162000,4003:18000}    {}    {}    25    800    1123    1685    []    [1156]

40103002    0    0    0    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):10000,(8,2,108):0,(8,3,108):0,(8,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(6400,1),(10000,2)],5:[(10000,2)]}    []    []    {}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:180000,3002:360000,3003:60000,4002:207000,4003:23000}    {}    {}    25    800    1123    1685    []    [1156]

40103003    0    0    0    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):20000,(8,2,108):0,(8,3,108):0,(8,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5200,1),(10000,2)],5:[(10000,2)]}    []    []    {}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:210000,3002:420000,3003:70000,4002:226333,4003:25148}    {}    {}    25    800    1123    1685    []    [1156]

40103004    0    0    0    0    [(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):10000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(6400,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:2778,5409:555}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:240000,3002:480000,3003:80000,4002:270000,4003:30000}    {}    {}    25    800    1129    1694    []    [1156]

40103005    0    0    0    0    [(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):20000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5200,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:4333,5409:666}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:270000,3002:540000,3003:90000,4002:288000,4003:32000}    {}    {}    25    800    1129    1694    []    [1156]

40103006    0    0    0    0    [(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):10000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(6400,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:5667,5409:666}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:300000,3002:600000,3003:100000,4002:405000,4003:45000,5002:60000}    {}    {}    25    800    1129    1694    []    [1156]

40103007    0    0    0    0    [(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):20000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5200,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:8750,5409:833}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:360000,3002:720000,3003:120000,4002:450000,4003:50000,5002:70000}    {}    {}    25    800    1356    1824    []    [1156]

40103008    0    0    0    0    [(388426,0),(531759,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):25000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:14444,5409:1111}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:450000,3002:900000,3003:150000,4002:585000,4003:65000,5002:80000}    {}    {}    25    800    1356    1824    []    [1156]