From 85609d27585a5386a0b3a46a916de4fa83c8306e Mon Sep 17 00:00:00 2001
From: jackyu66git <jackyu666@icloud.com>
Date: Sun, 22 Feb 2026 14:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=AC=94=E5=BD=A2?=
 =?UTF-8?q?=E6=88=90=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=A1=BA?=
 =?UTF-8?q?=E7=95=85=E5=A4=9A=E4=BA=86=EF=BC=8C=E6=8E=A5=E4=B8=8B=E6=9D=A5?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=BC=A0=E8=AE=BA=E4=B8=AD=E5=A4=9A=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E9=A1=B6=E5=BA=95=E5=88=86=E5=9E=8B=E5=92=8C=E7=AC=94?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=BD=A2=E6=88=90=E5=8E=9F=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E4=B9=B0=E5=8D=96=E7=82=B9=EF=BC=881=EF=BC=8C0=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=EF=BC=88-1=EF=BC=8C0=EF=BC=89=EF=BC=8C=EF=BC=881?=
 =?UTF-8?q?=EF=BC=8C1=EF=BC=89=EF=BC=8C=EF=BC=88-1=EF=BC=8C1=EF=BC=89?=
 =?UTF-8?q?=E6=9D=A5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store     | Bin 10244 -> 10244 bytes
 TF_DF.py      |  16 ++++++++--------
 web/.DS_Store | Bin 8196 -> 8196 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index f68b50542a7f0227804019fd0991d9135164ae64..87cba7fa0fccdd9c3e0b7b49ba9c041c53335d10 100644
GIT binary patch
delta 331
zcmZn(XbG6$&uG6fU^hRb{bU{i$=K5j9t;c&EDU-K=?s|+CAs-7E=f80NkB1<kmMDQ
zPc1&~h$^3gSH2*_FgQ6sw*aVzfl**`lYsT)bApPK`vf^ApAuBvyj$=(vx=@cP?C)y
znIWGck0A|cYdW&6$3CApDztd=Hc>e?DD#%60@DMA$@j(NHcN^9V_{}D^qG7>QbGt>
zm-^gQs;3uEE|iv<952no2Is0XaX3ugFDbcsv$P<iG{{xV4CM@|3`sfZ2!}FoU*es7
YUnYd{!N$a9=FRL1zgSrDyJ8j-0H|4K<NyEw

delta 542
zcmZn(XbG6$&*;1{U^hRb^JE?Y$ym{-b_NCp76v_rbcRfZlH7b3m!zEhB%m0_>FlMp
zEIG#=QRP$c$`@o91}Ep|76A1yFo;cV60ol4W{3yE0)|S4WQIf_&R|FdiR7dssbqes
z2UL$kC9<1hj$NrKnGbdoPSpq(f>i6`SB~OfmV(Jrf~u4632-nnPL>u_*~~3?omoXC
z3g|XApv&_a@)**9p_Gp7q8B%k_FK=J%qA+w24!lADllDOn5-`*w>eAn9}6?zZm!7!
zk`hA5y525yykj+Q@<A!7$?K(f*x+1sCV>l+`6VScGfN9HN;3j2W@ab{23QhGaB(ks
eGFe|Hgz><}#LG;Z*%f}VOb!&8NSQ-lF#-TJ8<H0Q

diff --git a/TF_DF.py b/TF_DF.py
index d2cdbb7..3a031cd 100644
--- a/TF_DF.py
+++ b/TF_DF.py
@@ -872,11 +872,11 @@ class TF_DF():
 		last_bottom = None
 		for klc in klc_list:
 			fx = self.check_fx(klc)
-			if fx == Chan_FX_TYPE.TOP:
+			if fx == Chan_FX_TYPE.TOP and False:
 				if last_bottom:
 					if self.check_top_fx(last_bottom, klc) == False:
 						fx = Chan_FX_TYPE.UNKNOWN
-			if fx == Chan_FX_TYPE.BOTTOM:
+			if fx == Chan_FX_TYPE.BOTTOM and False:
 				if last_top:
 					if self.check_bottom_fx(last_top, klc) == False:
 						#print(klc.end_time, last_top.end_time, "---")
@@ -1452,7 +1452,7 @@ class TF_DF():
 						Chan_BSP_TYPE.S1,
 						Chan_BSP_DIR.SELL,
 						leave_bi.sure_time,
-						1, zs, None
+						zs.index+1, zs, None
             		)
 					leave_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.S1)
 					bsp_list.append(bsp)
@@ -1467,7 +1467,7 @@ class TF_DF():
 							Chan_BSP_TYPE.B3,
 							Chan_BSP_DIR.BUY,
 							pullback_bi.sure_time,
-							1, zs, None
+							zs.index+1, zs, None
 						)
 						pullback_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B3)
 						bsp_list.append(bsp)
@@ -1481,7 +1481,7 @@ class TF_DF():
 							Chan_BSP_TYPE.S2,
 							Chan_BSP_DIR.SELL,
 							second_bsp_bi.sure_time,
-							1, zs, None
+							zs.index+1, zs, None
 						)
 						second_bsp_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B2)
 						bsp_list.append(bsp)
@@ -1495,7 +1495,7 @@ class TF_DF():
 						Chan_BSP_TYPE.B1,
 						Chan_BSP_DIR.BUY,
 						leave_bi.sure_time,
-						1, zs, None
+						zs.index+1, zs, None
             		)
 					leave_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B1)
 					bsp_list.append(bsp)
@@ -1510,7 +1510,7 @@ class TF_DF():
 							Chan_BSP_TYPE.S3,
 							Chan_BSP_DIR.SELL,
 							bounce_bi.sure_time,
-							1, zs, None
+							zs.index+1, zs, None
 						)
 						bounce_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.S3)
 						bsp_list.append(bsp)
@@ -1524,7 +1524,7 @@ class TF_DF():
 							Chan_BSP_TYPE.B2,
 							Chan_BSP_DIR.BUY,
 							second_bsp_bi.sure_time,
-							1, zs, None
+							zs.index+1, zs, None
 						)
 						second_bsp_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B2)
 						bsp_list.append(bsp)
diff --git a/web/.DS_Store b/web/.DS_Store
index a86278543e92a1430c244d18c5faf5dbc2292b95..0904e732108f82acd95172eb431291766b3e2f86 100644
GIT binary patch
delta 63
zcmZp1XmOa}&nUYwU^hRb>}DQ;TZ|kj#mPBI`T04UuM0XbGBQlI6Be7SC(O&t!Se&i
SE@$Epn7m!MakIb3R&D@%=o4cA

delta 71
zcmZp1XmOa}&nUAoU^hRb%w`^eTa26k3K}vpGENo{78A%xHw;eB&n;j80rux-K!TIA
Xg%g?BKTJL++&I}$Mt*a+$Xady1HToy