单号【2404】第一次强化引导结束后再引导关闭界面

client_Zxw

2018-08-13 fcb3e812d9a62c1cc8021b651aeef723b62e5ad9

单号【2404】第一次强化引导结束后再引导关闭界面

 System/MainInterfacePanel/TipPanel.cs

@@ -21,7 +21,7 @@


        LoginAdModel loginAdModel { get { return ModelCenter.Instance.GetModel<LoginAdModel>(); } }

        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }

        LimitedTimePackageItemClassModel limitedTimePackageItemClassModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }



        public TipPanel()

        {

            WindowCenter.Instance.windowAfterOpenEvent += windowBeforeOpen;

@@ -77,20 +77,6 @@
            {

                WindowCenter.Instance.Open<OffLineOnHookWin>();

                onHookModel.IsOpenOffLineOnHookBool = false;

            }

            else if (ModelCenter.Instance.GetModel<OSGiftModel>().CheckOpen() ||

                WindowCenter.Instance.CheckOpen<OpenServerGiftWin>())//超值礼包

            {



            }

            else if (limitedTimePackageItemClassModel.IsShowPanel)//限时礼包

            {

                limitedTimePackageItemClassModel.IsShowPanel = false;

                if (!WindowCenter.Instance.CheckOpen<LimitedTimePackageWin>())

                {

                    WindowCenter.Instance.Open<LimitedTimePackageWin>();

                }

               
            }

            else if (firstTimeRechargeModel.IsTryOut == 1 && !inDungeon)//装备试用

            {


 System/Strengthening/StrengtheningSripts.cs

@@ -99,6 +99,9 @@
    [SerializeField] GameObject m_ImageBGObj;

    public float _Delaytime = 0.1f;//延迟时间

    public float _Contracttime = 0.15f;//发包时间





    private bool IsGuide=false;

    void Awake()

    {



@@ -164,12 +167,26 @@


    private void OnEnable()

    {

        IsGuide = NewBieCenter.Instance.inGuiding&&NewBieCenter.Instance.currentGuide==10;

        _effects = true;

        _open = true;

        _money = PlayerDatas.Instance.baseData.allSliver;

        PlayerStrengthengDatas.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshMoney;//金钱的刷新

        Initialize();

        WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeCloseEvent;

    }



    private void windowBeforeCloseEvent(Window obj)

    {

        if (obj as GetItemPathWin)

        {

            if (IsGuide)

            {

                NewBieCenter.Instance.StartNewBieGuide(92);

                IsGuide = false;

            }

        }      
    }



    void Start()

@@ -212,8 +229,6 @@
                        _position -= 444;

                        _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_position/(1076.0f-444));

                        _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_Scrobar.verticalNormalizedPosition+(50/(1076.0f-444)));

                        //Mathf.Clamp01(1 - type * 0.1f + type * 4);

                        //_Scrobar.verticalNormalizedPosition = (float)type / (float)_content.childCount;

                    }

                    else

                    {

@@ -411,11 +426,17 @@
        else if (_theType == 2)

        {

            MessageWin.Inst.ShowFixedTip(Language.Get("Z1013"));//请佩戴装备

            if (IsGuide)

            {

                NewBieCenter.Instance.StartNewBieGuide(92);

                IsGuide = false;

            }

        }

        else if (_theType == 3)

        {

            MessageWin.Inst.ShowFixedTip(Language.Get("Z1012"));//装备强化满级

        }

       
    }



    IEnumerator AutomaticRein()//自动强化开始的协程

@@ -430,10 +451,6 @@
                    _tagEPlus.ItemIndex = (ushort)_tag;

                    _tagEPlus.PackType = 1;

                    GameNetSystem.Instance.SendInfo(_tagEPlus);//向服务器发送装备位  

                    //if (NewBieCenter.Instance.inGuiding)

                    //{

                    //    yield break;

                    //}

                }

                yield return new WaitForSeconds(_Contracttime);

            }

@@ -481,14 +498,16 @@
                _GridGreenB.gameObject.SetActive(true);

                DisplayPromoteLv(_tag);

                _UIEffect1D.StopImediatly();

                //int _index = _wear.IndexOf(_tag);//得到所处数组的位置

                //_wear.RemoveAt(_index);//删除数组所处下标的元素

                //_fullLevel.Add(_tag);//给数组添加元素

                FullLevel(_tag);

                _wear.Clear();

                _notWear.Clear();

                _fullLevel.Clear();

                TheEquipment();

                if (IsGuide)

                {

                    NewBieCenter.Instance.StartNewBieGuide(92);

                    IsGuide = false;

                }

                _automaticBtn.gameObject.SetActive(true);//自动强化按钮

                _strengBtn.interactable = true;//强化按钮

                _StrengImage.color = new Color32(51, 8, 0, 255);

@@ -1202,6 +1221,7 @@
        StopBtn();//停止强化关闭携程

        PlayerStrengthengDatas.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshMoney;//金钱的刷新

        WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeCloseEvent;

        int playerLv = PlayerDatas.Instance.baseData.LV;

        if (playerLv >= 150)

        {