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

client_Wu Xijin

2019-01-10 595ba75b66474870922d4266883a69e83930318f

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

 System/FashionDress/FashionDressWin.cs

@@ -320,6 +320,10 @@
            var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;



            var fashionDressClothesId = 0;

            var fashionDressWeaponId = 0;

            var fashionDressSecondaryId = 0;



            foreach (var type in model.fashionDressTypes)

            {

                var selectFashionId = model.GetSelectFashionDress(type);

@@ -334,13 +338,13 @@
                    switch ((RoleEquipType)index)

                    {

                        case RoleEquipType.retFashionWeapon:

                            weaponId = fashionDress.GetEquipItemId();

                            fashionDressWeaponId = fashionDress.GetEquipItemId();

                            break;

                        case RoleEquipType.retFashionClothes:

                            clothesId = fashionDress.GetEquipItemId();

                            fashionDressClothesId = fashionDress.GetEquipItemId();

                            break;

                        case RoleEquipType.retFashionWeapon2:

                            secondaryId = fashionDress.GetEquipItemId();

                            fashionDressSecondaryId = fashionDress.GetEquipItemId();

                            break;

                    }

                }

@@ -376,6 +380,9 @@
                weaponId = weaponId,

                wingsId = wingsId,

                secondaryId = secondaryId,

                fashionClothesId = fashionDressClothesId,

                fashionWeaponId = fashionDressWeaponId,

                fashionSecondaryId = fashionDressSecondaryId,

                isDialogue = false,

                godWeapons = dict

            };


 System/KnapSack/Logic/ItemInfoWin.cs

@@ -180,6 +180,11 @@
                    mountSkillDict = itemTipsModel.GetMountSkillDict(itemTipsModel.curAttrData.itemConfig.EffectValueA1);

                    modelShow.SetModelShow(horseConfig.Model, ModelShowType.mount, Language.Get("TreasureEffect103"), horseConfig.ShowFightPower);

                    break;

                case 83:

                    bgObj.anchoredPosition3D = new Vector3(197, 0, 0);

                    modelShow.gameObject.SetActive(true);

                    modelShow.SetModelShow(itemTipsModel.curAttrData.itemConfig.EffectValueA1, ModelShowType.FashionDress, Language.Get("TreasureEffect103"));

                    break;

                default:

                    modelShow.gameObject.SetActive(false);

                    bgObj.anchoredPosition3D = Vector3.zero;


 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -1,6 +1,7 @@
using UnityEngine;

using UnityEngine.UI;

using TableConfig;

using System.Collections.Generic;



namespace Snxxz.UI

{

@@ -12,6 +13,11 @@
        [SerializeField] public GameObject fightImg;



        ModelShowType showType;

        FashionDressModel fashionDressModel { get { return ModelCenter.Instance.GetModel<FashionDressModel>(); } }

        MagicianModel godWeaponModel

        {

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

        }



        public void OnDisable()

        {

@@ -31,6 +37,7 @@
        {

            titleText.text = title;

            this.showType = showType;

            var job = PlayerDatas.Instance.baseData.Job;

            switch (showType)

            {

                case ModelShowType.treasure:

@@ -42,6 +49,9 @@
                case ModelShowType.pet:

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

                    UI3DModelExhibition.Instance.ShowNPC(id, config.UIModeLOffset, config.UIModelRotation, modelImg);

                    break;

                case ModelShowType.FashionDress:

                    UI3DModelExhibition.Instance.ShowOtherPlayer(modelImg,SetFashionDressData(id));

                    break;

            }



@@ -57,12 +67,93 @@
                fightPowerText.text = fightValue.ToString();

            }

        }



        public UI3DPlayerExhibitionData SetFashionDressData(int fashionId)

        {

            var job = PlayerDatas.Instance.baseData.Job;



            var playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>();



            var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;



            var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;



            var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);

            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;



            var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;



            FashionDress fashionDress = null;

            bool isFashion = fashionDressModel.TryGetFashionDress(fashionId,out fashionDress);

            var fashionClothesId = 0;

            var fashionWeaponId = 0;

            var fashionSecondaryId = 0;

            if(isFashion)

            {

                int itemId = fashionDress.requireLevelUpItem;

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

                switch(fashionDress.fashionDressType)

                {

                    case 1:

                        fashionClothesId = fashionDress.GetEquipItemId();

                        break;

                    case 2:

                        fashionWeaponId = fashionDress.GetEquipItemId();

                        break;

                    case 3:

                        fashionSecondaryId = fashionDress.GetEquipItemId();

                        break;

                }

            }



            int _suitLevel = 0;



            if (clothes != null)

            {

                if (clothes.itemInfo.IsSuite == 1)

                {

                    if (clothes.GetUseDataModel(30) != null && clothes.GetUseDataModel(30)[0] != 0)

                    {

                        _suitLevel = clothes.GetUseDataModel(30)[0];

                    }

                }

            }



            Dictionary<int, int> dict = new Dictionary<int, int>();

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

            {

                var type = godWeaponModel.godWeaponTypes[i];

                var godWeaponInfo = godWeaponModel.GetGodWeaponInfo(type);

                var equipedLevel = godWeaponInfo != null ? godWeaponInfo.level : 0;

                dict[type] = equipedLevel;

            }



            UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()

            {

                job = job,

                clothesId = clothesId,

                suitLevel = _suitLevel,

                weaponId = weaponId,

                wingsId = wingsId,

                secondaryId = secondaryId,

                fashionClothesId = fashionClothesId,

                fashionWeaponId = fashionWeaponId,

                fashionSecondaryId = fashionSecondaryId,

                isDialogue = false,

                godWeapons = dict

            };

            return data;

        }

    }



    public enum ModelShowType

    {

        treasure, //法宝

        mount, //坐骑

        pet,

        pet, //灵宠

        FashionDress, //时装

    }

}


 System/RoleParticulars/RoleParticularModel.cs

@@ -190,6 +190,10 @@
        {

            var fightPower = GetHorseSkillFightPower(_id, lv);

            var horseUpConfig = HorseUpConfig.GetHorseIDAndLV(_id, lv);

            if (horseUpConfig == null)

            {

                return 0;

            }

            Dictionary<int, int> dict = new Dictionary<int, int>();

            int[] propertys = horseUpConfig.AttrType;

            int[] values = horseUpConfig.AttrValue;

@@ -285,6 +289,10 @@
            for (int i = 0; i < horses.Count; i++)

            {

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

                if (horseUpConfig == null)

                {

                    continue;

                }

                GetHorseProperty(horses[i].id, horses[i].lv, ref propertyDict);

                int[] propertys = horseUpConfig.AttrType;

                int[] values = horseUpConfig.AttrValue;

@@ -463,6 +471,10 @@
                     return x.id == condition;

                 });

                HorseUpConfig horseUpConfig = HorseUpConfig.GetHorseIDAndLV(horseInfo.id, horseInfo.lv);

                if (horseUpConfig == null)

                {

                    return dict;

                }

                int[] propertys = horseUpConfig.AttrType;

                int[] values = horseUpConfig.AttrValue;

                for (int k = 0; k < propertys.Length; k++)

@@ -478,6 +490,10 @@
                for (int i = 0; i < horses.Count; i++)

                {

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

                    if (horseConfig == null)

                    {

                        continue;

                    }

                    if (horseConfig.Quality == condition)

                    {

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