3335 修改装备tip

client_Wu Xijin

2019-03-15 2982f253653d80ef830a05f3c0d1da6190701d8d

3335 修改装备tip

 System/ItemTip/EquipTipUtility.cs

@@ -72,6 +72,7 @@

        public struct StrengthenProperty
        {
            public int strengthenLevel;
            public List<Int2> properties;
        }

@@ -83,6 +84,7 @@

        public struct TrainProperty
        {
            public int level;
            public List<Int2> properties;
        }

@@ -91,6 +93,7 @@
        static EquipStarModel starModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }
        static EquipGemModel gemModel { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
        static EquipTrainModel trainModel { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }
        static EquipStrengthModel strengthenModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }

        public static EquipTipType tipType { get; private set; }
        public static TipData mainTipData { get; private set; }
@@ -471,8 +474,25 @@

        private static StrengthenProperty GetStrengthenProperty(string guid)
        {
            var item = packModel.GetItemByGuid(guid);
            if (item == null)
            {
                return default(StrengthenProperty);
            }

            return default(StrengthenProperty);
            var level = item.config.LV;
            var place = item.config.EquipPlace;

            var data = new StrengthenProperty();
            data.strengthenLevel = strengthenModel.GetStrengthLevel(level, place);
            data.properties = new List<Int2>();
            var values = strengthenModel.GetEquipValueList(level, place);
            foreach (var value in values)
            {
                data.properties.Add(new Int2(value.AttType, value.AttValue));
            }

            return data;
        }

        private static GemInfo GetGemInfo(int itemId)
@@ -482,21 +502,53 @@

        private static GemInfo GetGemInfo(string guid)
        {
            return default(GemInfo);
            var item = packModel.GetItemByGuid(guid);
            if (item == null)
            {
                return default(GemInfo);
            }

            var level = item.config.LV;
            var place = item.config.EquipPlace;
            var gemInfo = new GemInfo();

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

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

            return gemInfo;
        }

        private static TrainProperty GetTrainProperty(string guid)
        {
            var item = packModel.GetItemByGuid(guid);
            var trainLevel = trainModel.GetTrainLevel(item.config.LV, item.config.EquipPlace);
            var type = EquipTrainModel.GetTrainType(item.config.EquipPlace);
            if (item == null)
            {
                return default(TrainProperty);
            }

            var trainProperty = new TrainProperty();
            var trainLevel = trainModel.GetTrainLevel(item.config.LV, item.config.EquipPlace);
            trainProperty.level = trainLevel;

            var trainedProperties = trainModel.GetTrainedProperties(item.config.LV, item.config.EquipPlace);
            var property1 = 0;
            var property2 = 0;
            var property3 = 0;

            var type = EquipTrainModel.GetTrainType(item.config.EquipPlace);
            for (int i = 1; i < trainLevel - 1; i++)
            {
                var data = EquipWashConfig.Get(type, i);

 System/ItemTip/TipBaseInfoWidget.cs

@@ -75,7 +75,7 @@
            if (baseInfo.auctionSurplusTime > 0)
            {
                m_SurplusTimeContainer.gameObject.SetActive(true);
                m_SurplusTime.text = TimeUtility.SecondsToTitleDHMS(baseInfo.auctionSurplusTime);
                m_SurplusTime.text = TimeUtility.SecondsToHMSCHSRetain(baseInfo.auctionSurplusTime);
            }
            else
            {

 System/ItemTip/TipGemInfoWidget.cs

@@ -38,7 +38,6 @@
            {
                if (active)
                {
                    locked.gameObject.SetActive(false);
                    if (gem > 0)
                    {
                        var config = ItemConfig.Get(gem);
@@ -88,13 +87,14 @@
                        propertyBehaviour.gameObject.SetActive(false);
                    }

                    locked.gameObject.SetActive(false);
                    unLockContainer.gameObject.SetActive(false);
                }
                else
                {
                    locked.gameObject.SetActive(true);
                    gemIcon.gameObject.SetActive(false);
                    gemName.text = "未镶嵌";
                    gemName.text = "未解锁";
                    propertyBehaviour.gameObject.SetActive(false);
                    unLockContainer.gameObject.SetActive(true);
                }

 System/ItemTip/TipStrengthenPropertyWidget.cs

@@ -26,10 +26,8 @@
                var value = PlayerPropertyConfig.GetPropertyDescription(property.x, property.y);
                lines[i] = string.Format("{0}：{1}", name, value);
            }

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

    }

}