From d75c2029758c46a4cee5e4fc255882dc248f951b Mon Sep 17 00:00:00 2001
From: jackyu66git <jackyu666@icloud.com>
Date: Sat, 12 Jul 2025 02:33:19 +0800
Subject: [PATCH] Change config

---
 .DS_Store                     | Bin 8196 -> 10244 bytes
 config/TradingViewConfig.xlsx | Bin 8753 -> 9095 bytes
 strategies/BB9033.py          |  39 +++++++++++++++++++---------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 041d444aaf408faaaec952cf1bc7a0c65bd35b52..eebb0aecff6b2305ab0c85be8469d78eed5318e4 100644
GIT binary patch
delta 448
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50$f&t7U^hRb=42j$<MjdzNeqb$
z$qd;HB@C$y#XvHip$N<>Wyk^Yiam4klaq4tlRyRljqL`~djG)y$O4HG(4SOZTmaR-
zJE<Tiv$({-;2I+nGYcylI|ut@8?pF$>FR1jb4vpq1tSx~S{;RILn9M&9R))JQ?uGy
zP7YCJee0n3?3~=Z{9dq?42+Brnt>Ne!>B$WgP?;_ij#Aa^7C^*n!t)R@Oi&1xF|0t
zKQA4qm~rz30aND5H-&jQU}kJ)6k%i8SRKzM$P6+L7|z^4!WC#R&&I;<%#-<L0!5f0
aF`xmG20GjTL{Bb|>786D+=Fgd5)%OK2Vs){

delta 101
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAsIoC&H$S7wWFCRzo1=w{m^UvI
qWnvLz1}Xsp32q?a3R1nX@H_Klew9EDMu-^<ljC`&Zk{K`&I|ySKoWca

diff --git a/config/TradingViewConfig.xlsx b/config/TradingViewConfig.xlsx
index f062039a6782f2f4f56e2c1dc811ccd6321a7314..9a0e745785fb374324802c81bf8c316110e2e7bc 100644
GIT binary patch
delta 2582
zcmZ8jXE+;<){hypLG4nbcI-WB)JV;e)~5C<qDBxkQd?`4NVrz){?#5;N+~KRRn$oB
z6=JlmQM0)Eet3JIdp?|Vp68rTzww;YpqqHV{(_1|NiN7TgbV;cP@#a-e8{9w?>qpB
z`Fk<P_vjgm$uBMGXj&lzt+J0X>dnkmRKGykk9BYKkA);WUXE*IIA7*9RuSfUSLS=r
zn4XYIcSZMm?W_(v$ojON-)Y4dcn00f$eldwIhBVUxxCzlORTNNGNe-i;E`@qhBex8
zXC)pIKTJQp40fuF^R0|2N7|P}335oB=gLef4&d-Q5`=;_Jt~3>d&wI__d_V1#P$TM
zZexO2(c*N(q^TDyfX?2Cuv*_pGgb>&iB_^#PcNz%V_oiRyqT#X&v2B`ii7kJy0K2|
zJDVm>stAiATG40F%A3z2cH_Xkn<-Rb*)d<7Z=~r2zH&3QpZ5QXG<?S6M)=XtVI>`N
z#h&`S8B!DXssmKg7Vg&)7Gk@XFz;9HGdj5?2MaFe{O09V*O&>mgsgL6T)r&82Ao+y
z9VB2rc0_U0hy1#7XyeNpskYBw2_yUuJ3fZI6{cG4fEtIGH|WA?;H}BqrV2_f!fyfb
zx0H6yKMKa;NF(ndtEI>J%Rm<j7H?$+gk;C2Z^ztU^x8|REkD80#ET7ff(?ukD5V#&
z&7oNn%{uW!u}<Bmx<(+iH6=GA+5%egK|IsK!c{)|l0>gT?zADNKQhBXJFIh5ScFx-
zWbW5~d@XLL6YQq{({Vj588tB|p=Llj^p)F}Lb;*lZo@p1u3v5kd#=gLz8N216#FJr
zb#ydiQ)>)lYz3FIp}GNd=p09Mw`0pUunB`lI>2hv4!e=5iz=7Has1p~E%Ww3{%INz
zs&48toiO=Keqrz7WX6+o{P*39-jha3oZC;L36buLxUA#)?FSxyl+=Jw@NxdIYJZRm
zA)31%PmLVMr{9MV>C5+gDZE#G;jWsWWVn{jhPiM0a>`De?3W0*lDxi8Gs9dIsh*lf
z(j8Kyj)y!x^3J~(!u1a$5c@S?$yzzD4YLYtA*jjC8s<-o%!Oe*8mfFsyJ(lM0#wts
zK(9e*9yX6ES()NM*vea$ea%1_7#V5j(?MJ<kM}Bv89Xr4?gn)|OMjtj+Y^nT4FMBb
zC8S_gZ=D80@zg6K7pkDOxP{@KF1~#*|1+v-#&5^_uy(g6&wL~D_^^(vOY4wcZCs^G
zeO%@=;%%$y__3_r+#;d$)uo)RyroWhX~L*^ZxfOPl|jbbRKq+<+9XMj1k#`fh8LW!
zeR!W5mB_|}L>Z;eNHfPDqtAH6cViC#<c!Yb&io!$!DrTLBlHdRs}qXp(8;TXJl>oP
zd{IUw5!cWa<QLI_Q1#JEb1IOBK}w<e)XhESjq~n@8|nNx(3QJS!L`P;9Fb)Au^7iL
z@dvn{kI9y(nQXJiaOaZl!!Ic1L+^aMm+a{6s&I@v@eUmhW<@B7kH745R(8)F!Z=V>
zM#edB+0x+I14c*BXg|fQ+`edsg#0x8w!)ad9)cv2I>Qr_9*S))Qi=%LmPxfwSv!dB
zoO7kN@p>j(rGy5eIdHpK&CFBEkIor0zxN$Po(Cy<+Ry19Uued?zzz36k8Yi$z0~v+
z&7DJ9@2QEO3iv*Y{na&80km;H+=UlZua9}Nto2n>6>h95Th|>JNK1Hxb#iDXu7>TW
zOR}LqasO=RXWdGvErF{Q`?j&~9~kuvM*j0+g8&v`xNUZ)q%7U@$#5t3Bu0miX<oWm
zIB=Q37-%L|Ix8yl`)g6OAWeN<Pyg8)OS)*}rH8>F_Zs8^gMMnp1bRTBpeb@SpWnh8
zn%WO_15q1Py`xu-&d>vwwq`Rz_-<l#hc1cED<`Kb7cnWqr8Z272F#`+qTQ$3NBV}J
zy2DEAdSVGAM?3())fM1R%F43wi<M@NtBZ*Mu+Ek}S>r{2u_uF;X$V?qHGhai79dDW
zd6}YOo<csRAnzp9b@B{__{s&eUy{F*Gtifgc$a<eaY35Ei3wu1K;!Cj6!B~bArzo*
zAoRZdmrfW9$HYYzx1PK^|5ge{>MefyWjW@|wr%1@r=`SOCC4g9ul@L`YM%`6UJLC|
z^OBBQCQ9^Na-J+r>*xu90z(;uBx<cP`+rCysQMMwXJ`KysOpfEig+{vUtmBuhmqQK
zb%TeBi=V{~(JxqQr028c?IzW9NGis|*3<EHi3?72H8Sz8W*l_FMGnX$d3K>H8PLBR
zHwh-8YZeaKY)osLccehYi9Lb0!)Ysun-!Hu(S*JBclC@gS3YJDCB%W_aIomuZ}4y6
z{{z-2s&8!i%S7Dp>oC}Iz`z9DU?DpyXZ29zv+>vG4MzL4A4@6>X$(#U1y9?g9U$H=
zhTe=xp4DZqFjz;@RpRV-V)h1`JDX=&1qM$7_+vigxh#p*#Wfr8Bme;Obw&6}1$j9K
zy1PAs2R`xh43b2^eBrMe9`s5x>xBwjcJDtZV2%c;)KbMzW8T#BgTn+cD;o@5yg4>b
zTE-u75MjJpGZuxZ>C!R-mSNJ4xjuxK3x~gJaZ)l1Ta{jM7G9#04yf!FU)hL7)u@jk
z?>;dOUS{Br0u~-mtS1~6T8AfVtf)Z4c;ie1>t{mksqwjBD;pD7we0c`4SXvI&=^mo
z?5?e!;q`n`l`%6f>8X&r&6&pPgavP=W|oCi-xJk0*vn(v@gMc{48FIn89<W*?etyA
zsbTTi)^4|N;;t_8cdz1@H(gxJ9joUKi#jWe80mEIl;Szq)8TSFN|#z+?eDT2>x5qX
zA423AVh1cuE}SAHNTX{I;uk5dbOyuoJc9iaTFB7qD$F}(5wwFpSbb5My6qR?-~6i3
zq9-}|L0$Pl2Ji8c7XPNk8P>?^matP4wX!~h$u>)3mboaVWCX3tS=_uptP=Y}$yrKS
zK4hj4C8vDyTZqiYEG3Q^)oHU7iAC)%zH8i{lgkwqf-b#~imlGS3t#}#l@reCr5vZU
z<s0mZWQ^PyF`$9<UUPLVe>#?lqWnGq{*&45j}u4J(GDCcKAT6WyYLh>585aO;PJ@k
zZhQ-DLMW0Bi(Q(Y><w~M$a*u&0?c|H^T_YH3Tz*}2C;kmeyKrRFwqItU4~dAw%EvQ
zTSo1blLzRxU-=N{h>lyy+=XO}C;uFp?UZ#0gdX=X5l{$O`c)hKm6$m*+0t)S?<D)v
zPbJTmOEfA@K^e?$4^VNqy(9$bnyALP<SARzC|3d5e?MKJymBZBK2Fk1I+Ot)4{C>(
zlhg%-qT&<e`g;)o0QPHn{*7f;R5BYUs*sO?>wh);cPW$;h2s_C`a_}FwZOwk0RYCo
a)9bF{7V0yfI;q5M6g59T<sR>!;eP<qhsoLi

delta 2219
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

diff --git a/strategies/BB9033.py b/strategies/BB9033.py
index a26e2c0..93ae3df 100644
--- a/strategies/BB9033.py
+++ b/strategies/BB9033.py
@@ -12,6 +12,7 @@ import freqtrade.vendor.qtpylib.indicators as qtpylib
 from technical.util import resample_to_interval, resampled_merge
 from freqtrade.persistence import Trade, Order
 from datetime import datetime, timedelta
+from typing import Optional
 import logging
 logger = logging.getLogger(__name__)
 # freqtrade plot-dataframe --strategy BB9033 --datadir user_data/data/binance -c ./user_data/ChanLun_SOL_30.json --timerange=20250309-
@@ -40,10 +41,10 @@ class BB9033(IStrategy):
 	INTERFACE_VERSION: int = 3
 	
 	# 策略参数
-	bb_length = 54           # 布林带长度
-	atr_multiplier = 2.5    # ATR乘数(轨道)
-	atr_stop_multiplier = 5.6 # ATR乘数(止损)
-	atr_length = 17          # ATR计算周期
+	bb_length = 90           # 布林带长度
+	atr_multiplier = 4.2    # ATR乘数(轨道)
+	atr_stop_multiplier = 1.8 # ATR乘数(止损)
+	atr_length = 14         # ATR计算周期
 	
 	# Minimal ROI designed for the strategy.
 	# This attribute will be overridden if the config file contains "minimal_roi"
@@ -58,10 +59,10 @@ class BB9033(IStrategy):
 	
 	# Optimal timeframe for the strategy
 	timeframe = '3m'
-	time3 = 60
+	time = 30
 	# Trailing stop loss
 	trailing_stop = False
-	
+	lev = 1.0
 	# Run "populate_indicators" only for new candle
 	process_only_new_candles = False
 	
@@ -75,7 +76,7 @@ class BB9033(IStrategy):
 		"""
 		计算技术指标
 		"""
-		dataframe_3 = resample_to_interval(dataframe, self.get_ticker_indicator() * self.time3)
+		dataframe_3 = resample_to_interval(dataframe, self.get_ticker_indicator() * self.time)
 		
 		# 计算ATR（用于止损计算）
 		dataframe_3['atr'] = ta.ATR(dataframe_3, timeperiod=self.atr_length)
@@ -84,7 +85,8 @@ class BB9033(IStrategy):
 		bb_upper, bb_middle, bb_lower = ta.BBANDS(dataframe_3['close'], timeperiod=self.bb_length, nbdevup=self.atr_multiplier, nbdevdn=self.atr_multiplier, matype=0)
 		dataframe_3['bb_upper'] = bb_upper
 		dataframe_3['bb_lower'] = bb_lower
-		
+		for i in range(1700, 1800):
+			print(dataframe_3.iloc[i])
 		# 计算突破条件（与Pine Script保持一致）
 		# 确保所有用于计算的数据都不是NaN
 		valid_data = (
@@ -113,8 +115,8 @@ class BB9033(IStrategy):
 		"""
 		Based on TA indicators, populates the entry trend columns
 		"""
-		break_below_lower = 'resample_{}_break_below_lower'.format(self.get_ticker_indicator()*self.time3)
-		break_above_upper = 'resample_{}_break_above_upper'.format(self.get_ticker_indicator()*self.time3)
+		break_below_lower = 'resample_{}_break_below_lower'.format(self.get_ticker_indicator()*self.time)
+		break_above_upper = 'resample_{}_break_above_upper'.format(self.get_ticker_indicator()*self.time)
 		
 		# 做多条件：价格跌破下轨
 		dataframe.loc[
@@ -138,8 +140,8 @@ class BB9033(IStrategy):
 		"""
 		Based on TA indicators, populates the exit trend columns
 		"""
-		bb_upper_str = 'resample_{}_bb_upper'.format(self.get_ticker_indicator()*self.time3)
-		bb_lower_str = 'resample_{}_bb_lower'.format(self.get_ticker_indicator()*self.time3)
+		bb_upper_str = 'resample_{}_bb_upper'.format(self.get_ticker_indicator()*self.time)
+		bb_lower_str = 'resample_{}_bb_lower'.format(self.get_ticker_indicator()*self.time)
 		
 		# 多头止盈：价格突破上轨（与Pine Script一致）
 		dataframe.loc[
@@ -215,9 +217,9 @@ class BB9033(IStrategy):
 		latest_candle = dataframe.iloc[-1]
 		
 		# 使用重采样后的字段名
-		bb_upper_str = 'resample_{}_bb_upper'.format(self.get_ticker_indicator() * self.time3)
-		bb_lower_str = 'resample_{}_bb_lower'.format(self.get_ticker_indicator() * self.time3)
-		atr_str = 'resample_{}_atr'.format(self.get_ticker_indicator() * self.time3)
+		bb_upper_str = 'resample_{}_bb_upper'.format(self.get_ticker_indicator() * self.time)
+		bb_lower_str = 'resample_{}_bb_lower'.format(self.get_ticker_indicator() * self.time)
+		atr_str = 'resample_{}_atr'.format(self.get_ticker_indicator() * self.time)
 		
 		# 确保技术指标有效
 		if (np.isnan(latest_candle[bb_upper_str]) or 
@@ -243,7 +245,7 @@ class BB9033(IStrategy):
 				return
 				
 			# 获取开仓时的ATR值
-			atr_str = 'resample_{}_atr'.format(self.get_ticker_indicator() * self.time3)
+			atr_str = 'resample_{}_atr'.format(self.get_ticker_indicator() * self.time)
 			
 			# 找到最接近开仓时间的K线
 			open_candle = dataframe.iloc[-1]  # 使用最新的K线作为开仓时的数据
@@ -275,6 +277,9 @@ class BB9033(IStrategy):
 		if trade_id in self.trade_stop_prices:
 			del self.trade_stop_prices[trade_id]
 			logger.info(f"交易 {trade.id} 已关闭，清理止损价格记录")
-	
+	def leverage(self, pair: str, current_time: datetime, current_rate: float,
+				 proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], side: str,
+				 **kwargs) -> float:
+		return self.lev
 	def get_ticker_indicator(self):
 		return int(self.timeframe[:-1])
\ No newline at end of file