chewing commited on
Commit
77749d1
·
1 Parent(s): 0e96e93

add project files

Browse files
Files changed (1) hide show
  1. src/gr_func.py +3 -2
src/gr_func.py CHANGED
@@ -5,6 +5,7 @@ material_table = db.table('material')
5
  medicine_table = db.table('medicine')
6
 
7
 
 
8
  def get_medicines(type="ALL"):
9
  assert type in ["ALL", "回复状态", "突破概率", "加攻击力"], f"type:{type} 不是有效的类别"
10
  if type in ["ALL"]:
@@ -131,11 +132,11 @@ def get_possible_material(medicine_select, first_material:str="无", second_mate
131
  first_material = _get_material_elixir_config(first_material_name)
132
  second_material = _get_material_elixir_config(second_material_name)
133
  if first_material["main_func_t"] in [func1_type,func2_type]:
134
- main_temp = first_material["main_temp"]
135
  main_material = f"{first_material_name}*{first_material_num}"
136
  auxi_material = f"{second_material_name}*{second_material_num}"
137
  else:
138
- main_temp = second_material["main_temp"]
139
  auxi_material = f"{first_material_name}*{first_material_num}"
140
  main_material = f"{second_material_name}*{second_material_num}"
141
 
 
5
  medicine_table = db.table('medicine')
6
 
7
 
8
+
9
  def get_medicines(type="ALL"):
10
  assert type in ["ALL", "回复状态", "突破概率", "加攻击力"], f"type:{type} 不是有效的类别"
11
  if type in ["ALL"]:
 
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