parent: 95e95e89 | 补丁 | 提交 | ignore whitespace
cehua_wcy
2018-12-28 b857abe8bf2250d8b5116459ab9e77f5f766bee3 
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
7个文件已修改
86 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt


@@ -1,32 +1,32 @@


DanLV    LVUpScore



0    200



1    400



2    600



3    800



4    1000



5    1480



6    1960



7    2440



8    2920



9    3400



10    4360



11    5320



12    6280



13    7240



14    8200



15    9740



16    11280



17    12810



18    14350



19    15880



20    18040



21    20190



22    22340



23    24490



24    26640



25    29230



26    31810



27    34390



28    36970



29    39550



30    0



DanLV    LVUpScore    MatchRange



0    200    [0, 5]



1    400    [0, 5]



2    600    [0, 5]



3    800    [0, 6]



4    1000    [0, 6]



5    1480    [2, 6]



6    1960    []



7    2440    []



8    2920    []



9    3400    []



10    4360    []



11    5320    []



12    6280    []



13    7240    []



14    8200    []



15    9740    []



16    11280    []



17    12810    []



18    14350    []



19    15880    []



20    18040    []



21    20190    []



22    22340    []



23    24490    []



24    26640    []



25    29230    []



26    31810    []



27    34390    []



28    36970    []



29    39550    []



30    0    []





 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ



 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc

Binary files differ



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

Binary files differ



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

Binary files differ



 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt


@@ -19,7 +19,7 @@


IceLodeSpecial    [31403002]    [23043,23044]            



ClearDevilPoint    1200    {30102001:20,30102002:50,30102003:300}    0    0    0



AI197Point    {"31040":[[16,34],[18,99]],"31340":[[10,29],[58,29],[58,10],[23,10],[23,40]]}                 



AI198Point    {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]]} 				


AI198Point    {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]],"3201100":[[24,23]],"3201101":[[24,23]]} 				


AIRefreshPointNPCRun    {101:[[7,15]],102:[[13,22]],103:[[21,25]]}                



RuneUnlock    0|204|304|404|504|604|704|804    8_100    8_120    9    0



RuneDoubleInlayCnt    101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9                





 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt


@@ -229,13 +229,13 @@


50103005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4151:1000000,4209:7000,4250:1000000,2384:1000000}    {4151:30,4250:5,2384:3}    {}    {}    {}    0    0    0    0    []    [1023]



50103006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {181:1000000,258:2300,223:1000000,2385:1000000}    {181:30,223:5,2385:4}    {}    {}    {}    0    0    0    0    []    [1023]



50103007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4151:1000000,4210:2300,4251:1000000,2386:1000000}    {4151:30,4251:5,2386:4}    {}    {}    {}    0    0    0    0    []    [1023]



33402001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,702:5555}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:300000,13202:300000,13203:533,13204:133,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:694444,7102:625000,7103:166666,7104:41666,7105:16666,702:694444}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:5000000,13202:5000000,13203:133333,13204:33333,13205:11666,13051:166666,13052:41666,13053:8333,13054:4166,13055:2777}    {}    {}    0    0    0    0    []    []



33402002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,702:6944}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,702:125000}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000}    {}    {}    0    0    0    0    []    []



33402003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,702:8333}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:450000,13202:450000,13203:800,13204:200,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33402004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,702:6944}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,702:125000}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000}    {}    {}    0    0    0    0    []    []



33402005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,702:9259}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:500000,13202:500000,13203:888,13204:222,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,702:9259}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:500000,13202:500000,13203:888,13204:222,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,702:166666}    {7101:3,7102:2,7103:1,7104:1,7105:1,702:3}    {13201:3000000,13202:3000000,13203:64000,13204:16000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666}    {}    {}    0    0    0    0    []    []



33402001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:5555}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:300000,13202:300000,13203:533,13204:133,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:694444,7102:625000,7103:166666,7104:41666,7105:16666,701:694444}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:5000000,13202:5000000,13203:133333,13204:33333,13205:11666,13051:166666,13052:41666,13053:8333,13054:4166,13055:2777}    {}    {}    0    0    0    0    []    []



33402002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:6944}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,701:125000}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000}    {}    {}    0    0    0    0    []    []



33402003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:8333}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:450000,13202:450000,13203:800,13204:200,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33402004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:0,7102:0,7103:0,7104:0,7105:0,701:6944}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:375000,13202:375000,13203:666,13204:166,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0}    {}    {}    0    0    0    0    []    []



33403004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {7101:250000,7102:225000,7103:60000,7104:15000,7105:6000,701:125000}    {7101:3,7102:2,7103:1,7104:1,7105:1,701:3}    {13201:2250000,13202:2250000,13203:48000,13204:12000,13205:6000,13051:300000,13052:75000,13053:15000,13054:7500,13055:5000}    {}    {}    0    0    0    0    []    []



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:500000,13202:500000,13203:888,13204:222,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:500000,13202:500000,13203:888,13204:222,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:3000000,13202:3000000,13203:64000,13204:16000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666}    {}    {}    0    0    0    0    []    []