2805【前端】超值礼包新增显示仙玉余额

client_linchunjie

2018-08-23 522ca3468a56c88cb15eaa428eb7499d3dba386f

 System/RoleParticulars/RoleParticularModel.cs

@@ -177,7 +177,7 @@
                }

            }

            fightPower += UIHelper.GetFightPower(dict);

            var config = ConfigManager.Instance.GetTemplate<HorseConfig>(_id);

            var config = Config.Instance.Get<HorseConfig>(_id);

            fightPower += config.InitFightPower;

            return fightPower;

        }

@@ -190,7 +190,7 @@
            {

                Dictionary<int, int> dict1 = null;

                Dictionary<int, int> dict2 = null;

                var skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skills[i]);

                var skillConfig = Config.Instance.Get<SkillConfig>(skills[i]);

                if (skillConfig == null)

                {

                    continue;

@@ -288,7 +288,7 @@
            {

                Dictionary<int, int> dict1 = null;

                Dictionary<int, int> dict2 = null;

                var skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skills[i]);

                var skillConfig = Config.Instance.Get<SkillConfig>(skills[i]);

                if (skillConfig == null)

                {

                    continue;

@@ -403,7 +403,7 @@
        {

            if (qualitys == null)

            {

                var config = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PetQuality");

                var config = Config.Instance.Get<FuncConfigConfig>("PetQuality");

                qualitys = ConfigParse.GetMultipleStr<int>(config.Numerical1);

                qualityTitles = ConfigParse.GetMultipleStr(config.Numerical2);

            }

@@ -446,7 +446,7 @@
            {

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

                {

                    HorseConfig horseConfig = ConfigManager.Instance.GetTemplate<HorseConfig>(horses[i].id);

                    HorseConfig horseConfig = Config.Instance.Get<HorseConfig>(horses[i].id);

                    if (horseConfig.Quality == condition)

                    {

                        HorseUpConfig horseUpConfig = HorseUpConfig.GetHorseIDAndLV(horses[i].id, horses[i].lv);

@@ -478,7 +478,7 @@
        public int GetPetFightPower(int id, int lv)

        {

            var fightPower = 0;

            var config = ConfigManager.Instance.GetTemplate<PetInfoConfig>(id);

            var config = Config.Instance.Get<PetInfoConfig>(id);

            var _init_fightpower = 0;

            int.TryParse(config.InitFightPower, out _init_fightpower);

            fightPower += _init_fightpower;

@@ -490,7 +490,7 @@
            }

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

            {

                var skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skills[i]);

                var skillConfig = Config.Instance.Get<SkillConfig>(skills[i]);

                if (skillConfig != null)

                {

                    fightPower += skillConfig.FightPower;

@@ -527,7 +527,7 @@


        public int GetPetAtkSkillProperty(int skillId, List<PetInfo> pets)

        {

            SkillConfig skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skillId);

            SkillConfig skillconfig = Config.Instance.Get<SkillConfig>(skillId);

            if (skillconfig == null)

            {

                return 0;

@@ -564,7 +564,7 @@
            var atk = 0;

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

            {

                var config = ConfigManager.Instance.GetTemplate<PetInfoConfig>(pets[i].id);

                var config = Config.Instance.Get<PetInfoConfig>(pets[i].id);

                if (config != null && config.Quality == quality)

                {

                    var petUpConfig = PetClassCostConfig.GetPetIdAndRank(pets[i].id, pets[i].lv);

@@ -667,7 +667,7 @@
                    {

                        return 0;

                    }

                    var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemData.ItemID);

                    var itemConfig = Config.Instance.Get<ItemConfig>(_itemData.ItemID);

                    _rank = itemConfig.LV;

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

                    {

@@ -676,7 +676,7 @@
                            && _suit.Index <= (int)RoleEquipType.retShoes

                            && roleEquipDataDic.TryGetValue((RoleEquipType)_suit.Index, out _itemData))

                        {

                            itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemData.ItemID);

                            itemConfig = Config.Instance.Get<ItemConfig>(_itemData.ItemID);

                            if (itemConfig.SuiteiD <= 0)

                            {

                                continue;

@@ -871,7 +871,7 @@
                            {

                                continue;

                            }

                            var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_item.ItemID);

                            var _itemCfg = Config.Instance.Get<ItemConfig>(_item.ItemID);

                            if (suitModel.IsMakerSuit(_type, _itemCfg.ItemColor, _itemCfg.StarLevel))

                            {

                                if (_itemCfg.LV < _suit.suitDict[(int)_type])

@@ -1087,14 +1087,14 @@
                }

                catch (Exception e)

                {

                    DesignDebug.Log(e.StackTrace);

                    DebugEx.Log(e.StackTrace);

                }

            }



            int Compare(PetInfo x, PetInfo y)

            {

                var config_x = ConfigManager.Instance.GetTemplate<PetInfoConfig>(x.id);

                var config_y = ConfigManager.Instance.GetTemplate<PetInfoConfig>(y.id);

                var config_x = Config.Instance.Get<PetInfoConfig>(x.id);

                var config_y = Config.Instance.Get<PetInfoConfig>(y.id);

                if (config_x == null || config_y == null)

                {

                    return 0;

@@ -1104,8 +1104,8 @@


            int Compare(HorseInfo x,HorseInfo y)

            {

                var config_x = ConfigManager.Instance.GetTemplate<HorseConfig>(x.id);

                var config_y = ConfigManager.Instance.GetTemplate<HorseConfig>(y.id);

                var config_x = Config.Instance.Get<HorseConfig>(x.id);

                var config_y = Config.Instance.Get<HorseConfig>(y.id);

                if (config_x == null || config_y == null)

                {

                    return 0;