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

cehua_wcy

2018-08-24 c859bdbf07655bc76a10b4486b14a6a5a2e80802

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

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -40,7 +40,7 @@
TeamReadyTime    30                

BossShunt    10040|21070    2    5        

MapLine    10040_10|21070_1                

DropRecordValue    2339|3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
DropRecordValue    3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
DropRecordNum    40    1            

KillBossCntLimit    {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}    0_3|1_0|2_3    {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'}    {1:27}    {0:[21,'WorldBossNoHarm']}

CreateRoleMap    {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}                


 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt

@@ -9,7 +9,7 @@
10    70    0    0

12    80    0    0

15    65    0    0

16    135    0    0

16    125    0    0

20    110    0    0

21    115    0    0

22    115    0    0


 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt

@@ -2,12 +2,12 @@
#{职业:[等级]}

(

{

    0:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[70,80,95,100,105,115,120,125,128,130,135,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    0:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],

}

)


 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -45,14 +45,14 @@
31220    0    31220    110    0    0    0    0    0    0    0    0    [12,23]                

31230    0    31230    0    0    0    0    0    0    0    0    0    [12,6]    [900,[30,20,10,9,8,7,6,5,4,3,2,1]]            

31240    0    31240    0    0    0    4010    2    80    0    0    0    [32,16]    [5,1800,15,101]            

51010    0    51010    190    500    0    0    0    0    0    0    0    [24,20,3]    [10,1800,10]    [{5101011:1},{5101012:1},{5101013:1},{5101014:1}]    [135,33,33,33,33]    [424500, [141,10]]

51010    1    51010    190    500    0    0    0    0    0    0    0    [70,19,3]    [10,1800,10]    [{5101021:1},{5101022:1},{5101023:1},{5101024:1}]    [135,33,33,33,33]    [536000, [141,10]]

51010    2    51010    190    500    0    0    0    0    0    0    0    [126,9,3]    [10,1800,10]    [{5101031:1, 5101032:1}]    [152,38,38,38,38]    [665000, [141,15]]

51010    3    51010    190    500    0    0    0    0    0    0    0    [30,62,3]    [10,1800,10]    [{5101041:0, 5101042:1}]    [155,38,38,38,38]    [812000, [142,10]]

51010    4    51010    190    500    0    0    0    0    0    0    0    [84,63,3]    [10,1800,10]    [{5101051:1, 5101052:0}]    [150,38,38,38,38]    [975500, [142,15]]

51010    5    51010    190    500    0    0    0    0    0    0    0    [137,73,3]    [10,1800,10]    [{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]    [153,38,38,38,38]    [1157000, [143,10]]

51010    6    51010    190    500    0    0    0    0    0    0    0    [14,114,3]    [10,1800,10]    [{5101071:1, 5101072:0}]    [155,38,38,38,38]    [1356500, [143,15]]

51010    7    51010    190    500    0    0    0    0    0    0    0    [71,111,3]    [10,1800,10]    [{5101081:1}]    [220,38,38,38,38]    [1573500, [144,10]]

51010    0    51010    160    500    0    0    0    0    0    0    0    [24,20,3]    [10,1800,10]    [{5101011:1},{5101012:1},{5101013:1},{5101014:1}]    [135,33,33,33,33]    [424500, [141,10]]

51010    1    51010    160    500    0    0    0    0    0    0    0    [70,19,3]    [10,1800,10]    [{5101021:1},{5101022:1},{5101023:1},{5101024:1}]    [135,33,33,33,33]    [536000, [141,10]]

51010    2    51010    160    500    0    0    0    0    0    0    0    [126,9,3]    [10,1800,10]    [{5101031:1, 5101032:1}]    [152,38,38,38,38]    [665000, [141,15]]

51010    3    51010    160    500    0    0    0    0    0    0    0    [30,62,3]    [10,1800,10]    [{5101041:0, 5101042:1}]    [155,38,38,38,38]    [812000, [142,10]]

51010    4    51010    160    500    0    0    0    0    0    0    0    [84,63,3]    [10,1800,10]    [{5101051:1, 5101052:0}]    [150,38,38,38,38]    [975500, [142,15]]

51010    5    51010    160    500    0    0    0    0    0    0    0    [137,73,3]    [10,1800,10]    [{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]    [153,38,38,38,38]    [1157000, [143,10]]

51010    6    51010    160    500    0    0    0    0    0    0    0    [14,114,3]    [10,1800,10]    [{5101071:1, 5101072:0}]    [155,38,38,38,38]    [1356500, [143,15]]

51010    7    51010    160    500    0    0    0    0    0    0    0    [71,111,3]    [10,1800,10]    [{5101081:1}]    [220,38,38,38,38]    [1573500, [144,10]]

60010    0    60010    105    500    0    0    0    0    0    0    0    [83,13]    [10,1800,50,10]    [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]        {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}

60010    1    60010    150    500    0    0    0    0    0    0    0    [208,24]    [10,1800,50,10]    [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]        {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}

60010    2    60010    200    500    0    0    0    0    0    0    0    [317,21]    [10,1800,50,10]    [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]        {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -205,9 +205,9 @@
DungeonIntegral    10000                

BuyFBCntCost    {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}                

FBEncourageBuff    {31080:20051,52010:20051}                

DropRecordValue    2339|3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
DropRecordValue    3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
DropRecordEquipment    {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}                

DropRecordNormal    2320|4606|4607|4608|4609|4610|3801|5302|5206|5207|5202|5006|5007|4182				
DropRecordNormal    2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182				
DropRecordBossID    10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006                

PKConfig    [[22,00], [8,00]]    50    10    10    

FamilyKilledNotify    {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}                


 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt

@@ -9,7 +9,7 @@
10    70    0    0    0

12    80    0    0    0

15    65    0    0    0

16    135    0    0    0

16    125    0    0    0

20    110    0    0    0

21    115    0    0    0

22    115    0    0    0


 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -421,7 +421,7 @@
2317    1    0    神兵石大礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    1800    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2318    1    0    二品秘方礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    70    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2319    1    0    二品阴魄礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    170    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2320    1    0    五行炼丹材料    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    50    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2320    1    0    炼丹材料    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    50    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2321    1    0    炼丹材料袋    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    50    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2322    1    0    炼丹材料袋    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    10    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2323    1    0    炼丹材料袋    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    80    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0