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

client_linchunjie

2019-01-14 64ff9d0995edc36bf176ff26789b0cfb26be19e7

 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -109,6 +109,9 @@


    public void OnBeforePlayerDataInitialize()

    {

        WeekPartyDayInfoDic.Clear();

        WeekPartyDayDic.Clear();

        WeekPartyActionDic.Clear();

        isOpenNow = false;

        isPreviewTime = false;

    }

@@ -117,6 +120,8 @@
    {

        GlobalTimeEvent.Instance.secondEvent -= secondEvent;

        GlobalTimeEvent.Instance.secondEvent += secondEvent;

        SetRedPoint();



    }



    private void secondEvent()

@@ -132,6 +137,7 @@
            }

        }

        GetIsOpen();//判断功能是否开启

        GetDayNow();



    }



@@ -357,8 +363,16 @@
        {

            Day = 0;

        }

        DebugEx.LogError("输出当前的天数" + Day);

        DayNow = Day;

       // DebugEx.LogError("输出当前的天数" + Day);

        if (DayNow != Day && Day<7)

        {

            DayNow = Day;

            if (WeekPartyDayInfoUpdate != null)

            {

                WeekPartyDayInfoUpdate();

            }

        }

        
    }



    public void SendGetWeekParty(int day, int temdayplateID)//领取周狂欢活动奖励

@@ -448,7 +462,7 @@
            bool IsBool = IsDayReward(day, type);

            if (point >= item.NeedPoint && !IsBool)

            {

                return RedPointState.Simple;

                return RedPointState.GetReward;

            }

        }

        for (int i = 0; i < WeekPartyDay.TemplateList.Length; i++)

@@ -467,7 +481,7 @@
                }

                if (TaypeNumber > 0 && rewardNum< number)

                {

                    return RedPointState.Simple;

                    return RedPointState.GetReward;

                }

            }

        }