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

client_Wu Xijin

2019-01-10 5a013c8de1078aca92a6a301f403e8ca78eeef3b

 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -64,6 +64,8 @@
    public Dictionary<int, WeekPartyActionClass> WeekPartyActionDic = new Dictionary<int, WeekPartyActionClass>();//活动模板信息

    public Dictionary<int, Redpoint> RedPointDic = new Dictionary<int, Redpoint>();//红点

    public event Action WeekPartyUpdate;//活动信息变更

    private const int Redpoint_key = 214;//周狂欢红点

    public Redpoint redPointStre = new Redpoint(2, Redpoint_key);

    private const int Redpoint_key1 = 21401;//周狂欢红点

    public Redpoint redPointStre1 = new Redpoint(214, Redpoint_key1);

    private int _SelectedNow = 0;

@@ -468,7 +470,7 @@
    public void  GetIsOpen()

    {

        var time1 = TimeDayBeginAndOver[0];

        var time2 = TimeDayBeginAndOver[0];

        var time2 = TimeDayBeginAndOver[1];

        if (TimeDayBeginAndOver.Length <= 0 || time1 == null || time2 == null)

        {

            return;