From e9cf737657b0f4cb8a236a8a9d313c6c4d4574f9 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 7 Jun 2024 11:04:07 +0700 Subject: [PATCH] AUS: update catalog winter warmers menu --- .../page_catalog_group_winter_warmers.lxml | 290 ++++++++++++- .../xml/page_catalog_group_winter_warmers.skt | 2 + ...e_catalog_group_winter_warmers_ignore.lxml | 290 ++++++++++++- ...nergy_drink_1_bath_and_wednesday_melon.xml | 388 +----------------- 4 files changed, 555 insertions(+), 415 deletions(-) diff --git a/inter/aus/xml/page_catalog_group_winter_warmers.lxml b/inter/aus/xml/page_catalog_group_winter_warmers.lxml index 85d62d9a..f9b6b7d4 100644 --- a/inter/aus/xml/page_catalog_group_winter_warmers.lxml +++ b/inter/aus/xml/page_catalog_group_winter_warmers.lxml @@ -15,6 +15,8 @@ Var Timeout = 0 + Var MenuWinterWarmersCatalogState = "PressForever" + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" @@ -4733,6 +4735,280 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-02-01-0039 - - + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0039.Button,$Sum5102010039) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + THAI MILK TEA + ชานมไทย + THAI MILK TEA + ชานมไทย + + ชานมไทย + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Thai tea, Sugar, milk + ชาไทย และ นม + Thai tea, Sugar, milk + ชาไทย และ นม + + ชาไทย และ นม + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0039.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0039.Button + StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.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 $Sum5102010039 = "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 $Sum5102010039 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0039.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum5102010039 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; 51-02-01-0004 - - @@ -6393,20 +6669,6 @@ - - - - Var BigButtonEnable = "Enable" Refresh diff --git a/inter/aus/xml/page_catalog_group_winter_warmers.skt b/inter/aus/xml/page_catalog_group_winter_warmers.skt index eacd3d13..7f2f3fa6 100644 --- a/inter/aus/xml/page_catalog_group_winter_warmers.skt +++ b/inter/aus/xml/page_catalog_group_winter_warmers.skt @@ -18,6 +18,8 @@ Var Timeout = 0 + Var MenuWinterWarmersCatalogState = "PressForever" + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" diff --git a/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml b/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml index 64e9cc77..b6e82caa 100644 --- a/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml +++ b/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml @@ -15,6 +15,8 @@ Var Timeout = 0 + Var MenuWinterWarmersCatalogState = "PressForever" + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" @@ -4733,6 +4735,280 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-02-01-0039 - - + + 33 + 22 + 225 + 296 + Flag( 51-02-01-0039.Button,$Sum5102010039) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + THAI MILK TEA + ชานมไทย + THAI MILK TEA + ชานมไทย + + ชานมไทย + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Thai tea, Sugar, milk + ชาไทย และ นม + Thai tea, Sugar, milk + ชาไทย และ นม + + ชาไทย และ นม + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-02-01-0039.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-01-0039.Button + StringFmt( $51-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.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 $Sum5102010039 = "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 $Sum5102010039 = "Disable" Then + STRCONTAIN "ERR" $51-02-01-0039.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum5102010039 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; 51-02-01-0004 - - @@ -6393,20 +6669,6 @@ - - - - Var BigButtonEnable = "Enable" Refresh diff --git a/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml b/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml index 98b96f75..f44cf577 100644 --- a/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml +++ b/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml @@ -156,393 +156,7 @@ -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - - EndIf - - - ; zone cup on arm - If CupOnArm = "true" Then - - If CheckCupStateDoorCupClose = "" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - - If CheckCupStateDoorCupClose = "done" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - Refresh - EndIf - EndIf - - - Var Timeout = Timeout + 1 - TimerReset - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - - ; Handle penetrator - - If Only18 = "true" Then - - Open "ROOT/taobin_project/xml/page_identity18_verification.xml" - Else - - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - EndIf - - ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - +;include="ROOT/taobin_project/xml/menu_catalog_new.lxml"