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

cehua_wcy

2018-11-27 33ef8c0c0e630b83ded24e591de3ca671ddccd04

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

 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt

@@ -4,3 +4,4 @@
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

6    NovemberExp25    []    []    2018-12-2    2018-12-2    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/GameWorldLogic/FBProcess/FBCommon.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActExpRate.txt

@@ -4,3 +4,4 @@
3    110    10000

4    110    10000

5    110    10000

6    110    10000


 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt

@@ -20,7 +20,6 @@
19    1    11    80    1    15    0

21    1    13    80    1    10    0

22    1    14    0    1    20    0

						
24    1    16    23    1    20    40

25    2    31240    22    1    30    0

26    2    31150    92    1    30    0