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

client_linchunjie

2019-03-12 d4a10b6c4ae397cd4b792eea9f89523abc6fcbb5

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

 System/EquipTrain/EquipTrainModel.cs

@@ -101,7 +101,7 @@
            var code = 0;
            for (int i = 0; i < inevitables.Length; i++)
            {
                code += inevitables[i] ? 0 : MathUtility.Power(2, i);
                code += inevitables[i] ? MathUtility.Power(2, i) : 0;
            }

            var equipWash = new CA325_tagCMEquipXLAttrChange();
@@ -318,23 +318,26 @@
            var trainLevel = GetTrainLevel(level, place);
            var data = EquipWashConfig.Get(GetTrainType(place), Mathf.Clamp(trainLevel + 1, 1, absoluteMax));

            var propertyBar = new EquipTrainPropertyBar(data.config.attType1, trainState == TrainState.Empty ? 0 : data.config.attMax1, trainState);
            propertyBar.propertyValue.value = trainedProperties.x;
            propertyBar.deltaValue.value = unSavedProperties.x;
            propertyBar.operateType.value = operateType;
            propertyBars.Add(propertyBar);
            if (data != null)
            {
                var propertyBar = new EquipTrainPropertyBar(data.config.attType1, trainState == TrainState.Empty ? 0 : data.config.attMax1, trainState);
                propertyBar.propertyValue.value = trainedProperties.x;
                propertyBar.deltaValue.value = unSavedProperties.x;
                propertyBar.operateType.value = operateType;
                propertyBars.Add(propertyBar);

            propertyBar = new EquipTrainPropertyBar(data.config.attType2, trainState == TrainState.Empty ? 0 : data.config.attMax2, trainState);
            propertyBar.propertyValue.value = trainedProperties.y;
            propertyBar.deltaValue.value = unSavedProperties.y;
            propertyBar.operateType.value = operateType;
            propertyBars.Add(propertyBar);
                propertyBar = new EquipTrainPropertyBar(data.config.attType2, trainState == TrainState.Empty ? 0 : data.config.attMax2, trainState);
                propertyBar.propertyValue.value = trainedProperties.y;
                propertyBar.deltaValue.value = unSavedProperties.y;
                propertyBar.operateType.value = operateType;
                propertyBars.Add(propertyBar);

            propertyBar = new EquipTrainPropertyBar(data.config.attType3, trainState == TrainState.Empty ? 0 : data.config.attMax3, trainState);
            propertyBar.propertyValue.value = trainedProperties.z;
            propertyBar.deltaValue.value = unSavedProperties.z;
            propertyBar.operateType.value = operateType;
            propertyBars.Add(propertyBar);
                propertyBar = new EquipTrainPropertyBar(data.config.attType3, trainState == TrainState.Empty ? 0 : data.config.attMax3, trainState);
                propertyBar.propertyValue.value = trainedProperties.z;
                propertyBar.deltaValue.value = unSavedProperties.z;
                propertyBar.operateType.value = operateType;
                propertyBars.Add(propertyBar);
            }

            inevitableMaterialCount.value = CalculateInevitableMaterialCount();
        }