少年修仙传客户端代码仓库
client_Wu Xijin
2019-04-28 c5da8671634eb0669fc349a7f0c3e4dae760631c
6626 【2.0】【开发】查看玩家装备和查看玩家战力功能
7个文件已修改
53 ■■■■ 已修改文件
System/Equip/EquipFightPower.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ItemTip/ItemTipUtility.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ItemTip/TipStrengthenPropertyWidget.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/OtherPlayerEquipModel.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/OtherPlayerEquipSlotBehaviour.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/OtherPlayerEquipWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RoleParticulars/RoleParticularsWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Equip/EquipFightPower.cs
@@ -289,6 +289,11 @@
        private void CountGemItemProperties(int gem, ref Properties container)
        {
            var config = ItemConfig.Get(gem);
            if (config == null)
            {
                return;
            }
            if (config.Effect2 > 0)
            {
                container.Add(config.Effect2, config.EffectValueA2);
System/ItemTip/ItemTipUtility.cs
@@ -462,6 +462,7 @@
                star = info.starLevel,
                strengthenLevel = info.strengthenLevel,
                score = info.score,
                isEquiped=true,
            };
            var baseProperty = GetBaseProperty(info.itemId);
System/ItemTip/TipStrengthenPropertyWidget.cs
@@ -20,11 +20,7 @@
            for (int i = 0; i < count; i++)
            {
                var property = data.properties[i];
                var config = PlayerPropertyConfig.Get(property.x);
                var name = config.Name;
                var value = PlayerPropertyConfig.GetValueDescription(property.x, property.y);
                lines[i] = string.Format("{0}:{1}", name, value);
                lines[i] = PlayerPropertyConfig.GetFullDescription(property.x, property.y);
            }
            m_PropertyBehaviour.text = string.Join("\r\n", lines);
        }
System/RoleParticulars/OtherPlayerEquipModel.cs
@@ -49,8 +49,6 @@
        public void ViewPlayerEquip(PlayerBriefInfo info)
        {
            Clear();
            this.playerId = info.id;
            this.playerJob = info.job;
            this.playerRealm = info.realm;
@@ -174,7 +172,7 @@
                return default(ItemTipUtility.OtherPlayerEquipInfo);
            }
            if (equipDetailsGroups[level].equips.ContainsKey(place))
            if (!equipDetailsGroups[level].equips.ContainsKey(place))
            {
                return default(ItemTipUtility.OtherPlayerEquipInfo);
            }
@@ -280,31 +278,39 @@
                    trainProperties.Add(new Int2(trainData.config.attType2, (int)washValueJson[1]));
                    trainProperties.Add(new Int2(trainData.config.attType3, (int)washValueJson[2]));
                }
                else
                {
                    var config = ItemConfig.Get(itemId);
                    var trainType = EquipTrainModel.GetTrainType(config.EquipPlace);
                    var trainData = EquipWashConfig.Get(trainType, 1);
                    trainProperties.Add(new Int2(trainData.config.attType1, 0));
                    trainProperties.Add(new Int2(trainData.config.attType2, 0));
                    trainProperties.Add(new Int2(trainData.config.attType3, 0));
                }
                Dictionary<int, List<int>> userData = null;
                if (serverInfo.Keys.Contains("UserData"))
                {
                    var userDataJson = serverInfo["UserData"];
                    if (userDataJson.Keys.Contains("17") && userDataJson.Keys.Contains("19"))
                    userData = ConfigParse.Analysis(serverInfo["UserData"].ToString());
                    if (userData.ContainsKey(17) && userData.ContainsKey(19))
                    {
                        var count = Mathf.Min(userDataJson["17"].Count, userDataJson["19"].Count);
                        var count = Mathf.Min(userData[17].Count, userData[19].Count);
                        for (int i = 0; i < count; i++)
                        {
                            legendProperties.Add(new Int2((int)userDataJson["17"][i], (int)userDataJson["19"][i]));
                            legendProperties.Add(new Int2(userData[17][i], userData[19][i]));
                        }
                    }
                }
                var legendIds = new List<int>();
                var legendValues = new List<int>();
                var userData = new Dictionary<int, List<int>>();
                foreach (var property in legendProperties)
                {
                    legendIds.Add(property.x);
                    legendValues.Add(property.y);
                }
                userData[17] = legendIds;
                userData[19] = legendValues;
                this.score = ItemLogicUtility.Instance.GetEquipScore(PackType.Item, itemId, userData);
            }
System/RoleParticulars/OtherPlayerEquipSlotBehaviour.cs
@@ -74,18 +74,6 @@
            ItemTipUtility.ShowOtherPlayerEquip(model.GetEquipInfo(model.selectedLevel, this.place));
        }
        [ContextMenu("addd")]
        public void FindChild()
        {
            m_ViewDetials = this.GetComponent<Button>();
            m_SlotName = this.GetComponent<Text>("Txt_Name");
            m_Star = this.GetComponent<Text>("Txt_Star");
            m_Icon = this.GetComponent<Image>("Img_Icon");
            m_IconFrame = this.GetComponent<Image>("Img_Frame");
        }
    }
}
System/RoleParticulars/OtherPlayerEquipWin.cs
@@ -90,7 +90,7 @@
            foreach (var level in allLevels)
            {
                var config = EquipControlConfig.Get(level, 1);
                if (config.realm >= realm)
                if (realm >= config.realm)
                {
                    levels.Add(level);
                }
System/RoleParticulars/RoleParticularsWin.cs
@@ -58,6 +58,7 @@
        protected override void OnPreClose()
        {
            otherPlayerEquipModel.Clear();
            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;
        }