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

cehua-HWJ35

2019-01-29 b54346cb9bfc22e834b40c75e725c32e5d1961aa

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

 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt

@@ -333,6 +333,7 @@
50106313    极炎剑客    1

50106314    阴雷之狼    1

50106315    雷蛟    441

50106318    福瑞宝猪    441

50105001    傲世神驹    1

50105002    枪元素    1

50105003    雷元素    1


 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -60,7 +60,7 @@
OpenServerRedPacketType    5                

OpenServerRedPacketCnt    30                

OSRSuccess    [14,15,16,17,18,19,20,21,22]                

OpenServerRedPacketRain    200    {"31":"OSRedpackSfx2", "32":"OSRedpackSfx3", "5":"OSRedpackSfx", "33":"OSRedpackSfx1"}			
OpenServerRedPacketRain    200    {"31":"OSRedpackSfx1", "32":"OSRedpackSfx2"}			
FeastRedPacket    5    max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5))))    [100,300,500,800,1000,1200,1500,1800]        

GeTuiOffLine    您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战    您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战    您收到来自[%s]的私聊消息，快上线回复对方    升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会]    您关注的诛仙BOSS[%s LV.%s]已经复活，快前往挑战

BillBoardPlayerLoginNotify    [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],]    100    300        


 CoreServerGroup/GameServer/Script/GM/Commands/SetRedPacket.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFBLine.txt

@@ -102,13 +102,13 @@
32010    3    32013    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]            

32010    4    32014    150    0    0    0    0    0    0    0    0    [26,6]    [180,3,10]            

31370    0    31370    0    500    0    0    0    0    0    0    0    [18,18]    [3,180,10, [179,178,120,60]]    101        

31380    0    31380    235    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1]]

31380    1    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1]]

31380    2    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1]]

31380    3    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1]]

31380    4    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    5    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    6    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    7    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    8    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    9    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1]]

31380    0    31380    235    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1],[5500,3,1]]

31380    1    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,2,1],[1158,1,1],[5500,3,1]]

31380    2    31380    300    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1],[5500,4,1]]

31380    3    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,3,1],[1158,1,1],[5500,4,1]]

31380    4    31380    400    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    5    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    6    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    7    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    8    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]

31380    9    31380    500    0    0    0    0    0    0    0    0    [17,19,8]    10            [[5414,4,1],[1158,1,1],[5500,5,1]]


 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -216,7 +216,7 @@
31903003    1000    0    0    0    [(716666,0),(783333,(5,2,107)),(1000000,(5,3,107)),(1000000,(5,2,108)),(1000000,(5,3,108))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):0,(5,3,108):0,(5,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,9074:3000,4609:100000,5202:520000,4151:1000000,4184:1000000,2405:301724}    {4151:4,5202:1}    {2:832000}    {}    {2:5}    0    0    0    0    []    [1006]

31903004    0    0    0    0    [(716666,0),(783333,(6,2,107)),(1000000,(6,3,107)),(1000000,(6,2,108)),(1000000,(6,3,108))]    30    {(6,4,107):1000000,(6,5,107):5000,(6,2,108):0,(6,3,108):0,(6,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:540000,4151:1000000,4184:1000000,2405:301724}    {4151:4,5202:1}    {2:676000}    {}    {2:10}    0    0    0    0    []    [1006]

31903005    0    0    0    0    [(716666,0),(783333,(7,2,107)),(1000000,(7,3,107)),(1000000,(7,2,108)),(1000000,(7,3,108))]    30    {(7,4,107):1000000,(7,5,107):5000,(7,2,108):0,(7,3,108):0,(7,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:560000,4151:1000000,4184:1000000,2405:301724}    {4151:4,5202:1}    {2:732333}    {}    {2:15}    0    0    0    0    []    [1006]

31903006    0    0    0    0    [(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))]    30    {(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:580000,4151:1000000,1906:1000000,5408:4000,2405:297872}    {4151:4,5202:1}    {2:915416}    {}    {2:15}    0    0    0    0    []    [1006]

31903006    0    0    0    0    [(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))]    30    {(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:297872}    {4151:4,5202:1}    {2:915416}    {}    {2:15}    0    0    0    0    []    [1006]

31903007    0    0    0    0    [(716666,0),(783333,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,2,108)),(1000000,(9,3,108))]    30    {(9,4,107):1000000,(9,5,107):5000,(9,2,108):0,(9,3,108):0,(9,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:580000,4151:1000000,1906:1000000,5408:4000,2405:297872}    {4151:4,5202:1}    {2:915416}    {}    {2:15}    0    0    0    0    []    [1006]

31903008    0    0    0    0    [(716666,0),(783333,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,2,108)),(1000000,(10,3,108))]    30    {(10,4,107):1000000,(10,5,107):5000,(10,2,108):0,(10,3,108):0,(10,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:10000,3803:100,3804:50,9074:3000,4609:100000,5202:600000,4151:1000000,1906:1000000,5408:4000,2405:297872}    {4151:4,5202:1}    {2:915416}    {}    {2:15}    0    0    0    0    []    [1006]

30301001    0    260    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []

@@ -268,12 +268,12 @@
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)]}    []    []    {5408:1458}    {}    {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:100}    {}    {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:100}    {}    {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:100}    {}    {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:100}    {}    {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:100}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:450000,3002:900000,3003:150000,4002:585000,4003:65000,5002:80000}    {}    {}    25    800    1356    1824    []    [1156]

60303001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:10}    {8411:1000000}    {}    {}    0    0    0    0    []    []

60303002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:10}    {8412:1000000}    {}    {}    0    0    0    0    []    []

60303003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:13}    {8421:1000000}    {}    {}    0    0    0    0    []    []

60303004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:13}    {8422:1000000}    {}    {}    0    0    0    0    []    []

60303005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:16}    {8431:1000000}    {}    {}    0    0    0    0    []    []

60303006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000}    {5414:16}    {8432:1000000}    {}    {}    0    0    0    0    []    []

40103006    0    0    0    0    [(388426,0),(531759,(10,2,107)),(1000000,(10,3,107))]    30    {(10,4,107):1000000,(10,5,107):10000,(10,2,108):0,(10,3,108):0,(10,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(6400,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:5667,5409:100}    {}    {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,(10,2,107)),(1000000,(10,3,107))]    30    {(10,4,107):1000000,(10,5,107):20000,(10,2,108):0,(10,3,108):0,(10,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(5200,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:8750,5409:100}    {}    {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,(10,2,107)),(1000000,(10,3,107))]    30    {(10,4,107):1000000,(10,5,107):25000,(10,2,108):0,(10,3,108):0,(10,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {5408:14444,5409:100}    {}    {2000:1600000,2001:1400000,2002:1000000,3001:450000,3002:900000,3003:150000,4002:585000,4003:65000,5002:80000}    {}    {}    25    800    1356    1824    []    [1156]

60303001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:10,5500:5}    {8411:1000000}    {}    {}    0    0    0    0    []    []

60303002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:10,5500:5}    {8412:1000000}    {}    {}    0    0    0    0    []    []

60303003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:13,5500:5}    {8421:1000000}    {}    {}    0    0    0    0    []    []

60303004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:13,5500:5}    {8422:1000000}    {}    {}    0    0    0    0    []    []

60303005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:16,5500:5}    {8431:1000000}    {}    {}    0    0    0    0    []    []

60303006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {5414:1000000,1158:1000000,5511:1000000,5500:1000000}    {5414:16,5500:5}    {8432:1000000}    {}    {}    0    0    0    0    []    []


 db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt

@@ -6,3 +6,4 @@
31903005    300

31903006    350

31903007    400

31903008    450


 db/PyMongoDataServer/PySysDB/tagPetInfo.txt

@@ -21,3 +21,4 @@
50106314    4    GetPet20    4222    1    1000    1    35    6    48515|48516|48520|48525    4|10|20|30    ['PetUpLv','PetUpLv','PetUpLv9']    32743

50106315    4    GetPet21    4223    1    1000    1    35    6    48530|48531|48535|48540    4|10|20|30    ['PetUpLv','PetUpLv','PetUpLv10']    32743

50106308    3    GetPet17    4216    1    1000    1    25    6    48485|48490|48495    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    13915

50106318    3    GetPet24    4228    1    1000    1    25    6    48550|48551|48552    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    25561


 db/PyMongoDataServer/SysDB/tagChinNPC.txt

@@ -333,6 +333,7 @@
50106313    16    0    极炎剑客    1    0    3    3    3    1    0    0    3    3    3    0    0    0    0    0    0    0    0    3    3    0    300    2    8    0    0    0    0    0    0    0    0    0    20    2    3    3    0    0    0    0    0    0    105    0    1

50106314    16    0    阴雷之狼    1    0    3    3    3    1    0    0    3    3    3    0    0    0    0    0    0    0    0    3    3    0    300    2    8    0    0    0    0    0    0    0    0    0    20    2    3    3    0    0    0    0    0    0    105    0    1

50106315    16    0    雷蛟    441    0    1    1    1    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1    1    0    300    2    8    0    0    0    0    0    0    0    0    0    20    2    48189    0    0    0    0    0    0    0    105    0    1

50106318    16    0    福瑞宝猪    441    0    1    1    1    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1    1    0    300    2    8    0    0    0    0    0    0    0    0    0    20    2    48189    0    0    0    0    0    0    0    105    0    1

50105001    16    0    傲世神驹    1    0    1    2    26    0    0    0    0    0    0    0    0    0    0    0    0    0    3000    1200    100    0    300    0    2    0    0    0    0    0    0    0    0    0    10    2    203    0    0    0    0    0    0    0    105    1    2

50105002    3    0    枪元素    1    0    1    1    1    0    0    0    0    0    0    0    0    1    0    0    0    0    1000    1    1    0    100    0    10    50932    0    0    0    0    0    0    0    0    10    2    5    0    0    0    0    0    0    0    101    0    1

50105003    3    0    雷元素    1    0    1    1    1    0    0    0    0    0    0    0    0    1    0    0    0    0    1000    1    1    0    100    0    10    55932    0    0    0    0    0    0    0    0    10    2    5    0    0    0    0    0    0    0    101    0    1