add project files
Browse files- src/gr_func.py +2 -2
src/gr_func.py
CHANGED
@@ -132,11 +132,11 @@ def get_possible_material(medicine_select, first_material:str="无", second_mate
|
|
132 |
first_material = _get_material_elixir_config(first_material_name)
|
133 |
second_material = _get_material_elixir_config(second_material_name)
|
134 |
if first_material["main_func_t"] in [func1_type,func2_type]:
|
135 |
-
main_temp = first_material["main_temp"] * first_material_num
|
136 |
main_material = f"{first_material_name}*{first_material_num}"
|
137 |
auxi_material = f"{second_material_name}*{second_material_num}"
|
138 |
else:
|
139 |
-
main_temp = second_material["main_temp"] * second_material_num
|
140 |
auxi_material = f"{first_material_name}*{first_material_num}"
|
141 |
main_material = f"{second_material_name}*{second_material_num}"
|
142 |
|
|
|
132 |
first_material = _get_material_elixir_config(first_material_name)
|
133 |
second_material = _get_material_elixir_config(second_material_name)
|
134 |
if first_material["main_func_t"] in [func1_type,func2_type]:
|
135 |
+
main_temp = first_material["main_temp"] * int(first_material_num)
|
136 |
main_material = f"{first_material_name}*{first_material_num}"
|
137 |
auxi_material = f"{second_material_name}*{second_material_num}"
|
138 |
else:
|
139 |
+
main_temp = second_material["main_temp"] * int(second_material_num)
|
140 |
auxi_material = f"{first_material_name}*{first_material_num}"
|
141 |
main_material = f"{second_material_name}*{second_material_num}"
|
142 |
|