单号【2614】神兽开发

client_Zxw

2018-08-21 9b993e14c6ec69b98d664eb25a7895cb847157c2

单号【2614】神兽开发

 System/Dogz/DogzWin.cs

@@ -42,7 +42,7 @@
        {
            CloseChild();
            functionOrder = 1;
            WindowCenter.Instance.Open<DogzStrengthenWin>();
            WindowCenter.Instance.Open<GodBeastReinforcementWin>();
        }

        private void OnDogz()
@@ -89,9 +89,9 @@
            {
                WindowCenter.Instance.CloseImmediately<DogzActiveWin>();
            }
            if (WindowCenter.Instance.CheckOpen<DogzStrengthenWin>())
            if (WindowCenter.Instance.CheckOpen<GodBeastReinforcementWin>())
            {
                WindowCenter.Instance.CloseImmediately<DogzStrengthenWin>();
                WindowCenter.Instance.CloseImmediately<GodBeastReinforcementWin>();
            }
        }
    }

 System/MainInterfacePanel/LowSettingTip.cs

@@ -25,7 +25,7 @@
        [SerializeField] Button m_BagualuBtn;//八卦炉



        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮



        [SerializeField] Button m_GodBeastBtn;//神兽按钮

        public void Init()

        {

            _Role1Btn.onClick.AddListener(Role1Button);

@@ -40,6 +40,7 @@
            _RankingListBtn.onClick.AddListener(RankingListButton);

            m_BagualuBtn.AddListener(OnClickBagualuBtn);

            m_TreasureSoulBtn.AddListener(OnClickTreasureSoul);

            m_GodBeastBtn.AddListener(GodBeastBtn);

        }



        public void UnInit()

@@ -55,6 +56,7 @@
            _SetUp1Btn.onClick.RemoveAllListeners();

            _RankingListBtn.onClick.RemoveAllListeners();

            m_BagualuBtn.RemoveAllListeners();

            m_GodBeastBtn.RemoveAllListeners();

        }



        void Role1Button()

@@ -84,11 +86,11 @@
            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<TreasureSoulWin>();

        }

        //private void OnRealmButton()

        //{

        //    WindowCenter.Instance.Open<RealmWin>();

        //    WindowCenter.Instance.Close<MainInterfaceWin>();

        //}

        private void GodBeastBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DogzWin>();

        }



        void Strengthen1Button()

        {


 System/Strengthening/GodBeastChildNodes.cs

@@ -13,7 +13,8 @@
        [SerializeField] GameObject m_ChoosenImg;
        [SerializeField] Text m_TextNumber;
        [SerializeField] Button m_Button;

        PlayerPackModel _playerPack;

        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
        public Button ButtonDown

        {

            get { return m_Button; }

@@ -34,6 +35,24 @@
            get { return m_TextNumber; }

            set { m_TextNumber = value; }

        }

        public void  GetGodBeastIndex(int Index)

        {

            ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptDogzItem, Index);

            m_ItemCell.Init(itemModel);

            var IudetDogzEquipPlus = itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]

            TextNumber.gameObject.SetActive(false);

            if (IudetDogzEquipPlus != null)

            {

                int lv = IudetDogzEquipPlus[0];

                if (lv > 0)

                {

                    TextNumber.gameObject.SetActive(true);

                    TextNumber.text = "+" + lv;

                    TextNumber.color = UIHelper.GetUIColor(itemModel.chinItemModel.ItemColor);

                }

            }

        }
    }

}

 System/Strengthening/GodBeastEntry.cs

@@ -28,8 +28,8 @@
        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        public void GetGodBeastLocationMarker(int locationMarker, int currentlySelected)

        {

            int godBeastNumber = locationMarker / 10;

            int godBeastPart = locationMarker % 10;

            int godBeastNumber = locationMarker % 100;//神兽编号

            int godBeastPart = locationMarker / 100;//神兽装备位ID

            List<ItemModel> itemModel = dogz_model.GetDogzEquips(godBeastNumber);

            if (itemModel != null)

            {


 System/Strengthening/GodBeastReinforcementWin.cs

@@ -79,10 +79,11 @@
            {

                if (DogzEquipDict[key] == 1)

                {

                    GodBeastClass godBeastClass = new GodBeastClass();

                   
                    List<ItemModel> itemModel = dogz_model.GetDogzEquips(key);

                    for (int i = 0; i < itemModel.Count; i++)

                    {

                        GodBeastClass godBeastClass = new GodBeastClass();

                        godBeastClass.GodBeastNumber = key;

                        godBeastClass.GodBeastPart = itemModel[i].EquipPlace;

                        godBeastClass.GodBeastQuality = itemModel[i].chinItemModel.ItemColor;

@@ -99,7 +100,7 @@
                            godBeastClass.GodBeastLv = IudetDogzEquipPlus[0];

                            godBeastClass.GodBeasProficiency = IudetDogzEquipPlus[1];

                        }                                  

                        godBeastClass.LocationMarker= key*10+ itemModel[i].EquipPlace;

                        godBeastClass.LocationMarker=itemModel[i].EquipPlace*100+key;

                        GodBeastList.Add(godBeastClass);

                    }

                }


 System/Strengthening/GodBeastSlidingList.cs

@@ -237,7 +237,7 @@
            AbsorptionDic.Clear();

            for (int i = 0; i < GodBeastBagList.Count; i++)

            {

                if (Quality > 0)//只有水晶

                if (Quality <= 0)//只有水晶

                {

                    if (GodBeastBagList[i].IsEquipment != 0)

                    {

@@ -247,16 +247,20 @@
                }

                else

                {

                    if (Quality < 10 && (GodBeastBagList[i].IsEquipment == 1 || GodBeastBagList[i].Color > Quality))//过滤掉只剩所选品质装备

                    if (Quality < 10 && GodBeastBagList[i].IsEquipment != 1 && GodBeastBagList[i].Color > Quality)//过滤掉只剩所选品质装备

                    {

                        int type = i;

                        DeleteIndexList.Add(type);

                    }

                }

            }

            for (int j = 0; j < DeleteIndexList.Count; j++)

            for (int j = DeleteIndexList.Count; j > 0; j--)

            {

                GodBeastBagList.RemoveAt(DeleteIndexList[j]);

                int Inedex = DeleteIndexList[j - 1];

                if (Inedex <= GodBeastBagList.Count - 1)

                {

                    GodBeastBagList.RemoveAt(Inedex);

                }

            }

            if (m_ToggleAll.isOn)

            {

@@ -357,6 +361,7 @@
                    {

                        GodBeastChildNodes.ChoosenImg.SetActive(true);

                    }

                    GodBeastChildNodes.GetGodBeastIndex(godBeastBagClass.Index);

                    GodBeastChildNodes.ButtonDown.AddListener(() =>

                    {

                        if (AbsorptionDic.ContainsKey(godBeastBagClass.Index))

@@ -373,7 +378,6 @@
                            AbsorbEvent(AbsorptionDic);

                        }

                    });

                    
                }

            }

        }