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

cehua_wcy

2018-08-28 961d1c5e6f2d25aee75af3d484ff7ef3df1373b3

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

 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,155,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,155,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,155,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,155,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,155,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,155,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,155,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,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],

}

)


 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagPetInfo.txt

@@ -10,5 +10,5 @@
50106302    5    GetPet9    4207    1    1000    1    50    6    48305|48310|48315    4|10|20    ['PetUpLv','PetUpLv','PetUpLv5']    31996

50106303    4    GetPet6    4209    1    1000    1    40    6    48335|48340|48345    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    13248

50106304    5    GetPet10    4210    1    1000    1    50    6    48350|48355|48360    4|10|20    ['PetUpLv','PetUpLv','PetUpLv6']    24796

50106305    3    GetPet11    4211    1    1000    1    30    6    48350|48355|48360    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    24796

50106306    4    GetPet12    4212    1    1000    1    40    6    48350|48355|48360    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    24796

50106305    3    GetPet11    4213    1    1000    1    30    6    48350|48355|48360    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    24796

50106306    4    GetPet12    4214    1    1000    1    40    6    48350|48355|48360    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    24796