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

cehua_lyf

2019-01-22 e6b3cf765fb55c81ade713c7bb57954886eb26d6

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

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActWeekParty.txt

@@ -1,2 +1,2 @@
CfgID    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    LimitLV    TemplateID    PointAward

1    8    15    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]]    {0:{290:[(4216,1,1)]},1:{290:[(5801,1,1)],390:[(5800,1,1)]},2:{320:[(5800,1,1)],420:[(5802,1,1)]},3:{260:[(1652,1,1)]},4:{380:[(4221,1,1)]},5:{320:[(5801,1,1)],420:[(5802,1,1)]},6:{290:[(62,1,1)]},}

1    8    15    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2500]]    {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}


 db/PyMongoDataServer/PySysDB/tagWeekParty.txt

@@ -15,11 +15,11 @@
900    9    5    1    [(2426,1,1),(882,1,1)]    10

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

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

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

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

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

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

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

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

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

1200    12    1    1    [(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

@@ -29,3 +29,9 @@
1800    18    1    1    [(2427,1,1),(882,1,1)]    10

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

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

2100    21    308    308    [(2427,1,1),(882,1,1)]    60

2200    22    50106315    50106315    [(2427,1,1),(882,1,1)]    60

2300    23    5    5    [(2427,1,1),(882,1,1)]    60

2400    24    90    90    [(2427,1,1),(882,1,1)]    60

2500    25    150    150    [(2427,1,1),(882,1,1)]    60

2600    26    5    5    [(2427,1,1),(882,1,1)]    60