diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index ee46ede5..11acb09a 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -147,6 +147,20 @@ ESPRESSO BLUE DADDY 12-01-01-0020 1 2 36 3 4 5 24 66 1:06 32 Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23 +OREO SMOOTHIE VOLCANO 12-03-03-0009 1 17 23 24 110 1:50 53 + + + + + + + + + + + + + Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 double espresso 14-11-01-0001 1 2 3 4 5 116 1:56 28 diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv index fbccfb9f..ee46ede5 100644 --- a/animation01/Menu Description - Sheet1_.tsv +++ b/animation01/Menu Description - Sheet1_.tsv @@ -73,7 +73,6 @@ DRINKING WATER 12-05-02-0016 1 16 24 60 1:00 56 Ice 12-05-02-0017 1 23 24 32 0:32 28 Iced water 12-05-02-0018 1 23 16 24 62 1:02 29 Hot Water 12-05-01-0002 1 16 24 55 0:55 51 -Coke 12-05-02-0019 0:00 #DIV/0! Sprite 12-05-02-0020 1 23 18 24 20 0:20 8 7UP 12-05-02-0021 1 23 18 24 20 0:20 8 MATCHA SHAKE 12-04-02-0001 1 25 26 9 6 7 23 24 181 3:01 30 @@ -142,10 +141,11 @@ Iced strawberrry tea 12-02-02-0022 1 10 19 23 24 85 1:25 27 STRAWBERRY SHAKE 12-04-02-0013 1 25 26 19 17 23 24 178 2:58 35 ETHIOPAI BLUE DADDY DIRTY 12-01-02-0020 1 7 36 2 3 4 5 24 100 22:40 32 -HOT AMERICANO BLUE DADDY 12-01-01-0019 1 36 2 3 4 5 16 24 88 1:28 32 -ICED AMERICANO BLUE DADDY 12-01-02-0019 1 36 2 3 4 5 23 16 24 133 2:13 32 -ESPRESSO BLUE DADDY 12-01-01-0020 1 36 2 3 4 5 24 66 1:06 32 +HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 36 3 4 5 16 24 88 1:28 32 +ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 36 3 4 5 23 16 24 133 2:13 32 +ESPRESSO BLUE DADDY 12-01-01-0020 1 2 36 3 4 5 24 66 1:06 32 +Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23 Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 diff --git a/image/page2/bn_soda_coke.png b/image/page2/bn_soda_coke.png index df7d6465..764ed34b 100644 Binary files a/image/page2/bn_soda_coke.png and b/image/page2/bn_soda_coke.png differ diff --git a/image/page2/bp_soda_coke.png b/image/page2/bp_soda_coke.png index 77665635..a7e04b80 100644 Binary files a/image/page2/bp_soda_coke.png and b/image/page2/bp_soda_coke.png differ diff --git a/image/page2_en/page2/bn_soda_coke.png b/image/page2_en/page2/bn_soda_coke.png index 701e730f..ab62eef8 100644 Binary files a/image/page2_en/page2/bn_soda_coke.png and b/image/page2_en/page2/bn_soda_coke.png differ diff --git a/image/page2_en/page2/bp_soda_coke.png b/image/page2_en/page2/bp_soda_coke.png index 3b2d8f7f..0686597e 100644 Binary files a/image/page2_en/page2/bp_soda_coke.png and b/image/page2_en/page2/bp_soda_coke.png differ diff --git a/image/page_drink/bn_smoothie_oreo.png b/image/page_drink/bn_smoothie_oreo.png new file mode 100644 index 00000000..269970b6 Binary files /dev/null and b/image/page_drink/bn_smoothie_oreo.png differ diff --git a/image/page_drink_disable/bn_smoothie_oreo.png b/image/page_drink_disable/bn_smoothie_oreo.png new file mode 100644 index 00000000..41d55067 Binary files /dev/null and b/image/page_drink_disable/bn_smoothie_oreo.png differ diff --git a/image/page_drink_press/bn_smoothie_oreo.png b/image/page_drink_press/bn_smoothie_oreo.png new file mode 100644 index 00000000..a02e1877 Binary files /dev/null and b/image/page_drink_press/bn_smoothie_oreo.png differ diff --git a/image/page_drink_select/bn_smoothie_oreo.png b/image/page_drink_select/bn_smoothie_oreo.png new file mode 100644 index 00000000..546a5015 Binary files /dev/null and b/image/page_drink_select/bn_smoothie_oreo.png differ diff --git a/image/topping2/bd_lid.png b/image/topping2/bd_lid.png new file mode 100644 index 00000000..bccf8589 Binary files /dev/null and b/image/topping2/bd_lid.png differ diff --git a/image/topping2/bd_straw.png b/image/topping2/bd_straw.png new file mode 100644 index 00000000..b89bde0e Binary files /dev/null and b/image/topping2/bd_straw.png differ diff --git a/image/topping2/bg_add_shot.png b/image/topping2/bg_add_shot.png new file mode 100644 index 00000000..2d217223 Binary files /dev/null and b/image/topping2/bg_add_shot.png differ diff --git a/image/topping2/bg_add_shot_coffee2_only.png b/image/topping2/bg_add_shot_coffee2_only.png new file mode 100644 index 00000000..2c11f0f9 Binary files /dev/null and b/image/topping2/bg_add_shot_coffee2_only.png differ diff --git a/image/topping2/bg_add_shot_coffee_only.png b/image/topping2/bg_add_shot_coffee_only.png new file mode 100644 index 00000000..4e4a836a Binary files /dev/null and b/image/topping2/bg_add_shot_coffee_only.png differ diff --git a/image/topping2/bg_blended.png b/image/topping2/bg_blended.png new file mode 100644 index 00000000..b027350a Binary files /dev/null and b/image/topping2/bg_blended.png differ diff --git a/image/topping2/bg_lid_only.png b/image/topping2/bg_lid_only.png new file mode 100644 index 00000000..dd69a59b Binary files /dev/null and b/image/topping2/bg_lid_only.png differ diff --git a/image/topping2/bg_straw_only.png b/image/topping2/bg_straw_only.png new file mode 100644 index 00000000..8174926a Binary files /dev/null and b/image/topping2/bg_straw_only.png differ diff --git a/image/topping2/bg_strawlid.png b/image/topping2/bg_strawlid.png new file mode 100644 index 00000000..57df0c79 Binary files /dev/null and b/image/topping2/bg_strawlid.png differ diff --git a/image/topping2/bg_sugar.png b/image/topping2/bg_sugar.png new file mode 100644 index 00000000..fa54dcee Binary files /dev/null and b/image/topping2/bg_sugar.png differ diff --git a/image/topping2/bn_add.png b/image/topping2/bn_add.png new file mode 100644 index 00000000..6dbf66d1 Binary files /dev/null and b/image/topping2/bn_add.png differ diff --git a/image/topping2/bn_add_Honey.png b/image/topping2/bn_add_Honey.png new file mode 100644 index 00000000..cf6dec04 Binary files /dev/null and b/image/topping2/bn_add_Honey.png differ diff --git a/image/topping2/bn_add_bubble.png b/image/topping2/bn_add_bubble.png new file mode 100644 index 00000000..8bdf6a4b Binary files /dev/null and b/image/topping2/bn_add_bubble.png differ diff --git a/image/topping2/bn_add_shot.png b/image/topping2/bn_add_shot.png new file mode 100644 index 00000000..a307f605 Binary files /dev/null and b/image/topping2/bn_add_shot.png differ diff --git a/image/topping2/bn_add_shot2.png b/image/topping2/bn_add_shot2.png new file mode 100644 index 00000000..c66d776b Binary files /dev/null and b/image/topping2/bn_add_shot2.png differ diff --git a/image/topping2/bn_blended.png b/image/topping2/bn_blended.png new file mode 100644 index 00000000..0cf88228 Binary files /dev/null and b/image/topping2/bn_blended.png differ diff --git a/image/topping2/bn_cancel.png b/image/topping2/bn_cancel.png new file mode 100644 index 00000000..4c3aafc8 Binary files /dev/null and b/image/topping2/bn_cancel.png differ diff --git a/image/topping2/bn_lid.png b/image/topping2/bn_lid.png new file mode 100644 index 00000000..bccf8589 Binary files /dev/null and b/image/topping2/bn_lid.png differ diff --git a/image/topping2/bn_next.png b/image/topping2/bn_next.png new file mode 100644 index 00000000..312e86f0 Binary files /dev/null and b/image/topping2/bn_next.png differ diff --git a/image/topping2/bn_normal_sugar.png b/image/topping2/bn_normal_sugar.png new file mode 100644 index 00000000..aa71b5a8 Binary files /dev/null and b/image/topping2/bn_normal_sugar.png differ diff --git a/image/topping2/bn_straw.png b/image/topping2/bn_straw.png new file mode 100644 index 00000000..a65e7806 Binary files /dev/null and b/image/topping2/bn_straw.png differ diff --git a/image/topping2/bn_sugar1.png b/image/topping2/bn_sugar1.png new file mode 100644 index 00000000..cc181714 Binary files /dev/null and b/image/topping2/bn_sugar1.png differ diff --git a/image/topping2/bn_sugar2.png b/image/topping2/bn_sugar2.png new file mode 100644 index 00000000..65fb17ef Binary files /dev/null and b/image/topping2/bn_sugar2.png differ diff --git a/image/topping2/bn_sugar3.png b/image/topping2/bn_sugar3.png new file mode 100644 index 00000000..35742f83 Binary files /dev/null and b/image/topping2/bn_sugar3.png differ diff --git a/image/topping2/bn_sugar4.png b/image/topping2/bn_sugar4.png new file mode 100644 index 00000000..d2b4416e Binary files /dev/null and b/image/topping2/bn_sugar4.png differ diff --git a/image/topping2/bn_sugar5.png b/image/topping2/bn_sugar5.png new file mode 100644 index 00000000..01a2dc04 Binary files /dev/null and b/image/topping2/bn_sugar5.png differ diff --git a/image/topping2/bn_sugar_zero_cal.png b/image/topping2/bn_sugar_zero_cal.png new file mode 100644 index 00000000..fdddd912 Binary files /dev/null and b/image/topping2/bn_sugar_zero_cal.png differ diff --git a/image/topping2/bp_add.png b/image/topping2/bp_add.png new file mode 100644 index 00000000..6ca2c0f7 Binary files /dev/null and b/image/topping2/bp_add.png differ diff --git a/image/topping2/bp_add_Honey.png b/image/topping2/bp_add_Honey.png new file mode 100644 index 00000000..bf9daac7 Binary files /dev/null and b/image/topping2/bp_add_Honey.png differ diff --git a/image/topping2/bp_add_bubble.png b/image/topping2/bp_add_bubble.png new file mode 100644 index 00000000..4beda0f8 Binary files /dev/null and b/image/topping2/bp_add_bubble.png differ diff --git a/image/topping2/bp_add_shot.png b/image/topping2/bp_add_shot.png new file mode 100644 index 00000000..971b05b0 Binary files /dev/null and b/image/topping2/bp_add_shot.png differ diff --git a/image/topping2/bp_add_shot2.png b/image/topping2/bp_add_shot2.png new file mode 100644 index 00000000..8e5fc8f2 Binary files /dev/null and b/image/topping2/bp_add_shot2.png differ diff --git a/image/topping2/bp_blended.png b/image/topping2/bp_blended.png new file mode 100644 index 00000000..a5c7ff34 Binary files /dev/null and b/image/topping2/bp_blended.png differ diff --git a/image/topping2/bp_cancel.png b/image/topping2/bp_cancel.png new file mode 100644 index 00000000..848db462 Binary files /dev/null and b/image/topping2/bp_cancel.png differ diff --git a/image/topping2/bp_lid.png b/image/topping2/bp_lid.png new file mode 100644 index 00000000..495d9864 Binary files /dev/null and b/image/topping2/bp_lid.png differ diff --git a/image/topping2/bp_next.png b/image/topping2/bp_next.png new file mode 100644 index 00000000..3db9dd33 Binary files /dev/null and b/image/topping2/bp_next.png differ diff --git a/image/topping2/bp_normal_sugar.png b/image/topping2/bp_normal_sugar.png new file mode 100644 index 00000000..31e96d7d Binary files /dev/null and b/image/topping2/bp_normal_sugar.png differ diff --git a/image/topping2/bp_straw.png b/image/topping2/bp_straw.png new file mode 100644 index 00000000..011b7c53 Binary files /dev/null and b/image/topping2/bp_straw.png differ diff --git a/image/topping2/bp_sugar1.png b/image/topping2/bp_sugar1.png new file mode 100644 index 00000000..81cc62a1 Binary files /dev/null and b/image/topping2/bp_sugar1.png differ diff --git a/image/topping2/bp_sugar2.png b/image/topping2/bp_sugar2.png new file mode 100644 index 00000000..4f8e17a4 Binary files /dev/null and b/image/topping2/bp_sugar2.png differ diff --git a/image/topping2/bp_sugar3.png b/image/topping2/bp_sugar3.png new file mode 100644 index 00000000..b6b1439e Binary files /dev/null and b/image/topping2/bp_sugar3.png differ diff --git a/image/topping2/bp_sugar4.png b/image/topping2/bp_sugar4.png new file mode 100644 index 00000000..a8779636 Binary files /dev/null and b/image/topping2/bp_sugar4.png differ diff --git a/image/topping2/bp_sugar5.png b/image/topping2/bp_sugar5.png new file mode 100644 index 00000000..4391a751 Binary files /dev/null and b/image/topping2/bp_sugar5.png differ diff --git a/image/topping2/bp_sugar_zero_cal.png b/image/topping2/bp_sugar_zero_cal.png new file mode 100644 index 00000000..57c6e68f Binary files /dev/null and b/image/topping2/bp_sugar_zero_cal.png differ diff --git a/image/topping2/bu_sugar1.png b/image/topping2/bu_sugar1.png new file mode 100644 index 00000000..5de98705 Binary files /dev/null and b/image/topping2/bu_sugar1.png differ diff --git a/image/topping2/bu_sugar2.png b/image/topping2/bu_sugar2.png new file mode 100644 index 00000000..9165cfd2 Binary files /dev/null and b/image/topping2/bu_sugar2.png differ diff --git a/image/topping2/bu_sugar3.png b/image/topping2/bu_sugar3.png new file mode 100644 index 00000000..6b0d37cb Binary files /dev/null and b/image/topping2/bu_sugar3.png differ diff --git a/image/topping2/bu_sugar4.png b/image/topping2/bu_sugar4.png new file mode 100644 index 00000000..16710c37 Binary files /dev/null and b/image/topping2/bu_sugar4.png differ diff --git a/image/topping2/bu_sugar5.png b/image/topping2/bu_sugar5.png new file mode 100644 index 00000000..79c0cf5e Binary files /dev/null and b/image/topping2/bu_sugar5.png differ diff --git a/image/topping2/cb_checked.png b/image/topping2/cb_checked.png new file mode 100644 index 00000000..f5d42843 Binary files /dev/null and b/image/topping2/cb_checked.png differ diff --git a/image/topping2/cb_notcheck.png b/image/topping2/cb_notcheck.png new file mode 100644 index 00000000..174df0da Binary files /dev/null and b/image/topping2/cb_notcheck.png differ diff --git a/image/topping2/cb_straw_nch.png b/image/topping2/cb_straw_nch.png new file mode 100644 index 00000000..ac05813f Binary files /dev/null and b/image/topping2/cb_straw_nch.png differ diff --git a/image/topping2_en/bd_lid.png b/image/topping2_en/bd_lid.png new file mode 100644 index 00000000..3b83102b Binary files /dev/null and b/image/topping2_en/bd_lid.png differ diff --git a/image/topping2_en/bd_straw.png b/image/topping2_en/bd_straw.png new file mode 100644 index 00000000..68c6f293 Binary files /dev/null and b/image/topping2_en/bd_straw.png differ diff --git a/image/topping2_en/bg_add_shot_coffee2_only.png b/image/topping2_en/bg_add_shot_coffee2_only.png new file mode 100644 index 00000000..abebf817 Binary files /dev/null and b/image/topping2_en/bg_add_shot_coffee2_only.png differ diff --git a/image/topping2_en/bg_add_shot_coffee_only.png b/image/topping2_en/bg_add_shot_coffee_only.png new file mode 100644 index 00000000..49c42aef Binary files /dev/null and b/image/topping2_en/bg_add_shot_coffee_only.png differ diff --git a/image/topping2_en/bg_blended.png b/image/topping2_en/bg_blended.png new file mode 100644 index 00000000..b6b9f068 Binary files /dev/null and b/image/topping2_en/bg_blended.png differ diff --git a/image/topping2_en/bg_lid_only.png b/image/topping2_en/bg_lid_only.png new file mode 100644 index 00000000..eb2d9ec5 Binary files /dev/null and b/image/topping2_en/bg_lid_only.png differ diff --git a/image/topping2_en/bg_straw_only.png b/image/topping2_en/bg_straw_only.png new file mode 100644 index 00000000..21af4f10 Binary files /dev/null and b/image/topping2_en/bg_straw_only.png differ diff --git a/image/topping2_en/bg_strawlid.png b/image/topping2_en/bg_strawlid.png new file mode 100644 index 00000000..9114b71f Binary files /dev/null and b/image/topping2_en/bg_strawlid.png differ diff --git a/image/topping2_en/bg_sugar.png b/image/topping2_en/bg_sugar.png new file mode 100644 index 00000000..2e0f6b40 Binary files /dev/null and b/image/topping2_en/bg_sugar.png differ diff --git a/image/topping2_en/bn_add.png b/image/topping2_en/bn_add.png new file mode 100644 index 00000000..4477e0cf Binary files /dev/null and b/image/topping2_en/bn_add.png differ diff --git a/image/topping2_en/bn_add_shot.png b/image/topping2_en/bn_add_shot.png new file mode 100644 index 00000000..a307f605 Binary files /dev/null and b/image/topping2_en/bn_add_shot.png differ diff --git a/image/topping2_en/bn_add_shot2.png b/image/topping2_en/bn_add_shot2.png new file mode 100644 index 00000000..6063ba01 Binary files /dev/null and b/image/topping2_en/bn_add_shot2.png differ diff --git a/image/topping2_en/bn_blended.png b/image/topping2_en/bn_blended.png new file mode 100644 index 00000000..f2d488b6 Binary files /dev/null and b/image/topping2_en/bn_blended.png differ diff --git a/image/topping2_en/bn_cancel.png b/image/topping2_en/bn_cancel.png new file mode 100644 index 00000000..c847e8e8 Binary files /dev/null and b/image/topping2_en/bn_cancel.png differ diff --git a/image/topping2_en/bn_lid.png b/image/topping2_en/bn_lid.png new file mode 100644 index 00000000..3b83102b Binary files /dev/null and b/image/topping2_en/bn_lid.png differ diff --git a/image/topping2_en/bn_next.png b/image/topping2_en/bn_next.png new file mode 100644 index 00000000..907e7613 Binary files /dev/null and b/image/topping2_en/bn_next.png differ diff --git a/image/topping2_en/bn_straw.png b/image/topping2_en/bn_straw.png new file mode 100644 index 00000000..59323c61 Binary files /dev/null and b/image/topping2_en/bn_straw.png differ diff --git a/image/topping2_en/bn_sugar1.png b/image/topping2_en/bn_sugar1.png new file mode 100644 index 00000000..2e9b89ef Binary files /dev/null and b/image/topping2_en/bn_sugar1.png differ diff --git a/image/topping2_en/bn_sugar2.png b/image/topping2_en/bn_sugar2.png new file mode 100644 index 00000000..38d8aa3f Binary files /dev/null and b/image/topping2_en/bn_sugar2.png differ diff --git a/image/topping2_en/bn_sugar3.png b/image/topping2_en/bn_sugar3.png new file mode 100644 index 00000000..8a323c5c Binary files /dev/null and b/image/topping2_en/bn_sugar3.png differ diff --git a/image/topping2_en/bn_sugar4.png b/image/topping2_en/bn_sugar4.png new file mode 100644 index 00000000..aa105dc8 Binary files /dev/null and b/image/topping2_en/bn_sugar4.png differ diff --git a/image/topping2_en/bn_sugar5.png b/image/topping2_en/bn_sugar5.png new file mode 100644 index 00000000..f2912762 Binary files /dev/null and b/image/topping2_en/bn_sugar5.png differ diff --git a/image/topping2_en/bp_add.png b/image/topping2_en/bp_add.png new file mode 100644 index 00000000..f5ddf296 Binary files /dev/null and b/image/topping2_en/bp_add.png differ diff --git a/image/topping2_en/bp_add_shot.png b/image/topping2_en/bp_add_shot.png new file mode 100644 index 00000000..971b05b0 Binary files /dev/null and b/image/topping2_en/bp_add_shot.png differ diff --git a/image/topping2_en/bp_add_shot2.png b/image/topping2_en/bp_add_shot2.png new file mode 100644 index 00000000..b234affa Binary files /dev/null and b/image/topping2_en/bp_add_shot2.png differ diff --git a/image/topping2_en/bp_blended.png b/image/topping2_en/bp_blended.png new file mode 100644 index 00000000..3f04d2a9 Binary files /dev/null and b/image/topping2_en/bp_blended.png differ diff --git a/image/topping2_en/bp_cancel.png b/image/topping2_en/bp_cancel.png new file mode 100644 index 00000000..ee4503c5 Binary files /dev/null and b/image/topping2_en/bp_cancel.png differ diff --git a/image/topping2_en/bp_lid.png b/image/topping2_en/bp_lid.png new file mode 100644 index 00000000..377bcdb3 Binary files /dev/null and b/image/topping2_en/bp_lid.png differ diff --git a/image/topping2_en/bp_next.png b/image/topping2_en/bp_next.png new file mode 100644 index 00000000..df337793 Binary files /dev/null and b/image/topping2_en/bp_next.png differ diff --git a/image/topping2_en/bp_straw.png b/image/topping2_en/bp_straw.png new file mode 100644 index 00000000..2c6b4cb2 Binary files /dev/null and b/image/topping2_en/bp_straw.png differ diff --git a/image/topping2_en/bp_sugar1.png b/image/topping2_en/bp_sugar1.png new file mode 100644 index 00000000..a39c12c9 Binary files /dev/null and b/image/topping2_en/bp_sugar1.png differ diff --git a/image/topping2_en/bp_sugar2.png b/image/topping2_en/bp_sugar2.png new file mode 100644 index 00000000..9cdab539 Binary files /dev/null and b/image/topping2_en/bp_sugar2.png differ diff --git a/image/topping2_en/bp_sugar3.png b/image/topping2_en/bp_sugar3.png new file mode 100644 index 00000000..d68fe308 Binary files /dev/null and b/image/topping2_en/bp_sugar3.png differ diff --git a/image/topping2_en/bp_sugar4.png b/image/topping2_en/bp_sugar4.png new file mode 100644 index 00000000..aca9c53a Binary files /dev/null and b/image/topping2_en/bp_sugar4.png differ diff --git a/image/topping2_en/bp_sugar5.png b/image/topping2_en/bp_sugar5.png new file mode 100644 index 00000000..2eccc1d4 Binary files /dev/null and b/image/topping2_en/bp_sugar5.png differ diff --git a/image/topping2_en/bu_sugar1.png b/image/topping2_en/bu_sugar1.png new file mode 100644 index 00000000..82eba5a9 Binary files /dev/null and b/image/topping2_en/bu_sugar1.png differ diff --git a/image/topping2_en/bu_sugar2.png b/image/topping2_en/bu_sugar2.png new file mode 100644 index 00000000..3b642156 Binary files /dev/null and b/image/topping2_en/bu_sugar2.png differ diff --git a/image/topping2_en/bu_sugar3.png b/image/topping2_en/bu_sugar3.png new file mode 100644 index 00000000..a65705f2 Binary files /dev/null and b/image/topping2_en/bu_sugar3.png differ diff --git a/image/topping2_en/bu_sugar4.png b/image/topping2_en/bu_sugar4.png new file mode 100644 index 00000000..5c3c0ad0 Binary files /dev/null and b/image/topping2_en/bu_sugar4.png differ diff --git a/image/topping2_en/bu_sugar5.png b/image/topping2_en/bu_sugar5.png new file mode 100644 index 00000000..4e736d9d Binary files /dev/null and b/image/topping2_en/bu_sugar5.png differ diff --git a/image/topping2_en/cb_checked.png b/image/topping2_en/cb_checked.png new file mode 100644 index 00000000..b862146d Binary files /dev/null and b/image/topping2_en/cb_checked.png differ diff --git a/image/topping2_en/cb_notcheck.png b/image/topping2_en/cb_notcheck.png new file mode 100644 index 00000000..116c2f7e Binary files /dev/null and b/image/topping2_en/cb_notcheck.png differ diff --git a/image/topping2_en/cb_straw_nch.png b/image/topping2_en/cb_straw_nch.png new file mode 100644 index 00000000..f5249c29 Binary files /dev/null and b/image/topping2_en/cb_straw_nch.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 95397c4f..b3cbf4f5 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -1,4 +1,5 @@ 17/1/21 +12-03-03-0009 12-05-02-0019 12-01-01-0019 12-01-02-0019 diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index ee050422..a27dd58f 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -68,14 +68,11 @@ ; 1035 is Coke. STRCONTAIN "1035" MaterialAvailable CokeUI - If CokeUI = "true" Then - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - Else - Var bnSodaAndOther = DirImage + "/bn_soda.png" - Var bpSodaAndOther = DirImage + "/bp_soda.png" - EndIf + Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" + Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" + + Var countClick = 0 1000 @@ -315,8 +312,12 @@ DEBUGVAR countClick If countClick = 5 Then - Var countClick = 0 - Open "ROOT/taobin_project/xml/page_tel_number_mask.xml" + If ToppingNewEnable = "false" Then + Var ToppingNewEnable = "true" + Else + Var ToppingNewEnable = "false" + EndIf + Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" EndIf Refresh diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml index 00686f8f..9d82637c 100644 --- a/xml/page_catalog_choose_drink4.pml +++ b/xml/page_catalog_choose_drink4.pml @@ -22,6 +22,7 @@ product_code.append('12-03-02-0005') #product_code.append('12-03-02-0002') product_code.append('12-03-02-0007') + product_code.append('12-03-03-0009') menu_count = len( product_code) ?> diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index c9181de8..da1a229e 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -1377,6 +1377,99 @@ showengText $12-03-02-0007.descriptionE + + ; button i=13 12-03-03-0009 + + 33 + 22 + 225 + 296 + $12-03-03-0009.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-03-03-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-03-03-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-03-03-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-03-03-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-03-03-0009.descriptionE + diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 1ab45fd6..07682eb1 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -65,6 +65,8 @@ StopLongPlay + Var show_eng = "false" + 500 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index dd919eef..cb75395e 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -15,6 +15,7 @@ ;SAVELOG topping1 ;SAVELOG topping2 ;SAVELOG topping3 + DEBUGVAR SelectDrink DEBUGVAR video_menu_0 diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 59b1d84f..af919cd7 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -6,7 +6,13 @@ SoundVolume Var y_topping_bg = 912 - + + If ToppingNewEnable = "false" Then + + Else + Open "ROOT/taobin_project/xml/page_topping_select2.xml" + EndIf + DEBUGVAR video_menu_0 Var DisableUsingCode = "false" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index 071ad08b..3ae28b68 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -9,11 +9,26 @@ DEBUGVAR video_menu_0 + DEBUGVAR SelectDrink + + Var SaveProductCodeSelect = SelectDrink + Var UserSelectProductCode = SelectDrink + + DEBUGVAR UserSelectProductCode + + Var blendedState = "Invisible" Var DisableUsingCode = "false" Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" Var ShowCollagenOnly = "Invisible" + Var blendedStateShow = "Invisible" + Var ShotCoffeeBG = "Invisible" + Var showShotEnable = "Invisible" + Var ShowLidStraw = "Invisible" + Var ShowStrawOnly = "Invisible" + Var ShowLidOnly = "Invisible" + ; On open Var lidAndStrawOldPageIgnore = "true" Var SugarState1 = "Invisible" @@ -47,34 +62,48 @@ If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/topping_en" + Var DirImage = "ROOT/taobin_project/image/topping2_en" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var showname = NameDrink Var showdesc = DrinkDescription - Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" Else - Var DirImage = "ROOT/taobin_project/image/topping" + Var DirImage = "ROOT/taobin_project/image/topping2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH - + EndIf + Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_straw_only = DirImage + "/bg_straw_only.png" + Var bg_lid_only = DirImage + "/bg_lid_only.png" + ; Move to catalog. ;Machine DoorClose + ;Var blendedState = "Enable" + ;Var ShotCoffeeBG = "Enable" + ;Var showShotEnable = "Enable" + ;Var ShowLidStraw = "Enable" + ;Var ShowStrawOnly = "Enable" + ;Var ShowLidOnly = "Enable" + + Var ShiftSugarStep = 1 - Var backGroundAddExtra = DirImage + "/img_ontop_shot.png" - Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png" + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" + Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" CRLFToSpace showname CRLFToSpace showdesc @@ -96,6 +125,9 @@ Var ToppingGotoPayment = "true" + + DEBUGVAR backGroundAddExtra + DEBUGVAR backGroundAddShotPremium 2000 @@ -129,23 +161,25 @@ If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/topping_en/" + Var DirImage = "ROOT/taobin_project/image/topping2_en/" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var showname = NameDrink Var showdesc = DrinkDescription Else - Var DirImage = "ROOT/taobin_project/image/topping/" + Var DirImage = "ROOT/taobin_project/image/topping2/" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH EndIf - Var backGroundAddExtra = DirImage + "/img_ontop_shot.png" - Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png" + Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png" + Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png" + + CRLFToSpace showname CRLFToSpace showdesc @@ -186,6 +220,12 @@ + DEBUGVAR SubMenuProductCode1 + DEBUGVAR SubMenuName11 + DEBUGVAR SubMenuPrice1 + + DEBUGVAR SubMenuProductCode2 + DEBUGVAR SubMenuName12 DEBUGVAR TOPPING1 DEBUGVAR TOPPING2 @@ -224,7 +264,15 @@ DEBUGVAR toppingID3price2 DEBUGVAR BrewParam - + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + ;Var BugFlag = 1 + If BugFlag = 1 Then Else @@ -235,10 +283,21 @@ Var h_block_of_sugar = 210 + STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie + If HaveSmoothie = "true" Then + Var blendedState = "Enable" + Var blendedStateShow = "Enable" + + Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop + + + EndIf + If IgnoreLidStraw = "true" Then Var IgnoreLidStraw = "false" Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" + Var ShowStrawOnly = "Invisible" Else If LidState = "Enable" Then @@ -246,13 +305,14 @@ Var ShowLidOnly = "Invisible" Else Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Enable" + Var ShowStrawOnly = "Enable" EndIf EndIf If Service_LidStraw = "Disable" Then Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" + Var ShowStawOnly = "Invisible" EndIf @@ -338,6 +398,7 @@ If TOPPING1 = "Sugar Premix 25" Then Var BGSugar = "Enable" Var ShiftSugarStep = 2 + Var SugarState1 = "Disable" Var SugarState2 = "Enable" Var SugarState3 = "Enable" Var SugarState4 = "Enable" @@ -438,14 +499,7 @@ Var ShotCoffeeBG = "Enable" Var showShotEnable = "Enable" - DEBUGVAR TOPPING3 - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf + Refresh EndIf @@ -464,13 +518,14 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" - If TOPPING3 = "Collagen" Then + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1007" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf DEBUGVAR TOPPING2 Refresh EndIf @@ -509,15 +564,15 @@ - +; same 374 - 436 + 382 331 436 PictureDrink - +; same 0 752 @@ -528,7 +583,7 @@ 0x513C2F showname - +; same 0 836 @@ -555,107 +610,125 @@ -; back - - -; next - - - - - 924 - 1804 - KanitTTF - 36 - 1080 - 0xFFFFFF - - - "OnValueChange" - - PriceDrinkTmpShow - - +; +; +; +; +; +; +; +; +; +; +; +; ;- FRAME SCORELLL - 44 - y_topping_bg + 52 + 881 1080 "auto-all" "Vertical" 1 -;- Begin topping1 + 986 - h_block_of_sugar - 5 - BGSugar -; sugar layout -; -; BGSugar -; Var( DirImage + "/img_sugar.png" ) -; + 160 + 20 + blendedStateShow - StateImgKeto - Var( DirImage + "/img_sugar_keto.png" ) + Var( DirImage + "/bg_blended.png" ) + + + + + + +;- Begin topping1 + + + 988 + 156 + 20 + "Enable" +; BGSugar +; sugar layout + + "Enable" +; BGSugar + Var( DirImage + "/bg_sugar.png" ) + + + ; ; sugar1 - -; - - - -; Collagen left - - - - - ;-END ; ; @@ -998,36 +929,37 @@ ;-BEGIN shot layout 986 - 224 - 5 + 164 + 20 ShotCoffeePremium - backGroundAddExtra2 + backGroundAddShotPremium ; + +;-END +; +; +; +; +; +; +;; +; +; +; +; +; +; +; +; +;-BEGIN shot layout + + 986 + 157 + 20 + ShotCoffeeBG + + backGroundAddExtra + -; Collagen left +; +; + ;-END ; @@ -1147,125 +1121,57 @@ ; ; ; +; ; ;-BEGIN Collagen - - 986 - 242 - 5 - ShowCollagenOnly - - "Enable" - Var( DirImage + "/img_ontop_collagen.png" ) - - -; straw left - - - - - ;- END ; ; ; -;-BEGIN Lid straw +;-BEGIN Lid only - 986 - 232 - 10 + 987 + 188 + 20 ShowLidOnly "Enable" - Var( DirImage + "/block_strawonly.png" ) + bg_lid_only - -; straw left +; lid left + + +;- END +; +; +; +; +; +; +; +; +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + +; next + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + + + "OnValueChange" + + PriceDrinkTmpShow + diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml index 96c80ef8..8b286018 100644 --- a/xml/test_video_loop.xml +++ b/xml/test_video_loop.xml @@ -59,17 +59,18 @@ -