diff --git a/inter/gbr/xml/page_catalog_group_coffee.lxml b/inter/gbr/xml/page_catalog_group_coffee.lxml index 408c71c8..3758102a 100644 --- a/inter/gbr/xml/page_catalog_group_coffee.lxml +++ b/inter/gbr/xml/page_catalog_group_coffee.lxml @@ -18610,280 +18610,6 @@ center-vertical-horizontal - - ; ==================> Len = 3 - ; 55-21-01-0067 55-21-02-0067 - - - 33 - 22 - 225 - 296 - Flag( 55-21-01-0067.Button,55-21-02-0067.Button,$Sum55210100675521020067) - - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - MELINILLA LATTE - - MELINILLA LATTE - - - - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Coffee, Caramel, Melon, Milk - - Coffee, Caramel, Melon, Milk - - - - - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $55-21-01-0067.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - TextPriceMenuHotX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-21-01-0067.Button - StringFmt( $55-21-01-0067.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $55-21-02-0067.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $55-21-02-0067.Button - StringFmt( $55-21-02-0067.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum55210100675521020067 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum55210100675521020067 = "Disable" Then - STRCONTAIN "ERR" $55-21-01-0067.TAG tag1_is_disable - STRCONTAIN "ERR" $55-21-02-0067.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - "disable-show" - $Sum55210100675521020067 - - 000013 - - center-vertical-horizontal - ; ==================> Len = 3 ; 55-21-01-0077 55-21-02-0077 - diff --git a/inter/gbr/xml/page_payment_with_ukb.lxml b/inter/gbr/xml/page_payment_with_ukb.lxml index f9f5d3c2..45772554 100644 --- a/inter/gbr/xml/page_payment_with_ukb.lxml +++ b/inter/gbr/xml/page_payment_with_ukb.lxml @@ -3,7 +3,6 @@ 1080 1920 "0xeae6e1" - PlaySoundCodeLang SoundVolume "Partial" diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml index ece8f4e1..18274c84 100644 --- a/xml/page_payment_cash-GBR.xml +++ b/xml/page_payment_cash-GBR.xml @@ -1449,6 +1449,7 @@ If scanresult = "true" Then + TrimCRLF scanmsg StrLen scanmsg textLen DEBUGVAR textLen