diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index 4b312e0a..80e977ea 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -20115,25 +20115,25 @@ Var aliasDesc[4] = "" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "" + Var NameLang[0][0] = "Hot LYCHEECANO" Var NameLang[0][1] = "" Var NameLang[0][2] = "" Var NameLang[0][3] = "" Var NameLang[0][4] = "" Var NameLang[0][5] = "" - Var DescLang[0][0] = "" + Var DescLang[0][0] = "Espresso, Lychee,\nSugar, Water" Var DescLang[0][1] = "" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "" + Var NameLang[1][0] = "Iced LYCHEECANO" Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "" + Var DescLang[1][0] = "Espresso, Lychee,\nSugar, Water" Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" @@ -21269,37 +21269,37 @@ Var aliasDesc[4] = "" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "" + Var NameLang[0][0] = "Hot TOKYO BANANA \nLATTE" Var NameLang[0][1] = "" Var NameLang[0][2] = "" Var NameLang[0][3] = "" Var NameLang[0][4] = "" Var NameLang[0][5] = "" - Var DescLang[0][0] = "" + Var DescLang[0][0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water" Var DescLang[0][1] = "" Var DescLang[0][2] = "" Var DescLang[0][3] = "" Var DescLang[0][4] = "" Var DescLang[0][5] = "" - Var NameLang[1][0] = "" + Var NameLang[1][0] = "Iced TOKYO BANANA \nLATTE" Var NameLang[1][1] = "" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" Var NameLang[1][5] = "" - Var DescLang[1][0] = "" + Var DescLang[1][0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water" Var DescLang[1][1] = "" Var DescLang[1][2] = "" Var DescLang[1][3] = "" Var DescLang[1][4] = "" Var DescLang[1][5] = "" - Var NameLang[2][0] = "" + Var NameLang[2][0] = "TOKYO BANANA \nLATTE SMOOTHIE" Var NameLang[2][1] = "" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" Var NameLang[2][5] = "" - Var DescLang[2][0] = "" + Var DescLang[2][0] = "Espresso, Tokyo Banana Syrup,\nSugar, Water" Var DescLang[2][1] = "" Var DescLang[2][2] = "" Var DescLang[2][3] = "" @@ -21551,7 +21551,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_hot_americano_Coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_hot_americano_Coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_hot_americano_Coconut.png" - xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -21651,13 +21651,13 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-21-02-0068" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-21-02-0068, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_forkid.lxml b/inter/sgp/xml/page_catalog_group_forkid.lxml index 86c2ecc8..5e523ccf 100644 --- a/inter/sgp/xml/page_catalog_group_forkid.lxml +++ b/inter/sgp/xml/page_catalog_group_forkid.lxml @@ -758,7 +758,7 @@ If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0005" - Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_5_posi1.png") + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") DEBUGVAR OverlayMenuFilter1 DEBUGVAR OverlayMenuFilter1_Value Else @@ -1944,7 +1944,7 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0002" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else diff --git a/inter/sgp/xml/page_catalog_group_milk.lxml b/inter/sgp/xml/page_catalog_group_milk.lxml index d55cfb56..a975e625 100644 --- a/inter/sgp/xml/page_catalog_group_milk.lxml +++ b/inter/sgp/xml/page_catalog_group_milk.lxml @@ -745,7 +745,7 @@ If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-03-01-0005" - Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_5_posi1.png") + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-03-01-0005, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_5_posi1.png") DEBUGVAR OverlayMenuFilter1 DEBUGVAR OverlayMenuFilter1_Value Else @@ -2238,7 +2238,7 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0002" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else @@ -2427,7 +2427,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_Cocoa_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_Cocoa_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_Cocoa_coconut.png" - xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") + xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2527,7 +2527,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0059" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -2542,7 +2542,7 @@ Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-03-02-0059, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6500,7 +6500,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_milk_coconut.png" - xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") + xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6600,7 +6600,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-03-02-0058" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -6609,13 +6609,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0058" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-03-02-0058, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml index 22fe83eb..2ace2dc4 100644 --- a/inter/sgp/xml/page_catalog_group_other.lxml +++ b/inter/sgp/xml/page_catalog_group_other.lxml @@ -941,7 +941,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi.png" - xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi2.png") + xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1041,13 +1041,13 @@ 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") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_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")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi2.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -2081,7 +2081,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_lemonade_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_lemonade_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_lemonade_soda.png" - xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_catalog_15_posi1.png") + xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_15_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2181,7 +2181,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0010" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_15_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_15_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -2190,13 +2190,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0010" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_17_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_17_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_15_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0010, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_15_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -5054,7 +5054,7 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0074" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0074, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_8_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0074, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else @@ -7223,7 +7223,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi_coconut.png" - xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") + xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7323,13 +7323,13 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0091" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0091, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10828,7 +10828,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_Lychee_Coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_Lychee_Coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_Lychee_Coconut.png" - xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") + xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10928,13 +10928,13 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0093" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0093, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -11113,7 +11113,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_Coconut_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_Coconut_soda.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_Coconut_soda.png" - xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11213,13 +11213,13 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0090" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0090, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -13353,7 +13353,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_lemonade.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_lemonade.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_lemonade.png" - xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_7_posi1.png") + xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_7_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -13453,7 +13453,7 @@ If PD_STAGE_1 = "Enable" Then Var OverlayMenuFilter1 = "52-05-01-0001" - Var OverlayMenuFilter1_Value !assigned xmlpro( 52-05-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_12_posi1.png") + Var OverlayMenuFilter1_Value !assigned xmlpro( 52-05-01-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_12_posi1.png") DEBUGVAR OverlayMenuFilter1 DEBUGVAR OverlayMenuFilter1_Value Else @@ -13462,7 +13462,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-05-02-0001" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_7_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -13471,13 +13471,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0001" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_10_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_10_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_7_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0001, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_7_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -14812,7 +14812,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_smoothie_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_smoothie_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_smoothie_coconut.png" - xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -14912,13 +14912,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-05-03-0092" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-03-0092, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_recommend.lxml b/inter/sgp/xml/page_catalog_group_recommend.lxml index 516bd949..b436dfbd 100644 --- a/inter/sgp/xml/page_catalog_group_recommend.lxml +++ b/inter/sgp/xml/page_catalog_group_recommend.lxml @@ -9225,7 +9225,7 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-03-03-0002" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeD/button_overlay_11_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-03-03-0002, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_11_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else @@ -11433,7 +11433,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_pepsi.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_pepsi.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_pepsi.png" - xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") + xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11533,13 +11533,13 @@ 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_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.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_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-05-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index 76e7a0e4..4b617325 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -5552,7 +5552,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_hot_thai_milk_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_hot_thai_milk_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_hot_thai_milk_tea_coconut.png" - xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") + xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -5652,7 +5652,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0062" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -5661,13 +5661,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0062" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0062, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -6702,7 +6702,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_jasmine_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_jasmine_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_jasmine_coconut.png" - xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6802,7 +6802,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0065" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -6817,7 +6817,7 @@ Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0065, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -7294,7 +7294,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_jasmine_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_jasmine_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_jasmine_milk_coconut.png" - xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") + xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -7394,7 +7394,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0064" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -7403,13 +7403,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0064" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0064, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -8728,7 +8728,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_match_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_match_milk_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_match_milk_coconut.png" - xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_1_posi1.png") + xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_catalog_2_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -8828,7 +8828,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0060" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -8837,13 +8837,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0060" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_3_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_1_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0060, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -10166,7 +10166,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_iced_matcha_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_iced_matcha_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_iced_matcha_tea_coconut.png" - xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -10266,7 +10266,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0061" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -10275,13 +10275,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0061" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0061, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" @@ -12413,7 +12413,7 @@ "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_black_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_black_tea_coconut.png" "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_black_tea_coconut.png" - xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_0_posi1.png") + xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_catalog_1_posi1.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -12513,7 +12513,7 @@ If PD_STAGE_2 = "Enable" Then Var OverlayMenuFilter2 = "52-02-02-0063" - Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter2_Value !assigned xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png") DEBUGVAR OverlayMenuFilter2 DEBUGVAR OverlayMenuFilter2_Value Else @@ -12522,13 +12522,13 @@ If PD_STAGE_3 = "Enable" Then Var OverlayMenuFilter3 = "52-02-03-0063" - Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png") + Var OverlayMenuFilter3_Value !assigned xmlpro( 52-02-03-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeB/button_overlay_2_posi1.png") DEBUGVAR OverlayMenuFilter3 DEBUGVAR OverlayMenuFilter3_Value Else Var OverlayMenuFilter = "" EndIf - Var OverlayMenuFilter = "xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_0_posi1.png")" + Var OverlayMenuFilter = "xmlpro( 52-02-02-0063, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeA/button_overlay_1_posi1.png")" Open "ROOT/taobin_project/xml/page_topping_select6.lxml" diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index d8bc776e..3f1b2a52 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -61,7 +61,11 @@ Else If Timeout = 0 Then - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + If CupChecking = "false" Then + If DoorCupPosition = "bottom" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + EndIf EndIf EndIf