少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-15 1004825f592e64bf8ee277bc16d9271d88abd3bb
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
60 ■■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackSendQuestMgr.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UI3DModelExhibition.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -222,7 +222,7 @@
        private void ClickBuyTimes()
        {
            if (!crossServerModel.TryGetBuyMatchTimes()) return;
            if (!crossServerModel.TryGetBuyMatchTimes("CrossMatching21")) return;
         
            WindowCenter.Instance.Open<CrossSeverOneVsOneBuyMatchTimesWin>();
        }
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -502,11 +502,11 @@
        }
        public bool TryGetBuyMatchTimes()
        public bool TryGetBuyMatchTimes(string key)
        {
            if (!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
            {
                SysNotifyMgr.Instance.ShowTip("CrossMatching21");
                SysNotifyMgr.Instance.ShowTip(key);
                return false;
            }
System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -701,7 +701,7 @@
                    return;
                case 1506:
                    var crossOneVsOneModel = ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>();
                    if (!crossOneVsOneModel.TryGetBuyMatchTimes())
                    if (!crossOneVsOneModel.TryGetBuyMatchTimes("CrossMatching26"))
                    {
                        return;
                    }
UI/Common/UI3DModelExhibition.cs
@@ -371,7 +371,57 @@
        public void ShowSitDownPlayer(RawImage _rawImage, int _job)
        {
            ShowPlayer(_rawImage, _job);
            var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes);
            var flashClothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionClothes);
            var clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID;
            var flashClothesId = flashClothes == null ? 0 : flashClothes.itemInfo.ItemID;
            var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon);
            var flashWeapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon);
            var weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID;
            var flashWeaponId = flashWeapon == null ? 0 : flashWeapon.itemInfo.ItemID;
            var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
            var wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID;
            var flahsSecondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon2);
            var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);
            var secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;
            var flashSecondaryId = flahsSecondary == null ? 0 : flahsSecondary.itemInfo.ItemID;
            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 = null;
            EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, out dict);
            if (dict != null && dict.ContainsKey(2))
            {
                dict.Remove(2);
            }
            var data = new UI3DPlayerExhibitionData
            {
                job = _job,
                fashionClothesId = flashClothesId,
                fashionWeaponId = flashWeaponId,
                fashionSecondaryId = flashSecondaryId,
                clothesId = clothesId,
                suitLevel = suitLevel,
                weaponId = weaponId,
                wingsId = wingsId,
                secondaryId = secondaryId,
                isDialogue = false,
                godWeapons = dict
            };
            ShowOtherPlayer(_rawImage, data);
            if (playerModel != null)
            {
                playerModel.SitDown();