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

cehua_LC

2018-11-20 b1c5e363026fd135506040eb1cd293fdff58150d

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

 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt

@@ -1,5 +1,6 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    StartTime    EndTime    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV    AddExpRate

1    OpenServer    []    []    5    5    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

3    DoubleExp10    []    []    2018-11-10    2018-11-10    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

4    DoubleExp11    []    []    2018-11-11    2018-11-11    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

5    NovemberExp17    []    []    2018-11-17    2018-11-17    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

2    DoubleExp10    []    []    2018-11-10    2018-11-10    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

3    DoubleExp11    []    []    2018-11-11    2018-11-11    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

4    NovemberExp17    []    []    2018-11-17    2018-11-17    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

5    NovemberExp25    []    []    2018-11-25    2018-11-25    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000


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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActExpRate.txt

@@ -1,5 +1,6 @@
CfgID    LimitLV    AddExpRate

1    110    10000

2    110    10000

3    110    10000

4    110    10000

5    110    10000