From 38a907ed159fbf480dd0205e9958b663d45ff341 Mon Sep 17 00:00:00 2001
From: kyh <1329522@naver.com>
Date: Thu, 22 Feb 2024 09:54:02 +0900
Subject: [PATCH] =?UTF-8?q?3=ED=8B=B1=20=EC=82=AD=EC=A0=9C=20(BTT=EB=8A=94?=
 =?UTF-8?q?=20=EC=A0=9C=EC=99=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=90=98?=
 =?UTF-8?q?=EC=96=B4=20=EC=9E=88=EC=9D=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Million Buyer/MainForm.cs           | 38 +++++++++++++++--------------
 Million/Manager/CalculateManager.cs | 10 ++++----
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs
index ebcc294..568bb51 100644
--- a/Million Buyer/MainForm.cs	
+++ b/Million Buyer/MainForm.cs	
@@ -479,9 +479,12 @@ namespace Million_Buyer
                     {
                         var tickDataList = UpbitApi.GetTickerList(realTimeMsg.coinFullNameList);
                         int topVolTempCnt = TopVolCnt;
-                        if(tickDataList.Select(t => t.TrendType).Where(t=>t == "RISE").ToList().Count > tickDataList.Count * 0.7)
+
+                        if (tickDataList == null) tickDataList = new List<Ticker>();
+
+                        if (tickDataList.Select(t => t.TrendType).Where(t=>t == "RISE").ToList().Count > tickDataList.Count * 0.7)
                         {
-                            topVolTempCnt = (int)(topVolTempCnt * 2);
+                            topVolTempCnt = (int)(topVolTempCnt * 15 / 10);
                         }
 
                         if (tickDataList.Count > topVolTempCnt)
@@ -500,20 +503,20 @@ namespace Million_Buyer
                                 }
                             }
 
-                            var AccumulateTradeVolume24 = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume24).Select(t => t.CoinFullName).ToList();
-                            var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
+                            //var AccumulateTradeVolume24 = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume24).Select(t => t.CoinFullName).ToList();
+                            //var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
 
-                            for (var i = 0; i < 5; i++)
-                            {
-                                if (!filterNameList.Any(t => t == AccumulateTradePrice24[i]))
-                                {
-                                    filterNameList.Add(AccumulateTradePrice24[i]);
-                                }
-                                if (!filterNameList.Any(t => t == AccumulateTradeVolume24[i]))
-                                {
-                                    filterNameList.Add(AccumulateTradeVolume24[i]);
-                                }
-                            }
+                            //for (var i = 0; i < 5; i++)
+                            //{
+                            //    if (!filterNameList.Any(t => t == AccumulateTradePrice24[i]))
+                            //    {
+                            //        filterNameList.Add(AccumulateTradePrice24[i]);
+                            //    }
+                            //    if (!filterNameList.Any(t => t == AccumulateTradeVolume24[i]))
+                            //    {
+                            //        filterNameList.Add(AccumulateTradeVolume24[i]);
+                            //    }
+                            //}
                             filterNameList = filterNameList.Distinct().ToList();
                             //if (filterNameList.Count == 0)
                             //{
@@ -825,9 +828,8 @@ namespace Million_Buyer
                                     result.SellCount = sellOrder.ExecutedVolume;
 
                                     if(sellVal == 0)
-                                    {
-                                        sellItem.SellValue = sellOrder.OrderPrice;
-                                        sellVal = sellOrder.OrderPrice;
+                                    {                                        
+                                        sellVal = sellItem.SellValue;
                                     }
 
                                     buyCycleCount--;
diff --git a/Million/Manager/CalculateManager.cs b/Million/Manager/CalculateManager.cs
index b707bf2..048e6d9 100644
--- a/Million/Manager/CalculateManager.cs
+++ b/Million/Manager/CalculateManager.cs
@@ -850,11 +850,11 @@ namespace Million.Manager
                     //TODO Tick 차이 관련 조건 식 추가 예정
                     //최초로 매수, 매도 진행 시 사전 조건과의 Tick거리를 예외할 수 있어야 함
                     //OverlapValue는 사야할 데이터, beforeIndiValue는 사전 데이터
-                    if (!GetTickDifferenceCount(overlapData, subVal, 3, coinFullName))
-                    {
-                        subManagement[coinFullName] = false;
-                        continue;
-                    }
+                    //if (!GetTickDifferenceCount(overlapData, subVal, 3, coinFullName))
+                    //{
+                    //    subManagement[coinFullName] = false;
+                    //    continue;
+                    //}
                     
                     //최초 시점이 아닐 경우                    
                     if ((subManagement != null && subManagement[coinFullName]) || !firstFlag)