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

client_linchunjie

2018-08-23 bd05d7b0e78cac2a631a336e55eceb5de731050e

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

 System/FindPrecious/BossHomeModel.cs

@@ -89,25 +89,33 @@
        public int GetRecommendFloor()

        {

            var vipLevel = PlayerDatas.Instance.baseData.VIPLv;

            var maxFloor = 1;

            var vipNeedFloor1 = GetFloorVipRequirement(1);

            var myLevel = PlayerDatas.Instance.baseData.LV;



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

            {

                var bossId = sortedBosses[i];

                var config = Config.Instance.Get<NPCConfig>(bossId);

                var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);



                if (bossHomeConfig.FloorNum > maxFloor)

                if (vipLevel < vipNeedFloor1)

                {

                    maxFloor = bossHomeConfig.FloorNum;

                    if (config.NPCLV > myLevel)

                    {

                        var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);

                        return bossHomeConfig.FloorNum;

                    }

                }

                else

                {

                    var bossHomeConfig = Config.Instance.Get<BossHomeConfig>(bossId);

                    if (vipLevel >= GetFloorVipRequirement(bossHomeConfig.FloorNum) && myLevel < config.NPCLV)

                    {

                        return bossHomeConfig.FloorNum;

                    }

                }



                if (vipLevel >= GetFloorVipRequirement(bossHomeConfig.FloorNum) && PlayerDatas.Instance.baseData.LV < config.NPCLV)

                {

                    return bossHomeConfig.FloorNum;

                }

            }



            return maxFloor;

            return 1;

        }



        public int GetFloorVipRequirement(int _floor)


 System/Strengthening/GodBeastAttributes.cs

@@ -25,7 +25,9 @@
        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        private Dictionary<int, int> QualityLimit = new Dictionary<int, int>();

        PlayerPackModel _playerPack;

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

        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }

        private int GodBeastNumber=0;//神兽编号
        private int GodBeastPart = 0;//神兽装备ID

@@ -83,8 +85,14 @@
                    {

                        if (itemModel[i].EquipPlace == GodBeastPart)

                        {

                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 1);

                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);

                            m_ItemCell.Init(ItemModel);

                            m_ItemCell.cellBtn.RemoveAllListeners();

                            int type = i;

                            m_ItemCell.cellBtn.AddListener(()=> 
                            {

                                itemTipsModel.SetItemTipsModel(PackType.rptDogzEquip, itemModel[type].itemInfo.ItemGUID);

                            });

                        }

                    }

                }


 System/Strengthening/GodBeastEntry.cs

@@ -37,7 +37,7 @@
                {

                    if (itemModel[i].EquipPlace == godBeastPart)

                    {

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 1);

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);

                        m_itemCell.Init(ItemModel);

                        var itemConfig = Config.Instance.Get<ItemConfig>(itemModel[i].itemId);

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