This commit is contained in:
wanlop run 2024-08-16 17:49:16 +07:00
commit 0b823f1281
16 changed files with 787 additions and 286 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 111 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 812 B

After

Width:  |  Height:  |  Size: 903 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 809 B

Before After
Before After

View file

@ -1548,7 +1548,7 @@
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_enblender_icon.png" </Filename>
</Image>
; same
@ -1918,7 +1918,7 @@
; sugar layout
<Image>
<State> "Enable" </State>
<Filename> "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" </Filename>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bg_sugar_bank_button.png" </Filename>
</Image>
@ -2258,7 +2258,7 @@
; sugar layout
<Image>
<State> BGSugarHotHealthy </State>
<Filename> "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" </Filename>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bg_sugar_bank_button.png" </Filename>
</Image>
<Text>
@ -2446,7 +2446,7 @@
; sugar layout
<Image>
<State> BGSugarColdHealthy </State>
<Filename> "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" </Filename>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bg_sugar_bank_button.png" </Filename>
</Image>
<Text>
@ -2655,8 +2655,8 @@
<Y> 72 </Y>
<State> OatMilkEnable </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_cereal.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_cereal.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2710,7 +2710,7 @@
<Font> KanitRegularTTF </Font>
<State> "Enable" </State>
<Size> 36 </Size>
<Color> 0x84776F </Color>
<Color> HeadlineColor2 </Color>
<Value> text_price_oat_milk </Value>
</Text>
@ -2810,8 +2810,8 @@
<Y> 5 </Y>
<State> ShotCoffeePremium </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_shot2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot2.png" </FilenamePress>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_add_shot2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_add_shot2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2864,7 +2864,7 @@
<Font> KanitRegularTTF </Font>
<State> "ShotCoffeePremium"</State>
<Size> 36 </Size>
<Color> 0x84776F </Color>
<Color> HeadlineColor2 </Color>
<Value> text_price_topping </Value>
</Text>
@ -2900,9 +2900,9 @@
<Y> 5 </Y>
<State> showShotEnable </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_shot.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_shot.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_add_shot.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_add_shot.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bd_add_shot.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -2970,7 +2970,7 @@
<Font> KanitRegularTTF </Font>
<State> "Enable" </State>
<Size> 36 </Size>
<Color> 0x84776F </Color>
<Color> HeadlineColor2 </Color>
<Value> text_shot_normal_add </Value>
</Text>
@ -3002,9 +3002,9 @@
<Y> 5 </Y>
<State> showOreoAddEnable </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_oreo.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_oreo.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_oreo.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_add_oreo.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_add_oreo.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bd_add_oreo.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -3085,7 +3085,7 @@
<Font> KanitRegularTTF </Font>
<State> "Enable" </State>
<Size> 36 </Size>
<Color> 0x84776F </Color>
<Color> HeadlineColor2 </Color>
<Value> text_price_6 </Value>
</Text>
@ -3196,9 +3196,9 @@
<Y> 72 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_straw.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bd_straw.png" </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
If StrawState = "Press" Then
@ -3221,8 +3221,8 @@
<Y> 79 </Y>
<State> StrawState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click straw cb"
@ -3249,8 +3249,8 @@
<Y> 148 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_lid.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID pic"
@ -3278,8 +3278,8 @@
<Y> 155 </Y>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/cb_notcheck.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/cb_checked.png" </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<EventClick>
SAVELOG "Click LID cb"

View file

@ -12814,7 +12814,7 @@ LIMENADE SODA" </Value>
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
</EventActionOk>
@ -12882,7 +12882,7 @@ LIMENADE SODA" </Value>
GETACCEXT AC 38
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
</EventOnClick>

View file

@ -12821,7 +12821,7 @@ LIMENADE SODA" </Value>
Else
SAVELOG "Ext1a=error not get discount."
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
</EventActionOk>
@ -12898,10 +12898,10 @@ LIMENADE SODA" </Value>
GETACCEXT AC 38
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf

View file

@ -7,7 +7,7 @@
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
</EventActionOk>
@ -75,7 +75,7 @@
GETACCEXT AC 38
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa.xml"
EndIf
</EventOnClick>

File diff suppressed because it is too large Load diff