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

cehua_wcy

2019-03-04 d0e60491a47ff1409860a915523ad8bf811cb934

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

 CoreServerGroup/GameServer/PyNetPack.ini

@@ -221,6 +221,34 @@
PacketSubCMD_1=0x03

PacketCallFunc_1=OnPYQueryBourseItemOnSale



;拍卖行

[AuctionHouse]

ScriptName = GameWorldLogic\AuctionHouse.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 5



PacketCMD_1=0xB5

PacketSubCMD_1=0x10

PacketCallFunc_1=OnQueryAuctionItem



PacketCMD_2=0xB5

PacketSubCMD_2=0x17

PacketCallFunc_2=OnQueryTagAuctionItem



PacketCMD_3=0xB5

PacketSubCMD_3=0x12

PacketCallFunc_3=OnQueryAuctionRecord



PacketCMD_4=0xB5

PacketSubCMD_4=0x16

PacketCallFunc_4=OnQueryAttentionAuctionItem



PacketCMD_5=0xB5

PacketSubCMD_5=0x18

PacketCallFunc_5=OnAttentionAuctionItemChange



;境界渡劫

[PlayerDuJie.py]

ScriptName = Player\PlayerDuJie.py


 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -84,4 +84,4 @@
CrossRealmPKCfg    [100, 10]    180    50        

CrossRealmPKScore    0    [100, 80]    min(cWinCount*20,100)        

MixServer    5                

MixServerMail    [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]    [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]    [500, 2000000]    [[947,1,1]]	
MixServerMail    [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]    [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]    [500, 2000000]    [[947,1,1]]    100


 CoreServerGroup/GameServer/Script/ChConfig.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/PyDataManager.pyc

Binary files differ

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

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

(

{

    0:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    0:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    1:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    2:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    3:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    4:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    5:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

    6:[10,65,70,80,95,100,105,108,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,205,220,240,250,260,280,300,320,340,350,360,370,380,390,400,410,420,430,440,450],

}

)


 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -1103,6 +1103,22 @@
PacketSubCMD_2=0x02

PacketCallFunc_2=OnPlayerBuyBourseItem



;拍卖行

[PlayerAuctionHouse]

ScriptName = Player\PlayerAuctionHouse.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 2



PacketCMD_1=0xB5

PacketSubCMD_1=0x13

PacketCallFunc_1=OnSellAuctionItem



PacketCMD_2=0xB5

PacketSubCMD_2=0x14

PacketCallFunc_2=OnBiddingAuctionItem



;法宝

[PlayerMagicWeapon]

ScriptName = Player\PlayerMagicWeapon.py


 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AuctionItem.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetEquipWash.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_AuctionHouse.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -170,9 +170,9 @@
FightHappenRate    150                

AngryNPCCount    {31080:20}    8    0    0    0

OpenJob    1|2    0    0    0    0

Strengthen1    1|2|8|9|10    0    0    0    0

Strengthen2    3|4|5|6|7    0    0    0    0

StrengthenLevelLimit    1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_2|9_3|10_3    1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2			
Strengthen1    1|2|9|10|11|12    0    0    0    0

Strengthen2    3|4|5|6|7|8    0    0    0    0

StrengthenLevelLimit    1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_1|9_3|10_2|11_2|12_3    1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2			
StrengthenLevelBroadCast    20|35|50|70|90|110|130|150|170|190                

SkillPlusAttrID    {102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]}    {"102":[50000,55000,60000],"103":[50100,55100,60100],"104":[50400,55400,60400],"105":[50200,55200,60200],"106":[50300,55300,60300],"107":[50800,55800,60800],"108":[51000,56000,61000],"109":[50000,55000,60000],"110":[50100,55100,60100],"111":[50400,55400,60400],"112":[50200,55200,60200],"113":[50300,55300,60300],"114":[50800,55800,60800],"115":[51000,56000,61000]}            

EquipZhuXian        {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}    {"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"3":[129,130,131,132,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"3":[129,130,131,132,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"3":[129,130,131,132,125,126,127,128]}}        

@@ -349,7 +349,7 @@
ZhuXianBossCntCfg    2    4    4        

ZhuXianTowerBossTime    int(min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48,10),119))    8    5        

LuckyAppraisal    30    10    8        

MixServerMail    [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]    [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]    [500, 2000000]    [[947,1,1]]	
MixServerMail    [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]    [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]    [500, 2000000]    [[947,1,1]]    100

MysteryShopGoods    10     [(3000,5),(5000,6),(7000,7),(10000,8)]             

MysteryShopRefresh    3809     {"5":1,"10":2,"15":3,"100000":5}    10    21600    {0:[4,20000]}

EquipPartStar    {"4":{"1":1,"2":2,"3":3,"4":4,"5":9,"6":9}}                


 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt

@@ -1202,6 +1202,11 @@
117370    20402005    21310    0    [151,94,0,15]    1    1    0    600000    0    0    1        5    5    0    0

117372    20402005    21310    0    [149,93,0,15]    1    1    0    600000    0    0    1        5    5    0    0

117374    20402005    21310    0    [155,92,0,15]    1    1    0    600000    0    0    1        5    5    0    0

117375    10104003    10120    0    [43,166,6,15]    1    1    0    0    0    0    1        5    5    0    0

117376    10104004    10120    0    [44,172,6,15]    1    1    0    0    0    0    1        5    5    0    0

117377    10104005    10120    0    [52,170,6,15]    1    1    0    0    0    0    1        5    5    0    0

117378    10104006    10120    0    [50,158,6,15]    1    1    0    0    0    0    1        5    5    0    0

117379    10201004    10120    0    [33,173,6,15]    5    5    0    1000    0    0    1        5    5    0    0

104851    0    21110    0    [8,82,0,15]    1    1    0    0    0    0    1        5    5    0    145

104852    0    21110    0    [42,92,0,15]    1    1    0    0    0    0    1        5    5    0    146

104853    0    21110    0    [51,98,0,15]    1    1    0    0    0    0    1        5    5    0    147