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

cehua_TRX

2018-10-11 98398c23f7a31d845aafd4ef39e150de12fde8b9

 CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt

@@ -1,3 +1,3 @@
CfgID   ActMark   ServerIDList   StartDate   EndDate   ResetType   NotifyInfoStart   NotifyInfoEnd   LimitLV

1   test1   []   2018-9-30   2018-10-1   1   {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}   {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]}   110

2   test2   []   2018-10-6   2018-10-6   1   {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}   {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyEnd", []]}   110

1   test1   []   2018-9-30   2018-10-1   1   {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}   {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}   110

2   test2   []   2018-10-6   2018-10-7   1   {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}   {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}   110