diff --git a/image/page_drink/bn_dirty_light__snowwhite.png b/image/page_drink/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..4e1137de Binary files /dev/null and b/image/page_drink/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink/bn_dirty_light_whiskydude.png b/image/page_drink/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..cd0b2550 Binary files /dev/null and b/image/page_drink/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink/bn_hot_americano_light.png b/image/page_drink/bn_hot_americano_light.png index 3752575d..2ee0797a 100644 Binary files a/image/page_drink/bn_hot_americano_light.png and b/image/page_drink/bn_hot_americano_light.png differ diff --git a/image/page_drink/bn_hot_americano_light_snowwhite.png b/image/page_drink/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..e684483a Binary files /dev/null and b/image/page_drink/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink/bn_hot_americano_light_whiskydude.png b/image/page_drink/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..ed389ce8 Binary files /dev/null and b/image/page_drink/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink/bn_hot_espresso_light.png b/image/page_drink/bn_hot_espresso_light.png index 09f84181..98b30d8b 100644 Binary files a/image/page_drink/bn_hot_espresso_light.png and b/image/page_drink/bn_hot_espresso_light.png differ diff --git a/image/page_drink/bn_hot_espresso_light_snowwhite.png b/image/page_drink/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..2b972933 Binary files /dev/null and b/image/page_drink/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink/bn_hot_espresso_light_whiskydude.png b/image/page_drink/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..ac1bff3d Binary files /dev/null and b/image/page_drink/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink/bn_iced_americano_light_snowwhite.png b/image/page_drink/bn_iced_americano_light_snowwhite.png new file mode 100644 index 00000000..d68395d4 Binary files /dev/null and b/image/page_drink/bn_iced_americano_light_snowwhite.png differ diff --git a/image/page_drink/bn_iced_americano_light_whiskydude.png b/image/page_drink/bn_iced_americano_light_whiskydude.png new file mode 100644 index 00000000..bcb44d31 Binary files /dev/null and b/image/page_drink/bn_iced_americano_light_whiskydude.png differ diff --git a/image/page_drink_disable/bn_dirty_light__snowwhite.png b/image/page_drink_disable/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..3218cfb8 Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_disable/bn_dirty_light_whiskydude.png b/image/page_drink_disable/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..bca8f989 Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light_snowwhite.png b/image/page_drink_disable/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..59caf58c Binary files /dev/null and b/image/page_drink_disable/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light_whiskydude.png b/image/page_drink_disable/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..b0971733 Binary files /dev/null and b/image/page_drink_disable/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light_snowwhite.png b/image/page_drink_disable/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..5472a1b7 Binary files /dev/null and b/image/page_drink_disable/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light_whiskydude.png b/image/page_drink_disable/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..dbb88a70 Binary files /dev/null and b/image/page_drink_disable/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light_snowwhite.png b/image/page_drink_disable/bn_iced_americano_light_snowwhite.png new file mode 100644 index 00000000..6dfc1974 Binary files /dev/null and b/image/page_drink_disable/bn_iced_americano_light_snowwhite.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light_whiskydude.png b/image/page_drink_disable/bn_iced_americano_light_whiskydude.png new file mode 100644 index 00000000..4b2ef889 Binary files /dev/null and b/image/page_drink_disable/bn_iced_americano_light_whiskydude.png differ diff --git a/image/page_drink_press/bn_dirty_light__snowwhite.png b/image/page_drink_press/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..9e9cf0b7 Binary files /dev/null and b/image/page_drink_press/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_press/bn_dirty_light_whiskydude.png b/image/page_drink_press/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..19653a66 Binary files /dev/null and b/image/page_drink_press/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_press/bn_hot_americano_light_snowwhite.png b/image/page_drink_press/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..7c5b2d70 Binary files /dev/null and b/image/page_drink_press/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_press/bn_hot_americano_light_whiskydude.png b/image/page_drink_press/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..a308c5c9 Binary files /dev/null and b/image/page_drink_press/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_press/bn_hot_espresso_light_snowwhite.png b/image/page_drink_press/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..0cae8950 Binary files /dev/null and b/image/page_drink_press/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_press/bn_hot_espresso_light_whiskydude.png b/image/page_drink_press/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..80c72524 Binary files /dev/null and b/image/page_drink_press/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_press/bn_iced_americano_light_snowwhite.png b/image/page_drink_press/bn_iced_americano_light_snowwhite.png new file mode 100644 index 00000000..31a4353a Binary files /dev/null and b/image/page_drink_press/bn_iced_americano_light_snowwhite.png differ diff --git a/image/page_drink_press/bn_iced_americano_light_whiskydude.png b/image/page_drink_press/bn_iced_americano_light_whiskydude.png new file mode 100644 index 00000000..ee099328 Binary files /dev/null and b/image/page_drink_press/bn_iced_americano_light_whiskydude.png differ diff --git a/image/page_drink_select/bn_dirty_light__snowwhite.png b/image/page_drink_select/bn_dirty_light__snowwhite.png new file mode 100644 index 00000000..2b75bbfe Binary files /dev/null and b/image/page_drink_select/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_select/bn_dirty_light_whiskydude.png b/image/page_drink_select/bn_dirty_light_whiskydude.png new file mode 100644 index 00000000..a36edccc Binary files /dev/null and b/image/page_drink_select/bn_dirty_light_whiskydude.png differ diff --git a/image/page_drink_select/bn_hot_americano_light_snowwhite.png b/image/page_drink_select/bn_hot_americano_light_snowwhite.png new file mode 100644 index 00000000..bb10a94a Binary files /dev/null and b/image/page_drink_select/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_hot_americano_light_whiskydude.png b/image/page_drink_select/bn_hot_americano_light_whiskydude.png new file mode 100644 index 00000000..cd3621c6 Binary files /dev/null and b/image/page_drink_select/bn_hot_americano_light_whiskydude.png differ diff --git a/image/page_drink_select/bn_hot_espresso_light_snowwhite.png b/image/page_drink_select/bn_hot_espresso_light_snowwhite.png new file mode 100644 index 00000000..f6fe5864 Binary files /dev/null and b/image/page_drink_select/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_hot_espresso_light_whiskydude.png b/image/page_drink_select/bn_hot_espresso_light_whiskydude.png new file mode 100644 index 00000000..cc30291a Binary files /dev/null and b/image/page_drink_select/bn_hot_espresso_light_whiskydude.png differ diff --git a/image/page_drink_select/bn_iced_americano_light_snowwhite.png b/image/page_drink_select/bn_iced_americano_light_snowwhite.png new file mode 100644 index 00000000..e20626be Binary files /dev/null and b/image/page_drink_select/bn_iced_americano_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_iced_americano_light_whiskydude.png b/image/page_drink_select/bn_iced_americano_light_whiskydude.png new file mode 100644 index 00000000..01ea4a13 Binary files /dev/null and b/image/page_drink_select/bn_iced_americano_light_whiskydude.png differ diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml index 756de394..6df211a5 100644 --- a/xml/page_payment_cashMore.xml +++ b/xml/page_payment_cashMore.xml @@ -1087,8 +1087,8 @@ 1677 PayState2 Var( DirImage + pay_with_code_imagebn) - Var( DirImage + pay_with_code_imagebp") - Var( DirImage + pay_with_code_imagebp") + Var( DirImage + pay_with_code_imagebp) + Var( DirImage + pay_with_code_imagebp) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index fbc137f4..e94ea030 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -8,6 +8,10 @@ Var y_topping_bg = 912 WEB "DISABLE" + If JXMLVersionInt >= 369 Then + + Open "ROOT/taobin_project/xml/page_topping_select4.xml" + EndIf Open "ROOT/taobin_project/xml/page_topping_select3.xml" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 37d2346c..a89933a0 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -152,6 +152,7 @@ Machine DoorLidClose Var ButtonNext = "false" + Var NEW_MULTI = "Invisible" @@ -174,7 +175,6 @@ EndIf Refresh - TimerReset @@ -277,10 +277,6 @@ DEBUGVAR SubMenuName12 DEBUGVAR TOPPING1 - DEBUGVAR TOPPING1_ALT_2 - DEBUGVAR TOPPING1_ALT_3 - - DEBUGVAR TOPPING2 DEBUGVAR TOPPING3 DEBUGVAR TOPPING4 @@ -1426,6 +1422,10 @@ + + + + ; add cart