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

client_Zxw

2019-03-28 10062993b6f817ac533ad6d31451a970e907d197

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

 System/ItemTip/EquipTipUtility.cs

@@ -591,12 +591,22 @@
            trainProperty.level = trainLevel;

            var trainConfig = EquipWashConfig.Get(type, trainLevel);
            var trainedProperties = trainModel.GetTrainedProperties(equipPosition);

            trainProperty.properties = new List<Int2>();
            trainProperty.properties.Add(new Int2(trainConfig.config.attType1, Mathf.Min(trainedProperties.x, trainConfig.config.attMax1)));
            trainProperty.properties.Add(new Int2(trainConfig.config.attType2, Mathf.Min(trainedProperties.y, trainConfig.config.attMax2)));
            trainProperty.properties.Add(new Int2(trainConfig.config.attType3, Mathf.Min(trainedProperties.z, trainConfig.config.attMax3)));

            if (trainConfig == null)
            {
                var trainConfigLevel1 = EquipWashConfig.Get(type, 1);
                trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType1, 0));
                trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType2, 0));
                trainProperty.properties.Add(new Int2(trainConfigLevel1.config.attType3, 0));
            }
            else
            {
                var trainedProperties = trainModel.GetTrainedProperties(equipPosition);
                trainProperty.properties.Add(new Int2(trainConfig.config.attType1, Mathf.Min(trainedProperties.x, trainConfig.config.attMax1)));
                trainProperty.properties.Add(new Int2(trainConfig.config.attType2, Mathf.Min(trainedProperties.y, trainConfig.config.attMax2)));
                trainProperty.properties.Add(new Int2(trainConfig.config.attType3, Mathf.Min(trainedProperties.z, trainConfig.config.attMax3)));
            }

            return trainProperty;
        }