少年修仙传客户端代码仓库
client_Wu Xijin
2019-07-11 00bee4ee75eea71cfb32a8d9946c39c2564f4e96
3335 更新ui3d模型展示逻辑
4个文件已修改
119 ■■■■■ 已修改文件
System/Equip/EquipModel.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Equip/RealmEquipWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DModelExhibition.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DShowHero.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Equip/EquipModel.cs
@@ -428,11 +428,7 @@
        public EquipAppearance GetAppearance()
        {
            var level = PlayerDatas.Instance.baseData.suitLevel;
            var isSuit = PlayerDatas.Instance.baseData.equipShowSwitch % 10 > 0;
            var appearance = GetAppearance((int)level);
            appearance.isSuit = isSuit;
            return appearance;
            return GetAppearance(level);
        }
        public EquipAppearance GetAppearance(int level)
@@ -469,6 +465,20 @@
            var fashionSecondary = packModel.GetItemByIndex(PackType.Equip, equipIndex);
            appearance.fashionSecondary = fashionSecondary == null ? 0 : fashionSecondary.itemId;
            var isSuit = true;
            for (var i = 1; i <= 8; i++)
            {
                var guid = GetEquip(new Int2(level, i));
                var item = packModel.GetItemByGuid(guid);
                if (item == null || !ItemLogicUtility.Instance.IsSuitEquip(item.itemId))
                {
                    isSuit = false;
                    break;
                }
            }
            appearance.isSuit = isSuit;
            return appearance;
        }
System/Equip/RealmEquipWin.cs
@@ -208,7 +208,8 @@
                secondaryId = appearance.secondary,
                keepRotation = !resetRotation,
                reikiRootEffectId = PlayerDatas.Instance.baseData.reikiRootEffectId,
            });
                suitLevel = appearance.isSuit ? 1 : 0,
            });
        }
        private void DisplayFightPoint(int fightPoint)
UI/Common/UI3DModelExhibition.cs
@@ -118,67 +118,6 @@
            return this.name;
        }
        public void ShowLoginPlayer(RawImage rawImage, int job)
        {
            var flashClothes = 0;
            var flashWeapon = 0;
            var flashSecondary = 0;
            var clothesItemId = 0;
            var weaponItemId = 0;
            var wingsItemId = 0;
            var secondaryItemId = 0;
            var suitLevel = 0;
            var equipInfos = PlayerDatas.Instance.loginInfo.EquipInfo;
            var reikiRootEffectId = PlayerDatas.Instance.loginInfo.EquipShowSwitch / 1000 % 1000;
            for (int i = 0; i < equipInfos.Length; i++)
            {
                var equipInfo = equipInfos[i];
                var config = ItemConfig.Get((int)equipInfo.ItemID);
                switch ((RoleEquipType)config.EquipPlace)
                {
                    case RoleEquipType.FashionClothes:
                        flashClothes = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.FashionWeapon:
                        flashWeapon = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.FashionWeapon2:
                        flashSecondary = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.Weapon:
                        weaponItemId = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.Clothes:
                        clothesItemId = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.Wing:
                        wingsItemId = (int)equipInfo.ItemID;
                        break;
                    case RoleEquipType.Weapon2:
                        secondaryItemId = (int)equipInfo.ItemID;
                        break;
                }
            }
            var data = new UI3DPlayerExhibitionData
            {
                job = job,
                fashionClothesId = flashClothes,
                fashionWeaponId = flashWeapon,
                fashionSecondaryId = flashSecondary,
                clothesId = clothesItemId,
                suitLevel = suitLevel,
                weaponId = weaponItemId,
                wingsId = wingsItemId,
                secondaryId = secondaryItemId,
                reikiRootEffectId = (int)reikiRootEffectId,
                isDialogue = false,
            };
            DrawPlayer(rawImage, data);
        }
        public void ShowPlayer(RawImage rawImage, int job, bool isDialogue = false)
        {
            var apperance = equipModel.GetAppearance();
@@ -196,27 +135,6 @@
                suitLevel = apperance.isSuit ? 1 : 0,
                reikiRootEffectId = isDialogue ? 0 : reikiRootEffectId,
                isDialogue = isDialogue,
            };
            DrawPlayer(rawImage, data);
        }
        public void ShowPlayer(RawImage rawImage, int job, RoleEquipType exceptEquip)
        {
            var apperance = equipModel.GetAppearance();
            var reikiRootEffectId = PlayerDatas.Instance.baseData.reikiRootEffectId;
            var data = new UI3DPlayerExhibitionData
            {
                job = job,
                fashionClothesId = exceptEquip == RoleEquipType.Clothes ? 0 : apperance.fashionClothes,
                fashionWeaponId = exceptEquip == RoleEquipType.Weapon ? 0 : apperance.fashionWeapon,
                fashionSecondaryId = exceptEquip == RoleEquipType.Weapon2 ? 0 : apperance.fashionSecondary,
                clothesId = exceptEquip == RoleEquipType.Clothes ? 0 : apperance.clothes,
                weaponId = exceptEquip == RoleEquipType.Weapon ? 0 : apperance.weapon,
                secondaryId = exceptEquip == RoleEquipType.Weapon2 ? 0 : apperance.secondary,
                wingsId = exceptEquip == RoleEquipType.Wing ? 0 : apperance.wings,
                reikiRootEffectId = (int)reikiRootEffectId,
                suitLevel = apperance.isSuit ? 1 : 0,
            };
            DrawPlayer(rawImage, data);
UI/Common/UI3DShowHero.cs
@@ -35,14 +35,14 @@
        GameObject reikiRootShowPoint = null;
        SFXController reikiRootEffect = null;
        int suitID;
        bool isSuit = false;
        public GameObject Show(UI3DPlayerExhibitionData data, Transform showPoint)
        {
            this.showPoint = showPoint;
            this.job = data.job;
            var clothes = data.fashionClothesId > 0 ? data.fashionClothesId : data.clothesId;
            suitID = data.suitLevel;
            isSuit = data.suitLevel > 0;
            var weaponId = data.fashionWeaponId > 0 ? data.fashionWeaponId : data.weaponId;
            var wingsId = data.wingsId;
            var secondaryId = data.fashionSecondaryId > 0 ? data.fashionSecondaryId : data.secondaryId;
@@ -59,7 +59,7 @@
                var item = ItemConfig.Get(clothes);
                clothesResId = item == null ? clothesResId = jobConfig.BaseEquip[0] : item.ChangeOrd;
            }
            PutOnClothes(job, clothesResId, suitID);
            PutOnClothes(job, clothesResId);
            var weaponResId = 0;
            if (weaponId == 0)
@@ -303,7 +303,7 @@
            }
        }
        private void PutOnClothes(int _job, int clothesResId, int suitLevel)
        private void PutOnClothes(int _job, int clothesResId)
        {
            var config = JobSetupConfig.Get(_job);
            if (clothesId == clothesResId)
@@ -604,10 +604,9 @@
        private void LoadClothesEffect()
        {
            var _appearance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();
            SwitchMaterial(_appearance.isSuit);
            SwitchMaterial(isSuit);
            HideSuitEffect();
            if (_appearance.isSuit || suitID > 0)
            if (isSuit)
            {
                var _modelResConfig = ModelResConfig.Get(clothesId);
                if (_modelResConfig != null)
@@ -634,6 +633,7 @@
                }
            }
        }
        private List<SFXController> m_SuitEffectList = new List<SFXController>();
        private List<SFXController> m_WeaponEffectList = new List<SFXController>();
        private List<SFXController> m_SecondaryEffectList = new List<SFXController>();