【1885】神兽功能开发

Client_PangDeRong

2018-08-27 264bad4450a966bbdeb23fcc88d4f87ac721a971

【1885】神兽功能开发

 System/BlastFurnace/LingDanTips.cs

@@ -135,7 +135,8 @@
                        isJumpToId = FurnaceModel.alchemyModellist[i].AlchemyID;

                        isMakeDan = true;

                        presentIndex = i;

                        _danDrugCtrl.JumpIndex(presentIndex - 1);

                        int jumpIndex = presentIndex - 1 < 0 ? 0 : presentIndex - 1;

                        _danDrugCtrl.JumpIndex(jumpIndex);

                        _danDrugCtrl.m_Scorller.RefreshActiveCellViews();

                        break;

                    }

@@ -178,7 +179,9 @@
                        }

                    }

                }

                _danDrugCtrl.JumpIndex(presentIndex - 1);



                int jumpIndex = presentIndex - 1 < 0 ? 0 : presentIndex - 1;

                _danDrugCtrl.JumpIndex(jumpIndex);

                _danDrugCtrl.m_Scorller.RefreshActiveCellViews();

            }




 System/Dogz/DogzActiveWin.cs

@@ -106,9 +106,6 @@
            UpdateDogzEquip();

            UpdateDogzProperty();

            UpdateDogzBtn();



            var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz);

            m_TakeOffEquipBtn.gameObject.SetActive(_dogzEquips != null && _dogzEquips.Count > 0);

        }

        private void UpdateDogzSkill()

        {

@@ -149,6 +146,7 @@
            if (dogzId != model.presentSelectDogz) return;

            UpdateDogzEquip();

            UpdateDogzProperty();

            UpdateDogzBtn();

        }



        private void UpdateDogzEquip()

@@ -220,6 +218,8 @@
        }

        private void UpdateDogzBtn()

        {

            var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz);

            m_TakeOffEquipBtn.gameObject.SetActive(_dogzEquips != null && _dogzEquips.Count > 0);

            m_CallBackBtnTxt.text = model.TryGetAssistDogzState(model.presentSelectDogz) ? Language.Get("DogzFunc104") : Language.Get("DogzFunc105");

        }




 System/Dogz/DogzWin.cs

@@ -1,107 +1,107 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Tuesday, January 23, 2018
//--------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class DogzWin : Window
    {

        [SerializeField] Button m_CloseBtn;
        [SerializeField] Button m_LeftBtn;
        [SerializeField] Button m_RightBtn;
        [SerializeField] FunctionButton functionButtonDogz;
        [SerializeField] FunctionButton functionButtonStrengthen;
        [SerializeField] FunctionButtonGroup funcBtnGroup;

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_CloseBtn.onClick.AddListener(OnClose);
            functionButtonDogz.onClick.AddListener(OnDogz);
            functionButtonStrengthen.onClick.AddListener(OnDogzStrengthen);
            m_LeftBtn.onClick.AddListener(() => {
                funcBtnGroup.TriggerLast();
            });
            m_RightBtn.onClick.AddListener(() => {
                funcBtnGroup.TriggerNext();
            });
        }

        private void OnDogzStrengthen()
        {
            CloseChild();
            functionOrder = 1;
            WindowCenter.Instance.Open<GodBeastReinforcementWin>();
        }

        private void OnDogz()
        {
            CloseChild();
            functionOrder = 0;
            WindowCenter.Instance.Open<DogzActiveWin>();
        }

        protected override void OnPreOpen()
        {
            dogzModel.SetDefaultSelectDogz();
        }

        protected override void OnActived()
        {
            base.OnActived();
            funcBtnGroup.TriggerByOrder(functionOrder);
        }

        protected override void OnAfterOpen()
        {

        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Tuesday, January 23, 2018

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {



    public class DogzWin : Window

    {



        [SerializeField] Button m_CloseBtn;

        [SerializeField] Button m_LeftBtn;

        [SerializeField] Button m_RightBtn;

        [SerializeField] FunctionButton functionButtonDogz;

        [SerializeField] FunctionButton functionButtonStrengthen;

        [SerializeField] FunctionButtonGroup funcBtnGroup;



        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_CloseBtn.onClick.AddListener(OnClose);

            functionButtonDogz.onClick.AddListener(OnDogz);

            functionButtonStrengthen.onClick.AddListener(OnDogzStrengthen);

            m_LeftBtn.onClick.AddListener(() => {

                funcBtnGroup.TriggerLast();

            });

            m_RightBtn.onClick.AddListener(() => {

                funcBtnGroup.TriggerNext();

            });

        }



        private void OnDogzStrengthen()

        {

            CloseChild();

            functionOrder = 1;

            WindowCenter.Instance.Open<GodBeastReinforcementWin>();

        }



        private void OnDogz()

        {

            CloseChild();

            functionOrder = 0;

            WindowCenter.Instance.Open<DogzActiveWin>();

        }



        protected override void OnPreOpen()

        {

            dogzModel.SetDefaultSelectDogz();

        }



        protected override void OnActived()

        {

            base.OnActived();

            funcBtnGroup.TriggerByOrder(functionOrder);

        }



        protected override void OnAfterOpen()

        {



        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }
        }

        void OnClose()
        {
            CloseChild();
            CloseImmediately();
        }

        void CloseChild()
        {
            if (WindowCenter.Instance.CheckOpen<DogzActiveWin>())
            {
                WindowCenter.Instance.CloseImmediately<DogzActiveWin>();
            }
            if (WindowCenter.Instance.CheckOpen<GodBeastReinforcementWin>())
            {
                WindowCenter.Instance.CloseImmediately<GodBeastReinforcementWin>();
            }
        }
    }

}




            }

        }



        void OnClose()

        {

            CloseChild();

            CloseImmediately();

        }



        void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<DogzActiveWin>())

            {

                WindowCenter.Instance.CloseImmediately<DogzActiveWin>();

            }

            if (WindowCenter.Instance.CheckOpen<GodBeastReinforcementWin>())

            {

                WindowCenter.Instance.CloseImmediately<GodBeastReinforcementWin>();

            }

        }

    }



}










 System/FairylandCeremony/CeremonyPeopleToHiWin.cs

@@ -58,7 +58,7 @@
            CreateAwardCell();

            CreateTaskCell();

            taskCtrl.JumpIndex(0);

            awardCtrl.JumpIndex(presentAwardIndex - 1);

            awardCtrl.JumpIndex(presentAwardIndex - 1 < 0 ? 0 : presentAwardIndex - 1);

        }



        private void CreateTaskCell()