From cbe19ea6066a600cbd0b5110db5d43f8252d14a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 13 六月 2024 11:23:53 +0800
Subject: [PATCH] L撤成交进度相关改进
---
third_data/code_plate_key_manager.py | 300 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 204 insertions(+), 96 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index d61a502..d92d255 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -11,14 +11,14 @@
from code_attribute import code_nature_analyse
from db.redis_manager_delegate import RedisUtils
from third_data import kpl_block_util, kpl_api, kpl_util
-from trade.trade_manager import MarketSituationManager
+from settings.trade_setting import MarketSituationManager
from utils import global_util, tool, buy_condition_util
from log_module import log, async_log_util
from db import redis_manager_delegate as redis_manager
from log_module.log import logger_kpl_block_can_buy
from third_data.kpl_util import KPLPlatManager
-from trade import trade_manager, l2_trade_util
+from trade import trade_manager, l2_trade_util, trade_constant
# 浠ｇ爜绮鹃�夋澘鍧楃鐞�
@@ -93,7 +93,7 @@
# logger_kpl_block_can_buy.info(f"鍑嗗鏇存柊绮鹃�夋澘鍧楋細{code}-{buy_1_price}-{limit_up_price}")
if limit_up_price and buy_1_price:
# 澶勭悊涔�1,鍗�1淇℃伅
- pre_close_price = round(float(limit_up_price) / 1.1, 2)
+ pre_close_price = round(float(limit_up_price) / tool.get_limit_up_rate(code), 2)
# 濡傛灉娑ㄥ箙澶т簬7%灏辫鍙栨澘鍧�
price_rate = (buy_1_price - pre_close_price) / pre_close_price
if price_rate > 0.07:
@@ -137,6 +137,48 @@
except Exception as e:
logger_kpl_block_can_buy.error(f"{code} 鑾峰彇鏉垮潡鍑洪敊")
logger_kpl_block_can_buy.exception(e)
+
+
+# 绂佹涓嬪崟鐨勬澘鍧�
+class ForbiddenBlockManager:
+ __db = 3
+ __redisManager = redis_manager.RedisManager(3)
+ __instance = None
+ __forbidden_blocks = set()
+
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(ForbiddenBlockManager, cls).__new__(cls, *args, **kwargs)
+ cls.__load_data()
+ return cls.__instance
+
+ @classmethod
+ def __get_redis(cls):
+ return cls.__redisManager.getRedis()
+
+ # 鍔犺浇鏁版嵁
+ @classmethod
+ def __load_data(cls):
+ blocks = cls.__get_redis().smembers("forbidden_blocks")
+ if blocks:
+ for b in blocks:
+ cls.__forbidden_blocks.add(b)
+
+ def add(self, block):
+ self.__forbidden_blocks.add(block)
+ RedisUtils.sadd_async(self.__db, "forbidden_blocks", block)
+ RedisUtils.expire_async(self.__db, "forbidden_blocks", tool.get_expire())
+
+ def remove(self, block):
+ if block in self.__forbidden_blocks:
+ self.__forbidden_blocks.remove(block)
+ RedisUtils.srem_async(self.__db, "forbidden_blocks", block)
+
+ def get_blocks(self):
+ return copy.deepcopy(self.__forbidden_blocks)
+
+ def is_in(self, block):
+ return block in self.__forbidden_blocks
# 寮�鐩樺暒绂佹浜ゆ槗鏉垮潡绠＄悊
@@ -505,7 +547,7 @@
# 鏍规嵁韬綅绉婚櫎浠ｇ爜
# return
# 涓嬭繃鍗曠殑浠ｇ爜涓嶇Щ闄�
- if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) != trade_manager.TRADE_STATE_NOT_TRADE:
+ if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) != trade_constant.TRADE_STATE_NOT_TRADE:
# 鍙涓嬭繃鍗曠殑灏变笉绉婚櫎
return
l2_trade_util.forbidden_trade(code, msg=msg)
@@ -513,65 +555,30 @@
# 鏄惁闇�瑕佹縺杩涗拱
@classmethod
- def __is_need_active_buy(cls, code, block, current_limit_up_datas, limit_up_record_datas,
- yesterday_current_limit_up_codes):
- code_limit_up_reason_dict = {}
- for d in limit_up_record_datas:
- code_limit_up_reason_dict[d[3]] = d[2]
+ def __is_need_active_buy(cls, code, block, current_rank, open_limit_up_count):
+ """
+ 鏉垮潡鏄惁闇�瑕佹縺杩涗拱鍏�
+ 瑙勫垯锛氭牴鎹韩浣嶅垽鏂槸鍚﹂渶瑕佹縺杩涗拱锛屾牴鎹椂闂村垝鍒�
+ @param code: 浠ｇ爜
+ @param block: 鏉垮潡鍚嶇О
+ @param current_rank: 鐩墠鍦ㄦ澘鍧椾腑鐨勮韩浣嶏紝浠�0寮�濮�
+ @param open_limit_up_count: 寮�1鐨勬暟閲�
+ @return:
+ """
- # 鍓嶉潰鏈夐珮浣嶆澘/闈炰富鏉挎定鍋滀笖鏇炬定鍋滀富鏉挎帓鑰佸ぇ鍒欐縺杩涗拱
- block_codes_info = []
- contains_code = False
- for d in current_limit_up_datas:
- reason = kpl_util.get_current_limit_up_reason(d)
- if reason != block:
- continue
- if d[0] == code:
- contains_code = True
- # 鏍煎紡锛歔浠ｇ爜,娑ㄥ仠鏃堕棿,鏄惁楂樹綅鏉�, 鑷敱娴侀�氬競鍊糫
- block_codes_info.append((d[0], d[2], d[0] in yesterday_current_limit_up_codes, d[7]))
- if not contains_code:
- block_codes_info.append((code, int(time.time()), False, global_util.zyltgb_map.get(code)))
- block_codes_info.sort(key=lambda x: x[1])
- # 鏆傚瓨鍦ㄥ綋鍓嶄唬鐮佷箣鍓嶆定鍋滅殑楂樹綅鏉�/闈炰富鏉夸唬鐮�
- before_codes = []
- for info in block_codes_info:
- if info[0] == code:
+ real_current_rank = max(current_rank - open_limit_up_count, 0)
+
+ TIME_STR_RANGES = ["10:00:00", "10:30:00", "11:00:00", "13:00:00", "13:30:00", "14:00:00", "14:30:00",
+ "15:00:00"]
+ TIME_INT_RANGES = [int(x.replace(':', '')) for x in TIME_STR_RANGES]
+ MAX_RANKS = [3, 3, 2, 2, 1, 0, 0, 0]
+ now_time_str = tool.get_now_time_str().replace(':', '')
+ for i in range(len(TIME_INT_RANGES)):
+ if int(now_time_str) <= TIME_INT_RANGES[i]:
+ if MAX_RANKS[i] > real_current_rank:
+ return True
break
- if info[2] or not tool.is_shsz_code(info[0]):
- before_codes.append(info[0])
- if before_codes:
- # 鍒ゆ柇鍘嗗彶娑ㄥ仠涓绘澘韬綅
- record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
- limit_up_record_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes,
- shsz=True)
- if record_shsz_rank == 0:
- # 鍘嗗彶涓绘澘鑰佸ぇ
- return True, f"涓绘澘鑰佸ぇ涓斿墠闈㈡湁闈炰富鏉�/楂樹綅鏉挎定鍋滐紝鍏堜簬娑ㄥ仠浠ｇ爜锛歿before_codes}"
- # 鎺掗櫎鑷繁鏈�3涓定鍋滐紝涓旇繖4涓腑鑷敱娴侀�氬競鍊兼渶灏忥紝涓旀定鍋滆繃鐨勪唬鐮佷腑涓绘澘鎺掑悕鍓�4
- if len(block_codes_info) >= 4:
- temp_codes = []
- for info in block_codes_info:
- # 涓嶆槸楂樹綅鏉夸笖鏄富鏉�
- if not info[2] and tool.is_shsz_code(info[0]):
- # 鏍煎紡锛�(浠ｇ爜, 鑷敱娴侀�氬競鍊�)
- temp_codes.append((info[0], info[3]))
- # 鍒ゆ柇鏄惁涓轰富鏉夸腑鑷敱甯傚�兼渶灏�
- temp_codes.sort(key=lambda x: x[1])
- if temp_codes[0][0] == code:
- # 鑷敱甯傚�兼渶灏�
- # 鍒ゆ柇鍘嗗彶韬綅
- record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
- limit_up_record_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes,
- shsz=True)
- if record_shsz_rank < 4:
- return True, f"鏉垮潡鏈夊ぇ浜�3绁ㄦ定鍋滐紝涓旇嚜鐢辨祦閫氬競鍊兼渶灏忥紝韬綅({record_shsz_rank})鍓�4"
-
- return False, "涓嶆弧瓒虫縺杩涗拱鍏ユ潯浠�"
+ return False
# 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅, 鏄惁涓哄己鍔夸富绾�, 鏄惁闇�瑕佹縺杩涗拱)
@classmethod
@@ -586,18 +593,14 @@
block_codes = current_limit_up_block_codes_dict.get(block)
if block_codes is None:
block_codes = set()
- # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
- active_buy = cls.__is_need_active_buy(code, block, current_limit_up_datas,
- limit_up_record_datas,
- yesterday_current_limit_up_codes)
if not block_codes:
# 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, active_buy
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, False
elif len(block_codes) == 1 and code in block_codes:
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, active_buy
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, False
# 鍙互涔扮殑鏈�澶ф帓鍚�
# open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
# code_limit_up_reason_dict)
@@ -660,6 +663,9 @@
current_open_limit_up_codes),
shsz=True,
limit_up_time=first_limit_up_time)
+ # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
+
# record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
# limit_up_record_datas,
# code_limit_up_reason_dict,
@@ -667,10 +673,10 @@
# shsz=True)
if int(tool.get_now_time_str().replace(":", "")) <= int("094000") and is_strong_block:
# 寮哄娍涓荤嚎鍔犲己鍔�10鍒嗛挓
- return True, False, f"銆恵block}銆戯細寮哄娍涓荤嚎+寮哄娍10鍒嗛挓", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戯細寮哄娍涓荤嚎+寮哄娍10鍒嗛挓", is_strong_block, is_active_buy
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
- return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy
else:
# k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
# if k_format and k_format[8][0]:
@@ -683,8 +689,8 @@
situation = MarketSituationManager().get_situation_cache()
zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
if zyltgb_as_yi and zylt_threshold_as_yi[2] <= zyltgb_as_yi <= zylt_threshold_as_yi[3]:
- return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block, active_buy
- return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block, is_active_buy
+ return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy
# 杩囨椂鐨勪唬鐮�
# if open_limit_up_codes:
@@ -704,6 +710,101 @@
# cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
#
# return False, f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank}:{front_current_shsz_rank_codes},鍘嗗彶韬綅-{record_shsz_rank}锛�"
+
+ @classmethod
+ def __is_block_can_buy_new(cls, code, block, current_limit_up_datas, code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes, limit_up_record_datas,
+ current_limit_up_block_codes_dict,
+ high_level_code_blocks=None, high_level_block_codes=None):
+ """
+ 璇ョエ鐨勬澘鍧楁槸鍚﹀彲浠ヤ拱
+ @param code:
+ @param block:
+ @param current_limit_up_datas:
+ @param code_limit_up_reasons_dict:
+ @param yesterday_current_limit_up_codes:
+ @param limit_up_record_datas:
+ @param current_limit_up_block_codes_dict:
+ @param high_level_code_blocks:
+ @param high_level_block_codes:
+ @return:
+ """
+ # 鐙嫍鍒ゆ柇
+ if high_level_code_blocks is None:
+ high_level_code_blocks = {}
+ if high_level_block_codes is None:
+ high_level_block_codes = {}
+ block_codes = current_limit_up_block_codes_dict.get(block)
+ if block_codes is None:
+ block_codes = set()
+ # 鍘嗗彶娑ㄥ仠浠ｇ爜
+ block_codes_records = set()
+ if limit_up_record_datas:
+ for k in limit_up_record_datas:
+ if block in code_limit_up_reasons_dict.get(k[3]):
+ block_codes_records.add(k[3])
+
+ if not block_codes:
+ # 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, False, 0, 0, 0
+ elif len(block_codes) == 1 and code in block_codes:
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, False, 0, 0, 0
+ # 鍙互涔扮殑鏈�澶ф帓鍚�
+ # open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+ # code_limit_up_reason_dict)
+ current_open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes_current(code, block,
+ current_limit_up_datas)
+
+ is_strong_block = False
+
+ # 鏈�澶氫拱鑰佸嚑
+ RANKS = [5, 4, 3, 3, 3, 2, 2]
+ RANK_TIMES = ["10:00:00", "10:30:00", "11:00:00", "11:30:00", "13:30:00", "14:00:00", "15:00:00"]
+ now_time_str = tool.get_now_time_str()
+ max_rank = 2
+ for i in range(len(RANK_TIMES)):
+ if tool.trade_time_sub(now_time_str, RANK_TIMES[i]) <= 0:
+ max_rank = RANKS[i]
+ break
+
+ # 闇�瑕佹帓闄ょ殑鑰佸ぇ鐨勪唬鐮�
+ exclude_first_codes = set()
+
+ # 鑾峰彇涓绘澘寮�1鐨勪唬鐮�
+
+ # 鍓旈櫎楂樹綅鏉�
+ if current_open_limit_up_codes and yesterday_current_limit_up_codes:
+ current_open_limit_up_codes -= yesterday_current_limit_up_codes
+
+ # 鑾峰彇浠ｇ爜鐨勫垵娆℃定鍋滄椂闂�
+ first_limit_up_time = time.time()
+ # if limit_up_record_datas:
+ for r in limit_up_record_datas:
+ if r[3] == code:
+ first_limit_up_time = int(r[5])
+
+ # 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
+ current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
+ current_limit_up_datas,
+ code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes,
+ exclude_first_codes,
+ len(
+ current_open_limit_up_codes),
+ shsz=True,
+ limit_up_time=first_limit_up_time)
+
+ # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
+
+ if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
+ return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy, current_shsz_rank, len(
+ block_codes), len(block_codes_records)
+ else:
+ return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy, current_shsz_rank, len(
+ block_codes), len(block_codes_records)
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
@@ -725,8 +826,9 @@
code_limit_up_reasons_dict[d[3]] = {list(before_blocks_dict.get(d[3]))[0]}
else:
code_limit_up_reasons_dict[d[3]] = {d[2]}
- if d[6]:
- code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
+ # 涓嶅寘鍚帹鑽愬師鍥�
+ # if d[6]:
+ # code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
return code_limit_up_reasons_dict
if current_limit_up_datas is None:
@@ -745,15 +847,17 @@
code_limit_up_reasons_dict = {}
load_code_block()
for block in keys:
- can_buy, unique, msg, is_strong, active_buy_info = cls.__is_block_can_buy(code, block,
- current_limit_up_datas,
- code_limit_up_reasons_dict,
- yesterday_current_limit_up_codes,
- limit_up_record_datas,
- current_limit_up_block_codes_dict,
- high_level_code_blocks=high_level_general_code_blocks,
- high_level_block_codes=high_level_general_block_codes)
- fresults.append((block, can_buy, unique, msg, is_strong, active_buy_info))
+ can_buy, unique, msg, is_strong, is_active_buy, current_rank, block_limit_up_count, block_limit_up_record_count = cls.__is_block_can_buy_new(
+ code, block,
+ current_limit_up_datas,
+ code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes,
+ limit_up_record_datas,
+ current_limit_up_block_codes_dict,
+ high_level_code_blocks=high_level_general_code_blocks,
+ high_level_block_codes=high_level_general_block_codes)
+ fresults.append((block, can_buy, unique, msg, is_strong, is_active_buy, current_rank, block_limit_up_count,
+ block_limit_up_record_count))
return fresults, keys
# 鏄惁鍙互涓嬪崟
@@ -762,7 +866,7 @@
@classmethod
def can_buy(cls, code):
if constant.TEST:
- return ["娴嬭瘯"], True, cls.BLOCK_TYPE_NONE, [], set(),["鍖栧伐"]
+ return [("娴嬭瘯", 0, 1, 1)], True, cls.BLOCK_TYPE_NONE, [], set(), ["鍖栧伐"]
# if True:
# # 娴嬭瘯
# return True, "涓嶅垽鏂澘鍧楄韩浣�"
@@ -789,9 +893,9 @@
if not blocks_compute_results:
return False, True, f"娌℃湁鎵惧埌鏉垮潡", [], keys, []
codes_delegate = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
- {trade_manager.TRADE_STATE_BUY_DELEGATED, trade_manager.TRADE_STATE_BUY_PLACE_ORDER}))
+ {trade_constant.TRADE_STATE_BUY_DELEGATED, trade_constant.TRADE_STATE_BUY_PLACE_ORDER}))
codes_success = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
- {trade_manager.TRADE_STATE_BUY_SUCCESS}))
+ {trade_constant.TRADE_STATE_BUY_SUCCESS}))
codes = codes_delegate | codes_success
# 缁熻鎴愪氦浠ｇ爜鐨勬澘鍧�
trade_codes_blocks_dict = {}
@@ -839,21 +943,24 @@
# 寮哄娍涓荤嚎鏈�澶氬悓鏃舵寕3鍙エ锛屾渶澶氭垚浜�2鍙エ
MAX_DELEGATE_COUNT = 3 if r[4] else 2
MAX_DEAL_COUNT = 2 if r[4] else 1
- if r[0] in trade_success_blocks_count and len(trade_success_blocks_count[r[0]]) >= MAX_DEAL_COUNT:
- msg_list.append(f"銆恵r[0]}銆戞湁鎴愪氦浠ｇ爜锛歿trade_success_blocks_count[r[0]]}")
- continue
- if r[0] in trade_delegate_blocks_count and len(trade_delegate_blocks_count[r[0]]) >= MAX_DELEGATE_COUNT:
- msg_list.append(f"銆恵r[0]}銆戝凡鎸傚崟锛歿trade_delegate_blocks_count[r[0]]}")
- continue
- can_buy_blocks.append(r[0])
+ # if r[0] in trade_success_blocks_count and len(trade_success_blocks_count[r[0]]) >= MAX_DEAL_COUNT:
+ # msg_list.append(f"銆恵r[0]}銆戞湁鎴愪氦浠ｇ爜锛歿trade_success_blocks_count[r[0]]}")
+ # continue
+ # if r[0] in trade_delegate_blocks_count and len(trade_delegate_blocks_count[r[0]]) >= MAX_DELEGATE_COUNT:
+ # msg_list.append(f"銆恵r[0]}銆戝凡鎸傚崟锛歿trade_delegate_blocks_count[r[0]]}")
+ # continue
+ if len(r) > 8:
+ can_buy_blocks.append((r[0], r[6], r[7], r[8]))
+ else:
+ # 锛堟澘鍧楀悕绉�,韬綅,鏉垮潡娑ㄥ仠鏁伴噺锛�
+ can_buy_blocks.append((r[0], 0, 1, 1))
if r[4]:
can_buy_strong_blocks.append(r[0])
if r[3]:
msg_list.append(r[3])
- if r[5][0]:
+ if r[5]:
active_buy_blocks.append(r[0])
- msg_list.append(f"銆恵r[0]}銆戞縺杩涗拱鍏�({r[5][1]})")
-
+ msg_list.append(f"銆恵r[0]}銆戞縺杩涗拱鍏�({r[5]})")
else:
if r[3]:
msg_list.append(r[3])
@@ -903,7 +1010,8 @@
current_limit_up_block_codes_dict,
high_level_general_code_blocks)
# 淇濆瓨鏉垮潡璁＄畻缁撴灉
- cls.__can_buy_compute_result_dict[code] = (can_buy_blocks, unique, msg, can_buy_strong_blocks, keys, active_buy_blocks)
+ cls.__can_buy_compute_result_dict[code] = (
+ can_buy_blocks, unique, msg, can_buy_strong_blocks, keys, active_buy_blocks)
if __name__ == "__main__":
--
Gitblit v1.8.0