Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

This commit is contained in:
Ittipat Lusuk 2025-02-26 11:11:55 +07:00
commit a54adb7b12
39 changed files with 8792 additions and 1663 deletions

View file

@ -2223,8 +2223,7 @@
<Button>
<X> 680 </X>
<Y> 79 </Y>
;<State> SugarState5 </State>
<State> "Invisible" </State>
<State> SugarState5 </State>
<Filename> SugarNormalPicLv5 </Filename>
<FilenamePress> SugarPressPicLv5 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
@ -2292,8 +2291,7 @@
<Button>
<X> 820 </X>
<Y> 79 </Y>
;<State> SugarState6 </State>
<State> "Invisible" </State>
<State> SugarState6 </State>
<Filename> SugarNormalPicLv6 </Filename>
<FilenamePress> SugarPressPicLv6 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>