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

This commit is contained in:
Ittipat Lusuk 2025-02-20 16:41:26 +07:00
commit 8c1fd1fbe3
167 changed files with 24173 additions and 1935 deletions

View file

@ -2223,9 +2223,11 @@
<Button>
<X> 680 </X>
<Y> 79 </Y>
<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
;<State> SugarState5 </State>
<State> "Invisible" </State>
<Filename> SugarNormalPicLv5 </Filename>
<FilenamePress> SugarPressPicLv5 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2290,10 +2292,11 @@
<Button>
<X> 820 </X>
<Y> 79 </Y>
<State> SugarState6 </State>
<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
;<State> SugarState6 </State>
<State> "Invisible" </State>
<Filename> SugarNormalPicLv6 </Filename>
<FilenamePress> SugarPressPicLv6 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>