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

client_linchunjie

2019-03-26 bdbb6e3550d85aaa81b27a4dfef02c608626e459

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

 Core/GameEngine/Model/TelPartialConfig/PartialEquipSuitNameConfig.cs

@@ -8,7 +8,7 @@

    public void OnConfigParseCompleted()
    {
        var key = level * 10000 + place * 1000 + job/100;
        var key = level * 10000 + place * 1000 + job;
        suitNames[key] = name;
    }


 System/ItemTip/EquipTipUtility.cs

@@ -545,16 +545,19 @@
            gemInfo.activeStates = new Dictionary<int, bool>();
            for (int i = 0; i < 4; i++)
            {
                gemInfo.activeStates[i] = gemModel.IsEquipGemHoleOpen(level, place, i);
                gemInfo.activeStates[i] = IsEquipGemHoleOpen(new Int2(level, place), i);
            }

            gemInfo.gems = new Dictionary<int, int>();
            int[] gems;
            if (gemModel.TryGetEquipGems(item.config.LV, item.config.EquipPlace, out gems))
            if (item.packType == PackType.Equip)
            {
                for (int i = 0; i < gems.Length; i++)
                int[] gems;
                if (gemModel.TryGetEquipGems(item.config.LV, item.config.EquipPlace, out gems))
                {
                    gemInfo.gems[i] = gems[i];
                    for (int i = 0; i < gems.Length; i++)
                    {
                        gemInfo.gems[i] = gems[i];
                    }
                }
            }

@@ -652,6 +655,26 @@
            return operates;
        }

        private static bool IsEquipGemHoleOpen(Int2 equipPosition, int hole)
        {
            GemHoleCondition condition;
            if (gemModel.TryGetGemHoleCondition(hole, out condition))
            {
                var star = starModel.GetEquipStarLevel(equipPosition);
                if (star < condition.equipStar)
                {
                    return false;
                }

                var vipLevel = PlayerDatas.Instance.baseData.VIPLv;
                if (vipLevel < condition.vipLevel)
                {
                    return false;
                }
            }

            return true;
        }
    }

}

 System/ItemTip/TipGemInfoWidget.cs

@@ -46,11 +46,6 @@
                        gemName.text = config.ItemName;

                        var properties = new List<Int2>();
                        if (config.Effect1 > 0)
                        {
                            properties.Add(new Int2(config.Effect1, config.EffectValueA1));
                        }

                        if (config.Effect2 > 0)
                        {
                            properties.Add(new Int2(config.Effect2, config.EffectValueA2));
@@ -75,7 +70,7 @@
                        for (int i = 0; i < properties.Count; i++)
                        {
                            var property = properties[i];
                            lines[i] = string.Format("{0}+{1}", property.x, PlayerPropertyConfig.GetValueDescription(property.x, property.y));
                            lines[i] =PlayerPropertyConfig.GetFullDescription(property.x, property.y);
                        }

                        propertyBehaviour.text = string.Join("\r\n", lines);