diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv index c55f4e16..ee59cebc 100644 --- a/inter/sgp/animation01/play_list.tsv +++ b/inter/sgp/animation01/play_list.tsv @@ -875,3 +875,10 @@ Coconut Jasmine tea 52-02-02-0065 1 10 62 23 24 120 7:00 23 Coconut Jasmine tea 52-02-03-0065 1 10 62 23 41 24 120 8:00 23 GINGER MILK TEA\nOREO SMOOTHIE 12-02-03-0056 ESPRESSO SHAKE 52-04-02-0021 1 25 26 2 3 4 5 17 23 24 230 3:50 28 +PEPSI Max PLUM 52-05-02-0074 +PEPSI Max PLUM 52-05-03-0074 +PEPSI Max MELON 52-05-02-0075 +PEPSI Max MELON 52-05-03-0075 +PEPSI Max BANANA 52-05-02-0077 +PEPSI Max YUZU 52-05-02-0076 +PEPSI MINT 52-05-02-0068 diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index af671635..c185816c 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -941,6 +941,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_Black.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_Black.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_Black.png" + xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1037,7 +1038,16 @@ Var OverlayMenuFilter1 = "" Var OverlayMenuFilter2 = "" Var OverlayMenuFilter3 = "" - Var OverlayMenuFilter = "" + + If PD_STAGE_2 = "Enable" Then + Var OverlayMenuFilter2 = "52-05-02-0062" + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi2.png") + DEBUGVAR OverlayMenuFilter2 + DEBUGVAR OverlayMenuFilter2_Value + Else + Var OverlayMenuFilter = "" + EndIf + Var OverlayMenuFilter = "xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi2.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -4921,6 +4931,300 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 52-05-02-0074 52-05-03-0074 + + 33 + 22 + 225 + 296 + Flag( 52-05-02-0074.Button,52-05-03-0074.Button,$Sum52050200745205030074) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + PEPSI Max PLUM + เป๊ปซี่บ๊วย + PEPSI Max PLUM + เป๊ปซี่บ๊วย + + เป๊ปซี่บ๊วย + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Pepsi Max, Ume Syrup & Ice + เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา + Pepsi Max, Ume Syrup & 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" ) + $52-05-02-0074.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $52-05-02-0074.Button + StringFmt( $52-05-02-0074.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-05-03-0074.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $52-05-03-0074.Button + StringFmt( $52-05-03-0074.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 $Sum52050200745205030074 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $52-05-02-0074.TAG tag2_is_disable + STRCONTAIN "ERR" $52-05-03-0074.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" + $Sum52050200745205030074 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 52-05-02-0047 52-05-03-0047 @@ -5500,6 +5804,291 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 52-05-02-0076 - + + 33 + 22 + 225 + 296 + Flag( 52-05-02-0076.Button,$Sum5205020076) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + PEPSI Max YUZU + เป๊ปซี่ยูซุ + PEPSI Max YUZU + เป๊ปซี่ยูซุ + + เป๊ปซี่ยูซุ + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Pepsi Max, Yuzu Syrup& Ice + เป๊ปซี่ น้ำเชื่อมยูซุ โซดา + Pepsi Max, Yuzu Syrup& 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" ) + $52-05-02-0076.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $52-05-02-0076.Button + StringFmt( $52-05-02-0076.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 $Sum5205020076 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $52-05-02-0076.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" + $Sum5205020076 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 52-05-02-0054 - @@ -5787,43 +6376,43 @@ ; ==================> Len = 3 - ; - 52-05-02-0091 - + ; - 52-05-02-0077 - 33 22 225 296 - Flag( 52-05-02-0091.Button,$Sum5205020091) + Flag( 52-05-02-0077.Button,$Sum5205020077) - - 16 - 164 - 22 - 222 - "multi2" - KanitMediumTTF - 0x322B26 - - PEPSI Max PLUM - เป๊ปซี่บ๊วย - PEPSI Max PLUM - เป๊ปซี่บ๊วย - - เป๊ปซี่บ๊วย - - - - 16 - 220 - 14 - 222 - KanitMediumTTF - 0x6F5F51 - - Pepsi Max, Ume Syrup & Ice - เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา - Pepsi Max, Ume Syrup & 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" ) - $52-05-02-0074.Button - - - 113 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $52-05-02-0074.Button - StringFmt( $52-05-02-0074.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $52-05-03-0074.Button - - - TextPriceMenuBlendX - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $52-05-03-0074.Button - StringFmt( $52-05-03-0074.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 $Sum52050200745205030074 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $52-05-02-0074.TAG tag2_is_disable - STRCONTAIN "ERR" $52-05-03-0074.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" - $Sum52050200745205030074 + $Sum5205020077 000013 @@ -6622,42 +6936,42 @@ ; ==================> Len = 3 - ; - 52-05-02-0076 - + ; - 52-05-02-0068 - 33 22 225 296 - Flag( 52-05-02-0076.Button,$Sum5205020076) + Flag( 52-05-02-0068.Button,$Sum5205020068)