diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 35ed510..e112e82 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -664,12 +664,12 @@ namespace BitgetAPI.IndicatorConditionSetup var flag_60 = 저고점_60["Type"] == 0 && 저고점_60["전저가"] < 현재봉3_60 && 저고점_60["전고가"] > 현재봉3_60; var flag_15 = 저고점_15["Type"] == 0 - && 저고점_60["전저가"] < 현재봉3_15 - && 저고점_60["전고가"] < 현재봉3_15 - && 저고점_60["전고가"] > 전봉3_15 - && 저고점_60["전저가"] > 저고점_60["전전저가"] - && 저고점_60["전저가"] < 저고점_60["전고가"] - && 저고점_60["전고가"] > 저고점_60["전전저가"] && 저고점_60["전고가"]< 저고점_60["전전고가"]; + && 저고점_15["전저가"] < 현재봉3_15 + && 저고점_15["전고가"] < 현재봉3_15 + && 저고점_15["전고가"] > 전봉3_15 + && 저고점_15["전저가"] > 저고점_15["전전저가"] + && 저고점_15["전저가"] < 저고점_15["전고가"] + && 저고점_15["전고가"] > 저고점_15["전전저가"] && 저고점_15["전고가"]< 저고점_15["전전고가"]; if (flag_60 && flag_15) { @@ -750,7 +750,7 @@ namespace BitgetAPI.IndicatorConditionSetup if (interval < MCandleTimeType.H1) { - var buyTime = ((DateTime)buyItem["CandleTime"]).AddMinutes((int)interval); + var buyTime = ((DateTime)buyItem["CandleTime"]).AddMinutes(15); if (nowTime < buyTime) { @@ -870,14 +870,13 @@ namespace BitgetAPI.IndicatorConditionSetup var flag_60 = 저고점_60["Type"] == 1 && 저고점_60["전고가"] > 현재봉3_60 && 저고점_60["전저가"] < 현재봉3_60; - var flag_15 = 저고점_15["Type"] == 1 - && 저고점_60["전고가"] > 현재봉3_15 - && 저고점_60["전저가"] > 현재봉3_15 - && 저고점_60["전저가"] < 전봉3_15 - && 저고점_60["전고가"] < 저고점_60["전전고가"] - && 저고점_60["전고가"] > 저고점_60["전저가"] - && 저고점_60["전저가"] < 저고점_60["전전고가"] && 저고점_60["전저가"] > 저고점_60["전전저가"]; + && 저고점_15["전고가"] > 현재봉3_15 + && 저고점_15["전저가"] > 현재봉3_15 + && 저고점_15["전저가"] < 전봉3_15 + && 저고점_15["전고가"] < 저고점_15["전전고가"] + && 저고점_15["전고가"] > 저고점_15["전저가"] + && 저고점_15["전저가"] < 저고점_15["전전고가"] && 저고점_15["전저가"] > 저고점_15["전전저가"]; if (flag_60 && flag_15) { @@ -959,7 +958,7 @@ namespace BitgetAPI.IndicatorConditionSetup var flag = (bool)buyItem["Flag"]; if (interval < MCandleTimeType.H1) { - var buyTime = ((DateTime)buyItem["CandleTime"]).AddMinutes((int)interval); + var buyTime = ((DateTime)buyItem["CandleTime"]).AddMinutes(15); if (nowTime < buyTime) {