diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs index ed99d13..0887c1f 100644 --- a/Million Buyer/MainForm.cs +++ b/Million Buyer/MainForm.cs @@ -903,6 +903,9 @@ namespace Million_Buyer var flag = false; var scriptStr = sellScript.regularExpressionString; var str = "default"; + var buyItem = buyList.FirstOrDefault(x => x.ConGoodsData.CoinFullName == item); + var buyCandleData = buyItem.CandleDataLists_Im[0]; + if (sellExceptionScript.regularExpressionString != null && sellExceptionScript.regularExpressionString.Length > 0) { @@ -917,15 +920,11 @@ namespace Million_Buyer if (sellNowDic.ContainsKey(item) && sellNowDic[item]) { - str = "exception"; - flag = true; + str = "exception"; } if (!flag) { - var buyItem = buyList.FirstOrDefault(x => x.ConGoodsData.CoinFullName == item); - var buyCandleData = buyItem.CandleDataLists_Im[0]; - if (str != "exception") { if ((int)smallCandleType < 60) @@ -993,7 +992,7 @@ namespace Million_Buyer if (beforeVal < recentlyVal) { slopeDic[item] = false; - if (recentlyData.BuyValue < recentlyData.EndValue) + if (buyCandleData.BuyValue < recentlyData.EndValue) flag = true; } @@ -1003,7 +1002,7 @@ namespace Million_Buyer if (beforeVal > recentlyVal) { slopeDic[item] = false; - if (recentlyData.BuyValue < recentlyData.EndValue) + if (buyCandleData.BuyValue < recentlyData.EndValue) flag = true; } } @@ -1030,7 +1029,7 @@ namespace Million_Buyer if (flag) { sw.Restart(); - var buyItem = buyList.FirstOrDefault(x => x.ConGoodsData.CoinFullName == item); + var time = DateTime.Now; var sellItem = recentlyData; @@ -1048,8 +1047,7 @@ namespace Million_Buyer } sellItem.SellTime = time; - - var buyCandleData = buyItem.CandleDataLists_Im[0]; + var result = DataManager.GetBuyerSearchResult(buyCandleData, recentlyData, buyItem.ConGoodsData); // buycount 에서 sell count를 제외한 양이 미체결 량