pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/hkg/image/page_payment/bd_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
inter/hkg/image/page_payment/bd_credit_card_ezlink.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
inter/hkg/image/page_payment/bd_qr_code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Before After
Before After

BIN
inter/hkg/image/page_payment/bn_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
inter/hkg/image/page_payment/bn_credit_card_ezlink.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
inter/hkg/image/page_payment/bn_qr_code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before After
Before After

BIN
inter/hkg/image/page_payment/bp_credit_card.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
inter/hkg/image/page_payment/bp_qr_code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

17
inter/hkg/xml/page_topping_select6.lxml
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>