From 82e807700e4c98e19ba5b027c94b104eefc50e32 Mon Sep 17 00:00:00 2001 From: kyh <1329522@naver.com> Date: Tue, 26 Nov 2024 14:14:53 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=ED=91=B8=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndicatorProcess.cs | 78 +++++++++++-------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 43e94e7..e717401 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -435,7 +435,7 @@ namespace BitgetAPI.IndicatorConditionSetup if (!UpBuyList.ContainsKey(market + interval)) { if ( - 낮은값_72_24_전봉 < 전봉2 && 전전봉2 < 낮은값_72_24_전전봉 + 낮은값_72_24 < candleData.Close && 전봉2 < 낮은값_72_24_전봉 && candleData.Close > candleData.Open ) { FirstLongFlag[market + interval] = false; @@ -496,6 +496,14 @@ namespace BitgetAPI.IndicatorConditionSetup else { var buyItem = UpBuyList[market + interval]; + + + var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes((int)interval); + if (nowTime < buyTime) + { + continue; + } + //var sellFlag = false; //if (interval < MCandleTimeType.H1) @@ -603,79 +611,79 @@ namespace BitgetAPI.IndicatorConditionSetup if (type == 24) { if (val == 0) { - var origin = 전봉24; - var compare = 전봉72; + var origin = 현재봉24; + var compare = 현재봉72; compareVal = origin; if (origin > compare) { - if (전봉2 > origin) + if (현재봉2 > origin) val = 1; else sellFlag = true; } else { - if (전봉2 > compare) + if (현재봉2 > compare) compareVal = compare; } } if (val == 1) { - compareVal = 높은값_72_24_전봉; + compareVal = 높은값_72_24; - if (전봉2 > 전봉12) + if (현재봉2 > 현재봉12) { val = 2; } } if (val == 2) - compareVal = 전봉12; + compareVal = 현재봉12; } if(type == 72) { if (val == 0) { - var origin = 전봉72; - var compare = 전봉24; + var origin = 현재봉72; + var compare = 현재봉24; compareVal = origin; if (origin > compare) { - if (전봉2 > origin) + if (현재봉2 > origin) val = 1; else sellFlag = true; } else { - if (전봉2 > compare) + if (현재봉2 > compare) compareVal = compare; } } if (val == 1) { - compareVal = 높은값_72_24_전봉; + compareVal = 높은값_72_24; - if (전봉2 > 전봉12) + if (현재봉2 > 현재봉12) { val = 2; } } if (val == 2) - compareVal = 전봉12; + compareVal = 현재봉12; } SellLongStep[market + interval] = val; - if (전봉2 < compareVal || 전봉2 < 낮은값_72_24 || sellFlag) + if (현재봉2 < compareVal || 현재봉2 < 낮은값_72_24 || sellFlag) { double.TryParse(buyItem["Price"].ToString(), out var buyPrice); var resultRate = ((price - buyPrice) / buyPrice) * 100; @@ -764,7 +772,7 @@ namespace BitgetAPI.IndicatorConditionSetup if (!DownBuyList.ContainsKey(market + interval)) { if ( - 높은값_72_24_전봉 > 전봉2 && 전전봉2 > 높은값_72_24_전전봉 + 높은값_72_24 > candleData.Close && 전봉2 > 높은값_72_24_전봉 && candleData.Close < candleData.Open ) { FirstShortFlag[market + interval] = false; @@ -828,7 +836,11 @@ namespace BitgetAPI.IndicatorConditionSetup var sellFlag = false; var buyItem = DownBuyList[market + interval]; - + var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes((int)interval); + if (nowTime < buyTime) + { + continue; + } //if (interval < MCandleTimeType.H1) //{ // var buyTime = ((DateTime)buyItem["BuyDate"]).AddHours(((int)interval/60) * 2); @@ -937,79 +949,79 @@ namespace BitgetAPI.IndicatorConditionSetup { if (val == 0) { - var origin = 전봉24; - var compare = 전봉72; + var origin = 현재봉24; + var compare = 현재봉72; compareVal = origin; if (origin < compare) { - if (전봉2 < origin) + if (현재봉2 < origin) val = 1; else sellFlag = true; } else { - if (전봉2 < compare) + if (현재봉2 < compare) compareVal = compare; } } if (val == 1) { - compareVal = 낮은값_72_24_전봉; + compareVal = 낮은값_72_24; - if (전봉2 < 전봉12) + if (현재봉2 < 현재봉12) { val = 2; } } if (val == 2) - compareVal = 전봉12; + compareVal = 현재봉12; } if (type == 72) { if (val == 0) { - var origin = 전봉72; - var compare = 전봉24; + var origin = 현재봉72; + var compare = 현재봉24; compareVal = origin; if (origin < compare) { - if (전봉2 < origin) + if (현재봉2 < origin) val = 1; else sellFlag = true; } else { - if (전봉2 < compare) + if (현재봉2 < compare) compareVal = compare; } } if (val == 1) { - compareVal = 낮은값_72_24_전봉; + compareVal = 낮은값_72_24; - if (전봉2 < 전봉12) + if (현재봉2 < 현재봉12) { val = 2; } } if (val == 2) - compareVal = 전봉12; + compareVal = 현재봉12; } SellShortStep[market + interval] = val; - if (전봉2 > compareVal || 전봉2 > 높은값_72_24 || sellFlag) + if (현재봉2 > compareVal || 전봉2 > 높은값_72_24 || sellFlag) { double.TryParse(buyItem["Price"].ToString(), out var buyPrice); var resultRate = ((price - buyPrice) / buyPrice) * 100;