diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 48bb1c7..98c9feb 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -686,9 +686,9 @@ namespace BitgetAPI.IndicatorConditionSetup var flag_1 = 현재봉3 > oneList.Max(); var flag_15 = - (저고점_15["전전전저가"] > 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && candleData_15.Close > 저고점_15["전고가"]) - || (저고점_15["전전전고가"] > 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && 현재봉3_15 > 저고점_15["전고가"]) - || (저고점_15["전전전고가"] < 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && 현재봉3_15 < 저고점_15["전전고가"]); + (저고점_15["전전전저가"] > 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && 저고점_15["전고가"] > 전봉3_15 && 현재봉3_15 > 저고점_15["전고가"]) + || (저고점_15["전전전고가"] > 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && 저고점_15["전고가"] > 전봉3_15 && 현재봉3_15 > 저고점_15["전고가"]) + || (저고점_15["전전전고가"] < 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && 전봉3_15 < 저고점_15["전전고가"] && 현재봉3_15 > 저고점_15["전전고가"]); var flag_30 = 저고점_30["전고가"] < 현재봉3_30; @@ -776,7 +776,7 @@ namespace BitgetAPI.IndicatorConditionSetup var flag = (bool)buyItem["Flag"]; if (interval < MCandleTimeType.H1) { - var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30); + var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(15); if (nowTime < buyTime) continue; } @@ -912,9 +912,9 @@ namespace BitgetAPI.IndicatorConditionSetup var flag_1 = 현재봉3 < oneList.Min(); var flag_15 = - (저고점_15["전전전고가"] < 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && candleData_15.Close < 저고점_15["전저가"]) - || (저고점_15["전전전저가"] < 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && 현재봉3_15 < 저고점_15["전저가"]) - || (저고점_30["전전전저가"] > 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && 현재봉3_15 > 저고점_15["전전저가"]); + (저고점_15["전전전고가"] < 저고점_15["전전고가"] && 저고점_15["전전고가"] > 저고점_15["전고가"] && 전봉3_15 > 저고점_15["전저가"] && 현재봉3_15 < 저고점_15["전저가"]) + || (저고점_15["전전전저가"] < 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && 전봉3_15 > 저고점_15["전저가"] && 현재봉3_15 < 저고점_15["전저가"]) + || (저고점_30["전전전저가"] > 저고점_15["전전저가"] && 저고점_15["전전저가"] < 저고점_15["전저가"] && 전봉3_15 > 저고점_15["전전저가"] && 현재봉3_15 < 저고점_15["전전저가"]); var flag_30 = 저고점_30["전저가"] > 현재봉3_30; @@ -1000,7 +1000,7 @@ namespace BitgetAPI.IndicatorConditionSetup var flag = (bool)buyItem["Flag"]; if (interval < MCandleTimeType.H1) { - var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30); + var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(15); if (nowTime < buyTime) continue; }