3335 修改洗练操作

client_Wu Xijin

2019-03-16 01341e2f50adbab54442361a72f3fa4579f938a3

3335 修改洗练操作

 System/EquipTrain/EquipTrainModel.cs

@@ -228,18 +228,19 @@
                switch (index)
                {
                    case 1:
                        isPerfect = properties[index - 1] >= data.config.attMax1;
                        isPerfect = properties[index] >= data.config.attMax1;
                        break;
                    case 2:
                        isPerfect = properties[index - 1] >= data.config.attMax2;
                        isPerfect = properties[index] >= data.config.attMax2;
                        break;
                    case 3:
                        isPerfect = properties[index - 1] >= data.config.attMax3;
                        isPerfect = properties[index] >= data.config.attMax3;
                        break;
                }

                if (isPerfect)
                {
                    SysNotifyMgr.Instance.ShowTip("WashOperateTip1");
                    return;
                }
            }
@@ -249,7 +250,7 @@
                propertyBars[index].inevitable.value = invevitable;
            }

            inevitableMaterialCount.value = CalculateInevitableMaterialCount();
            inevitableMaterialCount.value = CalculateInevitableMaterialCount(equipPosition);
        }

        public int GetTrainLevel(Int2 equipPosition)
@@ -419,7 +420,7 @@
                propertyBars.Add(propertyBar);
            }

            inevitableMaterialCount.value = CalculateInevitableMaterialCount();
            inevitableMaterialCount.value = CalculateInevitableMaterialCount(equipPosition);
        }

        private int GetTrainMaterial(Int2 equipPosition)
@@ -437,7 +438,13 @@
            }
        }

        private int CalculateInevitableMaterialCount()
        public int GetInevitableMaterialPrice()
        {
            var config = StoreConfig.GetStoreCfg(GeneralDefine.equipTrainMustItemId, 1);
            return config != null ? config.MoneyNumber : 0;
        }

        private int CalculateInevitableMaterialCount(Int2 equipPosition)
        {
            var count = 0;
            for (int i = 0; i < propertyBars.Count; i++)
@@ -445,7 +452,18 @@
                count += propertyBars[i].inevitable.value ? 1 : 0;
            }

            return count;
            if (count > 0)
            {
                var type = GetTrainType(equipPosition.y);
                var trainLevel = GetTrainLevel(equipPosition);
                var config = EquipWashConfig.Get(type, trainLevel);

                return config.mustCosts[count - 1];
            }
            else
            {
                return 0;
            }
        }

        private TrainOperateType CalculateTrainOperateType(Int2 equipPosition)

 System/EquipTrain/EquipTrainWin.cs

@@ -205,10 +205,8 @@
            if (trainable && need > 0)
            {
                var own = packModel.GetItemCountByID(PackType.Item, GeneralDefine.equipTrainMustItemId);
                var type = EquipTrainModel.GetTrainType(equipPosition.y);
                var trainLevel = model.GetTrainLevel(equipPosition);
                var config = EquipWashConfig.Get(type, trainLevel + 1);
                m_InevitableMaterial.Display(false, need, own, config.mustCosts[need - 1]);
                var diamond = (need - own) * model.GetInevitableMaterialPrice();
                m_InevitableMaterial.Display(false, need, own, diamond);
            }
            else
            {