diff --git a/image/page2_inter/bn_cocktail.png b/image/page2_inter/bn_cocktail.png new file mode 100644 index 00000000..95febe95 Binary files /dev/null and b/image/page2_inter/bn_cocktail.png differ diff --git a/image/page2_inter/bp_Cocktail.png b/image/page2_inter/bp_Cocktail.png new file mode 100644 index 00000000..dce72f1e Binary files /dev/null and b/image/page2_inter/bp_Cocktail.png differ diff --git a/image/page_doing/bn_get_lid.png b/image/page_doing/bn_get_lid.png index 2670b5a3..d982b37c 100644 Binary files a/image/page_doing/bn_get_lid.png and b/image/page_doing/bn_get_lid.png differ diff --git a/image/page_doing/bn_get_more_straw.png b/image/page_doing/bn_get_more_straw.png index 1795984c..ae0f200d 100644 Binary files a/image/page_doing/bn_get_more_straw.png and b/image/page_doing/bn_get_more_straw.png differ diff --git a/image/page_doing/bp_get_lid.png b/image/page_doing/bp_get_lid.png index 501c5224..98ed36ea 100644 Binary files a/image/page_doing/bp_get_lid.png and b/image/page_doing/bp_get_lid.png differ diff --git a/image/page_doing/bp_get_more_straw.png b/image/page_doing/bp_get_more_straw.png index ad4ccf83..01ea7291 100644 Binary files a/image/page_doing/bp_get_more_straw.png and b/image/page_doing/bp_get_more_straw.png differ diff --git a/image/page_payment/bn_topup_credit.png b/image/page_payment/bn_topup_credit.png index d65dc018..cd4f691b 100644 Binary files a/image/page_payment/bn_topup_credit.png and b/image/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment/bp_topup_credit.png b/image/page_payment/bp_topup_credit.png index 43f07a84..6a4760b2 100644 Binary files a/image/page_payment/bp_topup_credit.png and b/image/page_payment/bp_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bn_topup_credit.png b/image/page_payment_en/page_payment/bn_topup_credit.png index db94981b..916e6d91 100644 Binary files a/image/page_payment_en/page_payment/bn_topup_credit.png and b/image/page_payment_en/page_payment/bn_topup_credit.png differ diff --git a/image/page_payment_en/page_payment/bp_topup_credit.png b/image/page_payment_en/page_payment/bp_topup_credit.png index 7f35e388..61dcf749 100644 Binary files a/image/page_payment_en/page_payment/bp_topup_credit.png and b/image/page_payment_en/page_payment/bp_topup_credit.png differ diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev index 1fd22ce3..484ab1f3 100644 --- a/inter/aus/xml/event/tricker.ev +++ b/inter/aus/xml/event/tricker.ev @@ -8,12 +8,10 @@ Var NewCollectPointFlag = 0 -Var WinterWarmersCatalogFlag = 0 +Var WinterWarmersCatalogFlag = 1 Var XMLLiveInfoEnable = 0 -Var CocktailShow = "true" - DEBUGVAR Propepsi99Enable DEBUGVAR DisplayFormatFull \ No newline at end of file diff --git a/inter/aus/xml/open_page_catalog.ev b/inter/aus/xml/open_page_catalog.ev index 8a118187..bc1a4515 100644 --- a/inter/aus/xml/open_page_catalog.ev +++ b/inter/aus/xml/open_page_catalog.ev @@ -1,9 +1,8 @@ If WinterWarmersCatalogFlag = 1 Then Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml" - Open catalogFile +Else + Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml" EndIf -If CocktailShow = "true" Then - Var catalogFile = CountryRootPath + "/xml/page_catalog_cocktail.lxml" - Open catalogFile -EndIf \ No newline at end of file + +Open catalogFile \ No newline at end of file diff --git a/inter/aus/xml/page_catalog_group_cocktail.lxml b/inter/aus/xml/page_catalog_group_cocktail.lxml index 35762d96..3c8171c2 100644 --- a/inter/aus/xml/page_catalog_group_cocktail.lxml +++ b/inter/aus/xml/page_catalog_group_cocktail.lxml @@ -1,34 +1,35 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" - - - Var Menu8Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" - - - - - -;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml" + + + Var Menu8Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml" + + + + + +;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml" + + + + 10 497 @@ -40,74 +41,83 @@ Var block_index_override = 0 Var block_index_move = 0 +;dummy_layout.inc ; ==================> Len = 3 - ; - 11-99-05-0001 - + ; - 51-99-05-0001 - 33 22 225 296 - Flag( 11-99-05-0001.Button,$Sum1199050001) + Flag( 51-99-05-0001.Button,$Sum5199050001) + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Petrol Fumes + + Petrol Fumes + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gold lable, soda + + Gold lable, soda + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0017.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0017.Button + StringFmt( $51-99-05-0017.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050017 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0017.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" + $Sum5199050017 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0018 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0018.Button,$Sum5199050018) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Big Kid + + Big Kid + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gold lable, water + + Gold lable, water + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0018.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0018.Button + StringFmt( $51-99-05-0018.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050018 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0018.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" + $Sum5199050018 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0019 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0019.Button,$Sum5199050019) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Peach Smash + + Peach Smash + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Limenade ,\nSoda, Ice, Gin + + Peach Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0019.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0019.Button + StringFmt( $51-99-05-0019.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050019 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0019.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" + $Sum5199050019 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0020 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0020.Button,$Sum5199050020) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Melon Fizz + + Melon Fizz + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Limenade ,\nSoda, Ice, Gin + + Melon Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0020.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0020.Button + StringFmt( $51-99-05-0020.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050020 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0020.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" + $Sum5199050020 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0021 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0021.Button,$Sum5199050021) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Yuzu Collins + + Yuzu Collins + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gin + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0021.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0021.Button + StringFmt( $51-99-05-0021.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050021 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0021.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" + $Sum5199050021 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0022 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0022.Button,$Sum5199050022) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Gin Collins + + Gin Collins + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Gin, Limenade, Sugar, Soda and Ice + + Gin, Limenade, Sugar, Soda and Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0022.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0022.Button + StringFmt( $51-99-05-0022.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050022 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0022.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" + $Sum5199050022 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0023 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0023.Button,$Sum5199050023) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + The Floral + + The Floral + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Jasmine Tea ,\nWater, Ice, Gin + + Peach Syrup, Jasmine Tea ,\nWater, Ice, Gin + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0023.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0023.Button + StringFmt( $51-99-05-0023.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050023 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0023.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" + $Sum5199050023 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0024 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0024.Button,$Sum5199050024) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Combination + + Combination + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Melon Syrup, Limenade ,\nSoda, Ice, Vodka + + Melon Syrup, Limenade ,\nSoda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0024.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0024.Button + StringFmt( $51-99-05-0024.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050024 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0024.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" + $Sum5199050024 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0025 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0025.Button,$Sum5199050025) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Ume Ume + + Ume Ume + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Plum Syrup, Limenade ,\nSoda, Ice, Vodka + + Yuzu Syrup, Plum Syrup, Limenade ,\nSoda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0025.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0025.Button + StringFmt( $51-99-05-0025.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050025 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0025.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" + $Sum5199050025 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0026 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0026.Button,$Sum5199050026) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Like Sex\non The Beach + + Like Sex\non The Beach + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Peach Syrup, Limenade ,\nPineapple juice ,Soda, Ice, Vodka + + Peach Syrup, Limenade ,\nPineapple juice ,Soda, Ice, Vodka + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0026.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0026.Button + StringFmt( $51-99-05-0026.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050026 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0026.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" + $Sum5199050026 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-99-05-0027 - + + 33 + 22 + 225 + 296 + Flag( 51-99-05-0027.Button,$Sum5199050027) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Plum Highball + + Plum Highball + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gold label + + Yuzu Syrup, Limenade ,\nSoda, Ice, Gold label + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-05-0027.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-05-0027.Button + StringFmt( $51-99-05-0027.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 + + Var ice_tab_process_show = "Invisible" + + 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 $Sum5199050027 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-05-0027.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" + $Sum5199050027 000013 @@ -3722,9 +6806,9 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - + + + + + + diff --git a/inter/aus/xml/page_topping_select6.lxml b/inter/aus/xml/page_topping_select6.lxml index 2853f4a7..1fe36a1a 100644 --- a/inter/aus/xml/page_topping_select6.lxml +++ b/inter/aus/xml/page_topping_select6.lxml @@ -1850,6 +1850,11 @@ DEBUGVAR toppingID2price1 DEBUGVAR toppingID2price2 DEBUGVAR toppingID2price3 + + DEBUGVAR toppingID9price1 + DEBUGVAR toppingID9price2 + DEBUGVAR toppingID9price3 + DEBUGVAR toppingID9price4 Function 2 EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 3d2af218..922319ce 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -55,8 +55,8 @@ Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" - Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png" - Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png" + Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png" + Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png" Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" @@ -65,13 +65,15 @@ Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" - Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" - Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + ;Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" + ;Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png" - Var XStraw = 274 + Var XStraw = 142 Else Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3" @@ -108,7 +110,7 @@ Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png" Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png" - Var XStraw = 274 + Var XStraw = 142 EndIf Var waitAckPay = 0 @@ -364,15 +366,18 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Else Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" EndIf If GetFreeFromError = 1 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -404,21 +409,25 @@ If Seeker.CreditCard = 1 Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedUpgrade = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If NeedReboot = "true" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SELLSTATUS = "DEACTIVE" Then Var SelectMenuBetweenBrewEnable1Blink = "Invisible" Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf DEBUGVAR NeedUpgrade @@ -1443,6 +1452,7 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf ; Close next button. @@ -1450,12 +1460,14 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" Var SelectMenuBetweenBrewEnable2 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If DisableFromPowerup = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -1923,8 +1935,8 @@