diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 9dc22e1..8a1b60a 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -774,8 +774,8 @@ namespace BitgetAPI.IndicatorConditionSetup if(BuyLongStep[market] == 0) { - if ((전전봉macdData_30.SH < 0 && 전봉macdData_30.SH > 0 && 전봉macdData_30.MD > 전전봉macdData_30.MD && macdData_30.MD > 전봉macdData_30.MD) //&& 전봉macdData_30.MD < 0 - || (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD > 0 && 전봉macdData_30.SH > 전전봉macdData_30.SH)) + if (//(전전봉macdData_30.SH < 0 && 전봉macdData_30.SH > 0 && 전봉macdData_30.MD > 전전봉macdData_30.MD && macdData_30.MD > 전봉macdData_30.MD) || //&& 전봉macdData_30.MD < 0 + (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD > 0 && 전봉macdData_30.SH > 전전봉macdData_30.SH)) { BuyLongStep[market] = 1; BuyLongStepStampData[market] = 저고점_30["tempLowVal"]; @@ -799,8 +799,8 @@ namespace BitgetAPI.IndicatorConditionSetup if (BuyLongStep[market] == 2) { - if ((전전봉macdData_30.SH < 0 && 전봉macdData_30.SH > 0 && 전봉macdData_30.MD > 전전봉macdData_30.MD && macdData_30.MD > 전봉macdData_30.MD) //&& 전봉macdData_30.MD < 0 - || (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD > 0 && 전봉macdData_30.SH > 전전봉macdData_30.SH)) + if ((전전봉macdData_30.SH < 0 && 전봉macdData_30.SH > 0 && macdData_30.MD > 전봉macdData_30.MD) || + (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD > 0 && 전봉macdData_30.SH > 전전봉macdData_30.SH)) { buyFlag = true; } @@ -1116,8 +1116,8 @@ namespace BitgetAPI.IndicatorConditionSetup if (BuyShortStep[market] == 0) { - if ((전전봉macdData_30.SH > 0 && 전봉macdData_30.SH < 0 && 전봉macdData_30.MD < 전전봉macdData_30.MD && macdData_30.MD < 전봉macdData_30.MD)// 전봉macdData_30.MD > 0 && ) - || (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD < 0 && 전봉macdData_30.SH < 전전봉macdData_30.SH)) + if (//(전전봉macdData_30.SH > 0 && 전봉macdData_30.SH < 0 && 전봉macdData_30.MD < 전전봉macdData_30.MD && macdData_30.MD < 전봉macdData_30.MD) ||// 전봉macdData_30.MD > 0 && ) + (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD < 0 && 전봉macdData_30.SH < 전전봉macdData_30.SH)) { BuyShortStep[market] = 1; BuyShortStepStampData[market] = 저고점_30["tempHighVal"]; @@ -1142,8 +1142,8 @@ namespace BitgetAPI.IndicatorConditionSetup if (BuyShortStep[market] == 2) { - if ((전전봉macdData_30.SH > 0 && 전봉macdData_30.SH < 0 && 전봉macdData_30.MD < 전전봉macdData_30.MD && macdData_30.MD < 전봉macdData_30.MD)// 전봉macdData_30.MD > 0 && ) - || (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD < 0 && 전봉macdData_30.SH < 전전봉macdData_30.SH)) + if (//(전전봉macdData_30.SH > 0 && 전봉macdData_30.SH < 0 && 전봉macdData_30.MD < 전전봉macdData_30.MD && macdData_30.MD < 전봉macdData_30.MD) || // 전봉macdData_30.MD > 0 && ) + (전전전봉macdData_30.MD == 0 && 전전봉macdData_30.MD == 0 && 전봉macdData_30.MD < 0 && 전봉macdData_30.SH < 전전봉macdData_30.SH)) { buyFlag = true; }