다시 푸시

This commit is contained in:
kyh
2024-11-26 14:14:53 +09:00
parent ec4d9c7a4a
commit 82e807700e

View File

@@ -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;