diff --git a/image/drink_main.gif b/image/drink_main.gif index 19a15033..3c964beb 100644 Binary files a/image/drink_main.gif and b/image/drink_main.gif differ diff --git a/image/menu_drink/bn_apple_cocktail.png b/image/menu_drink/bn_apple_cocktail.png new file mode 100644 index 00000000..1575dd8a Binary files /dev/null and b/image/menu_drink/bn_apple_cocktail.png differ diff --git a/image/menu_drink/bn_blue_col.png b/image/menu_drink/bn_blue_col.png new file mode 100644 index 00000000..29c975f9 Binary files /dev/null and b/image/menu_drink/bn_blue_col.png differ diff --git a/image/menu_drink/bn_blue_soda.png b/image/menu_drink/bn_blue_soda.png new file mode 100644 index 00000000..0138307a Binary files /dev/null and b/image/menu_drink/bn_blue_soda.png differ diff --git a/image/menu_drink/bn_blue_water.png b/image/menu_drink/bn_blue_water.png new file mode 100644 index 00000000..12b4b656 Binary files /dev/null and b/image/menu_drink/bn_blue_water.png differ diff --git a/image/menu_drink/bn_iris_coffee.png b/image/menu_drink/bn_iris_coffee.png new file mode 100644 index 00000000..5521c3de Binary files /dev/null and b/image/menu_drink/bn_iris_coffee.png differ diff --git a/image/menu_drink/bn_punch_cocktail.png b/image/menu_drink/bn_punch_cocktail.png new file mode 100644 index 00000000..af3aed66 Binary files /dev/null and b/image/menu_drink/bn_punch_cocktail.png differ diff --git a/image/menu_drink/bn_rasp_cocktail.png b/image/menu_drink/bn_rasp_cocktail.png new file mode 100644 index 00000000..c27c1505 Binary files /dev/null and b/image/menu_drink/bn_rasp_cocktail.png differ diff --git a/image/menu_drink_disable/bn_coffee_thai_tea.png b/image/menu_drink_disable/bn_coffee_thai_tea.png new file mode 100644 index 00000000..ebf8ae3a Binary files /dev/null and b/image/menu_drink_disable/bn_coffee_thai_tea.png differ diff --git a/image/menu_drink_disable/bn_diy.png b/image/menu_drink_disable/bn_diy.png new file mode 100644 index 00000000..390d40c6 Binary files /dev/null and b/image/menu_drink_disable/bn_diy.png differ diff --git a/image/menu_drink_disable/bn_hot_america_no.png b/image/menu_drink_disable/bn_hot_america_no.png new file mode 100644 index 00000000..509448d7 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_america_no.png differ diff --git a/image/menu_drink_disable/bn_hot_cappuccino.png b/image/menu_drink_disable/bn_hot_cappuccino.png new file mode 100644 index 00000000..09af9e31 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_cappuccino.png differ diff --git a/image/menu_drink_disable/bn_hot_caramel_macchiato.png b/image/menu_drink_disable/bn_hot_caramel_macchiato.png new file mode 100644 index 00000000..ec7d2ec0 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_caramel_macchiato.png differ diff --git a/image/menu_drink_disable/bn_hot_choco.png b/image/menu_drink_disable/bn_hot_choco.png new file mode 100644 index 00000000..e2d3f7ba Binary files /dev/null and b/image/menu_drink_disable/bn_hot_choco.png differ diff --git a/image/menu_drink_disable/bn_hot_cocoa.png b/image/menu_drink_disable/bn_hot_cocoa.png new file mode 100644 index 00000000..c5a714f5 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_cocoa.png differ diff --git a/image/menu_drink_disable/bn_hot_double_espresso.png b/image/menu_drink_disable/bn_hot_double_espresso.png new file mode 100644 index 00000000..46bad73e Binary files /dev/null and b/image/menu_drink_disable/bn_hot_double_espresso.png differ diff --git a/image/menu_drink_disable/bn_hot_espresso.png b/image/menu_drink_disable/bn_hot_espresso.png new file mode 100644 index 00000000..09d790b5 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_espresso.png differ diff --git a/image/menu_drink_disable/bn_hot_ginger_tea.png b/image/menu_drink_disable/bn_hot_ginger_tea.png new file mode 100644 index 00000000..68f7ebd4 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_ginger_tea.png differ diff --git a/image/menu_drink_disable/bn_hot_latte.png b/image/menu_drink_disable/bn_hot_latte.png new file mode 100644 index 00000000..6af616bf Binary files /dev/null and b/image/menu_drink_disable/bn_hot_latte.png differ diff --git a/image/menu_drink_disable/bn_hot_lemon_espresso.png b/image/menu_drink_disable/bn_hot_lemon_espresso.png new file mode 100644 index 00000000..620d6309 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_lemon_espresso.png differ diff --git a/image/menu_drink_disable/bn_hot_lemon_tea.png b/image/menu_drink_disable/bn_hot_lemon_tea.png new file mode 100644 index 00000000..21e8e952 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_lemon_tea.png differ diff --git a/image/menu_drink_disable/bn_hot_lemonate.png b/image/menu_drink_disable/bn_hot_lemonate.png new file mode 100644 index 00000000..49dc7b49 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_lemonate.png differ diff --git a/image/menu_drink_disable/bn_hot_macchiato.png b/image/menu_drink_disable/bn_hot_macchiato.png new file mode 100644 index 00000000..3cc31cd1 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_macchiato.png differ diff --git a/image/menu_drink_disable/bn_hot_milk_caramel.png b/image/menu_drink_disable/bn_hot_milk_caramel.png new file mode 100644 index 00000000..cc83d06c Binary files /dev/null and b/image/menu_drink_disable/bn_hot_milk_caramel.png differ diff --git a/image/menu_drink_disable/bn_hot_milo.png b/image/menu_drink_disable/bn_hot_milo.png new file mode 100644 index 00000000..f0dd2b16 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_milo.png differ diff --git a/image/menu_drink_disable/bn_hot_mocha.png b/image/menu_drink_disable/bn_hot_mocha.png new file mode 100644 index 00000000..a8a6f527 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_mocha.png differ diff --git a/image/menu_drink_disable/bn_hot_taiwan_milk_tea.png b/image/menu_drink_disable/bn_hot_taiwan_milk_tea.png new file mode 100644 index 00000000..ec061487 Binary files /dev/null and b/image/menu_drink_disable/bn_hot_taiwan_milk_tea.png differ diff --git a/image/menu_drink_disable/bn_hot_water.png b/image/menu_drink_disable/bn_hot_water.png new file mode 100644 index 00000000..f26644be Binary files /dev/null and b/image/menu_drink_disable/bn_hot_water.png differ diff --git a/image/menu_drink_disable/bn_iced.png b/image/menu_drink_disable/bn_iced.png new file mode 100644 index 00000000..d5a90624 Binary files /dev/null and b/image/menu_drink_disable/bn_iced.png differ diff --git a/image/menu_drink_disable/bn_iced_america_no.png b/image/menu_drink_disable/bn_iced_america_no.png new file mode 100644 index 00000000..15a8b944 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_america_no.png differ diff --git a/image/menu_drink_disable/bn_iced_cappuccino.png b/image/menu_drink_disable/bn_iced_cappuccino.png new file mode 100644 index 00000000..b57d297c Binary files /dev/null and b/image/menu_drink_disable/bn_iced_cappuccino.png differ diff --git a/image/menu_drink_disable/bn_iced_caramel.png b/image/menu_drink_disable/bn_iced_caramel.png new file mode 100644 index 00000000..b7b70d11 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_caramel.png differ diff --git a/image/menu_drink_disable/bn_iced_caramel_macchiato.png b/image/menu_drink_disable/bn_iced_caramel_macchiato.png new file mode 100644 index 00000000..76fc343c Binary files /dev/null and b/image/menu_drink_disable/bn_iced_caramel_macchiato.png differ diff --git a/image/menu_drink_disable/bn_iced_cocoa.png b/image/menu_drink_disable/bn_iced_cocoa.png new file mode 100644 index 00000000..e1697f68 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_cocoa.png differ diff --git a/image/menu_drink_disable/bn_iced_coffee_thai_milk_tea.png b/image/menu_drink_disable/bn_iced_coffee_thai_milk_tea.png new file mode 100644 index 00000000..e46b48a3 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_coffee_thai_milk_tea.png differ diff --git a/image/menu_drink_disable/bn_iced_cola.png b/image/menu_drink_disable/bn_iced_cola.png new file mode 100644 index 00000000..f92c10c4 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_cola.png differ diff --git a/image/menu_drink_disable/bn_iced_cola_zero.png b/image/menu_drink_disable/bn_iced_cola_zero.png new file mode 100644 index 00000000..ba59ae95 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_cola_zero.png differ diff --git a/image/menu_drink_disable/bn_iced_epsresso.png b/image/menu_drink_disable/bn_iced_epsresso.png new file mode 100644 index 00000000..66ae4a2e Binary files /dev/null and b/image/menu_drink_disable/bn_iced_epsresso.png differ diff --git a/image/menu_drink_disable/bn_iced_lattle.png b/image/menu_drink_disable/bn_iced_lattle.png new file mode 100644 index 00000000..7efa3aad Binary files /dev/null and b/image/menu_drink_disable/bn_iced_lattle.png differ diff --git a/image/menu_drink_disable/bn_iced_lemon_espresso.png b/image/menu_drink_disable/bn_iced_lemon_espresso.png new file mode 100644 index 00000000..b196ca7f Binary files /dev/null and b/image/menu_drink_disable/bn_iced_lemon_espresso.png differ diff --git a/image/menu_drink_disable/bn_iced_lemonade.png b/image/menu_drink_disable/bn_iced_lemonade.png new file mode 100644 index 00000000..4b64387d Binary files /dev/null and b/image/menu_drink_disable/bn_iced_lemonade.png differ diff --git a/image/menu_drink_disable/bn_iced_lemonade_soda.png b/image/menu_drink_disable/bn_iced_lemonade_soda.png new file mode 100644 index 00000000..405a7780 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_lemonade_soda.png differ diff --git a/image/menu_drink_disable/bn_iced_macchiato.png b/image/menu_drink_disable/bn_iced_macchiato.png new file mode 100644 index 00000000..e9b125e5 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_macchiato.png differ diff --git a/image/menu_drink_disable/bn_iced_milo.png b/image/menu_drink_disable/bn_iced_milo.png new file mode 100644 index 00000000..e0bfd5aa Binary files /dev/null and b/image/menu_drink_disable/bn_iced_milo.png differ diff --git a/image/menu_drink_disable/bn_iced_mocha.png b/image/menu_drink_disable/bn_iced_mocha.png new file mode 100644 index 00000000..408fa319 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_mocha.png differ diff --git a/image/menu_drink_disable/bn_iced_soda.png b/image/menu_drink_disable/bn_iced_soda.png new file mode 100644 index 00000000..ecff5862 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_soda.png differ diff --git a/image/menu_drink_disable/bn_iced_sprite.png b/image/menu_drink_disable/bn_iced_sprite.png new file mode 100644 index 00000000..0977a34c Binary files /dev/null and b/image/menu_drink_disable/bn_iced_sprite.png differ diff --git a/image/menu_drink_disable/bn_iced_taiwan_milk_tea.png b/image/menu_drink_disable/bn_iced_taiwan_milk_tea.png new file mode 100644 index 00000000..3483ad53 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_taiwan_milk_tea.png differ diff --git a/image/menu_drink_disable/bn_iced_thai_black_coffee.png b/image/menu_drink_disable/bn_iced_thai_black_coffee.png new file mode 100644 index 00000000..1be1605d Binary files /dev/null and b/image/menu_drink_disable/bn_iced_thai_black_coffee.png differ diff --git a/image/menu_drink_disable/bn_iced_thai_milk_tea.png b/image/menu_drink_disable/bn_iced_thai_milk_tea.png new file mode 100644 index 00000000..12002e31 Binary files /dev/null and b/image/menu_drink_disable/bn_iced_thai_milk_tea.png differ diff --git a/image/menu_drink_disable/bn_iced_thai_tea.png b/image/menu_drink_disable/bn_iced_thai_tea.png new file mode 100644 index 00000000..441589dd Binary files /dev/null and b/image/menu_drink_disable/bn_iced_thai_tea.png differ diff --git a/image/menu_drink_disable/bn_lemon_thai_tea.png b/image/menu_drink_disable/bn_lemon_thai_tea.png new file mode 100644 index 00000000..eaeeac6c Binary files /dev/null and b/image/menu_drink_disable/bn_lemon_thai_tea.png differ diff --git a/image/menu_drink_disable/bn_pink_milk.png b/image/menu_drink_disable/bn_pink_milk.png new file mode 100644 index 00000000..8783e483 Binary files /dev/null and b/image/menu_drink_disable/bn_pink_milk.png differ diff --git a/image/menu_drink_disable/bn_sala.png b/image/menu_drink_disable/bn_sala.png new file mode 100644 index 00000000..d9985307 Binary files /dev/null and b/image/menu_drink_disable/bn_sala.png differ diff --git a/image/menu_drink_disable/bn_sala_lemon_juice.png b/image/menu_drink_disable/bn_sala_lemon_juice.png new file mode 100644 index 00000000..1d56b270 Binary files /dev/null and b/image/menu_drink_disable/bn_sala_lemon_juice.png differ diff --git a/image/menu_drink_disable/bn_sala_lemon_soda.png b/image/menu_drink_disable/bn_sala_lemon_soda.png new file mode 100644 index 00000000..581e1e3d Binary files /dev/null and b/image/menu_drink_disable/bn_sala_lemon_soda.png differ diff --git a/image/menu_drink_disable/bn_sala_soda.png b/image/menu_drink_disable/bn_sala_soda.png new file mode 100644 index 00000000..1616a0cc Binary files /dev/null and b/image/menu_drink_disable/bn_sala_soda.png differ diff --git a/image/menu_drink_disable/bn_soda.png b/image/menu_drink_disable/bn_soda.png new file mode 100644 index 00000000..b826e05f Binary files /dev/null and b/image/menu_drink_disable/bn_soda.png differ diff --git a/image/menu_drink_disable/bn_sparking_soda.png b/image/menu_drink_disable/bn_sparking_soda.png new file mode 100644 index 00000000..b9ea760f Binary files /dev/null and b/image/menu_drink_disable/bn_sparking_soda.png differ diff --git a/image/menu_drink_disable/bn_water_cool.png b/image/menu_drink_disable/bn_water_cool.png new file mode 100644 index 00000000..a25610db Binary files /dev/null and b/image/menu_drink_disable/bn_water_cool.png differ diff --git a/image/menu_drink_press/bn_apple_cocktail.png b/image/menu_drink_press/bn_apple_cocktail.png new file mode 100644 index 00000000..66c2ee0e Binary files /dev/null and b/image/menu_drink_press/bn_apple_cocktail.png differ diff --git a/image/menu_drink_press/bn_blue_col.png b/image/menu_drink_press/bn_blue_col.png new file mode 100644 index 00000000..c753bfcd Binary files /dev/null and b/image/menu_drink_press/bn_blue_col.png differ diff --git a/image/menu_drink_press/bn_blue_soda.png b/image/menu_drink_press/bn_blue_soda.png new file mode 100644 index 00000000..cf3b6b0d Binary files /dev/null and b/image/menu_drink_press/bn_blue_soda.png differ diff --git a/image/menu_drink_press/bn_blue_water.png b/image/menu_drink_press/bn_blue_water.png new file mode 100644 index 00000000..b57095f1 Binary files /dev/null and b/image/menu_drink_press/bn_blue_water.png differ diff --git a/image/menu_drink_press/bn_iris_coffee.png b/image/menu_drink_press/bn_iris_coffee.png new file mode 100644 index 00000000..2f90f0d3 Binary files /dev/null and b/image/menu_drink_press/bn_iris_coffee.png differ diff --git a/image/menu_drink_press/bn_punch_cocktail.png b/image/menu_drink_press/bn_punch_cocktail.png new file mode 100644 index 00000000..fec412ba Binary files /dev/null and b/image/menu_drink_press/bn_punch_cocktail.png differ diff --git a/image/menu_drink_press/bn_rasp_cocktail.png b/image/menu_drink_press/bn_rasp_cocktail.png new file mode 100644 index 00000000..a8bc9c5c Binary files /dev/null and b/image/menu_drink_press/bn_rasp_cocktail.png differ diff --git a/image/menu_drink_select/bn_apple_cocktail.png b/image/menu_drink_select/bn_apple_cocktail.png new file mode 100644 index 00000000..09b1d4a8 Binary files /dev/null and b/image/menu_drink_select/bn_apple_cocktail.png differ diff --git a/image/menu_drink_select/bn_blue_col.png b/image/menu_drink_select/bn_blue_col.png new file mode 100644 index 00000000..bb7a4e4c Binary files /dev/null and b/image/menu_drink_select/bn_blue_col.png differ diff --git a/image/menu_drink_select/bn_blue_soda.png b/image/menu_drink_select/bn_blue_soda.png new file mode 100644 index 00000000..1edb390d Binary files /dev/null and b/image/menu_drink_select/bn_blue_soda.png differ diff --git a/image/menu_drink_select/bn_blue_water.png b/image/menu_drink_select/bn_blue_water.png new file mode 100644 index 00000000..7f5195db Binary files /dev/null and b/image/menu_drink_select/bn_blue_water.png differ diff --git a/image/menu_drink_select/bn_iced_coffee_thai_milk_tea-1.png b/image/menu_drink_select/bn_iced_coffee_thai_milk_tea-1.png new file mode 100644 index 00000000..ecf11c38 Binary files /dev/null and b/image/menu_drink_select/bn_iced_coffee_thai_milk_tea-1.png differ diff --git a/image/menu_drink_select/bn_iris_coffee.png b/image/menu_drink_select/bn_iris_coffee.png new file mode 100644 index 00000000..f81abd39 Binary files /dev/null and b/image/menu_drink_select/bn_iris_coffee.png differ diff --git a/image/menu_drink_select/bn_punch_cocktail.png b/image/menu_drink_select/bn_punch_cocktail.png new file mode 100644 index 00000000..8f06cb86 Binary files /dev/null and b/image/menu_drink_select/bn_punch_cocktail.png differ diff --git a/image/menu_drink_select/bn_rasp_cocktail.png b/image/menu_drink_select/bn_rasp_cocktail.png new file mode 100644 index 00000000..f11d07b9 Binary files /dev/null and b/image/menu_drink_select/bn_rasp_cocktail.png differ diff --git a/xml/menu_board.xml b/xml/menu_board.xml index 9f97bef9..b9bbb397 100644 --- a/xml/menu_board.xml +++ b/xml/menu_board.xml @@ -73,7 +73,7 @@ - 196 + 127 607 "ROOT/taobin_project/image/drink_main.gif" diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml index d122f9f1..570d0d99 100644 --- a/xml/menu_catalog_choose_drink1.pml +++ b/xml/menu_catalog_choose_drink1.pml @@ -7,15 +7,15 @@ bt_pic = [] - bt_pic.append('b#_blue_soda.png') - bt_pic.append('b#_blue_water.png') - bt_pic.append('b#_rasp_cocktail.png') + #bt_pic.append('b#_blue_soda.png') + #bt_pic.append('b#_blue_water.png') + #bt_pic.append('b#_rasp_cocktail.png') - bt_pic.append('b#_apple_cocktail.png') - bt_pic.append('b#_blue_col.png') - bt_pic.append('b#_punch_cocktail.png') + #bt_pic.append('b#_apple_cocktail.png') + #bt_pic.append('b#_blue_col.png') + #bt_pic.append('b#_punch_cocktail.png') - bt_pic.append('b#_iris_coffee.png') + #bt_pic.append('b#_iris_coffee.png') bt_pic.append('b#_hot_america_no.png') bt_pic.append('b#_sala.png') @@ -27,15 +27,15 @@ product_code = [] - product_code.append('11-99-02-0038') - product_code.append('11-99-02-0039') - product_code.append('11-99-02-0040') + #product_code.append('11-99-02-0038') + #product_code.append('11-99-02-0039') + #product_code.append('11-99-02-0040') - product_code.append('11-99-02-0041') - product_code.append('11-99-02-0042') - product_code.append('11-99-02-0043') + #product_code.append('11-99-02-0041') + #product_code.append('11-99-02-0042') + #product_code.append('11-99-02-0043') - product_code.append('11-99-02-0044') + #product_code.append('11-99-02-0044') product_code.append('11-99-01-0004') product_code.append('11-99-02-0020') diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml index 9237cf86..4f42f8c4 100644 --- a/xml/menu_catalog_choose_drink1.xml +++ b/xml/menu_catalog_choose_drink1.xml @@ -134,160 +134,14 @@ - ; button i=1 11-99-02-0038 + ; button i=1 11-99-01-0004 - ; button i=2 11-99-02-0039 - - ; button i=3 11-99-02-0040 - - ; button i=4 11-99-02-0041 - - ; button i=5 11-99-02-0042 - - ; button i=6 11-99-02-0043 - - ; button i=7 11-99-02-0044 - - ; button i=8 11-99-01-0004 - - ; button i=9 11-99-02-0020 + ; button i=2 11-99-02-0020 - ; button i=10 11-99-02-0017 + ; button i=3 11-99-02-0017 - ; button i=11 11-99-01-0017 + ; button i=4 11-99-01-0017 - ; button i=12 11-99-02-0018 + ; button i=5 11-99-02-0018