Merge branch '3243Activity' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_linchunjie

2018-09-08 67e4a6aaf732dc6e884330b893a6daa1958b6902

Merge branch '3243Activity' of http://192.168.0.87:10010/r/snxxz_scripts into 3243Activity

 System/DailyQuest/DailyQuestData.cs

@@ -55,8 +55,10 @@
    public int id;

    public bool always;



    Dictionary<int, List<HourMinute>> openTimes;//常规的活动时间，key是星期x

    Dictionary<int, Dictionary<int, List<HourMinute>>> specificOpenTimes;//开服前2周的活动时间,key1是开服日的星期，key2是开服第几天

    //常规的活动时间，key是星期x

    Dictionary<int, List<HourMinute>> openTimes = new Dictionary<int, List<HourMinute>>();

    //开服前2周的活动时间,key1是开服日的星期，key2是开服第几天

    Dictionary<int, Dictionary<int, List<HourMinute>>> specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>();



    public DailyQuestOpenTime(int _id)

    {

@@ -67,7 +69,6 @@
    {

        var matches = Regex.Matches(timeString, "\\\"[0-9]\\\":\\[[0-9|,|\\[|\\]]+");

        always = matches.Count == 0;

        openTimes = new Dictionary<int, List<HourMinute>>();



        for (int i = 0; i < matches.Count; i++)

        {

@@ -112,7 +113,11 @@


    public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecialOpenTimeConfig> configs)

    {

        specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;

        if (configs == null)

        {

            return;

        }



        foreach (var config in configs)

        {

            var openDayWeek = config.OpenServerWeek % 7;

@@ -143,7 +148,6 @@
    public void ParseDungeonNormalOpenTimes(List<DungeonStateTimeConfig> configs)

    {

        always = configs == null || configs.Count == 0;

        openTimes = new Dictionary<int, List<HourMinute>>();



        if (!always)

        {

@@ -179,7 +183,11 @@


    public void ParseDungeonSpecificOpenTimes(List<DungeonSpecialStateTimeConfig> configs)

    {

        specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;

        if (configs == null)

        {

            return;

        }



        foreach (var config in configs)

        {

            var openDayWeek = config.OpenServerWeek % 7;