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

client_Wu Xijin

2018-09-29 b352ff5ef3b7dab39dc26793e2b2bf6a3efce1b1

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

 System/MainInterfacePanel/TaskListTip.cs

@@ -219,7 +219,11 @@
            var inDungeon = IsDungeon();

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)

            {

                TaskAddAndDelete();

                if (MissionState != 0)

                {

                    TaskAddAndDelete(MissionID);

                }

              
            }

            TaskJump(MissionID);

        }

@@ -243,33 +247,55 @@
            }

            SetLength();

        }

        private void TaskAddAndDelete()

        private void TaskAddAndDelete(int TaskID)

        {

            //for (int i = 0; i < Content.childCount; i++)

            //{

            //    GameObject childObj = Content.GetChild(i).gameObject;

            //    TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

            //    if (i < _list.Count)

            //    {

            //        if (!childObj.activeSelf)

            //        {

            //            childObj.SetActive(true);

            //        }

            //        childObjTaskType.TaskID = _list[i];

            //        childObjTaskType.IsGameObjectName(_list[i]);

            //        childObjTaskType.IsMysteriousTask();

            //        childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);

            //    }

            //    else

            //    {

            //        childObjTaskType.ClearTaskName();

            //        if (childObj.activeSelf)

            //        {

            //            childObj.SetActive(false);

            //        }

            //    }



            //}

            for (int i = 0; i < Content.childCount; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                if (i < _list.Count)

                {

                    if (!childObj.activeSelf)

                    GameObject obj = Content.GetChild(i).gameObject;

                    TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                    if (childObjTaskType.TaskID == TaskID)

                    {

                        childObj.SetActive(true);

                        return;

                    }

                    childObjTaskType.TaskID = _list[i];

                    childObjTaskType.IsGameObjectName(_list[i]);

                    childObjTaskType.IsMysteriousTask();

                    childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);

                }

                else

                {

                    childObjTaskType.ClearTaskName();

                    if (childObj.activeSelf)

                    if (childObjTaskType.TaskID == 0)

                    {

                        childObj.SetActive(false);

                        obj.SetActive(true);

                        childObjTaskType.TaskID = TaskID;

                        childObjTaskType.IsGameObjectName(TaskID);

                        childObjTaskType.IsMysteriousTask();

                        obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID);

                    }

                }

              


            }

            ChangeSort();//关于任务变更排序

            SetLength();

        }




 System/Vip/LimitedTimePackageModel.cs

@@ -20,10 +20,6 @@
        OpenServerActivityCenter.Instance.Register(7, this);

        OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

    }







    public bool IsShowPanel = false;

    private const int Redpoint_key1 = 20907;

    public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//限时礼包红点

    public bool IsOpen

@@ -52,7 +48,6 @@


    public void OnBeforePlayerDataInitialize()

    {

        IsShowPanel = false;

        DicBuyPackage.Clear();

    }

    public override void UnInit()

@@ -115,8 +110,7 @@
        bool Isbool = IsExpired();

        if (day != GetDayOfYear && IsExpired())

        {

            LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);

            IsShowPanel = true;

         //   LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);

            redPointStre1.state = RedPointState.Simple;

        }

        else


 System/Vip/LimitedTimePackageWin.cs

@@ -58,9 +58,10 @@


        protected override void OnAfterOpen()

        {

            if (limitedTimePackageItemModel.IsShowPanel)

            if (limitedTimePackageItemModel.redPointStre1.state == RedPointState.Simple)

            {

                limitedTimePackageItemModel.IsShowPanel = false;

                int GetDayOfYear = DateTime.Now.DayOfYear;

                LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);

                limitedTimePackageItemModel.IsShowTip();

            }