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

client_Hale

2018-08-23 ddba48b78f2e433ea0365235d13f9c20fc9183a4

 System/MainInterfacePanel/SideMission.cs

@@ -47,6 +47,7 @@
            _TaskRamusList.OnRefreshCell += OnRefreshGridCell;

            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            playerPack.ItemCntReduceAct += ItemCntReduceAct;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            OnCreateGridLineCell(_TaskRamusList);

        }



@@ -55,8 +56,31 @@
            _TaskRamusList.OnRefreshCell -= OnRefreshGridCell;

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            playerPack.ItemCntReduceAct -= ItemCntReduceAct;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)

        }



        private void Updatefighting(PlayerDataRefresh obj)

        {

            if (obj == PlayerDataRefresh.LV)

            {

                OpenShowButton();

            }

        }



        private void OpenShowButton()

        {

            if (mainModel.TaskId_Skill1.Contains(TaskIdNow))

            {

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

                    _Btn_Forward.gameObject.SetActive(true);

                }

                else

                {

                    _Btn_Forward.gameObject.SetActive(false);

                }

            }

        }

        private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptItem && arg3 == mainModel.ItemID)

@@ -196,6 +220,7 @@
                    if (TaskId != TaskIdNow)

                    {

                        TaskIdNow = TaskId;

                        OpenShowButton();

                        _TaskRamusList.m_Scorller.RefreshActiveCellViews();//刷新当前可见

                    }

                });

@@ -214,6 +239,8 @@
            string str = string.Empty;

            if (mainModel.TaskId_Skill1.Contains(taskID))

            {

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品

                if (itemNumber >= mainModel.ItemNumber)

                {

@@ -228,6 +255,12 @@
            }

            else

            {

                    string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);

                    str = Str_C;

                }

            }

            else

            {

                str = Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;

            }       

            str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);