SGP: fix blur 2x images, invisible img, wrong small image column
This commit is contained in:
Pakin
parent
fdc9178397
commit
79583753c0
25 changed files with 1374 additions and 1256 deletions
|
|
@ -36,7 +36,7 @@
|
|||
"append": appendValueInMap
|
||||
}
|
||||
|
||||
def cloneTextExport(key: str | list, mods=None, remove=None, replace=None):
|
||||
def cloneTextExport(key: str | list, mods=None, remove=None, replace=None, block_output=False, block_append=False):
|
||||
return {
|
||||
"source": season_pass_menu_big_btn_ui,
|
||||
"key": key,
|
||||
|
|
@ -45,7 +45,9 @@
|
|||
"remove": removePartOfText,
|
||||
"remove_target": remove,
|
||||
"replace_by": replace,
|
||||
"modifiers": mods
|
||||
"modifiers": mods,
|
||||
"no_output": block_output,
|
||||
"no_append": block_append
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -188,6 +190,7 @@
|
|||
|
||||
if "sm" in spl[idx_img][8]:
|
||||
is_sm = True
|
||||
|
||||
if pd_code_1.startswith('52-01') or pd_code_2.startswith('52-01') or pd_code_3.startswith('52-01'):
|
||||
is_v1 = True
|
||||
|
||||
|
|
@ -494,12 +497,22 @@
|
|||
out_xml( '\t<X> 16 </X>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Y> 264 </Y>\r\n',export_to=cloneTextExport(menu_key, lambda y_pos: y_pos * 2 + 10))
|
||||
|
||||
if multi_pro_gen and gen_ss and not is_sm:
|
||||
if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
|
||||
# expect season mode
|
||||
out_xml('\t<Width> 390 </Width>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Width> 390 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
else:
|
||||
if gen_ss:
|
||||
print("use normal: caused by multi_pro_gen=",multi_pro_gen,",is_sm=", is_sm )
|
||||
|
||||
|
||||
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
|
||||
if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
|
||||
out_xml('\t<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/option_deactive.png" </Filename>\r\n', export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
ice_tab_hot_show = True
|
||||
|
|
@ -518,15 +531,20 @@
|
|||
menu_key,
|
||||
lambda y_pos: y_pos * 2 + 10))
|
||||
|
||||
if multi_pro_gen and gen_ss and not is_sm:
|
||||
if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
|
||||
# expect season mode
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
|
||||
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
|
||||
if gen_ss and (not is_sm or "," in spl[idx_img][8]):
|
||||
out_xml( '\t<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/hot_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
out_xml( '\t<Text>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
|
@ -585,17 +603,22 @@
|
|||
menu_key,
|
||||
lambda y_pos: y_pos * 2 + 10))
|
||||
|
||||
if multi_pro_gen and gen_ss and not is_sm:
|
||||
if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
|
||||
# expect season mode
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
if pd_code_2 == "51-05-02-0016":
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "normal.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key))
|
||||
else:
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
|
||||
if gen_ss and (not is_sm or "," in spl[idx_img][8]):
|
||||
out_xml( '\t<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/cold_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
|
|
@ -653,13 +676,18 @@
|
|||
mods=lambda y_pos: y_pos * 2 + 10
|
||||
))
|
||||
|
||||
if multi_pro_gen and gen_ss and not is_sm:
|
||||
if gen_ss and (not is_sm or ", " in spl[idx_img][8]):
|
||||
# expect season mode
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml('\t<Width> 134 </Width>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml('\t<Height> 44 </Height>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_append=True))
|
||||
|
||||
if gen_ss and (not is_sm or "," in spl[idx_img][8]):
|
||||
out_xml( '\t<Filename> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend.png" </Filename>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
out_xml( '\t<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/event/season_pass/drink_option_en/blend_db.png" </FilenameDisable>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
out_xml( '\t<State> ' + shw + ' </State>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t</Image>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
|
|
@ -801,13 +829,13 @@
|
|||
out_xml( '\t<Mode> "disable-show" </Mode>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
if multi_pro_gen and gen_ss and not is_sm:
|
||||
out_xml('\t<Color> 0x322B26 </Color>',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t<Value> \"UNAVAILABLE\" </Value>\r\n',export_to=cloneTextExport(menu_key))
|
||||
else:
|
||||
out_xml( '\t<Language>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t\t<ID> 000013 </ID> \r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t</Language>\r\n',export_to=cloneTextExport(menu_key))
|
||||
# if gen_ss and not is_sm:
|
||||
# out_xml('\t<Color> 0x322B26 </Color>',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
# out_xml( '\t<Value> \"UNAVAILABLE\" </Value>\r\n',export_to=cloneTextExport(menu_key, block_output=True))
|
||||
|
||||
out_xml( '\t<Language>\r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t\t<ID> 000013 </ID> \r\n',export_to=cloneTextExport(menu_key))
|
||||
out_xml( '\t</Language>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
||||
|
||||
out_xml( '\t<Align> center-vertical-horizontal </Align>\r\n',export_to=cloneTextExport(menu_key))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue