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

cehua-TT

2019-01-18 2bda68391ddef973c78d43dd31127fc0358ee0b6

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

 CoreServerGroup/GameServer/PySysDB/tagActLoginAward.txt

New file
@@ -0,0 +1,2 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    NotifyInfoStart    NotifyInfoEnd    LimitLV

1    OpenSever1    []    []    2099-1-1    2099-1-3    300    1    1    {0:["SevenDayStart", []],30:["SevenDayStart", []],60:["SevenDayStart", []],180:["SevenDayStart", []],360:["SevenDayStart", []]}    {-60:["SevenDayEnd", []],-30:["SevenDayEnd", []],0:["SevenDayOver", []]}    110


 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 CoreServerGroup/LoginServer/LoginServer.exe

Binary files differ

 CoreServerGroup/LoginServer/LoginServer.map

Diff too large

 CoreServerGroup/LoginServer/LoginServer.tds

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc

Binary files differ

 db/PyMongoDataServer/Protocol/IPacketDispatcher.pyc

Binary files differ

 db/PyMongoDataServer/Protocol/PacketDispatcher.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActLoginAward.txt

New file
@@ -0,0 +1,2 @@
CfgID    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    LimitLV    TemplateID

1    2099-1-1    2099-1-3    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,300,400,500,700,900,1000,1103],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,700,900,1000,1103,1300],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,701,901,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,900,1000,1101],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,701,901,1000,1103,1301],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,901,1000,1101]]


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -210,7 +210,7 @@
XjmjAddHarm    20    20061            

AlchemyNotify    3    4716    4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729        

SpecialAlchemy    {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}}    {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}    {4206:1,253:1}    4254|225    

GodAlchemy    [[800,4706,1],[1600,4707,1],[3200,4708,1],[1600,4709,1],[800,4710,1],[400,4711,1],[3200,4712,1],[1600,4713,1],[800,4714,1],[400,4715,1],[1600,4716,1],[3200,4717,1],[1600,4718,1],[800,4719,1],[400,4720,1],[3200,4721,1],[1600,4722,1],[800,4723,1],[400,4724,1],[1600,4725,1],[800,4726,1],[400,4727,1],[800,4728,1],[400,4729,1],[145,4730,1],[94,4731,1],[53,4732,1],[11,4733,1],[533,4740,1],[5,4742,1],[200,4780,1],[200,4781,1],[200,4782,1],[200,4783,1],[200,4784,1],[200,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]]    20    1		
GodAlchemy    [[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]]    20    1		
TreasureUpRateItem    101|105|106|107|104|102|109|110    4601|4602|4603|4604|4605            

ClientFightEnable    1    0    0    0    0

GodAreaExpAward    {"Exp":"int(reExp*2)"}    500    0        

@@ -226,7 +226,7 @@
DropRecordValue    4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|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|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8205|8206|8207|8218|8219|8220|8231|8232|8233|8244|8245|8246|8257|8258|8259                

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|31501009|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|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008				
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|31501009|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|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009				
PKConfig    [[22,00], [8,00]]    50    10    10    110

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

KillBossCntLimit    {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007,40103001,40103002,40103003,40103004,40103005,40103006,40103007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1}    0_3|2_3|1_9999    {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'}    {}    {0:[21,'WorldBossNoHarm']}

@@ -323,6 +323,7 @@
HelpBattleRobot    50105026    baseHurt*hpCoefficient            

CrossUseItem    901|902|903|904                

CrossRealmCfg    5                

CrossSyncPlayerData    5				
CrossRealmPKAward    {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}    {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}    {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}        

CrossRealmPKMatchCount    10    10    10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*10+min(max(todayBuyCount-5,0),1)*10+min(max(todayBuyCount-7,0),1)*10        

CrossRealmPKFB    [30, 3, 60,30,10]    [[14,18,19,11,42], [30,33,36,28,50]]    2        


 db/PyMongoDataServer/PySysDB/tagLoginAward.txt

New file
@@ -0,0 +1,31 @@
TemplateID    ActionType    TotalTimes    SingleTimes    Reward

100    1    20    10    [(2426,1,1),(882,1,1)]

200    2    2    1    [(2426,1,1),(882,1,1)]

201    2    3    1    [(2426,1,1),(882,1,1)]

300    3    2    1    [(2426,1,1),(882,1,1)]

301    3    3    1    [(2426,1,1),(882,1,1)]

302    3    5    1    [(2426,1,1),(882,1,1)]

400    4    2    1    [(2426,1,1),(882,1,1)]

401    4    3    1    [(2426,1,1),(882,1,1)]

500    5    5    1    [(2426,1,1),(882,1,1)]

600    6    50    50    [(2426,1,1),(882,1,1)]

700    7    3    1    [(2426,1,1),(882,1,1)]

701    7    4    1    [(2426,1,1),(882,1,1)]

800    8    1    1    [(2426,1,1),(882,1,1)]

900    9    5    1    [(2426,1,1),(882,1,1)]

901    9    8    1    [(2426,1,1),(882,1,1)]

1000    10    1    1    [(2426,1,1),(882,1,1)]

1100    11    5    5    [(2427,1,1),(882,1,1)]

1101    11    10    5    [(2427,1,1),(882,1,1)]

1102    11    15    5    [(2427,1,1),(882,1,1)]

1103    11    20    5    [(2427,1,1),(882,1,1)]

1200    12    1000    1000    [(2427,1,1),(882,1,1)]

1300    13    9    9    [(2427,1,1),(882,1,1)]

1301    13    21    21    [(2427,1,1),(882,1,1)]

1400    14    1    1    [(2427,1,1),(882,1,1)]

1500    15    1    1    [(2427,1,1),(882,1,1)]

1600    16    1    1    [(2427,1,1),(882,1,1)]

1700    17    1    1    [(2427,1,1),(882,1,1)]

1800    18    1    1    [(2427,1,1),(882,1,1)]

1900    19    1    1    [(2427,1,1),(882,1,1)]

2000    20    1    1    [(2426,1,1),(882,1,1)]


 db/PyMongoDataServer/PySysDB/tagWeekParty.txt

@@ -20,8 +20,8 @@
1102    11    15    5    [(2427,1,1),(882,1,1)]    20

1103    11    20    5    [(2427,1,1),(882,1,1)]    20

1200    12    1000    1000    [(2427,1,1),(882,1,1)]    60

1300    13    9    9    [(2427,1,1),(882,1,1)]    60

1301    13    21    21    [(2427,1,1),(882,1,1)]    60

1300    13    62    62    [(2427,1,1),(882,1,1)]    60

1301    13    15    15    [(2427,1,1),(882,1,1)]    60

1400    14    1    1    [(2427,1,1),(882,1,1)]    10

1500    15    1    1    [(2427,1,1),(882,1,1)]    10

1600    16    1    1    [(2427,1,1),(882,1,1)]    10


 db/PyMongoDataServer/SysDB/tagChinItem.txt

Diff too large