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

cehua_hzl

2019-01-16 4536327a16199855917035676cdf5bd101c56725

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

 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt

@@ -13,3 +13,4 @@
12    JanuaryExp2    []    []    2019-1-6    2019-1-6    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

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

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

15    OpenServer1    []    []    14    14    18:00    20:00    { 0:["ExpActivity_Start", [3]]}    {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}    [30, "ExpActivity_Goahead", [3]]    110    20000


 db/PyMongoDataServer/PySysDB/tagActExpRate.txt

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

13    110    10000

14    110    10000

15    110    20000