|
|
@@ -362,7 +362,7 @@ class EquipmentInfoService:
|
|
|
"""
|
|
|
arr_list = []
|
|
|
event_arr = []
|
|
|
- resource_list = [1, 2, 4, 8]
|
|
|
+ resource_list = [1, 2, 4, 8, 16, 32]
|
|
|
for i in range(2, len(resource_list) + 1):
|
|
|
arr_list += list(itertools.combinations(resource_list, i)) # 表示从 [1,2,3,4] 中选出 3个元素的组合情况
|
|
|
for i in arr_list:
|
|
|
@@ -400,7 +400,7 @@ class EquipmentInfoService:
|
|
|
res_list = [int(i.strip()) for i in res_list]
|
|
|
else:
|
|
|
res_list = [int(event_type)]
|
|
|
- combo_types = [51, 57, 58, 60]
|
|
|
+ combo_types = [51, 57, 58, 60, 59, 61]
|
|
|
for e_item in res_list:
|
|
|
bins = EquipmentInfoService.combo_type_all()
|
|
|
if e_item in combo_types:
|
