diff --git a/.gitignore b/.gitignore index e43b0f98..dbb2edc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +video/_main_page.mp4 .DS_Store diff --git a/adv/sync_1.file b/adv/sync_1.file index 3c77a801..0f92d893 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 229760 --rw-rw---- 1 root sdcard_rw 0 2022-11-21 07:10 sync_1.file +total 237532 +-rw-rw---- 1 root sdcard_rw 0 2022-12-28 14:21 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2021-07-06 15:30 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 3184464 2021-06-22 14:08 taobin_adv_02.mp4 @@ -10,7 +10,7 @@ total 229760 -rw-rw---- 1 root sdcard_rw 1637056 2021-09-21 09:57 taobin_adv_07.mp4 -rw-rw---- 1 root sdcard_rw 1962660 2021-09-17 16:42 taobin_adv_08.mp4 -rw-rw---- 1 root sdcard_rw 2461527 2022-06-10 14:31 taobin_adv_09.mp4 --rw-rw---- 1 root sdcard_rw 6807878 2022-11-09 11:12 taobin_adv_10.mp4 +-rw-rw---- 1 root sdcard_rw 10011292 2022-12-19 15:25 taobin_adv_10.mp4 -rw-rw---- 1 root sdcard_rw 2133473 2022-06-10 14:32 taobin_adv_11.mp4 -rw-rw---- 1 root sdcard_rw 2671705 2022-06-10 17:22 taobin_adv_12.mp4 -rw-rw---- 1 root sdcard_rw 2756221 2022-06-10 14:32 taobin_adv_13.mp4 @@ -31,7 +31,7 @@ total 229760 -rw-rw---- 1 root sdcard_rw 1653061 2021-09-21 10:00 taobin_adv_menu2_07.mp4 -rw-rw---- 1 root sdcard_rw 2098002 2021-09-17 16:42 taobin_adv_menu2_08.mp4 -rw-rw---- 1 root sdcard_rw 2197656 2022-06-10 14:34 taobin_adv_menu2_09.mp4 --rw-rw---- 1 root sdcard_rw 4049510 2022-11-09 11:12 taobin_adv_menu2_10.mp4 +-rw-rw---- 1 root sdcard_rw 6392776 2022-12-19 15:25 taobin_adv_menu2_10.mp4 -rw-rw---- 1 root sdcard_rw 1914492 2022-06-10 14:35 taobin_adv_menu2_11.mp4 -rw-rw---- 1 root sdcard_rw 1801226 2022-06-10 17:21 taobin_adv_menu2_12.mp4 -rw-rw---- 1 root sdcard_rw 2264499 2022-06-10 14:36 taobin_adv_menu2_13.mp4 @@ -52,7 +52,7 @@ total 229760 -rw-rw---- 1 root sdcard_rw 1805549 2021-09-21 10:00 taobin_adv_menu_07.mp4 -rw-rw---- 1 root sdcard_rw 1873183 2021-09-17 16:42 taobin_adv_menu_08.mp4 -rw-rw---- 1 root sdcard_rw 1954754 2022-06-10 14:37 taobin_adv_menu_09.mp4 --rw-rw---- 1 root sdcard_rw 4279445 2022-11-09 11:12 taobin_adv_menu_10.mp4 +-rw-rw---- 1 root sdcard_rw 6688846 2022-12-19 15:25 taobin_adv_menu_10.mp4 -rw-rw---- 1 root sdcard_rw 1818488 2022-06-10 14:37 taobin_adv_menu_11.mp4 -rw-rw---- 1 root sdcard_rw 1911441 2022-06-10 17:21 taobin_adv_menu_12.mp4 -rw-rw---- 1 root sdcard_rw 2145648 2022-06-10 14:36 taobin_adv_menu_13.mp4 diff --git a/adv/taobin_adv_10.mp4 b/adv/taobin_adv_10.mp4 index f5cd7e3e..820a7980 100644 Binary files a/adv/taobin_adv_10.mp4 and b/adv/taobin_adv_10.mp4 differ diff --git a/adv/taobin_adv_menu2_10.mp4 b/adv/taobin_adv_menu2_10.mp4 index 7f1c20a9..a8664bf8 100644 Binary files a/adv/taobin_adv_menu2_10.mp4 and b/adv/taobin_adv_menu2_10.mp4 differ diff --git a/adv/taobin_adv_menu_10.mp4 b/adv/taobin_adv_menu_10.mp4 index bb8fbf73..c7e9ce14 100644 Binary files a/adv/taobin_adv_menu_10.mp4 and b/adv/taobin_adv_menu_10.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 29d4e482..87f5bab0 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -198,6 +198,7 @@ ROSALYN ALMOST DIRTY 12-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32 นมลิ้นจี่ปั่น 12-03-03-0024 1 17 23 11 41 24 120 2:00 23 นมลิ้นจี่เย็น 12-03-02-0024 1 17 23 11 24 120 2:00 23 +นมลิ้นจี่ร้อน 12-03-01-0024 1 17 11 นมยูซุร้อน 12-03-01-0023 1 53 6 16 24 120 3:00 23 นมยูซุเย็น 12-03-02-0023 1 53 6 23 24 120 4:00 23 นมยูซุปั่น 12-03-03-0023 1 53 6 23 41 24 120 5:00 23 @@ -332,16 +333,17 @@ nUll 12-02-03-0037 24 1 1 32 +อเมริกาโนยูซุร้อน 12-01-01-0040 1 53 3 5 6 7 24 49 0:49 23 +อเมริกาโนยูซุเย็น 12-01-02-0040 1 53 3 5 6 7 23 24 49 0:49 23 +ชายูซุร้อน 12-02-01-0038 1 10 16 53 24 49 1:49 23 +ชายูซุเย็น 12-02-02-0038 1 10 16 53 23 24 49 2:49 23 +โกโก้ยูซุเย็น 12-03-02-0025 1 15 7 53 24 49 3:49 23 +โกโก้ยูซุร้อน 12-03-01-0025 1 15 7 53 23 24 49 4:49 23 +โกโก้ยูซุปั่น 12-03-03-0025 1 15 7 53 23 41 24 49 5:49 23 - - - - - - - - - +HOT BANANA CAFE LATTE 12-01-01-0042 +ICED BANANA CAFE LATTE 12-01-02-0042 +BANANA CAFE LATTE 12-01-03-0042 diff --git a/animation01/sync_1.file b/animation01/sync_1.file index 447f7a67..962c37d9 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -49,6 +49,6 @@ total 201928 -rw-rw---- 1 root sdcard_rw 3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4 -rw-rw---- 1 root sdcard_rw 3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4 -rw-rw---- 1 root sdcard_rw 3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4 --rw-rw---- 1 root sdcard_rw 32861 2022-10-24 15:24 play_list.tsv +-rw-rw---- 1 root sdcard_rw 33545 2022-12-27 10:47 play_list.tsv -rw-rw---- 1 root sdcard_rw 32861 2022-10-24 15:23 play_list2.tsv --rw-rw---- 1 root sdcard_rw 0 2022-10-24 15:30 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2022-12-28 14:21 sync_1.file diff --git a/font/Montserrat/Montserrat-Black.ttf b/font/Montserrat/Montserrat-Black.ttf new file mode 100644 index 00000000..7bb6575c Binary files /dev/null and b/font/Montserrat/Montserrat-Black.ttf differ diff --git a/font/Montserrat/Montserrat-BlackItalic.ttf b/font/Montserrat/Montserrat-BlackItalic.ttf new file mode 100644 index 00000000..172e2498 Binary files /dev/null and b/font/Montserrat/Montserrat-BlackItalic.ttf differ diff --git a/font/Montserrat/Montserrat-Bold.ttf b/font/Montserrat/Montserrat-Bold.ttf new file mode 100644 index 00000000..efddc834 Binary files /dev/null and b/font/Montserrat/Montserrat-Bold.ttf differ diff --git a/font/Montserrat/Montserrat-BoldItalic.ttf b/font/Montserrat/Montserrat-BoldItalic.ttf new file mode 100644 index 00000000..b7d8031b Binary files /dev/null and b/font/Montserrat/Montserrat-BoldItalic.ttf differ diff --git a/font/Montserrat/Montserrat-ExtraBold.ttf b/font/Montserrat/Montserrat-ExtraBold.ttf new file mode 100644 index 00000000..30595072 Binary files /dev/null and b/font/Montserrat/Montserrat-ExtraBold.ttf differ diff --git a/font/Montserrat/Montserrat-ExtraBoldItalic.ttf b/font/Montserrat/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 00000000..c21a396b Binary files /dev/null and b/font/Montserrat/Montserrat-ExtraBoldItalic.ttf differ diff --git a/font/Montserrat/Montserrat-ExtraLight.ttf b/font/Montserrat/Montserrat-ExtraLight.ttf new file mode 100644 index 00000000..f1b405ec Binary files /dev/null and b/font/Montserrat/Montserrat-ExtraLight.ttf differ diff --git a/font/Montserrat/Montserrat-ExtraLightItalic.ttf b/font/Montserrat/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 00000000..382293d2 Binary files /dev/null and b/font/Montserrat/Montserrat-ExtraLightItalic.ttf differ diff --git a/font/Montserrat/Montserrat-Italic.ttf b/font/Montserrat/Montserrat-Italic.ttf new file mode 100644 index 00000000..eee45ba9 Binary files /dev/null and b/font/Montserrat/Montserrat-Italic.ttf differ diff --git a/font/Montserrat/Montserrat-Light.ttf b/font/Montserrat/Montserrat-Light.ttf new file mode 100644 index 00000000..c5dfdb76 Binary files /dev/null and b/font/Montserrat/Montserrat-Light.ttf differ diff --git a/font/Montserrat/Montserrat-LightItalic.ttf b/font/Montserrat/Montserrat-LightItalic.ttf new file mode 100644 index 00000000..5bdce7fb Binary files /dev/null and b/font/Montserrat/Montserrat-LightItalic.ttf differ diff --git a/font/Montserrat/Montserrat-Medium.ttf b/font/Montserrat/Montserrat-Medium.ttf new file mode 100644 index 00000000..dfc7e2fc Binary files /dev/null and b/font/Montserrat/Montserrat-Medium.ttf differ diff --git a/font/Montserrat/Montserrat-MediumItalic.ttf b/font/Montserrat/Montserrat-MediumItalic.ttf new file mode 100644 index 00000000..ce56883a Binary files /dev/null and b/font/Montserrat/Montserrat-MediumItalic.ttf differ diff --git a/font/Montserrat/Montserrat-Regular.ttf b/font/Montserrat/Montserrat-Regular.ttf new file mode 100644 index 00000000..aa9033a8 Binary files /dev/null and b/font/Montserrat/Montserrat-Regular.ttf differ diff --git a/font/Montserrat/Montserrat-SemiBold.ttf b/font/Montserrat/Montserrat-SemiBold.ttf new file mode 100644 index 00000000..cbf44db9 Binary files /dev/null and b/font/Montserrat/Montserrat-SemiBold.ttf differ diff --git a/font/Montserrat/Montserrat-SemiBoldItalic.ttf b/font/Montserrat/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 00000000..7f9153d2 Binary files /dev/null and b/font/Montserrat/Montserrat-SemiBoldItalic.ttf differ diff --git a/font/Montserrat/Montserrat-Thin.ttf b/font/Montserrat/Montserrat-Thin.ttf new file mode 100644 index 00000000..7c90a547 Binary files /dev/null and b/font/Montserrat/Montserrat-Thin.ttf differ diff --git a/font/Montserrat/Montserrat-ThinItalic.ttf b/font/Montserrat/Montserrat-ThinItalic.ttf new file mode 100644 index 00000000..94bcf553 Binary files /dev/null and b/font/Montserrat/Montserrat-ThinItalic.ttf differ diff --git a/image/collectiing/img_popupDtac.png b/image/collectiing/img_popupDtac.png index d189ed9a..4e0f3eca 100644 Binary files a/image/collectiing/img_popupDtac.png and b/image/collectiing/img_popupDtac.png differ diff --git a/image/collectiing/text22-2.png b/image/collectiing/text22-2.png new file mode 100644 index 00000000..e598fb32 Binary files /dev/null and b/image/collectiing/text22-2.png differ diff --git a/image/collectiing/text22.png b/image/collectiing/text22.png index 7cf5f58b..69877470 100644 Binary files a/image/collectiing/text22.png and b/image/collectiing/text22.png differ diff --git a/image/collectiing/text23.png b/image/collectiing/text23.png index d3039eac..041666f5 100644 Binary files a/image/collectiing/text23.png and b/image/collectiing/text23.png differ diff --git a/image/collectiing_en/img_popupDtac.png b/image/collectiing_en/img_popupDtac.png index d189ed9a..4e0f3eca 100644 Binary files a/image/collectiing_en/img_popupDtac.png and b/image/collectiing_en/img_popupDtac.png differ diff --git a/image/collectiing_en/text22-2.png b/image/collectiing_en/text22-2.png new file mode 100644 index 00000000..5359815a Binary files /dev/null and b/image/collectiing_en/text22-2.png differ diff --git a/image/collectiing_en/text22.png b/image/collectiing_en/text22.png index aca72316..17f3eb8c 100644 Binary files a/image/collectiing_en/text22.png and b/image/collectiing_en/text22.png differ diff --git a/image/collectiing_en/text23.png b/image/collectiing_en/text23.png index bf813362..14f6781e 100644 Binary files a/image/collectiing_en/text23.png and b/image/collectiing_en/text23.png differ diff --git a/image/lang/bn_china_lang.png b/image/lang/bn_china_lang.png new file mode 100644 index 00000000..5a1573c9 Binary files /dev/null and b/image/lang/bn_china_lang.png differ diff --git a/image/lang/bn_eng_lang.png b/image/lang/bn_eng_lang.png new file mode 100644 index 00000000..6d42563c Binary files /dev/null and b/image/lang/bn_eng_lang.png differ diff --git a/image/lang/bn_japan_lang.png b/image/lang/bn_japan_lang.png new file mode 100644 index 00000000..87eda982 Binary files /dev/null and b/image/lang/bn_japan_lang.png differ diff --git a/image/lang/bn_thai_lang.png b/image/lang/bn_thai_lang.png new file mode 100644 index 00000000..bb5df62d Binary files /dev/null and b/image/lang/bn_thai_lang.png differ diff --git a/image/lang/lang_bg_bottom.png b/image/lang/lang_bg_bottom.png new file mode 100644 index 00000000..40306e2b Binary files /dev/null and b/image/lang/lang_bg_bottom.png differ diff --git a/image/lang/lang_bg_center.png b/image/lang/lang_bg_center.png new file mode 100644 index 00000000..95ef4bd4 Binary files /dev/null and b/image/lang/lang_bg_center.png differ diff --git a/image/lang/lang_bg_top.png b/image/lang/lang_bg_top.png new file mode 100644 index 00000000..e7e0e648 Binary files /dev/null and b/image/lang/lang_bg_top.png differ diff --git a/image/lang/world.png b/image/lang/world.png new file mode 100644 index 00000000..0722d9d8 Binary files /dev/null and b/image/lang/world.png differ diff --git a/image/page2_inter/bn_HealthyOption.png b/image/page2_inter/bn_HealthyOption.png new file mode 100644 index 00000000..96349b72 Binary files /dev/null and b/image/page2_inter/bn_HealthyOption.png differ diff --git a/image/page2_inter/bn_appfast.png b/image/page2_inter/bn_appfast.png new file mode 100644 index 00000000..2a026a1c Binary files /dev/null and b/image/page2_inter/bn_appfast.png differ diff --git a/image/page2_inter/bn_cho_caramel.png b/image/page2_inter/bn_cho_caramel.png new file mode 100644 index 00000000..83b24ffd Binary files /dev/null and b/image/page2_inter/bn_cho_caramel.png differ diff --git a/image/page2_inter/bn_coffee.png b/image/page2_inter/bn_coffee.png new file mode 100644 index 00000000..4d2482b9 Binary files /dev/null and b/image/page2_inter/bn_coffee.png differ diff --git a/image/page2_inter/bn_diy.png b/image/page2_inter/bn_diy.png new file mode 100644 index 00000000..91efc0f9 Binary files /dev/null and b/image/page2_inter/bn_diy.png differ diff --git a/image/page2_inter/bn_kidmenu.png b/image/page2_inter/bn_kidmenu.png new file mode 100644 index 00000000..070756b8 Binary files /dev/null and b/image/page2_inter/bn_kidmenu.png differ diff --git a/image/page2_inter/bn_protein.png b/image/page2_inter/bn_protein.png new file mode 100644 index 00000000..c60c2625 Binary files /dev/null and b/image/page2_inter/bn_protein.png differ diff --git a/image/page2_inter/bn_soda_coke.png b/image/page2_inter/bn_soda_coke.png new file mode 100644 index 00000000..865f08dd Binary files /dev/null and b/image/page2_inter/bn_soda_coke.png differ diff --git a/image/page2_inter/bn_tea.png b/image/page2_inter/bn_tea.png new file mode 100644 index 00000000..1ebebbae Binary files /dev/null and b/image/page2_inter/bn_tea.png differ diff --git a/image/page2_inter/bn_vending_machine.png b/image/page2_inter/bn_vending_machine.png new file mode 100644 index 00000000..77334251 Binary files /dev/null and b/image/page2_inter/bn_vending_machine.png differ diff --git a/image/page2_inter/bp_HealthyOption.png b/image/page2_inter/bp_HealthyOption.png new file mode 100644 index 00000000..c0f9c356 Binary files /dev/null and b/image/page2_inter/bp_HealthyOption.png differ diff --git a/image/page2_inter/bp_appfast.png b/image/page2_inter/bp_appfast.png new file mode 100644 index 00000000..f74f454d Binary files /dev/null and b/image/page2_inter/bp_appfast.png differ diff --git a/image/page2_inter/bp_cho_caramel.png b/image/page2_inter/bp_cho_caramel.png new file mode 100644 index 00000000..b2fe26e4 Binary files /dev/null and b/image/page2_inter/bp_cho_caramel.png differ diff --git a/image/page2_inter/bp_coffee.png b/image/page2_inter/bp_coffee.png new file mode 100644 index 00000000..a5c7f219 Binary files /dev/null and b/image/page2_inter/bp_coffee.png differ diff --git a/image/page2_inter/bp_diy.png b/image/page2_inter/bp_diy.png new file mode 100644 index 00000000..7cfc743e Binary files /dev/null and b/image/page2_inter/bp_diy.png differ diff --git a/image/page2_inter/bp_kidmenu.png b/image/page2_inter/bp_kidmenu.png new file mode 100644 index 00000000..74dce815 Binary files /dev/null and b/image/page2_inter/bp_kidmenu.png differ diff --git a/image/page2_inter/bp_protein.png b/image/page2_inter/bp_protein.png new file mode 100644 index 00000000..27efbcbd Binary files /dev/null and b/image/page2_inter/bp_protein.png differ diff --git a/image/page2_inter/bp_soda_coke.png b/image/page2_inter/bp_soda_coke.png new file mode 100644 index 00000000..90509077 Binary files /dev/null and b/image/page2_inter/bp_soda_coke.png differ diff --git a/image/page2_inter/bp_tea.png b/image/page2_inter/bp_tea.png new file mode 100644 index 00000000..366e5208 Binary files /dev/null and b/image/page2_inter/bp_tea.png differ diff --git a/image/page2_inter/bp_vending_machine.png b/image/page2_inter/bp_vending_machine.png new file mode 100644 index 00000000..2541bb0d Binary files /dev/null and b/image/page2_inter/bp_vending_machine.png differ diff --git a/image/page_campaign/video_desc.mp4 b/image/page_campaign/video_desc.mp4 deleted file mode 100644 index 34c75087..00000000 Binary files a/image/page_campaign/video_desc.mp4 and /dev/null differ diff --git a/image/page_doing/bn_get_lid.png b/image/page_doing/bn_get_lid.png new file mode 100644 index 00000000..2955b331 Binary files /dev/null and b/image/page_doing/bn_get_lid.png differ diff --git a/image/page_doing/bn_get_lid_en.png b/image/page_doing/bn_get_lid_en.png new file mode 100644 index 00000000..579e8750 Binary files /dev/null and b/image/page_doing/bn_get_lid_en.png differ diff --git a/image/page_doing/bp_get_lid.png b/image/page_doing/bp_get_lid.png new file mode 100644 index 00000000..272cc711 Binary files /dev/null and b/image/page_doing/bp_get_lid.png differ diff --git a/image/page_doing/bp_get_lid_en.png b/image/page_doing/bp_get_lid_en.png new file mode 100644 index 00000000..92748ea3 Binary files /dev/null and b/image/page_doing/bp_get_lid_en.png differ diff --git a/image/page_doing/brewing_txt_adv1.png b/image/page_doing/brewing_txt_adv1.png new file mode 100644 index 00000000..6e8b5a98 Binary files /dev/null and b/image/page_doing/brewing_txt_adv1.png differ diff --git a/image/page_doing/brewing_txt_adv1_en.png b/image/page_doing/brewing_txt_adv1_en.png new file mode 100644 index 00000000..fe30b8b2 Binary files /dev/null and b/image/page_doing/brewing_txt_adv1_en.png differ diff --git a/image/page_doing/brewing_txt_adv2.png b/image/page_doing/brewing_txt_adv2.png new file mode 100644 index 00000000..d26b16a2 Binary files /dev/null and b/image/page_doing/brewing_txt_adv2.png differ diff --git a/image/page_doing/brewing_txt_adv2_en.png b/image/page_doing/brewing_txt_adv2_en.png new file mode 100644 index 00000000..7a9c27b6 Binary files /dev/null and b/image/page_doing/brewing_txt_adv2_en.png differ diff --git a/image/page_doing/tao_adv1.png b/image/page_doing/tao_adv1.png new file mode 100644 index 00000000..e540a6c8 Binary files /dev/null and b/image/page_doing/tao_adv1.png differ diff --git a/image/page_doing/txt_15.png b/image/page_doing/txt_15.png index 9eb2b831..6a5b6fdf 100644 Binary files a/image/page_doing/txt_15.png and b/image/page_doing/txt_15.png differ diff --git a/image/page_doing/txt_15_en.png b/image/page_doing/txt_15_en.png index c715a3f3..e786d7de 100644 Binary files a/image/page_doing/txt_15_en.png and b/image/page_doing/txt_15_en.png differ diff --git a/image/page_doing/txt_17.png b/image/page_doing/txt_17.png index 7c0fa160..e3750911 100644 Binary files a/image/page_doing/txt_17.png and b/image/page_doing/txt_17.png differ diff --git a/image/page_doing/txt_17_en.png b/image/page_doing/txt_17_en.png index 1efd7af6..49165991 100644 Binary files a/image/page_doing/txt_17_en.png and b/image/page_doing/txt_17_en.png differ diff --git a/image/page_doing/txt_6.png b/image/page_doing/txt_6.png index 74400a40..a00444f2 100644 Binary files a/image/page_doing/txt_6.png and b/image/page_doing/txt_6.png differ diff --git a/image/page_doing/txt_6_en.png b/image/page_doing/txt_6_en.png index da18d1c5..c15cdf68 100644 Binary files a/image/page_doing/txt_6_en.png and b/image/page_doing/txt_6_en.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png b/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png index 6d69f066..f00fb5aa 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png and b/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png b/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png index 6b272df3..571dfef0 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png and b/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png b/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png index 5c92a8c0..f054f724 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png and b/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png b/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png index 7052a31c..6dc93497 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png and b/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png b/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png index a34e3944..872e796d 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png and b/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png b/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png index dd305d5c..1a35f1c7 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png and b/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png b/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png index d726af86..da5d3f1b 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png and b/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png b/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png index 3b4cb91a..063a0574 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png and b/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png b/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png index 9fefe2de..3e4e854e 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png and b/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png differ diff --git a/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png b/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png index e23bfce0..fb43b04d 100644 Binary files a/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png and b/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png differ diff --git a/image/page_drink_disable_n2/bn_Banana_milk.png b/image/page_drink_disable_n2/bn_Banana_milk.png new file mode 100644 index 00000000..7372f511 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Banana_milk.png differ diff --git a/image/page_drink_disable_n2/bn_ChocoBanana_milk.png b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png new file mode 100644 index 00000000..019c59e3 Binary files /dev/null and b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png differ diff --git a/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..c96df54a Binary files /dev/null and b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_disable_n2/bn_Melon_smoothie.png b/image/page_drink_disable_n2/bn_Melon_smoothie.png index eb582366..92caddfb 100644 Binary files a/image/page_drink_disable_n2/bn_Melon_smoothie.png and b/image/page_drink_disable_n2/bn_Melon_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..f93508d1 Binary files /dev/null and b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Pinky Promise.png b/image/page_drink_disable_n2/bn_Pinky Promise.png new file mode 100644 index 00000000..3e4e854e Binary files /dev/null and b/image/page_drink_disable_n2/bn_Pinky Promise.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_americano.png b/image/page_drink_disable_n2/bn_Yuzu_americano.png index c4c6ba69..b7c3741b 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_americano.png and b/image/page_drink_disable_n2/bn_Yuzu_americano.png differ diff --git a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png index 22924ce6..eeb3ea19 100644 Binary files a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png and b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..4d8be495 Binary files /dev/null and b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png index b96fae12..233453f7 100644 Binary files a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_iced_black.png b/image/page_drink_disable_n2/bn_iced_black.png new file mode 100644 index 00000000..85a59a43 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_black.png differ diff --git a/image/page_drink_disable_n2/bn_iced_soda_black.png b/image/page_drink_disable_n2/bn_iced_soda_black.png new file mode 100644 index 00000000..cccb3c4a Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_soda_black.png differ diff --git a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png index 49b96fde..6ae9f17f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_n/bn_Alcohol_Bedroom_Story.png b/image/page_drink_n/bn_Alcohol_Bedroom_Story.png index f1a5ac1f..254149f3 100644 Binary files a/image/page_drink_n/bn_Alcohol_Bedroom_Story.png and b/image/page_drink_n/bn_Alcohol_Bedroom_Story.png differ diff --git a/image/page_drink_n/bn_Alcohol_Forever_Love.png b/image/page_drink_n/bn_Alcohol_Forever_Love.png index 4060e8ac..ccb4441d 100644 Binary files a/image/page_drink_n/bn_Alcohol_Forever_Love.png and b/image/page_drink_n/bn_Alcohol_Forever_Love.png differ diff --git a/image/page_drink_n/bn_Alcohol_Gale_Jail.png b/image/page_drink_n/bn_Alcohol_Gale_Jail.png index 3b574454..c85ef3c8 100644 Binary files a/image/page_drink_n/bn_Alcohol_Gale_Jail.png and b/image/page_drink_n/bn_Alcohol_Gale_Jail.png differ diff --git a/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png b/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png index 4767fe78..399a14ce 100644 Binary files a/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png and b/image/page_drink_n/bn_Alcohol_Good_Night_Kiss.png differ diff --git a/image/page_drink_n/bn_Alcohol_Long_Night.png b/image/page_drink_n/bn_Alcohol_Long_Night.png index 4184374d..131e6ee2 100644 Binary files a/image/page_drink_n/bn_Alcohol_Long_Night.png and b/image/page_drink_n/bn_Alcohol_Long_Night.png differ diff --git a/image/page_drink_n/bn_Alcohol_Love_Potion.png b/image/page_drink_n/bn_Alcohol_Love_Potion.png index a55a7f3f..d40f3b53 100644 Binary files a/image/page_drink_n/bn_Alcohol_Love_Potion.png and b/image/page_drink_n/bn_Alcohol_Love_Potion.png differ diff --git a/image/page_drink_n/bn_Alcohol_Oriental_Kink.png b/image/page_drink_n/bn_Alcohol_Oriental_Kink.png index b23a6907..a36081d5 100644 Binary files a/image/page_drink_n/bn_Alcohol_Oriental_Kink.png and b/image/page_drink_n/bn_Alcohol_Oriental_Kink.png differ diff --git a/image/page_drink_n/bn_Alcohol_Pinky_Promise.png b/image/page_drink_n/bn_Alcohol_Pinky_Promise.png index e31aa74b..5f4cfe10 100644 Binary files a/image/page_drink_n/bn_Alcohol_Pinky_Promise.png and b/image/page_drink_n/bn_Alcohol_Pinky_Promise.png differ diff --git a/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png b/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png index 6759c321..7bd14acd 100644 Binary files a/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png and b/image/page_drink_n/bn_Alcohol_Third_Behind_Bars.png differ diff --git a/image/page_drink_n/bn_Banana_milk.png b/image/page_drink_n/bn_Banana_milk.png new file mode 100644 index 00000000..3002b949 Binary files /dev/null and b/image/page_drink_n/bn_Banana_milk.png differ diff --git a/image/page_drink_n/bn_ChocoBanana_milk.png b/image/page_drink_n/bn_ChocoBanana_milk.png new file mode 100644 index 00000000..b13ff070 Binary files /dev/null and b/image/page_drink_n/bn_ChocoBanana_milk.png differ diff --git a/image/page_drink_n/bn_ChocoYuzu_milk.png b/image/page_drink_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..feeeac79 Binary files /dev/null and b/image/page_drink_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_n/bn_Melon_smoothie.png b/image/page_drink_n/bn_Melon_smoothie.png index f669797a..7a21c0bd 100644 Binary files a/image/page_drink_n/bn_Melon_smoothie.png and b/image/page_drink_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_n/bn_PinkOreo_smoothie.png b/image/page_drink_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..b3da405a Binary files /dev/null and b/image/page_drink_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_n/bn_Pinky Promise.png b/image/page_drink_n/bn_Pinky Promise.png new file mode 100644 index 00000000..b39456c7 Binary files /dev/null and b/image/page_drink_n/bn_Pinky Promise.png differ diff --git a/image/page_drink_n/bn_Yuzu_americano.png b/image/page_drink_n/bn_Yuzu_americano.png index 1fbfcd37..0a6145ee 100644 Binary files a/image/page_drink_n/bn_Yuzu_americano.png and b/image/page_drink_n/bn_Yuzu_americano.png differ diff --git a/image/page_drink_n/bn_Yuzu_smoothie.png b/image/page_drink_n/bn_Yuzu_smoothie.png index c2f9922b..51e24157 100644 Binary files a/image/page_drink_n/bn_Yuzu_smoothie.png and b/image/page_drink_n/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_n/bn_hot_Banana_cafe_latte.png b/image/page_drink_n/bn_hot_Banana_cafe_latte.png new file mode 100644 index 00000000..a49f91eb Binary files /dev/null and b/image/page_drink_n/bn_hot_Banana_cafe_latte.png differ diff --git a/image/page_drink_n/bn_hot_lychee_espresso.png b/image/page_drink_n/bn_hot_lychee_espresso.png index b811bb35..9c1c5739 100644 Binary files a/image/page_drink_n/bn_hot_lychee_espresso.png and b/image/page_drink_n/bn_hot_lychee_espresso.png differ diff --git a/image/page_drink_n/bn_hot_yuzu_tea.png b/image/page_drink_n/bn_hot_yuzu_tea.png new file mode 100644 index 00000000..4e3d1193 Binary files /dev/null and b/image/page_drink_n/bn_hot_yuzu_tea.png differ diff --git a/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png index 6221063e..242774a4 100644 Binary files a/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_americano_soda.png b/image/page_drink_n/bn_iced_americano_soda.png index b08a764b..f72b4854 100644 Binary files a/image/page_drink_n/bn_iced_americano_soda.png and b/image/page_drink_n/bn_iced_americano_soda.png differ diff --git a/image/page_drink_n/bn_iced_black.png b/image/page_drink_n/bn_iced_black.png new file mode 100644 index 00000000..113c846f Binary files /dev/null and b/image/page_drink_n/bn_iced_black.png differ diff --git a/image/page_drink_n/bn_iced_soda_black.png b/image/page_drink_n/bn_iced_soda_black.png new file mode 100644 index 00000000..9b1b1fcf Binary files /dev/null and b/image/page_drink_n/bn_iced_soda_black.png differ diff --git a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png index 05d17a67..4c3db071 100644 Binary files a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_n/bn_iced_yuzu_soda.png b/image/page_drink_n/bn_iced_yuzu_soda.png index 4a8178ee..78e9174d 100644 Binary files a/image/page_drink_n/bn_iced_yuzu_soda.png and b/image/page_drink_n/bn_iced_yuzu_soda.png differ diff --git a/image/page_drink_n/bn_melon_americano.png b/image/page_drink_n/bn_melon_americano.png index 61fd70b7..ab918aa2 100644 Binary files a/image/page_drink_n/bn_melon_americano.png and b/image/page_drink_n/bn_melon_americano.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png b/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png index 7a64095c..e0b7beb0 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png and b/image/page_drink_picture2_n/bn_Alcohol_Bedroom_Story.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png b/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png index 4ce0a0b6..4e14801a 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png and b/image/page_drink_picture2_n/bn_Alcohol_Forever_Love.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png b/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png index e4980460..f4f13b54 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png and b/image/page_drink_picture2_n/bn_Alcohol_Gale_Jail.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png b/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png index b3bf85e5..0e80f5ad 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png and b/image/page_drink_picture2_n/bn_Alcohol_Good_Night_Kiss.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png b/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png index 826d7887..e0830ef5 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png and b/image/page_drink_picture2_n/bn_Alcohol_ILYSB.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png b/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png index 386921e4..07af5474 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png and b/image/page_drink_picture2_n/bn_Alcohol_Long_Night.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png b/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png index 2acd3136..28551fb5 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png and b/image/page_drink_picture2_n/bn_Alcohol_Love_Potion.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png b/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png index e325826c..ebb2ac1e 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png and b/image/page_drink_picture2_n/bn_Alcohol_Oriental_Kink.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png b/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png index f201bfa5..5be1e119 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png and b/image/page_drink_picture2_n/bn_Alcohol_Pinky_Promise.png differ diff --git a/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png b/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png index 906b69fa..87fea81b 100644 Binary files a/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png and b/image/page_drink_picture2_n/bn_Alcohol_Third_Behind_Bars.png differ diff --git a/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..ed0097ee Binary files /dev/null and b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_picture2_n/bn_Melon_smoothie.png b/image/page_drink_picture2_n/bn_Melon_smoothie.png index d2f8380c..ab13d0f5 100644 Binary files a/image/page_drink_picture2_n/bn_Melon_smoothie.png and b/image/page_drink_picture2_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..ae380f20 Binary files /dev/null and b/image/page_drink_picture2_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_americano.png b/image/page_drink_picture2_n/bn_Yuzu_americano.png index 092734ff..0fe81be0 100644 Binary files a/image/page_drink_picture2_n/bn_Yuzu_americano.png and b/image/page_drink_picture2_n/bn_Yuzu_americano.png differ diff --git a/image/page_drink_picture2_n/bn_Yuzu_smoothie.png b/image/page_drink_picture2_n/bn_Yuzu_smoothie.png index e81dffa7..24e1da3e 100644 Binary files a/image/page_drink_picture2_n/bn_Yuzu_smoothie.png and b/image/page_drink_picture2_n/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..7b062051 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png index d1c92c66..88b44f27 100644 Binary files a/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_picture2_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_iced_black.png b/image/page_drink_picture2_n/bn_iced_black.png new file mode 100644 index 00000000..f294291b Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_black.png differ diff --git a/image/page_drink_picture2_n/bn_iced_soda_black.png b/image/page_drink_picture2_n/bn_iced_soda_black.png new file mode 100644 index 00000000..9d43dbd9 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_soda_black.png differ diff --git a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png index 35f61559..90f305dc 100644 Binary files a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_drink_press_n/Component 3.png b/image/page_drink_press_n/Component 3.png new file mode 100644 index 00000000..1fb58891 Binary files /dev/null and b/image/page_drink_press_n/Component 3.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png b/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png index 5aa53c75..00ea3b08 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png and b/image/page_drink_press_n/bn_Alcohol_Bedroom_Story.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Forever_Love.png b/image/page_drink_press_n/bn_Alcohol_Forever_Love.png index d16ceb77..6e3d5b99 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Forever_Love.png and b/image/page_drink_press_n/bn_Alcohol_Forever_Love.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png b/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png index 2c58d878..d8a69d43 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png and b/image/page_drink_press_n/bn_Alcohol_Gale_Jail.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png b/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png index 8c9f0d4c..fe4a1f4e 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png and b/image/page_drink_press_n/bn_Alcohol_Good_Night_Kiss.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_ILYSB.png b/image/page_drink_press_n/bn_Alcohol_ILYSB.png index 65835fa2..ff29a626 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_ILYSB.png and b/image/page_drink_press_n/bn_Alcohol_ILYSB.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Long_Night.png b/image/page_drink_press_n/bn_Alcohol_Long_Night.png index 2b67a815..199b4471 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Long_Night.png and b/image/page_drink_press_n/bn_Alcohol_Long_Night.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Love_Potion.png b/image/page_drink_press_n/bn_Alcohol_Love_Potion.png index 4a1e3553..83e4a6cd 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Love_Potion.png and b/image/page_drink_press_n/bn_Alcohol_Love_Potion.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png b/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png index afe31f28..dcefcd5b 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png and b/image/page_drink_press_n/bn_Alcohol_Oriental_Kink.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png b/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png index cbbfe535..00c5712a 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png and b/image/page_drink_press_n/bn_Alcohol_Pinky_Promise.png differ diff --git a/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png b/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png index 21920c4f..2190c0ee 100644 Binary files a/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png and b/image/page_drink_press_n/bn_Alcohol_Third_Behind_Bars.png differ diff --git a/image/page_drink_press_n/bn_Banana_milk.png b/image/page_drink_press_n/bn_Banana_milk.png new file mode 100644 index 00000000..0a40143a Binary files /dev/null and b/image/page_drink_press_n/bn_Banana_milk.png differ diff --git a/image/page_drink_press_n/bn_ChocoYuzu_milk.png b/image/page_drink_press_n/bn_ChocoYuzu_milk.png new file mode 100644 index 00000000..25e382ed Binary files /dev/null and b/image/page_drink_press_n/bn_ChocoYuzu_milk.png differ diff --git a/image/page_drink_press_n/bn_Melon_smoothie.png b/image/page_drink_press_n/bn_Melon_smoothie.png index f3abe763..b54a7236 100644 Binary files a/image/page_drink_press_n/bn_Melon_smoothie.png and b/image/page_drink_press_n/bn_Melon_smoothie.png differ diff --git a/image/page_drink_press_n/bn_PinkOreo_smoothie.png b/image/page_drink_press_n/bn_PinkOreo_smoothie.png new file mode 100644 index 00000000..1a4b4efc Binary files /dev/null and b/image/page_drink_press_n/bn_PinkOreo_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Yuzu_americano.png b/image/page_drink_press_n/bn_Yuzu_americano.png index 89544bca..5bdf489a 100644 Binary files a/image/page_drink_press_n/bn_Yuzu_americano.png and b/image/page_drink_press_n/bn_Yuzu_americano.png differ diff --git a/image/page_drink_press_n/bn_Yuzu_smoothie.png b/image/page_drink_press_n/bn_Yuzu_smoothie.png index afba8082..17954a60 100644 Binary files a/image/page_drink_press_n/bn_Yuzu_smoothie.png and b/image/page_drink_press_n/bn_Yuzu_smoothie.png differ diff --git a/image/page_drink_press_n/bn_hot_Yuzu_tea.png b/image/page_drink_press_n/bn_hot_Yuzu_tea.png new file mode 100644 index 00000000..b83f0083 Binary files /dev/null and b/image/page_drink_press_n/bn_hot_Yuzu_tea.png differ diff --git a/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png b/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png index 14718abe..fda460a9 100644 Binary files a/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png and b/image/page_drink_press_n/bn_iced_Milk_Lychee_smoothie.png differ diff --git a/image/page_drink_press_n/bn_iced_black.png b/image/page_drink_press_n/bn_iced_black.png new file mode 100644 index 00000000..be326d57 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_black.png differ diff --git a/image/page_drink_press_n/bn_iced_soda_black.png b/image/page_drink_press_n/bn_iced_soda_black.png new file mode 100644 index 00000000..9915539d Binary files /dev/null and b/image/page_drink_press_n/bn_iced_soda_black.png differ diff --git a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png index f98e9c07..de6ac677 100644 Binary files a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png and b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png differ diff --git a/image/page_payment_en/page_payment/bd_prompt_pay.png b/image/page_payment_en/page_payment/bd_prompt_pay.png index 0047ce9d..df62e794 100644 Binary files a/image/page_payment_en/page_payment/bd_prompt_pay.png and b/image/page_payment_en/page_payment/bd_prompt_pay.png differ diff --git a/image/sync_1.file b/image/sync_1.file index a5f14026..7fd4e86a 100644 --- a/image/sync_1.file +++ b/image/sync_1.file @@ -1,10 +1,22 @@ ./page_doing: -total 3292 +total 3420 -rw-rw---- 1 root sdcard_rw 21318 2022-06-13 18:43 6.png +-rw-rw---- 1 root sdcard_rw 3268 2022-12-05 21:41 bn_get_lid.png +-rw-rw---- 1 root sdcard_rw 3806 2022-12-05 21:41 bn_get_lid_en.png -rw-rw---- 1 root sdcard_rw 5196 2022-09-27 09:36 bn_get_more_straw.png -rw-rw---- 1 root sdcard_rw 5975 2022-09-27 10:36 bn_get_more_straw_en.png +-rw-rw---- 1 root sdcard_rw 4448 2022-12-02 19:59 bn_send_report_lid.png +-rw-rw---- 1 root sdcard_rw 6315 2022-12-02 19:58 bn_send_report_lid_en.png +-rw-rw---- 1 root sdcard_rw 5197 2022-10-14 21:53 bn_send_report_straw.png +-rw-rw---- 1 root sdcard_rw 7299 2022-10-14 21:53 bn_send_report_straw_en.png +-rw-rw---- 1 root sdcard_rw 3589 2022-12-05 20:59 bp_get_lid.png +-rw-rw---- 1 root sdcard_rw 3354 2022-12-05 20:59 bp_get_lid_en.png -rw-rw---- 1 root sdcard_rw 4955 2022-09-27 10:04 bp_get_more_straw.png -rw-rw---- 1 root sdcard_rw 5726 2022-09-27 10:04 bp_get_more_straw_en.png +-rw-rw---- 1 root sdcard_rw 4361 2022-12-02 19:59 bp_send_report_lid.png +-rw-rw---- 1 root sdcard_rw 6267 2022-12-02 19:58 bp_send_report_lid_en.png +-rw-rw---- 1 root sdcard_rw 4942 2022-10-14 21:53 bp_send_report_straw.png +-rw-rw---- 1 root sdcard_rw 7053 2022-10-14 21:53 bp_send_report_straw_en.png -rw-rw---- 1 root sdcard_rw 34923 2022-06-13 18:43 image_bottom1.png -rw-rw---- 1 root sdcard_rw 5473 2022-06-13 18:43 img2.png -rw-rw---- 1 root sdcard_rw 4680 2022-06-13 18:43 img2_eng.png @@ -24,12 +36,12 @@ total 3292 -rw-rw---- 1 root sdcard_rw 24728 2022-06-13 18:43 txt_13_en.png -rw-rw---- 1 root sdcard_rw 23644 2022-06-13 18:43 txt_14.png -rw-rw---- 1 root sdcard_rw 22085 2022-06-13 18:43 txt_14_en.png --rw-rw---- 1 root sdcard_rw 20734 2022-06-13 18:43 txt_15.png --rw-rw---- 1 root sdcard_rw 21447 2022-06-13 18:43 txt_15_en.png +-rw-rw---- 1 root sdcard_rw 17382 2022-12-19 19:42 txt_15.png +-rw-rw---- 1 root sdcard_rw 21535 2022-12-19 19:41 txt_15_en.png -rw-rw---- 1 root sdcard_rw 21304 2022-06-13 18:43 txt_16.png -rw-rw---- 1 root sdcard_rw 23166 2022-06-13 18:43 txt_16_en.png --rw-rw---- 1 root sdcard_rw 20229 2022-06-13 18:43 txt_17.png --rw-rw---- 1 root sdcard_rw 20068 2022-06-13 18:43 txt_17_en.png +-rw-rw---- 1 root sdcard_rw 20442 2022-12-19 10:33 txt_17.png +-rw-rw---- 1 root sdcard_rw 16556 2022-12-19 10:34 txt_17_en.png -rw-rw---- 1 root sdcard_rw 24904 2022-06-13 18:43 txt_18.png -rw-rw---- 1 root sdcard_rw 20747 2022-06-13 18:43 txt_18_en.png -rw-rw---- 1 root sdcard_rw 28389 2022-06-13 18:43 txt_19.png @@ -99,8 +111,8 @@ total 3292 -rw-rw---- 1 root sdcard_rw 18549 2022-09-12 11:10 txt_55.png -rw-rw---- 1 root sdcard_rw 18299 2022-09-12 11:10 txt_55_en.png -rw-rw---- 1 root sdcard_rw 32717 2022-06-13 18:43 txt_5_en.png --rw-rw---- 1 root sdcard_rw 15158 2022-06-13 18:43 txt_6.png --rw-rw---- 1 root sdcard_rw 17589 2022-06-13 18:43 txt_6_en.png +-rw-rw---- 1 root sdcard_rw 20474 2022-12-19 10:33 txt_6.png +-rw-rw---- 1 root sdcard_rw 16556 2022-12-19 10:34 txt_6_en.png -rw-rw---- 1 root sdcard_rw 20203 2022-06-13 18:43 txt_7.png -rw-rw---- 1 root sdcard_rw 20068 2022-06-13 18:43 txt_7_en.png -rw-rw---- 1 root sdcard_rw 20339 2022-06-13 18:43 txt_8.png @@ -108,607 +120,24 @@ total 3292 -rw-rw---- 1 root sdcard_rw 19244 2022-06-13 18:43 txt_9.png -rw-rw---- 1 root sdcard_rw 19707 2022-06-13 18:43 txt_9_en.png -./page_drink_disable_n2: -total 2928 --rw-rw---- 1 root sdcard_rw 9060 2022-09-13 20:53 CHOCO & CARAMEL.png --rw-rw---- 1 root sdcard_rw 2746 2022-09-13 20:53 COFFEE.png --rw-rw---- 1 root sdcard_rw 3061 2022-09-13 20:53 Protein-1.png --rw-rw---- 1 root sdcard_rw 3385 2022-09-13 20:53 Protein.png --rw-rw---- 1 root sdcard_rw 7406 2022-09-13 20:53 Softdrink & other.png --rw-rw---- 1 root sdcard_rw 1382 2022-09-13 20:53 TEA.png --rw-rw---- 1 root sdcard_rw 8842 2022-09-13 20:53 bn_Congee.png --rw-rw---- 1 root sdcard_rw 12686 2022-09-13 20:53 bn_Lychee_lime_soda.png --rw-rw---- 1 root sdcard_rw 10664 2022-09-13 20:53 bn_Melon_smoothie.png --rw-rw---- 1 root sdcard_rw 5192 2022-09-13 20:53 bn_Yuzu_americano.png --rw-rw---- 1 root sdcard_rw 10140 2022-09-13 20:53 bn_Yuzu_smoothie.png --rw-rw---- 1 root sdcard_rw 14956 2022-09-13 20:53 bn_dirty_light.png --rw-rw---- 1 root sdcard_rw 13622 2022-09-13 20:53 bn_dirty_light__peacher.png --rw-rw---- 1 root sdcard_rw 15201 2022-09-13 20:53 bn_dirty_light__snowwhite.png --rw-rw---- 1 root sdcard_rw 14505 2022-09-13 20:53 bn_dirty_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 13754 2022-09-13 20:53 bn_dirty_light_geisha.png --rw-rw---- 1 root sdcard_rw 14330 2022-09-13 20:53 bn_dirty_light_mozart.png --rw-rw---- 1 root sdcard_rw 14118 2022-09-13 20:53 bn_dirty_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 15845 2022-09-13 20:53 bn_dirty_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 14621 2022-09-13 20:53 bn_dirty_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 5988 2022-09-13 20:53 bn_diy.png --rw-rw---- 1 root sdcard_rw 4690 2022-09-13 20:53 bn_hot_Black_Sugar_Milk_Tea.png --rw-rw---- 1 root sdcard_rw 9280 2022-09-14 12:46 bn_hot_Cappu_Healthy.png --rw-rw---- 1 root sdcard_rw 9964 2022-09-13 20:53 bn_hot_Ginger_lemon_tea.png --rw-rw---- 1 root sdcard_rw 7499 2022-09-13 20:53 bn_hot_Ginger_tea.png --rw-rw---- 1 root sdcard_rw 5009 2022-09-13 20:53 bn_hot_america_no.png --rw-rw---- 1 root sdcard_rw 8935 2022-09-14 12:46 bn_hot_america_no_Healthy.png --rw-rw---- 1 root sdcard_rw 5091 2022-09-13 20:53 bn_hot_americano_honey.png --rw-rw---- 1 root sdcard_rw 15525 2022-09-13 20:53 bn_hot_americano_light.png --rw-rw---- 1 root sdcard_rw 13045 2022-09-13 20:53 bn_hot_americano_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 14517 2022-09-13 20:53 bn_hot_americano_light_geisha.png --rw-rw---- 1 root sdcard_rw 12979 2022-09-13 20:53 bn_hot_americano_light_mozart.png --rw-rw---- 1 root sdcard_rw 14437 2022-09-13 20:53 bn_hot_americano_light_peacher.png --rw-rw---- 1 root sdcard_rw 14586 2022-09-13 20:53 bn_hot_americano_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 16214 2022-09-13 20:53 bn_hot_americano_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 15926 2022-09-13 20:53 bn_hot_americano_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 15274 2022-09-13 20:53 bn_hot_americano_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 8405 2022-09-14 12:46 bn_hot_blacktea.png --rw-rw---- 1 root sdcard_rw 7235 2022-09-13 20:53 bn_hot_blueberry_tea.png --rw-rw---- 1 root sdcard_rw 5358 2022-09-13 20:53 bn_hot_cappuccino.png --rw-rw---- 1 root sdcard_rw 5562 2022-09-13 20:53 bn_hot_caramel_latte.png --rw-rw---- 1 root sdcard_rw 7049 2022-09-13 20:53 bn_hot_chrysanthemum_tea.png --rw-rw---- 1 root sdcard_rw 5575 2022-09-13 20:53 bn_hot_coffee_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 3886 2022-09-13 20:53 bn_hot_double_espresso-1.png --rw-rw---- 1 root sdcard_rw 5941 2022-09-13 20:53 bn_hot_double_espresso.png --rw-rw---- 1 root sdcard_rw 3740 2022-09-13 20:53 bn_hot_espresso-1.png --rw-rw---- 1 root sdcard_rw 5817 2022-09-13 20:53 bn_hot_espresso.png --rw-rw---- 1 root sdcard_rw 14095 2022-09-13 20:53 bn_hot_espresso_light.png --rw-rw---- 1 root sdcard_rw 11809 2022-09-13 20:53 bn_hot_espresso_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 13174 2022-09-13 20:53 bn_hot_espresso_light_geisha.png --rw-rw---- 1 root sdcard_rw 11647 2022-09-13 20:53 bn_hot_espresso_light_mozart.png --rw-rw---- 1 root sdcard_rw 13083 2022-09-13 20:53 bn_hot_espresso_light_peacher.png --rw-rw---- 1 root sdcard_rw 13321 2022-09-13 20:53 bn_hot_espresso_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 14832 2022-09-13 20:53 bn_hot_espresso_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 14495 2022-09-13 20:53 bn_hot_espresso_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 13877 2022-09-13 20:53 bn_hot_espresso_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 5544 2022-09-13 20:53 bn_hot_greenteacoffee_lattle.png --rw-rw---- 1 root sdcard_rw 4620 2022-09-13 20:53 bn_hot_hojicha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 8587 2022-09-14 12:46 bn_hot_hojicha_milk_tea_sing_Healthy.png --rw-rw---- 1 root sdcard_rw 4438 2022-10-10 14:31 bn_hot_hojicha_tea_sing.png --rw-rw---- 1 root sdcard_rw 5547 2022-09-13 20:53 bn_hot_honey_latte.png --rw-rw---- 1 root sdcard_rw 5378 2022-09-13 20:53 bn_hot_latte.png --rw-rw---- 1 root sdcard_rw 9297 2022-09-14 12:46 bn_hot_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 7855 2022-09-13 20:53 bn_hot_lime_Matcha.png --rw-rw---- 1 root sdcard_rw 9359 2022-09-13 20:53 bn_hot_lime_Matcha_Honey.png --rw-rw---- 1 root sdcard_rw 9164 2022-09-13 20:53 bn_hot_lime_Oolong_Honey_tea.png --rw-rw---- 1 root sdcard_rw 7708 2022-09-13 20:53 bn_hot_lime_Oolong_tea.png --rw-rw---- 1 root sdcard_rw 11581 2022-09-14 12:46 bn_hot_lime_Oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 7862 2022-09-13 20:53 bn_hot_lime_tea.png --rw-rw---- 1 root sdcard_rw 9333 2022-09-13 20:53 bn_hot_lime_tea_Honey.png --rw-rw---- 1 root sdcard_rw 11731 2022-09-14 12:46 bn_hot_limeblack tea_Healthy.png --rw-rw---- 1 root sdcard_rw 7861 2022-09-13 20:53 bn_hot_limeblack_tea.png --rw-rw---- 1 root sdcard_rw 5189 2022-09-13 20:53 bn_hot_lychee_espresso.png --rw-rw---- 1 root sdcard_rw 7824 2022-09-13 20:53 bn_hot_lychee_tea.png --rw-rw---- 1 root sdcard_rw 9550 2022-09-13 20:53 bn_hot_marijuana_tea.png --rw-rw---- 1 root sdcard_rw 8616 2022-09-14 12:46 bn_hot_matcha_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 4653 2022-09-13 20:53 bn_hot_matcha_milk_tea.png --rw-rw---- 1 root sdcard_rw 4653 2022-09-13 20:53 bn_hot_matcha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 4419 2022-09-13 20:53 bn_hot_matcha_tea.png --rw-rw---- 1 root sdcard_rw 8377 2022-09-14 12:46 bn_hot_matcha_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 4419 2022-09-13 20:53 bn_hot_matcha_tea_sing.png --rw-rw---- 1 root sdcard_rw 5525 2022-09-13 20:53 bn_hot_mocha.png --rw-rw---- 1 root sdcard_rw 9376 2022-09-14 12:46 bn_hot_mocha_Healthy.png --rw-rw---- 1 root sdcard_rw 4373 2022-09-13 20:53 bn_hot_oolong_tea.png --rw-rw---- 1 root sdcard_rw 8320 2022-09-14 12:46 bn_hot_oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 8552 2022-09-13 20:53 bn_hot_strawberry_tea.png --rw-rw---- 1 root sdcard_rw 4563 2022-09-13 20:53 bn_hot_taiwan_milk_tea.png --rw-rw---- 1 root sdcard_rw 8692 2022-09-13 20:53 bn_hot_taiwan_milk_tea_Jason.png --rw-rw---- 1 root sdcard_rw 8533 2022-09-14 12:46 bn_hot_taiwan_milk_tea_Jason_Healthy.png --rw-rw---- 1 root sdcard_rw 5524 2022-09-13 20:53 bn_hot_taiwantea_macchiato.png --rw-rw---- 1 root sdcard_rw 4678 2022-09-13 20:53 bn_hot_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 8652 2022-09-14 12:46 bn_hot_thai_milk_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 4678 2022-09-13 20:53 bn_hot_thai_milk_tea_tacc.png --rw-rw---- 1 root sdcard_rw 4446 2022-09-13 20:53 bn_hot_thai_tea.png --rw-rw---- 1 root sdcard_rw 5583 2022-09-13 20:53 bn_hot_thai_tea_coffee.png --rw-rw---- 1 root sdcard_rw 8171 2022-09-13 20:53 bn_hot_ume_tea.png --rw-rw---- 1 root sdcard_rw 3554 2022-09-13 20:53 bn_iced.png --rw-rw---- 1 root sdcard_rw 7869 2022-09-13 20:53 bn_iced_7up.png --rw-rw---- 1 root sdcard_rw 4370 2022-09-13 20:53 bn_iced_Black_Sugar_Milk.png --rw-rw---- 1 root sdcard_rw 8797 2022-09-13 20:53 bn_iced_Black_Sugar_Milk_smoothie.png --rw-rw---- 1 root sdcard_rw 8953 2022-09-13 20:53 bn_iced_Cokecola.png --rw-rw---- 1 root sdcard_rw 10738 2022-09-13 20:53 bn_iced_Ginger_soda.png --rw-rw---- 1 root sdcard_rw 12185 2022-09-13 20:53 bn_iced_Gingerlime_soda.png --rw-rw---- 1 root sdcard_rw 7610 2022-09-13 20:53 bn_iced_Lychee.png --rw-rw---- 1 root sdcard_rw 10299 2022-09-13 20:53 bn_iced_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 11531 2022-09-13 20:53 bn_iced_Lychee_soda.png --rw-rw---- 1 root sdcard_rw 10697 2022-09-13 20:53 bn_iced_Mango_soda.png --rw-rw---- 1 root sdcard_rw 9775 2022-09-13 20:53 bn_iced_Milk_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 11096 2022-09-13 20:53 bn_iced_Ovalcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 10857 2022-09-13 20:53 bn_iced_americano_soda.png --rw-rw---- 1 root sdcard_rw 6707 2022-09-13 20:53 bn_iced_blueberry.png --rw-rw---- 1 root sdcard_rw 10622 2022-09-13 20:53 bn_iced_blueberry_soda.png --rw-rw---- 1 root sdcard_rw 4380 2022-09-13 20:53 bn_iced_caramel.png --rw-rw---- 1 root sdcard_rw 4321 2022-09-13 20:53 bn_iced_caramel_cocoa.png --rw-rw---- 1 root sdcard_rw 7570 2022-09-13 20:53 bn_iced_caramel_latte_smoothie.png --rw-rw---- 1 root sdcard_rw 7523 2022-09-13 20:53 bn_iced_caramelcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 4278 2022-09-13 20:53 bn_iced_cocoa.png --rw-rw---- 1 root sdcard_rw 8188 2022-09-14 12:46 bn_iced_cocoa_Healthy.png --rw-rw---- 1 root sdcard_rw 8732 2022-09-13 20:53 bn_iced_cocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 6009 2022-09-13 20:53 bn_iced_energy_drink.png --rw-rw---- 1 root sdcard_rw 9135 2022-09-13 20:53 bn_iced_energy_drink_lime_soda.png --rw-rw---- 1 root sdcard_rw 7555 2022-09-13 20:53 bn_iced_energy_drink_soda.png --rw-rw---- 1 root sdcard_rw 5403 2022-09-13 20:53 bn_iced_epsresso.png --rw-rw---- 1 root sdcard_rw 8491 2022-09-13 20:53 bn_iced_epsresso_smoothie.png --rw-rw---- 1 root sdcard_rw 15659 2022-09-13 20:53 bn_iced_hemp_lime_soda.png --rw-rw---- 1 root sdcard_rw 13445 2022-09-13 20:53 bn_iced_hemp_soda.png --rw-rw---- 1 root sdcard_rw 7646 2022-09-13 20:53 bn_iced_honeymilk.png --rw-rw---- 1 root sdcard_rw 7638 2022-09-13 20:53 bn_iced_lemonade.png --rw-rw---- 1 root sdcard_rw 9459 2022-09-13 20:53 bn_iced_lemonade_honey.png --rw-rw---- 1 root sdcard_rw 13071 2022-09-13 20:53 bn_iced_lemonade_honey_soda.png --rw-rw---- 1 root sdcard_rw 10408 2022-09-13 20:53 bn_iced_lemonade_smoothie.png --rw-rw---- 1 root sdcard_rw 11642 2022-09-13 20:53 bn_iced_lemonade_soda.png --rw-rw---- 1 root sdcard_rw 15575 2022-09-14 12:46 bn_iced_lemonade_soda_Healthy.png --rw-rw---- 1 root sdcard_rw 6731 2022-09-13 20:53 bn_iced_mango.png --rw-rw---- 1 root sdcard_rw 8060 2022-09-13 20:53 bn_iced_matcha_milk_tea_smoothie-1.png --rw-rw---- 1 root sdcard_rw 8007 2022-09-13 20:53 bn_iced_matcha_milk_tea_smoothie.png --rw-rw---- 1 root sdcard_rw 12689 2022-09-13 20:53 bn_iced_melon_soda.png --rw-rw---- 1 root sdcard_rw 4243 2022-09-13 20:53 bn_iced_milk.png --rw-rw---- 1 root sdcard_rw 8158 2022-09-14 12:46 bn_iced_milk_Healthy.png --rw-rw---- 1 root sdcard_rw 4292 2022-09-13 20:53 bn_iced_ovaltine.png --rw-rw---- 1 root sdcard_rw 7614 2022-09-13 20:53 bn_iced_pepsi.png --rw-rw---- 1 root sdcard_rw 13691 2022-09-13 20:53 bn_iced_pepsi_Melon.png --rw-rw---- 1 root sdcard_rw 13308 2022-09-13 20:53 bn_iced_pepsi_plum.png --rw-rw---- 1 root sdcard_rw 9431 2022-09-13 20:53 bn_iced_slushie.png --rw-rw---- 1 root sdcard_rw 10598 2022-09-13 20:53 bn_iced_slushieplum.png --rw-rw---- 1 root sdcard_rw 12300 2022-09-13 20:53 bn_iced_sprite.png --rw-rw---- 1 root sdcard_rw 8386 2022-09-13 20:53 bn_iced_strawberry.png --rw-rw---- 1 root sdcard_rw 10905 2022-09-13 20:53 bn_iced_strawberry_smoothie.png --rw-rw---- 1 root sdcard_rw 11693 2022-09-13 20:53 bn_iced_strawberry_soda.png --rw-rw---- 1 root sdcard_rw 10062 2022-09-13 20:53 bn_iced_strawberrycocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 9823 2022-09-13 20:53 bn_iced_strawberrymilk_smoothie.png --rw-rw---- 1 root sdcard_rw 8071 2022-09-13 20:53 bn_iced_ume_drink.png --rw-rw---- 1 root sdcard_rw 10740 2022-09-13 20:53 bn_iced_ume_drink_smoothie.png --rw-rw---- 1 root sdcard_rw 13362 2022-09-13 20:53 bn_iced_ume_lime_soda.png --rw-rw---- 1 root sdcard_rw 12194 2022-09-13 20:53 bn_iced_ume_soda.png --rw-rw---- 1 root sdcard_rw 11382 2022-09-13 20:53 bn_iced_yuzu_soda.png --rw-rw---- 1 root sdcard_rw 5534 2022-09-13 20:53 bn_kuromitsu_coffee.png --rw-rw---- 1 root sdcard_rw 11638 2022-09-14 12:46 bn_limande_Healthy.png --rw-rw---- 1 root sdcard_rw 5491 2022-09-13 20:53 bn_melon_americano.png --rw-rw---- 1 root sdcard_rw 4304 2022-09-13 20:53 bn_pink_milk.png --rw-rw---- 1 root sdcard_rw 9001 2022-09-13 20:53 bn_pink_milk_smoothie.png --rw-rw---- 1 root sdcard_rw 13917 2022-09-13 20:53 bn_protein_Blueberry.png --rw-rw---- 1 root sdcard_rw 12522 2022-09-13 20:53 bn_protein_Chocolate.png --rw-rw---- 1 root sdcard_rw 16473 2022-09-13 20:53 bn_protein_Chocolate_BDMS.png --rw-rw---- 1 root sdcard_rw 12964 2022-09-13 20:53 bn_protein_Mango.png --rw-rw---- 1 root sdcard_rw 12504 2022-09-13 20:53 bn_protein_Matcha.png --rw-rw---- 1 root sdcard_rw 16469 2022-09-13 20:53 bn_protein_Matcha_BDMS.png --rw-rw---- 1 root sdcard_rw 13108 2022-09-13 20:53 bn_protein_Strawberry.png --rw-rw---- 1 root sdcard_rw 12557 2022-09-13 20:53 bn_protein_Taiwantea.png --rw-rw---- 1 root sdcard_rw 12548 2022-09-13 20:53 bn_protein_Thaitea.png --rw-rw---- 1 root sdcard_rw 16464 2022-09-13 20:53 bn_protein_Thaitea_BDMS.png --rw-rw---- 1 root sdcard_rw 11301 2022-09-13 20:53 bn_protein_caramel.png --rw-rw---- 1 root sdcard_rw 11479 2022-09-13 20:53 bn_protein_espresso.png --rw-rw---- 1 root sdcard_rw 15217 2022-09-13 20:53 bn_protein_espresso_BDMS.png --rw-rw---- 1 root sdcard_rw 10406 2022-09-13 20:53 bn_protein_isolated.png --rw-rw---- 1 root sdcard_rw 13726 2022-09-13 20:53 bn_protein_kokuto.png --rw-rw---- 1 root sdcard_rw 14740 2022-09-13 20:53 bn_protein_melon.png --rw-rw---- 1 root sdcard_rw 13121 2022-09-13 20:53 bn_protein_milk.png --rw-rw---- 1 root sdcard_rw 15423 2022-09-13 20:53 bn_protein_oreo.png --rw-rw---- 1 root sdcard_rw 17621 2022-09-13 20:53 bn_protein_original_BDMS.png --rw-rw---- 1 root sdcard_rw 7475 2022-09-13 20:53 bn_sala.png --rw-rw---- 1 root sdcard_rw 12161 2022-09-13 20:53 bn_sala_lime.png --rw-rw---- 1 root sdcard_rw 13319 2022-09-13 20:53 bn_sala_lime_soda.png --rw-rw---- 1 root sdcard_rw 11781 2022-09-13 20:53 bn_sala_soda.png --rw-rw---- 1 root sdcard_rw 13897 2022-09-13 20:53 bn_smoothie_oreo.png --rw-rw---- 1 root sdcard_rw 10463 2022-09-13 20:53 bn_smoothie_ovaltine.png --rw-rw---- 1 root sdcard_rw 5116 2022-09-13 20:53 bn_soda.png --rw-rw---- 1 root sdcard_rw 14137 2022-09-13 20:53 bn_strawberry_lime_soda.png --rw-rw---- 1 root sdcard_rw 2824 2022-09-13 20:53 bn_water_roomtemp.png - -./page_drink_n: -total 3172 --rw-rw---- 1 root sdcard_rw 9068 2022-07-04 10:45 CHOCO & CARAMEL.png --rw-rw---- 1 root sdcard_rw 2746 2022-07-04 10:45 COFFEE.png --rw-rw---- 1 root sdcard_rw 1161 2022-06-23 22:34 Component 3.png --rw-rw---- 1 root sdcard_rw 5213 2022-06-23 22:34 Group 12.png --rw-rw---- 1 root sdcard_rw 4777 2022-06-23 22:34 Group 28.png --rw-rw---- 1 root sdcard_rw 4212 2022-06-23 22:34 Group 32.png --rw-rw---- 1 root sdcard_rw 4858 2022-06-23 22:34 Group 39.png --rw-rw---- 1 root sdcard_rw 5161 2022-06-23 22:34 Group 64-1.png --rw-rw---- 1 root sdcard_rw 5100 2022-06-23 22:34 Group 64-2.png --rw-rw---- 1 root sdcard_rw 5131 2022-06-23 22:34 Group 64-3.png --rw-rw---- 1 root sdcard_rw 5159 2022-06-23 22:34 Group 64-4.png --rw-rw---- 1 root sdcard_rw 5118 2022-06-23 22:34 Group 64-5.png --rw-rw---- 1 root sdcard_rw 5139 2022-06-23 22:34 Group 64.png --rw-rw---- 1 root sdcard_rw 4282 2022-06-23 22:34 Group 76.png --rw-rw---- 1 root sdcard_rw 30584 2022-06-23 22:34 Peacher.svg --rw-rw---- 1 root sdcard_rw 3385 2022-07-04 10:45 Protein.png --rw-rw---- 1 root sdcard_rw 3374 2022-06-23 22:34 REAL-1.png --rw-rw---- 1 root sdcard_rw 3374 2022-06-23 22:34 REAL.png --rw-rw---- 1 root sdcard_rw 7406 2022-07-04 10:45 Softdrink & other.png --rw-rw---- 1 root sdcard_rw 133 2022-06-23 22:34 Subtract.png --rw-rw---- 1 root sdcard_rw 1382 2022-07-04 10:45 TEA.png --rw-rw---- 1 root sdcard_rw 1161 2022-06-23 22:34 Thai menu.png --rw-rw---- 1 root sdcard_rw 8457 2022-07-04 10:45 bn_Congee.png --rw-rw---- 1 root sdcard_rw 13836 2022-07-04 10:45 bn_Lychee_lime_soda.png --rw-rw---- 1 root sdcard_rw 11353 2022-07-04 10:45 bn_Melon_smoothie.png --rw-rw---- 1 root sdcard_rw 5225 2022-07-04 10:45 bn_Yuzu_americano.png --rw-rw---- 1 root sdcard_rw 10593 2022-07-04 10:45 bn_Yuzu_smoothie.png --rw-rw---- 1 root sdcard_rw 15485 2022-07-04 10:45 bn_dirty_light.png --rw-rw---- 1 root sdcard_rw 14133 2022-07-04 10:45 bn_dirty_light__peacher.png --rw-rw---- 1 root sdcard_rw 15688 2022-07-04 10:45 bn_dirty_light__snowwhite.png --rw-rw---- 1 root sdcard_rw 15024 2022-07-04 10:45 bn_dirty_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 14161 2022-07-04 10:45 bn_dirty_light_geisha.png --rw-rw---- 1 root sdcard_rw 14786 2022-07-04 10:45 bn_dirty_light_mozart.png --rw-rw---- 1 root sdcard_rw 14553 2022-07-04 10:45 bn_dirty_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 16124 2022-07-04 10:45 bn_dirty_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 15171 2022-07-04 10:45 bn_dirty_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 5611 2022-07-04 10:45 bn_diy.png --rw-rw---- 1 root sdcard_rw 4582 2022-07-04 10:45 bn_hot_Black_Sugar_Milk_Tea.png --rw-rw---- 1 root sdcard_rw 9252 2022-09-14 12:45 bn_hot_Cappu_Healthy.png --rw-rw---- 1 root sdcard_rw 10492 2022-07-04 10:45 bn_hot_Ginger_lemon_tea.png --rw-rw---- 1 root sdcard_rw 7719 2022-07-04 10:45 bn_hot_Ginger_tea.png --rw-rw---- 1 root sdcard_rw 4919 2022-07-04 10:45 bn_hot_america_no.png --rw-rw---- 1 root sdcard_rw 8912 2022-09-14 12:45 bn_hot_america_no_Healthy.png --rw-rw---- 1 root sdcard_rw 4958 2022-07-04 10:45 bn_hot_americano_honey.png --rw-rw---- 1 root sdcard_rw 13788 2022-07-04 10:45 bn_hot_americano_light.png --rw-rw---- 1 root sdcard_rw 13262 2022-07-04 10:45 bn_hot_americano_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 12497 2022-07-04 10:45 bn_hot_americano_light_geisha.png --rw-rw---- 1 root sdcard_rw 13114 2022-07-04 10:45 bn_hot_americano_light_mozart.png --rw-rw---- 1 root sdcard_rw 12497 2022-07-04 10:45 bn_hot_americano_light_peacher.png --rw-rw---- 1 root sdcard_rw 12772 2022-07-04 10:45 bn_hot_americano_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 14499 2022-07-04 10:45 bn_hot_americano_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 14006 2022-07-04 10:45 bn_hot_americano_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 13513 2022-07-04 10:45 bn_hot_americano_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 8328 2022-09-14 12:45 bn_hot_blacktea.png --rw-rw---- 1 root sdcard_rw 7600 2022-07-04 10:45 bn_hot_blueberry_tea.png --rw-rw---- 1 root sdcard_rw 5266 2022-07-04 10:45 bn_hot_cappuccino.png --rw-rw---- 1 root sdcard_rw 5557 2022-07-04 10:45 bn_hot_caramel_latte.png --rw-rw---- 1 root sdcard_rw 7060 2022-07-04 10:45 bn_hot_chrysanthemum_tea.png --rw-rw---- 1 root sdcard_rw 5543 2022-07-04 10:45 bn_hot_coffee_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 3778 2022-07-04 10:45 bn_hot_double_espresso.png --rw-rw---- 1 root sdcard_rw 3656 2022-07-04 10:45 bn_hot_espresso.png --rw-rw---- 1 root sdcard_rw 12188 2022-07-04 10:45 bn_hot_espresso_light.png --rw-rw---- 1 root sdcard_rw 11786 2022-07-04 10:45 bn_hot_espresso_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 10915 2022-07-04 10:45 bn_hot_espresso_light_geisha.png --rw-rw---- 1 root sdcard_rw 11520 2022-07-04 10:45 bn_hot_espresso_light_mozart.png --rw-rw---- 1 root sdcard_rw 10888 2022-07-04 10:45 bn_hot_espresso_light_peacher.png --rw-rw---- 1 root sdcard_rw 11250 2022-07-04 10:45 bn_hot_espresso_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 12895 2022-07-04 10:45 bn_hot_espresso_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 12384 2022-07-04 10:45 bn_hot_espresso_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 11933 2022-07-04 10:45 bn_hot_espresso_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 5542 2022-07-04 10:45 bn_hot_greenteacoffee_lattle.png --rw-rw---- 1 root sdcard_rw 4525 2022-07-04 10:45 bn_hot_hojicha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 8552 2022-09-14 12:45 bn_hot_hojicha_milk_tea_sing_Healthy.png --rw-rw---- 1 root sdcard_rw 4295 2022-10-10 14:32 bn_hot_hojicha_tea_sing.png --rw-rw---- 1 root sdcard_rw 5557 2022-07-04 10:45 bn_hot_honey_latte.png --rw-rw---- 1 root sdcard_rw 5250 2022-07-04 10:45 bn_hot_latte.png --rw-rw---- 1 root sdcard_rw 9233 2022-09-14 12:45 bn_hot_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 8348 2022-07-04 10:45 bn_hot_lime_Matcha.png --rw-rw---- 1 root sdcard_rw 9944 2022-07-04 10:45 bn_hot_lime_Matcha_Honey.png --rw-rw---- 1 root sdcard_rw 9830 2022-07-04 10:45 bn_hot_lime_Oolong_Honey_tea.png --rw-rw---- 1 root sdcard_rw 8271 2022-07-04 10:45 bn_hot_lime_Oolong_tea.png --rw-rw---- 1 root sdcard_rw 12165 2022-09-14 12:45 bn_hot_lime_Oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 8388 2022-07-04 10:45 bn_hot_lime_tea.png --rw-rw---- 1 root sdcard_rw 9963 2022-07-04 10:45 bn_hot_lime_tea_Honey.png --rw-rw---- 1 root sdcard_rw 12273 2022-09-14 12:45 bn_hot_limeblack tea_Healthy.png --rw-rw---- 1 root sdcard_rw 8388 2022-07-04 10:45 bn_hot_limeblack_tea.png --rw-rw---- 1 root sdcard_rw 5201 2022-07-04 10:45 bn_hot_lychee_espresso.png --rw-rw---- 1 root sdcard_rw 8113 2022-07-04 10:45 bn_hot_lychee_tea.png --rw-rw---- 1 root sdcard_rw 9861 2022-07-04 10:45 bn_hot_marijuana_tea.png --rw-rw---- 1 root sdcard_rw 8560 2022-09-14 12:45 bn_hot_matcha_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 4534 2022-07-04 10:45 bn_hot_matcha_milk_tea.png --rw-rw---- 1 root sdcard_rw 4534 2022-07-04 10:45 bn_hot_matcha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 4296 2022-07-04 10:45 bn_hot_matcha_tea.png --rw-rw---- 1 root sdcard_rw 8318 2022-09-14 12:45 bn_hot_matcha_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 4296 2022-07-04 10:45 bn_hot_matcha_tea_sing.png --rw-rw---- 1 root sdcard_rw 5594 2022-07-04 10:45 bn_hot_mocha.png --rw-rw---- 1 root sdcard_rw 9491 2022-09-14 12:45 bn_hot_mocha_Healthy.png --rw-rw---- 1 root sdcard_rw 4219 2022-07-04 10:45 bn_hot_oolong_tea.png --rw-rw---- 1 root sdcard_rw 8239 2022-09-14 12:45 bn_hot_oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 8740 2022-07-04 10:45 bn_hot_strawberry_tea.png --rw-rw---- 1 root sdcard_rw 4517 2022-07-04 10:45 bn_hot_taiwan_milk_tea.png --rw-rw---- 1 root sdcard_rw 8471 2022-07-04 10:45 bn_hot_taiwan_milk_tea_Jason.png --rw-rw---- 1 root sdcard_rw 8407 2022-09-14 12:45 bn_hot_taiwan_milk_tea_Jason_Healthy.png --rw-rw---- 1 root sdcard_rw 5569 2022-07-04 10:45 bn_hot_taiwantea_macchiato.png --rw-rw---- 1 root sdcard_rw 4522 2022-07-04 10:45 bn_hot_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 8582 2022-09-14 12:45 bn_hot_thai_milk_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 4522 2022-07-04 10:45 bn_hot_thai_milk_tea_tacc.png --rw-rw---- 1 root sdcard_rw 4312 2022-07-04 10:45 bn_hot_thai_tea.png --rw-rw---- 1 root sdcard_rw 5515 2022-07-04 10:45 bn_hot_thai_tea_coffee.png --rw-rw---- 1 root sdcard_rw 9345 2022-07-04 10:45 bn_hot_ume_tea.png --rw-rw---- 1 root sdcard_rw 3591 2022-07-04 10:45 bn_iced.png --rw-rw---- 1 root sdcard_rw 8002 2022-07-04 10:45 bn_iced_7up.png --rw-rw---- 1 root sdcard_rw 4161 2022-07-04 10:45 bn_iced_Black_Sugar_Milk.png --rw-rw---- 1 root sdcard_rw 9299 2022-07-04 10:45 bn_iced_Black_Sugar_Milk_smoothie.png --rw-rw---- 1 root sdcard_rw 9044 2022-07-04 10:45 bn_iced_Cokecola.png --rw-rw---- 1 root sdcard_rw 11628 2022-07-04 10:45 bn_iced_Ginger_soda.png --rw-rw---- 1 root sdcard_rw 13628 2022-07-04 10:45 bn_iced_Gingerlime_soda.png --rw-rw---- 1 root sdcard_rw 7873 2022-07-04 10:45 bn_iced_Lychee.png --rw-rw---- 1 root sdcard_rw 10841 2022-07-04 10:45 bn_iced_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 12492 2022-07-04 10:45 bn_iced_Lychee_soda.png --rw-rw---- 1 root sdcard_rw 11435 2022-07-04 10:45 bn_iced_Mango_soda.png --rw-rw---- 1 root sdcard_rw 10389 2022-07-04 10:45 bn_iced_Milk_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 12099 2022-07-04 10:45 bn_iced_Ovalcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 9784 2022-07-04 10:45 bn_iced_americano_soda.png --rw-rw---- 1 root sdcard_rw 7126 2022-07-04 10:45 bn_iced_blueberry.png --rw-rw---- 1 root sdcard_rw 11660 2022-07-04 10:45 bn_iced_blueberry_soda.png --rw-rw---- 1 root sdcard_rw 4166 2022-07-04 10:45 bn_iced_caramel.png --rw-rw---- 1 root sdcard_rw 4078 2022-07-04 10:45 bn_iced_caramel_cocoa.png --rw-rw---- 1 root sdcard_rw 7760 2022-07-04 10:45 bn_iced_caramel_latte_smoothie.png --rw-rw---- 1 root sdcard_rw 7519 2022-07-04 10:45 bn_iced_caramelcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 4032 2022-07-04 10:45 bn_iced_cocoa.png --rw-rw---- 1 root sdcard_rw 8111 2022-09-14 12:45 bn_iced_cocoa_Healthy.png --rw-rw---- 1 root sdcard_rw 8846 2022-07-04 10:45 bn_iced_cocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 6024 2022-07-04 10:45 bn_iced_energy_drink.png --rw-rw---- 1 root sdcard_rw 9363 2022-07-04 10:45 bn_iced_energy_drink_lime_soda.png --rw-rw---- 1 root sdcard_rw 7595 2022-07-04 10:45 bn_iced_energy_drink_soda.png --rw-rw---- 1 root sdcard_rw 5258 2022-07-04 10:45 bn_iced_epsresso.png --rw-rw---- 1 root sdcard_rw 9036 2022-07-04 10:45 bn_iced_epsresso_smoothie.png --rw-rw---- 1 root sdcard_rw 17042 2022-07-04 10:45 bn_iced_hemp_lime_soda.png --rw-rw---- 1 root sdcard_rw 14891 2022-07-04 10:45 bn_iced_hemp_soda.png --rw-rw---- 1 root sdcard_rw 7926 2022-07-04 10:45 bn_iced_honeymilk.png --rw-rw---- 1 root sdcard_rw 8200 2022-07-04 10:45 bn_iced_lemonade.png --rw-rw---- 1 root sdcard_rw 9873 2022-07-04 10:45 bn_iced_lemonade_honey.png --rw-rw---- 1 root sdcard_rw 14216 2022-07-04 10:45 bn_iced_lemonade_honey_soda.png --rw-rw---- 1 root sdcard_rw 11022 2022-07-04 10:45 bn_iced_lemonade_smoothie.png --rw-rw---- 1 root sdcard_rw 12879 2022-07-04 10:45 bn_iced_lemonade_soda.png --rw-rw---- 1 root sdcard_rw 16960 2022-09-14 12:45 bn_iced_lemonade_soda_Healthy.png --rw-rw---- 1 root sdcard_rw 6704 2022-07-04 10:45 bn_iced_mango.png --rw-rw---- 1 root sdcard_rw 8023 2022-07-04 10:45 bn_iced_matcha_milk_tea_smoothie-1.png --rw-rw---- 1 root sdcard_rw 7956 2022-07-04 10:45 bn_iced_matcha_milk_tea_smoothie.png --rw-rw---- 1 root sdcard_rw 13709 2022-07-04 10:45 bn_iced_melon_soda.png --rw-rw---- 1 root sdcard_rw 4100 2022-07-04 10:45 bn_iced_milk.png --rw-rw---- 1 root sdcard_rw 8163 2022-09-14 12:45 bn_iced_milk_Healthy.png --rw-rw---- 1 root sdcard_rw 4104 2022-07-04 10:45 bn_iced_ovaltine.png --rw-rw---- 1 root sdcard_rw 7564 2022-07-04 10:45 bn_iced_pepsi.png --rw-rw---- 1 root sdcard_rw 14400 2022-07-04 10:45 bn_iced_pepsi_Melon.png --rw-rw---- 1 root sdcard_rw 14976 2022-07-04 10:45 bn_iced_pepsi_plum.png --rw-rw---- 1 root sdcard_rw 9848 2022-07-04 10:45 bn_iced_slushie.png --rw-rw---- 1 root sdcard_rw 11404 2022-07-04 10:45 bn_iced_slushieplum.png --rw-rw---- 1 root sdcard_rw 6987 2022-06-13 18:43 bn_iced_soda.png --rw-rw---- 1 root sdcard_rw 12891 2022-07-04 10:45 bn_iced_sprite.png --rw-rw---- 1 root sdcard_rw 8541 2022-07-04 10:45 bn_iced_strawberry.png --rw-rw---- 1 root sdcard_rw 11217 2022-07-04 10:45 bn_iced_strawberry_smoothie.png --rw-rw---- 1 root sdcard_rw 12489 2022-07-04 10:45 bn_iced_strawberry_soda.png --rw-rw---- 1 root sdcard_rw 10376 2022-07-04 10:45 bn_iced_strawberrycocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 10177 2022-07-04 10:45 bn_iced_strawberrymilk_smoothie.png --rw-rw---- 1 root sdcard_rw 9428 2022-07-04 10:45 bn_iced_ume_drink.png --rw-rw---- 1 root sdcard_rw 12166 2022-07-04 10:45 bn_iced_ume_drink_smoothie.png --rw-rw---- 1 root sdcard_rw 15114 2022-07-04 10:45 bn_iced_ume_lime_soda.png --rw-rw---- 1 root sdcard_rw 14145 2022-07-04 10:45 bn_iced_ume_soda.png --rw-rw---- 1 root sdcard_rw 12311 2022-07-04 10:45 bn_iced_yuzu_soda.png --rw-rw---- 1 root sdcard_rw 5531 2022-07-04 10:45 bn_kuromitsu_coffee.png --rw-rw---- 1 root sdcard_rw 12232 2022-09-14 12:45 bn_limande_Healthy.png --rw-rw---- 1 root sdcard_rw 5551 2022-07-04 10:45 bn_melon_americano.png --rw-rw---- 1 root sdcard_rw 4162 2022-07-04 10:45 bn_pink_milk.png --rw-rw---- 1 root sdcard_rw 9279 2022-07-04 10:45 bn_pink_milk_smoothie.png --rw-rw---- 1 root sdcard_rw 13933 2022-07-04 10:45 bn_protein_Blueberry.png --rw-rw---- 1 root sdcard_rw 12587 2022-07-04 10:45 bn_protein_Chocolate.png --rw-rw---- 1 root sdcard_rw 16399 2022-08-03 13:32 bn_protein_Chocolate_BDMS.png --rw-rw---- 1 root sdcard_rw 12824 2022-07-04 10:45 bn_protein_Mango.png --rw-rw---- 1 root sdcard_rw 12474 2022-07-04 10:45 bn_protein_Matcha.png --rw-rw---- 1 root sdcard_rw 16354 2022-08-03 13:32 bn_protein_Matcha_BDMS.png --rw-rw---- 1 root sdcard_rw 13152 2022-07-04 10:45 bn_protein_Strawberry.png --rw-rw---- 1 root sdcard_rw 12530 2022-07-04 10:45 bn_protein_Taiwantea.png --rw-rw---- 1 root sdcard_rw 12528 2022-07-04 10:45 bn_protein_Thaitea.png --rw-rw---- 1 root sdcard_rw 16429 2022-08-03 13:32 bn_protein_Thaitea_BDMS.png --rw-rw---- 1 root sdcard_rw 11031 2022-07-04 10:45 bn_protein_caramel.png --rw-rw---- 1 root sdcard_rw 11735 2022-07-04 10:45 bn_protein_espresso.png --rw-rw---- 1 root sdcard_rw 15361 2022-08-03 13:32 bn_protein_espresso_BDMS.png --rw-rw---- 1 root sdcard_rw 10210 2022-07-04 10:45 bn_protein_isolated.png --rw-rw---- 1 root sdcard_rw 13837 2022-07-04 10:45 bn_protein_kokuto.png --rw-rw---- 1 root sdcard_rw 14941 2022-07-04 10:45 bn_protein_melon.png --rw-rw---- 1 root sdcard_rw 13113 2022-07-04 10:45 bn_protein_milk.png --rw-rw---- 1 root sdcard_rw 15585 2022-07-04 10:45 bn_protein_oreo.png --rw-rw---- 1 root sdcard_rw 18620 2022-08-03 13:32 bn_protein_original_BDMS.png --rw-rw---- 1 root sdcard_rw 7706 2022-07-04 10:45 bn_sala.png --rw-rw---- 1 root sdcard_rw 13430 2022-07-04 10:45 bn_sala_lime.png --rw-rw---- 1 root sdcard_rw 14580 2022-07-04 10:45 bn_sala_lime_soda.png --rw-rw---- 1 root sdcard_rw 13091 2022-07-04 10:45 bn_sala_soda.png --rw-rw---- 1 root sdcard_rw 14514 2022-07-04 10:45 bn_smoothie_oreo.png --rw-rw---- 1 root sdcard_rw 11532 2022-07-04 10:45 bn_smoothie_ovaltine.png --rw-rw---- 1 root sdcard_rw 5260 2022-07-04 10:45 bn_soda.png --rw-rw---- 1 root sdcard_rw 15531 2022-07-04 10:45 bn_strawberry_lime_soda.png --rw-rw---- 1 root sdcard_rw 2584 2022-07-04 10:45 bn_water_roomtemp.png --rw-rw---- 1 root sdcard_rw 2761 2022-06-23 22:34 waterglass-1.png --rw-rw---- 1 root sdcard_rw 6255 2022-06-23 22:34 waterglass.png - -./page_drink_picture2_n: -total 5080 --rw-rw---- 1 root sdcard_rw 9976 2022-07-04 10:48 CHOCO & CARAMEL.png --rw-rw---- 1 root sdcard_rw 3227 2022-07-04 10:48 COFFEE.png --rw-rw---- 1 root sdcard_rw 3770 2022-07-04 10:48 Protein.png --rw-rw---- 1 root sdcard_rw 8871 2022-07-04 10:48 Softdrink & other.png --rw-rw---- 1 root sdcard_rw 1635 2022-07-04 10:48 TEA.png --rw-rw---- 1 root sdcard_rw 16469 2022-07-04 10:48 bn_Congee.png --rw-rw---- 1 root sdcard_rw 27667 2022-07-04 10:48 bn_Lychee_lime_soda.png --rw-rw---- 1 root sdcard_rw 21654 2022-07-04 10:48 bn_Melon_smoothie.png --rw-rw---- 1 root sdcard_rw 10841 2022-07-04 10:48 bn_Yuzu_americano.png --rw-rw---- 1 root sdcard_rw 20238 2022-07-04 10:48 bn_Yuzu_smoothie.png --rw-rw---- 1 root sdcard_rw 31987 2022-07-04 10:48 bn_dirty_light.png --rw-rw---- 1 root sdcard_rw 30362 2022-07-04 10:48 bn_dirty_light__peacher.png --rw-rw---- 1 root sdcard_rw 34020 2022-07-04 10:48 bn_dirty_light__snowwhite.png --rw-rw---- 1 root sdcard_rw 32025 2022-07-04 10:48 bn_dirty_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 30119 2022-07-04 10:48 bn_dirty_light_geisha.png --rw-rw---- 1 root sdcard_rw 31928 2022-07-04 10:48 bn_dirty_light_mozart.png --rw-rw---- 1 root sdcard_rw 31440 2022-07-04 10:48 bn_dirty_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 34380 2022-07-04 10:48 bn_dirty_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 32094 2022-07-04 10:48 bn_dirty_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 11664 2022-07-04 10:48 bn_diy.png --rw-rw---- 1 root sdcard_rw 9515 2022-07-04 10:48 bn_hot_Black_Sugar_Milk_Tea.png --rw-rw---- 1 root sdcard_rw 41507 2022-09-14 13:08 bn_hot_Cappu_Healthy.png --rw-rw---- 1 root sdcard_rw 20659 2022-07-04 10:48 bn_hot_Ginger_lemon_tea.png --rw-rw---- 1 root sdcard_rw 15587 2022-07-04 10:48 bn_hot_Ginger_tea.png --rw-rw---- 1 root sdcard_rw 41384 2022-09-14 13:08 bn_hot_Mocha_Healthy.png --rw-rw---- 1 root sdcard_rw 10197 2022-07-04 10:48 bn_hot_america_no.png --rw-rw---- 1 root sdcard_rw 38503 2022-09-14 13:08 bn_hot_america_no_Healthy.png --rw-rw---- 1 root sdcard_rw 9967 2022-07-04 10:48 bn_hot_americano_honey.png --rw-rw---- 1 root sdcard_rw 28774 2022-07-04 10:48 bn_hot_americano_light.png --rw-rw---- 1 root sdcard_rw 28009 2022-07-04 10:48 bn_hot_americano_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 25921 2022-07-04 10:48 bn_hot_americano_light_geisha.png --rw-rw---- 1 root sdcard_rw 27958 2022-07-04 10:48 bn_hot_americano_light_mozart.png --rw-rw---- 1 root sdcard_rw 26006 2022-07-04 10:48 bn_hot_americano_light_peacher.png --rw-rw---- 1 root sdcard_rw 26886 2022-07-04 10:48 bn_hot_americano_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 30278 2022-07-04 10:48 bn_hot_americano_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 29707 2022-07-04 10:48 bn_hot_americano_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 27818 2022-07-04 10:48 bn_hot_americano_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 37429 2022-09-14 13:08 bn_hot_blacktea.png --rw-rw---- 1 root sdcard_rw 14941 2022-07-04 10:48 bn_hot_blueberry_tea.png --rw-rw---- 1 root sdcard_rw 10388 2022-07-04 10:48 bn_hot_cappuccino.png --rw-rw---- 1 root sdcard_rw 11183 2022-07-04 10:48 bn_hot_caramel_latte.png --rw-rw---- 1 root sdcard_rw 14331 2022-07-04 10:48 bn_hot_chrysanthemum_tea.png --rw-rw---- 1 root sdcard_rw 10921 2022-07-04 10:48 bn_hot_coffee_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 7484 2022-07-04 10:48 bn_hot_double_espresso.png --rw-rw---- 1 root sdcard_rw 7774 2022-07-04 10:48 bn_hot_espresso.png --rw-rw---- 1 root sdcard_rw 25947 2022-07-04 10:48 bn_hot_espresso_light.png --rw-rw---- 1 root sdcard_rw 25211 2022-07-04 10:48 bn_hot_espresso_light_bluedaddy.png --rw-rw---- 1 root sdcard_rw 23149 2022-07-04 10:48 bn_hot_espresso_light_geisha.png --rw-rw---- 1 root sdcard_rw 24618 2022-07-04 10:48 bn_hot_espresso_light_mozart.png --rw-rw---- 1 root sdcard_rw 23249 2022-07-04 10:48 bn_hot_espresso_light_peacher.png --rw-rw---- 1 root sdcard_rw 24228 2022-07-04 10:48 bn_hot_espresso_light_pure_beauty.png --rw-rw---- 1 root sdcard_rw 27228 2022-07-04 10:48 bn_hot_espresso_light_rosalyn.png --rw-rw---- 1 root sdcard_rw 26762 2022-07-04 10:48 bn_hot_espresso_light_snowwhite.png --rw-rw---- 1 root sdcard_rw 24914 2022-07-04 10:48 bn_hot_espresso_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 11208 2022-07-04 10:48 bn_hot_greenteacoffee_lattle.png --rw-rw---- 1 root sdcard_rw 9478 2022-07-04 10:48 bn_hot_hojicha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 37580 2022-09-14 13:08 bn_hot_hojicha_milk_tea_sing_Healthy.png --rw-rw---- 1 root sdcard_rw 9032 2022-10-10 14:32 bn_hot_hojicha_tea_sing.png --rw-rw---- 1 root sdcard_rw 11210 2022-07-04 10:48 bn_hot_honey_latte.png --rw-rw---- 1 root sdcard_rw 10361 2022-07-04 10:48 bn_hot_latte.png --rw-rw---- 1 root sdcard_rw 41338 2022-09-14 13:08 bn_hot_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 15968 2022-07-04 10:48 bn_hot_lime_Matcha.png --rw-rw---- 1 root sdcard_rw 18293 2022-07-04 10:48 bn_hot_lime_Matcha_Honey.png --rw-rw---- 1 root sdcard_rw 18190 2022-07-04 10:48 bn_hot_lime_Oolong_Honey_tea.png --rw-rw---- 1 root sdcard_rw 15425 2022-09-11 00:58 bn_hot_lime_Oolong_tea.png --rw-rw---- 1 root sdcard_rw 42620 2022-09-14 13:08 bn_hot_lime_Oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 16086 2022-07-04 10:48 bn_hot_lime_tea.png --rw-rw---- 1 root sdcard_rw 18313 2022-07-04 10:48 bn_hot_lime_tea_Honey.png --rw-rw---- 1 root sdcard_rw 43496 2022-09-14 13:08 bn_hot_limeblack tea_Healthy.png --rw-rw---- 1 root sdcard_rw 16061 2022-07-04 10:48 bn_hot_limeblack_tea.png --rw-rw---- 1 root sdcard_rw 10602 2022-07-04 10:48 bn_hot_lychee_espresso.png --rw-rw---- 1 root sdcard_rw 15422 2022-07-04 10:48 bn_hot_lychee_tea.png --rw-rw---- 1 root sdcard_rw 17576 2022-07-04 10:48 bn_hot_marijuana_tea.png --rw-rw---- 1 root sdcard_rw 39539 2022-09-14 13:08 bn_hot_matcha_latte_Healthy.png --rw-rw---- 1 root sdcard_rw 9519 2022-07-04 10:48 bn_hot_matcha_milk_tea.png --rw-rw---- 1 root sdcard_rw 9315 2022-07-04 10:48 bn_hot_matcha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 9003 2022-07-04 10:48 bn_hot_matcha_tea.png --rw-rw---- 1 root sdcard_rw 38110 2022-09-14 13:08 bn_hot_matcha_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 9222 2022-07-04 10:48 bn_hot_matcha_tea_sing.png --rw-rw---- 1 root sdcard_rw 11147 2022-07-04 10:48 bn_hot_mocha.png --rw-rw---- 1 root sdcard_rw 9051 2022-07-04 10:48 bn_hot_oolong_tea.png --rw-rw---- 1 root sdcard_rw 37664 2022-09-14 13:08 bn_hot_oolong_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 16858 2022-07-04 10:48 bn_hot_strawberry_tea.png --rw-rw---- 1 root sdcard_rw 9479 2022-07-04 10:48 bn_hot_taiwan_milk_tea.png --rw-rw---- 1 root sdcard_rw 16406 2022-07-04 10:48 bn_hot_taiwan_milk_tea_Jason.png --rw-rw---- 1 root sdcard_rw 39484 2022-09-14 13:08 bn_hot_taiwan_milk_tea_Jason_Healthy.png --rw-rw---- 1 root sdcard_rw 10949 2022-07-04 10:48 bn_hot_taiwantea_macchiato.png --rw-rw---- 1 root sdcard_rw 9267 2022-07-04 10:48 bn_hot_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 39367 2022-09-14 13:08 bn_hot_thai_milk_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 9450 2022-07-04 10:48 bn_hot_thai_milk_tea_tacc.png --rw-rw---- 1 root sdcard_rw 9142 2022-07-04 10:48 bn_hot_thai_tea.png --rw-rw---- 1 root sdcard_rw 41387 2022-09-11 00:58 bn_hot_thai_tea_Healthy.png --rw-rw---- 1 root sdcard_rw 11118 2022-07-04 10:48 bn_hot_thai_tea_coffee.png --rw-rw---- 1 root sdcard_rw 18720 2022-07-04 10:48 bn_hot_ume_tea.png --rw-rw---- 1 root sdcard_rw 7425 2022-07-04 10:48 bn_iced.png --rw-rw---- 1 root sdcard_rw 16581 2022-07-04 10:48 bn_iced_7up.png --rw-rw---- 1 root sdcard_rw 8512 2022-07-04 10:48 bn_iced_Black_Sugar_Milk.png --rw-rw---- 1 root sdcard_rw 18361 2022-07-04 10:48 bn_iced_Black_Sugar_Milk_smoothie.png --rw-rw---- 1 root sdcard_rw 19196 2022-07-04 10:48 bn_iced_Cokecola.png --rw-rw---- 1 root sdcard_rw 23069 2022-07-04 10:48 bn_iced_Ginger_soda.png --rw-rw---- 1 root sdcard_rw 26831 2022-07-04 10:48 bn_iced_Gingerlime_soda.png --rw-rw---- 1 root sdcard_rw 15224 2022-07-04 10:48 bn_iced_Lychee.png --rw-rw---- 1 root sdcard_rw 20520 2022-07-04 10:48 bn_iced_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 25495 2022-07-04 10:48 bn_iced_Lychee_soda.png --rw-rw---- 1 root sdcard_rw 23461 2022-07-04 10:48 bn_iced_Mango_soda.png --rw-rw---- 1 root sdcard_rw 20157 2022-07-04 10:48 bn_iced_Milk_Lychee_smoothie.png --rw-rw---- 1 root sdcard_rw 24528 2022-07-04 10:48 bn_iced_Ovalcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 21957 2022-07-04 10:48 bn_iced_americano_soda.png --rw-rw---- 1 root sdcard_rw 14266 2022-07-04 10:48 bn_iced_blueberry.png --rw-rw---- 1 root sdcard_rw 25384 2022-07-04 10:48 bn_iced_blueberry_soda.png --rw-rw---- 1 root sdcard_rw 8534 2022-07-04 10:48 bn_iced_caramel.png --rw-rw---- 1 root sdcard_rw 8423 2022-07-04 10:48 bn_iced_caramel_cocoa.png --rw-rw---- 1 root sdcard_rw 15365 2022-07-04 10:48 bn_iced_caramel_latte_smoothie.png --rw-rw---- 1 root sdcard_rw 14704 2022-07-04 10:48 bn_iced_caramelcocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 8480 2022-07-04 10:48 bn_iced_cocoa.png --rw-rw---- 1 root sdcard_rw 37426 2022-09-14 13:08 bn_iced_cocoa_Healthy.png --rw-rw---- 1 root sdcard_rw 17700 2022-07-04 10:48 bn_iced_cocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 12333 2022-07-04 10:48 bn_iced_energy_drink.png --rw-rw---- 1 root sdcard_rw 18355 2022-07-04 10:48 bn_iced_energy_drink_lime_soda.png --rw-rw---- 1 root sdcard_rw 15109 2022-07-04 10:48 bn_iced_energy_drink_soda.png --rw-rw---- 1 root sdcard_rw 10572 2022-07-04 10:48 bn_iced_epsresso.png --rw-rw---- 1 root sdcard_rw 17180 2022-07-04 10:48 bn_iced_epsresso_smoothie.png --rw-rw---- 1 root sdcard_rw 32213 2022-07-04 10:48 bn_iced_hemp_lime_soda.png --rw-rw---- 1 root sdcard_rw 28962 2022-07-04 10:48 bn_iced_hemp_soda.png --rw-rw---- 1 root sdcard_rw 14584 2022-07-04 10:48 bn_iced_honeymilk.png --rw-rw---- 1 root sdcard_rw 16214 2022-07-04 10:48 bn_iced_lemonade.png --rw-rw---- 1 root sdcard_rw 18852 2022-07-04 10:48 bn_iced_lemonade_honey.png --rw-rw---- 1 root sdcard_rw 28279 2022-07-04 10:48 bn_iced_lemonade_honey_soda.png --rw-rw---- 1 root sdcard_rw 21212 2022-07-04 10:48 bn_iced_lemonade_smoothie.png --rw-rw---- 1 root sdcard_rw 26323 2022-07-04 10:48 bn_iced_lemonade_soda.png --rw-rw---- 1 root sdcard_rw 51305 2022-09-14 13:08 bn_iced_lemonade_soda_Healthy.png --rw-rw---- 1 root sdcard_rw 13223 2022-07-04 10:48 bn_iced_mango.png --rw-rw---- 1 root sdcard_rw 15961 2022-07-04 10:48 bn_iced_matcha_milk_tea_smoothie-1.png --rw-rw---- 1 root sdcard_rw 16059 2022-07-04 10:48 bn_iced_matcha_milk_tea_smoothie.png --rw-rw---- 1 root sdcard_rw 28188 2022-07-04 10:48 bn_iced_melon_soda.png --rw-rw---- 1 root sdcard_rw 8561 2022-07-04 10:48 bn_iced_milk.png --rw-rw---- 1 root sdcard_rw 41876 2022-09-14 13:08 bn_iced_milk_Healthy-1.png --rw-rw---- 1 root sdcard_rw 37909 2022-09-14 13:08 bn_iced_milk_Healthy.png --rw-rw---- 1 root sdcard_rw 8431 2022-07-04 10:48 bn_iced_ovaltine.png --rw-rw---- 1 root sdcard_rw 15338 2022-07-04 10:48 bn_iced_pepsi.png --rw-rw---- 1 root sdcard_rw 28451 2022-07-04 10:48 bn_iced_pepsi_Melon.png --rw-rw---- 1 root sdcard_rw 29893 2022-07-04 10:48 bn_iced_pepsi_plum.png --rw-rw---- 1 root sdcard_rw 19775 2022-07-04 10:48 bn_iced_slushie.png --rw-rw---- 1 root sdcard_rw 22364 2022-07-04 10:48 bn_iced_slushieplum.png --rw-rw---- 1 root sdcard_rw 13343 2022-06-13 18:43 bn_iced_soda.png --rw-rw---- 1 root sdcard_rw 28993 2022-07-04 10:48 bn_iced_sprite.png --rw-rw---- 1 root sdcard_rw 16539 2022-07-04 10:48 bn_iced_strawberry.png --rw-rw---- 1 root sdcard_rw 21706 2022-07-04 10:48 bn_iced_strawberry_smoothie.png --rw-rw---- 1 root sdcard_rw 25509 2022-07-04 10:48 bn_iced_strawberry_soda.png --rw-rw---- 1 root sdcard_rw 19718 2022-07-04 10:48 bn_iced_strawberrycocoa_smoothie.png --rw-rw---- 1 root sdcard_rw 19386 2022-07-04 10:48 bn_iced_strawberrymilk_smoothie.png --rw-rw---- 1 root sdcard_rw 18855 2022-07-04 10:48 bn_iced_ume_drink.png --rw-rw---- 1 root sdcard_rw 24142 2022-07-04 10:48 bn_iced_ume_drink_smoothie.png --rw-rw---- 1 root sdcard_rw 31035 2022-07-04 10:48 bn_iced_ume_lime_soda.png --rw-rw---- 1 root sdcard_rw 29674 2022-07-04 10:48 bn_iced_ume_soda.png --rw-rw---- 1 root sdcard_rw 24966 2022-07-04 10:48 bn_iced_yuzu_soda.png --rw-rw---- 1 root sdcard_rw 10916 2022-07-04 10:48 bn_kuromitsu_coffee.png --rw-rw---- 1 root sdcard_rw 11201 2022-07-04 10:48 bn_melon_americano.png --rw-rw---- 1 root sdcard_rw 8527 2022-07-04 10:48 bn_pink_milk.png --rw-rw---- 1 root sdcard_rw 17925 2022-07-04 10:48 bn_pink_milk_smoothie.png --rw-rw---- 1 root sdcard_rw 25887 2022-07-04 10:48 bn_protein_Blueberry.png --rw-rw---- 1 root sdcard_rw 22629 2022-07-04 10:48 bn_protein_Chocolate.png --rw-rw---- 1 root sdcard_rw 33045 2022-08-03 16:32 bn_protein_Chocolate_BDMS.png --rw-rw---- 1 root sdcard_rw 23292 2022-07-04 10:48 bn_protein_Mango.png --rw-rw---- 1 root sdcard_rw 23278 2022-07-04 10:48 bn_protein_Matcha.png --rw-rw---- 1 root sdcard_rw 33546 2022-08-03 16:32 bn_protein_Matcha_BDMS.png --rw-rw---- 1 root sdcard_rw 24321 2022-07-04 10:48 bn_protein_Strawberry.png --rw-rw---- 1 root sdcard_rw 22954 2022-07-04 10:48 bn_protein_Taiwantea.png --rw-rw---- 1 root sdcard_rw 23343 2022-07-04 10:48 bn_protein_Thaitea.png --rw-rw---- 1 root sdcard_rw 33567 2022-08-03 16:32 bn_protein_Thaitea_BDMS.png --rw-rw---- 1 root sdcard_rw 20233 2022-07-04 10:48 bn_protein_caramel.png --rw-rw---- 1 root sdcard_rw 21740 2022-07-04 10:48 bn_protein_espresso.png --rw-rw---- 1 root sdcard_rw 31645 2022-08-03 16:32 bn_protein_espresso_BDMS.png --rw-rw---- 1 root sdcard_rw 19029 2022-07-04 10:48 bn_protein_isolated.png --rw-rw---- 1 root sdcard_rw 24479 2022-07-04 10:48 bn_protein_kokuto.png --rw-rw---- 1 root sdcard_rw 27002 2022-07-04 10:48 bn_protein_melon.png --rw-rw---- 1 root sdcard_rw 23176 2022-07-04 10:48 bn_protein_milk.png --rw-rw---- 1 root sdcard_rw 29836 2022-07-04 10:48 bn_protein_oreo.png --rw-rw---- 1 root sdcard_rw 38729 2022-08-03 16:32 bn_protein_original_BDMS.png --rw-rw---- 1 root sdcard_rw 14892 2022-07-04 10:48 bn_sala.png --rw-rw---- 1 root sdcard_rw 27332 2022-07-04 10:48 bn_sala_lime.png --rw-rw---- 1 root sdcard_rw 29343 2022-07-04 10:48 bn_sala_lime_soda.png --rw-rw---- 1 root sdcard_rw 27015 2022-07-04 10:48 bn_sala_soda.png --rw-rw---- 1 root sdcard_rw 28650 2022-07-04 10:48 bn_smoothie_oreo.png --rw-rw---- 1 root sdcard_rw 23370 2022-07-04 10:48 bn_smoothie_ovaltine.png --rw-rw---- 1 root sdcard_rw 11071 2022-07-04 10:48 bn_soda.png --rw-rw---- 1 root sdcard_rw 31095 2022-07-04 10:48 bn_strawberry_lime_soda.png --rw-rw---- 1 root sdcard_rw 6001 2022-07-04 10:48 bn_water_roomtemp.png --rw-rw---- 1 root sdcard_rw 5359 2022-07-03 22:20 green-tea 4.png - ./page_drink_press_n: -total 2880 +total 3076 -rw-rw---- 1 root sdcard_rw 9060 2022-07-04 10:47 CHOCO & CARAMEL.png -rw-rw---- 1 root sdcard_rw 2746 2022-07-04 10:47 COFFEE.png -rw-rw---- 1 root sdcard_rw 7748 2022-09-11 01:33 Group 945_Healthy.png -rw-rw---- 1 root sdcard_rw 3376 2022-07-04 10:47 Protein.png -rw-rw---- 1 root sdcard_rw 7406 2022-07-04 10:47 Softdrink & other.png -rw-rw---- 1 root sdcard_rw 1381 2022-07-04 10:47 TEA.png +-rw-rw---- 1 root sdcard_rw 9006 2022-11-09 14:25 bn_Alcohol_Bedroom_Story.png +-rw-rw---- 1 root sdcard_rw 9916 2022-11-09 14:25 bn_Alcohol_Forever_Love.png +-rw-rw---- 1 root sdcard_rw 13093 2022-11-09 14:25 bn_Alcohol_Gale_Jail.png +-rw-rw---- 1 root sdcard_rw 6801 2022-11-09 14:25 bn_Alcohol_Good_Night_Kiss.png +-rw-rw---- 1 root sdcard_rw 11128 2022-11-09 14:25 bn_Alcohol_ILYSB.png +-rw-rw---- 1 root sdcard_rw 9435 2022-11-09 14:25 bn_Alcohol_Long_Night.png +-rw-rw---- 1 root sdcard_rw 10633 2022-11-09 14:25 bn_Alcohol_Love_Potion.png +-rw-rw---- 1 root sdcard_rw 10243 2022-11-09 14:25 bn_Alcohol_Oriental_Kink.png +-rw-rw---- 1 root sdcard_rw 4904 2022-11-09 14:25 bn_Alcohol_Pinky_Promise.png +-rw-rw---- 1 root sdcard_rw 10059 2022-11-09 14:25 bn_Alcohol_Third_Behind_Bars.png -rw-rw---- 1 root sdcard_rw 8826 2022-07-04 10:47 bn_Congee.png -rw-rw---- 1 root sdcard_rw 13889 2022-07-04 10:47 bn_Lychee_lime_soda.png -rw-rw---- 1 root sdcard_rw 11074 2022-07-04 10:47 bn_Melon_smoothie.png @@ -725,11 +154,11 @@ total 2880 -rw-rw---- 1 root sdcard_rw 15091 2022-07-04 10:47 bn_dirty_light_whiskydude.png -rw-rw---- 1 root sdcard_rw 5658 2022-07-04 10:47 bn_diy.png -rw-rw---- 1 root sdcard_rw 4375 2022-07-04 10:47 bn_hot_Black_Sugar_Milk_Tea.png --rw-rw---- 1 root sdcard_rw 9005 2022-09-14 12:46 bn_hot_Cappu_Healthy.png +-rw-rw---- 1 root sdcard_rw 9017 2022-10-19 14:23 bn_hot_Cappu_Healthy.png -rw-rw---- 1 root sdcard_rw 10426 2022-07-04 10:47 bn_hot_Ginger_lemon_tea.png -rw-rw---- 1 root sdcard_rw 7620 2022-07-04 10:47 bn_hot_Ginger_tea.png -rw-rw---- 1 root sdcard_rw 4672 2022-07-04 10:47 bn_hot_america_no.png --rw-rw---- 1 root sdcard_rw 8631 2022-09-14 12:46 bn_hot_america_no_Healthy.png +-rw-rw---- 1 root sdcard_rw 8645 2022-10-19 14:23 bn_hot_america_no_Healthy.png -rw-rw---- 1 root sdcard_rw 4720 2022-07-04 10:47 bn_hot_americano_honey.png -rw-rw---- 1 root sdcard_rw 13474 2022-07-04 10:47 bn_hot_americano_light.png -rw-rw---- 1 root sdcard_rw 12906 2022-07-04 10:47 bn_hot_americano_light_bluedaddy.png @@ -740,7 +169,7 @@ total 2880 -rw-rw---- 1 root sdcard_rw 14319 2022-07-04 10:47 bn_hot_americano_light_rosalyn.png -rw-rw---- 1 root sdcard_rw 13777 2022-07-04 10:47 bn_hot_americano_light_snowwhite.png -rw-rw---- 1 root sdcard_rw 13281 2022-07-04 10:47 bn_hot_americano_light_whiskydude.png --rw-rw---- 1 root sdcard_rw 8058 2022-09-14 12:46 bn_hot_blacktea.png +-rw-rw---- 1 root sdcard_rw 8058 2022-10-19 14:23 bn_hot_blacktea.png -rw-rw---- 1 root sdcard_rw 7363 2022-07-04 10:47 bn_hot_blueberry_tea.png -rw-rw---- 1 root sdcard_rw 5036 2022-07-04 10:47 bn_hot_cappuccino.png -rw-rw---- 1 root sdcard_rw 5298 2022-07-04 10:47 bn_hot_caramel_latte.png @@ -759,40 +188,40 @@ total 2880 -rw-rw---- 1 root sdcard_rw 11789 2022-07-04 10:47 bn_hot_espresso_light_whiskydude.png -rw-rw---- 1 root sdcard_rw 5278 2022-07-04 10:47 bn_hot_greenteacoffee_lattle.png -rw-rw---- 1 root sdcard_rw 4289 2022-07-04 10:47 bn_hot_hojicha_milk_tea_sing.png --rw-rw---- 1 root sdcard_rw 8266 2022-09-14 12:46 bn_hot_hojicha_milk_tea_sing_Healthy.png +-rw-rw---- 1 root sdcard_rw 8266 2022-10-19 14:23 bn_hot_hojicha_milk_tea_sing_Healthy.png -rw-rw---- 1 root sdcard_rw 4056 2022-10-10 14:31 bn_hot_hojicha_tea_sing.png -rw-rw---- 1 root sdcard_rw 5330 2022-07-04 10:47 bn_hot_honey_latte.png -rw-rw---- 1 root sdcard_rw 5016 2022-07-04 10:47 bn_hot_latte.png --rw-rw---- 1 root sdcard_rw 8972 2022-09-14 12:46 bn_hot_latte_Healthy.png +-rw-rw---- 1 root sdcard_rw 8978 2022-10-19 14:23 bn_hot_latte_Healthy.png -rw-rw---- 1 root sdcard_rw 8094 2022-07-04 10:47 bn_hot_lime_Matcha.png -rw-rw---- 1 root sdcard_rw 9739 2022-07-04 10:47 bn_hot_lime_Matcha_Honey.png -rw-rw---- 1 root sdcard_rw 9622 2022-07-04 10:47 bn_hot_lime_Oolong_Honey_tea.png -rw-rw---- 1 root sdcard_rw 8033 2022-07-04 10:47 bn_hot_lime_Oolong_tea.png --rw-rw---- 1 root sdcard_rw 11882 2022-09-14 12:46 bn_hot_lime_Oolong_tea_Healthy.png +-rw-rw---- 1 root sdcard_rw 11882 2022-10-19 14:23 bn_hot_lime_Oolong_tea_Healthy.png -rw-rw---- 1 root sdcard_rw 8161 2022-07-04 10:47 bn_hot_lime_tea.png -rw-rw---- 1 root sdcard_rw 9740 2022-07-04 10:47 bn_hot_lime_tea_Honey.png --rw-rw---- 1 root sdcard_rw 12012 2022-09-14 12:46 bn_hot_limeblack tea_Healthy.png +-rw-rw---- 1 root sdcard_rw 12012 2022-10-19 14:23 bn_hot_limeblack tea_Healthy.png -rw-rw---- 1 root sdcard_rw 8161 2022-07-04 10:47 bn_hot_limeblack_tea.png -rw-rw---- 1 root sdcard_rw 4906 2022-07-04 10:47 bn_hot_lychee_espresso.png -rw-rw---- 1 root sdcard_rw 7911 2022-07-04 10:47 bn_hot_lychee_tea.png -rw-rw---- 1 root sdcard_rw 9684 2022-07-04 10:47 bn_hot_marijuana_tea.png --rw-rw---- 1 root sdcard_rw 8224 2022-09-14 12:46 bn_hot_matcha_latte_Healthy.png +-rw-rw---- 1 root sdcard_rw 8224 2022-10-19 14:23 bn_hot_matcha_latte_Healthy.png -rw-rw---- 1 root sdcard_rw 4244 2022-07-04 10:47 bn_hot_matcha_milk_tea.png -rw-rw---- 1 root sdcard_rw 4244 2022-07-04 10:47 bn_hot_matcha_milk_tea_sing.png -rw-rw---- 1 root sdcard_rw 4034 2022-07-04 10:47 bn_hot_matcha_tea.png --rw-rw---- 1 root sdcard_rw 8014 2022-09-14 12:46 bn_hot_matcha_tea_Healthy.png +-rw-rw---- 1 root sdcard_rw 8014 2022-10-19 14:23 bn_hot_matcha_tea_Healthy.png -rw-rw---- 1 root sdcard_rw 4034 2022-07-04 10:47 bn_hot_matcha_tea_sing.png -rw-rw---- 1 root sdcard_rw 5326 2022-07-04 10:47 bn_hot_mocha.png --rw-rw---- 1 root sdcard_rw 9199 2022-09-14 12:46 bn_hot_mocha_Healthy.png +-rw-rw---- 1 root sdcard_rw 9212 2022-10-19 14:23 bn_hot_mocha_Healthy.png -rw-rw---- 1 root sdcard_rw 4032 2022-07-04 10:47 bn_hot_oolong_tea.png --rw-rw---- 1 root sdcard_rw 8010 2022-09-14 12:46 bn_hot_oolong_tea_Healthy.png +-rw-rw---- 1 root sdcard_rw 8010 2022-10-19 14:23 bn_hot_oolong_tea_Healthy.png -rw-rw---- 1 root sdcard_rw 8606 2022-07-04 10:47 bn_hot_strawberry_tea.png -rw-rw---- 1 root sdcard_rw 4303 2022-07-04 10:47 bn_hot_taiwan_milk_tea.png -rw-rw---- 1 root sdcard_rw 8494 2022-07-04 10:47 bn_hot_taiwan_milk_tea_Jason.png --rw-rw---- 1 root sdcard_rw 8291 2022-09-14 12:46 bn_hot_taiwan_milk_tea_Jason_Healthy.png +-rw-rw---- 1 root sdcard_rw 8291 2022-10-19 14:23 bn_hot_taiwan_milk_tea_Jason_Healthy.png -rw-rw---- 1 root sdcard_rw 5319 2022-07-04 10:47 bn_hot_taiwantea_macchiato.png -rw-rw---- 1 root sdcard_rw 4225 2022-07-04 10:47 bn_hot_thai_milk_tea.png --rw-rw---- 1 root sdcard_rw 8215 2022-09-14 12:46 bn_hot_thai_milk_tea_Healthy.png +-rw-rw---- 1 root sdcard_rw 8215 2022-10-19 14:23 bn_hot_thai_milk_tea_Healthy.png -rw-rw---- 1 root sdcard_rw 4225 2022-07-04 10:47 bn_hot_thai_milk_tea_tacc.png -rw-rw---- 1 root sdcard_rw 4077 2022-07-04 10:47 bn_hot_thai_tea.png -rw-rw---- 1 root sdcard_rw 5255 2022-07-04 10:47 bn_hot_thai_tea_coffee.png @@ -811,6 +240,7 @@ total 2880 -rw-rw---- 1 root sdcard_rw 10174 2022-07-04 10:47 bn_iced_Milk_Lychee_smoothie.png -rw-rw---- 1 root sdcard_rw 11778 2022-07-04 10:47 bn_iced_Ovalcocoa_smoothie.png -rw-rw---- 1 root sdcard_rw 9687 2022-07-04 10:47 bn_iced_americano_soda.png +-rw-rw---- 1 root sdcard_rw 8323 2022-11-09 14:25 bn_iced_blue.png -rw-rw---- 1 root sdcard_rw 7106 2022-07-04 10:47 bn_iced_blueberry.png -rw-rw---- 1 root sdcard_rw 11891 2022-07-04 10:47 bn_iced_blueberry_soda.png -rw-rw---- 1 root sdcard_rw 4001 2022-07-04 10:47 bn_iced_caramel.png @@ -818,7 +248,7 @@ total 2880 -rw-rw---- 1 root sdcard_rw 7504 2022-07-04 10:47 bn_iced_caramel_latte_smoothie.png -rw-rw---- 1 root sdcard_rw 7204 2022-07-04 10:47 bn_iced_caramelcocoa_smoothie.png -rw-rw---- 1 root sdcard_rw 3838 2022-07-04 10:47 bn_iced_cocoa.png --rw-rw---- 1 root sdcard_rw 7775 2022-09-14 12:46 bn_iced_cocoa_Healthy.png +-rw-rw---- 1 root sdcard_rw 7775 2022-10-19 14:23 bn_iced_cocoa_Healthy.png -rw-rw---- 1 root sdcard_rw 8282 2022-07-04 10:47 bn_iced_cocoa_smoothie.png -rw-rw---- 1 root sdcard_rw 5951 2022-07-04 10:47 bn_iced_energy_drink.png -rw-rw---- 1 root sdcard_rw 9418 2022-07-04 10:47 bn_iced_energy_drink_lime_soda.png @@ -833,13 +263,13 @@ total 2880 -rw-rw---- 1 root sdcard_rw 14214 2022-07-04 10:47 bn_iced_lemonade_honey_soda.png -rw-rw---- 1 root sdcard_rw 10728 2022-07-04 10:47 bn_iced_lemonade_smoothie.png -rw-rw---- 1 root sdcard_rw 12843 2022-07-04 10:47 bn_iced_lemonade_soda.png --rw-rw---- 1 root sdcard_rw 16718 2022-09-14 12:46 bn_iced_lemonade_soda_Healthy.png +-rw-rw---- 1 root sdcard_rw 16713 2022-10-19 14:23 bn_iced_lemonade_soda_Healthy.png -rw-rw---- 1 root sdcard_rw 6596 2022-07-04 10:47 bn_iced_mango.png -rw-rw---- 1 root sdcard_rw 7609 2022-07-04 10:47 bn_iced_matcha_milk_tea_smoothie-1.png -rw-rw---- 1 root sdcard_rw 7312 2022-07-04 10:47 bn_iced_matcha_milk_tea_smoothie.png -rw-rw---- 1 root sdcard_rw 13582 2022-07-04 10:47 bn_iced_melon_soda.png -rw-rw---- 1 root sdcard_rw 3908 2022-07-04 10:47 bn_iced_milk.png --rw-rw---- 1 root sdcard_rw 7837 2022-09-14 12:46 bn_iced_milk_Healthy.png +-rw-rw---- 1 root sdcard_rw 7837 2022-10-19 14:23 bn_iced_milk_Healthy.png -rw-rw---- 1 root sdcard_rw 3907 2022-07-04 10:47 bn_iced_ovaltine.png -rw-rw---- 1 root sdcard_rw 7469 2022-07-04 10:47 bn_iced_pepsi.png -rw-rw---- 1 root sdcard_rw 14595 2022-07-04 10:47 bn_iced_pepsi_Melon.png @@ -847,6 +277,7 @@ total 2880 -rw-rw---- 1 root sdcard_rw 9588 2022-07-04 10:47 bn_iced_slushie.png -rw-rw---- 1 root sdcard_rw 11088 2022-07-04 10:47 bn_iced_slushieplum.png -rw-rw---- 1 root sdcard_rw 6977 2022-06-13 18:43 bn_iced_soda.png +-rw-rw---- 1 root sdcard_rw 10667 2022-11-09 14:25 bn_iced_soda_blue.png -rw-rw---- 1 root sdcard_rw 12894 2022-07-04 10:47 bn_iced_sprite.png -rw-rw---- 1 root sdcard_rw 8486 2022-07-04 10:47 bn_iced_strawberry.png -rw-rw---- 1 root sdcard_rw 10994 2022-07-04 10:47 bn_iced_strawberry_smoothie.png @@ -859,7 +290,7 @@ total 2880 -rw-rw---- 1 root sdcard_rw 14158 2022-07-04 10:47 bn_iced_ume_soda.png -rw-rw---- 1 root sdcard_rw 12253 2022-07-04 10:47 bn_iced_yuzu_soda.png -rw-rw---- 1 root sdcard_rw 5331 2022-07-04 10:47 bn_kuromitsu_coffee.png --rw-rw---- 1 root sdcard_rw 11951 2022-09-14 12:46 bn_limande_Healthy.png +-rw-rw---- 1 root sdcard_rw 11951 2022-10-19 14:23 bn_limande_Healthy.png -rw-rw---- 1 root sdcard_rw 5285 2022-07-04 10:47 bn_melon_americano.png -rw-rw---- 1 root sdcard_rw 3980 2022-07-04 10:47 bn_pink_milk.png -rw-rw---- 1 root sdcard_rw 8882 2022-07-04 10:47 bn_pink_milk_smoothie.png @@ -891,3 +322,4 @@ total 2880 -rw-rw---- 1 root sdcard_rw 5250 2022-07-04 10:47 bn_soda.png -rw-rw---- 1 root sdcard_rw 15584 2022-07-04 10:47 bn_strawberry_lime_soda.png -rw-rw---- 1 root sdcard_rw 2643 2022-07-04 10:47 bn_water_roomtemp.png +drwxrwx--x 2 root sdcard_rw 4096 2021-03-19 17:41 page_drink_press_n diff --git a/image/warning/image_warning_energy_drink_en.png b/image/warning/image_warning_energy_drink_en.png new file mode 100644 index 00000000..a85048cd Binary files /dev/null and b/image/warning/image_warning_energy_drink_en.png differ diff --git a/spiral/image/page_spiral/03-02-01-0006.png b/spiral/image/page_spiral/03-02-01-0006.png new file mode 100644 index 00000000..ab8d93c0 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0006.png differ diff --git a/spiral/image/page_spiral/03-02-01-0007.png b/spiral/image/page_spiral/03-02-01-0007.png new file mode 100644 index 00000000..294c2c98 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0007.png differ diff --git a/spiral/image/page_spiral/03-02-01-0008.png b/spiral/image/page_spiral/03-02-01-0008.png new file mode 100644 index 00000000..91302583 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0008.png differ diff --git a/spiral/image/page_spiral/03-02-01-0009.png b/spiral/image/page_spiral/03-02-01-0009.png new file mode 100644 index 00000000..3f531741 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0009.png differ diff --git a/spiral/image/page_spiral/03-02-01-0010.png b/spiral/image/page_spiral/03-02-01-0010.png new file mode 100644 index 00000000..5ebafca7 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0010.png differ diff --git a/spiral/image/page_spiral/03-02-01-0011.png b/spiral/image/page_spiral/03-02-01-0011.png new file mode 100644 index 00000000..5a4f74d0 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0011.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0006.png b/spiral/image/page_spiral/spiral_product_03-02-01-0006.png new file mode 100644 index 00000000..e4fdf371 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0006.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0007.png b/spiral/image/page_spiral/spiral_product_03-02-01-0007.png new file mode 100644 index 00000000..e01d013a Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0007.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0008.png b/spiral/image/page_spiral/spiral_product_03-02-01-0008.png new file mode 100644 index 00000000..2f13db27 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0008.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0009.png b/spiral/image/page_spiral/spiral_product_03-02-01-0009.png new file mode 100644 index 00000000..63c0af71 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0009.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0010.png b/spiral/image/page_spiral/spiral_product_03-02-01-0010.png new file mode 100644 index 00000000..55585741 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0010.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0011.png b/spiral/image/page_spiral/spiral_product_03-02-01-0011.png new file mode 100644 index 00000000..63d170db Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0011.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0006.png b/spiral/image/page_spiral_press/03-02-01-0006.png new file mode 100644 index 00000000..c52a2c7f Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0006.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0007.png b/spiral/image/page_spiral_press/03-02-01-0007.png new file mode 100644 index 00000000..faf78c67 Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0007.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0008.png b/spiral/image/page_spiral_press/03-02-01-0008.png new file mode 100644 index 00000000..00cb9ddc Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0008.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0009.png b/spiral/image/page_spiral_press/03-02-01-0009.png new file mode 100644 index 00000000..4a74b6c3 Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0009.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0010.png b/spiral/image/page_spiral_press/03-02-01-0010.png new file mode 100644 index 00000000..af05793b Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0010.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0011.png b/spiral/image/page_spiral_press/03-02-01-0011.png new file mode 100644 index 00000000..42a3eff3 Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0011.png differ diff --git a/spiral/product.json b/spiral/product.json index ef0d2384..1946a939 100644 --- a/spiral/product.json +++ b/spiral/product.json @@ -79,6 +79,102 @@ "header2E": "Allergen Contains:", "detail2E": "egg, treenuts, May Contains: Gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, sulphites", "price": 120 + }, + { + "id": 6, + "code": "03-02-01-0008", + "name": "คาราเมลแพนเค้ก\nป๊อปคอร์น", + "nameE": "Caramel Pancake\nPopcorn", + "desc": "TAO BIN SNACK STATION", + "descE": "TAO BIN SNACK STATION", + "image": "03-02-01-0008.png", + "detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบคาราเมลกรุบกรอบและหอมเนย", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "", + "detail1E": "Handcrafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and buttery caramel delight.", + "header2E": "Allergen Contains:", + "detail2E": "", + "price": 55 + }, + { + "id": 7, + "code": "03-02-01-0009", + "name": "ช็อกโกแลตพุดดิ้ง\nป๊อปคอร์น", + "nameE": "Chocolate Pudding\nPopcorn", + "desc": "TAO BIN SNACK STATION", + "descE": "TAO BIN SNACK STATION", + "image": "03-02-01-0009.png", + "detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบช็อคโกแล๊ตกรุบกรอบและหอมเนยนม", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "", + "detail1E": "Handcrafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and buttery chocolate pudding delight.", + "header2E": "Allergen Contains:", + "detail2E": "", + "price": 55 + }, + { + "id": 8, + "code": "03-02-01-0007", + "name": "เชดดาร์ชีส\nป๊อปคอร์น", + "nameE": "Cheddar Cheese\nPopcorn", + "desc": "TAO BIN SNACK STATION", + "descE": "TAO BIN SNACK STATION", + "image": "03-02-01-0007.png", + "detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบชีสกรุบกรอบและหอมเนย และชีส", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "", + "detail1E": "Handcrafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and buttery cheese delight.", + "header2E": "Allergen Contains:", + "detail2E": "", + "price": 55 + }, + { + "id": 9, + "code": "03-02-01-0006", + "name": "มัทฉะลาเต้\nป๊อปคอร์น", + "nameE": "Matcha Latte\nPopcorn", + "desc": "TAO BIN SNACK STATION", + "descE": "TAO BIN SNACK STATION", + "image": "03-02-01-0006.png", + "detail1": "ป๊อปคอร์นแฮนด์เมดเคลือบชาเขียวกรุบกรอบและหอมเนย", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "", + "detail1E": "Handcrafted in old-fashioned popcorn one batch at a time, this popcorn is a crunchy and buttery matcha delight.", + "header2E": "Allergen Contains:", + "detail2E": "", + "price": 55 + }, + { + "id": 10, + "code": "03-02-01-0010", + "name": "น้ำเสาวรส", + "nameE": "Passion Fruit Juice", + "desc": "SINGHA PARK", + "descE": "SINGHA PARK", + "image": "03-02-01-0010.png", + "detail1": "น้ำเสาวรส 300 มล. สิงห์ปาร์ค น้ำผลไม้เสารสพร้อมดื่ม ไม่ใส่วัตถุกันเสียไม่แต่งสีแต่งกลิ่น ผลิตจากผลไม้สดจากไร่ รสเปรี้ยวอมหวาน เพิ่มความสดชื่นให้ร่างกาย", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "ผลไม้ทำมาจากธรรมชาติ ไม่มีสารก่อให้เกิดการแพ้อาหาร", + "detail1E": "Best order with TAO BIN ice. Singha Park Chiangrai Passion Fruit Juice 300ml. Made from fresh fruit with no added preservatives, artificial color or artificial flavor.", + "header2E": "Allergen Contains:", + "detail2E": "Made from real fruit. No substances that cause food allergies.", + "price": 50 + }, + { + "id": 11, + "code": "03-02-01-0011", + "name": "น้ำมัลเบอร์รี่", + "nameE": "Mulberry Juice", + "desc": "SINGHA PARK", + "descE": "SINGHA PARK", + "image": "03-02-01-0011.png", + "detail1": "แนะนำดื่มกันน้ำแข็งเต่าบิน น้ำมัลเบอร์รี่ 300 มล. สิงห์ปาร์ค น้ำผลไม้เสารสพร้อมดื่ม ไม่ใส่วัตถุกันเสียไม่แต่งสีแต่งกลิ่น ผลิตจากผลไม้สดจากไร่ รสเปรี้ยวอมหวาน เพิ่มความสดชื่นให้ร่างกาย", + "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", + "detail2": "ผลไม้ทำมาจากธรรมชาติ ไม่มีสารก่อให้เกิดการแพ้อาหาร", + "detail1E": "Best order with TAO BIN ice. Singha Park Chiangrai mulberry Fruit Juice 300ml. Made from fresh fruit with no added preservatives, artificial color or artificial flavor.", + "header2E": "Allergen Contains:", + "detail2E": "Made from real fruit. No substances that cause food allergies.", + "price": 50 } ] } \ No newline at end of file diff --git a/spiral/video/sp02.mp4 b/spiral/video/sp02.mp4 index df55d34c..8f9e9800 100644 Binary files a/spiral/video/sp02.mp4 and b/spiral/video/sp02.mp4 differ diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 66ed7662..6646cf0a 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -9,7 +9,7 @@ "0xeae6e1" SoundVolume - Var SpiralSoftwareVersion = "1.01" + Var SpiralSoftwareVersion = "1.03" Var ColorBrown = 0x746253 Var ColorBrown2 = 0x513C2F @@ -104,6 +104,12 @@ ;Var Menu22Selected = "Enable" Var Menu22Selected = "Invisible" + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; spiral Var MenuVSelected2 = "PressForever" @@ -179,21 +185,25 @@ + ; back @@ -1217,38 +1227,38 @@ - ; button i=1 01-00-00-0006 + ; button i=1 03-02-01-0006 33 22 225 296 - $01-00-00-0006.Button + $03-02-01-0006.Button + + 49 + 117 + + eval( + If $03-02-01-0006.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0006.Button + text_unavailable + center-vertical-horizontal + + + 10 251 @@ -1277,7 +1318,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0006.Price + $03-02-01-0006.Price @@ -1302,7 +1343,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0006.Name + $03-02-01-0006.Name @@ -1313,7 +1354,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0006.description + $03-02-01-0006.description @@ -1325,7 +1366,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0006.NameE + $03-02-01-0006.NameE @@ -1336,44 +1377,44 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0006.descriptionE + $03-02-01-0006.descriptionE -; button i=1 01-00-00-0007 +; button i=1 03-02-01-0007 33 22 225 296 - $01-00-00-0007.Button + $03-02-01-0007.Button + + 49 + 117 + + eval( + If $03-02-01-0007.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0007.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1402,7 +1473,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0007.Price + $03-02-01-0007.Price @@ -1427,7 +1498,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0007.Name + $03-02-01-0007.Name @@ -1438,7 +1509,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0007.description + $03-02-01-0007.description @@ -1450,7 +1521,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0007.NameE + $03-02-01-0007.NameE @@ -1461,45 +1532,45 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0007.descriptionE + $03-02-01-0007.descriptionE -; button i=1 01-00-00-0008 +; button i=1 03-02-01-0008 33 22 225 296 - $01-00-00-0008.Button + $03-02-01-0008.Button + + 49 + 117 + + eval( + If $03-02-01-0008.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0008.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1528,7 +1629,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0008.Price + $03-02-01-0008.Price @@ -1553,7 +1654,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0008.Name + $03-02-01-0008.Name @@ -1564,7 +1665,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0008.description + $03-02-01-0008.description @@ -1576,7 +1677,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0008.NameE + $03-02-01-0008.NameE @@ -1587,7 +1688,7 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0008.descriptionE + $03-02-01-0008.descriptionE @@ -1595,38 +1696,38 @@ - ; button i=1 01-00-00-0009 + ; button i=1 03-02-01-0009 33 22 225 296 - $01-00-00-0009.Button + $03-02-01-0009.Button + + 49 + 117 + + eval( + If $03-02-01-0009.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0009.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1655,7 +1786,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0009.Price + $03-02-01-0009.Price @@ -1680,7 +1811,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0009.Name + $03-02-01-0009.Name @@ -1691,7 +1822,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0009.description + $03-02-01-0009.description @@ -1703,7 +1834,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0009.NameE + $03-02-01-0009.NameE @@ -1714,44 +1845,44 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0009.descriptionE + $03-02-01-0009.descriptionE -; button i=1 01-00-00-0010 +; button i=1 03-02-01-0010 33 22 225 296 - $01-00-00-0010.Button + $03-02-01-0010.Button + + 49 + 117 + + eval( + If $03-02-01-0010.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0010.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1780,7 +1941,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0010.Price + $03-02-01-0010.Price @@ -1805,7 +1966,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0010.Name + $03-02-01-0010.Name @@ -1816,7 +1977,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0010.description + $03-02-01-0010.description @@ -1828,7 +1989,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0010.NameE + $03-02-01-0010.NameE @@ -1839,44 +2000,44 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0010.descriptionE + $03-02-01-0010.descriptionE - ; button i=1 01-00-00-0011 + ; button i=1 03-02-01-0011 33 22 225 296 - $01-00-00-0011.Button + $03-02-01-0011.Button + + 49 + 117 + + eval( + If $03-02-01-0011.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0011.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1905,7 +2096,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0011.Price + $03-02-01-0011.Price @@ -1930,7 +2121,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0011.Name + $03-02-01-0011.Name @@ -1941,7 +2132,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0011.description + $03-02-01-0011.description @@ -1953,7 +2144,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0011.NameE + $03-02-01-0011.NameE @@ -1964,7 +2155,7 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0011.descriptionE + $03-02-01-0011.descriptionE @@ -2013,6 +2204,37 @@ + + 49 + 117 + + eval( + If $01-00-00-0012.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $01-00-00-0012.Button + text_unavailable + center-vertical-horizontal + + 10 251 diff --git a/spiral/xml/page_spiral_thankyou_creditcard.xml b/spiral/xml/page_spiral_thankyou_creditcard.xml new file mode 100644 index 00000000..d924568a --- /dev/null +++ b/spiral/xml/page_spiral_thankyou_creditcard.xml @@ -0,0 +1,603 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + Var CreditCardVoid = 0 + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + + + Var PayFlagCoinQR = 0 + Var SetFlagCoinQR = 0 + Var SetFlagCoinQRTimer = 999999 + Var waitAckPay = 0 + Var Timeout = 0 + Var ServiceType = "locker" + Var ServiceCharge = 0 + If TelephoneNumber = "" Then + Var TelephoneNumber = "0899999999" + EndIf + Var Donate = "" + Var SuggestID = "CRM00A00P000" + Var SessionID3 = "locker4/" + Var SessionID4 = "" + Var VendingCampaign = IntVendingCampaign + + Var PayType = "" + + Var PayOk = 0 + Var ChangeFlag = 0 + + Var CheckAckCode = 0 + Var CheckAckCodeTimer = 9999999 + Var ChangeTimeout = 9999999 + + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + If Seeker.TNumberTaobinMember = "" Then + Else + Var TelephoneNumber = Seeker.TNumberTaobinMember + EndIf + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + + Var CreditReference = "" + Var CreditReference = Seeker.CreditReferenceTmp + Var VendingDiscount = Seeker.VendingDiscount + Var VendingCampaign = Seeker.VendingCampaign + + ;SendSpiralResult = spiral-success , spiral-failed , spiral-valid , spiral-invalid + SPIRAL_SELL ServiceCredit SpiralRef + + + 1000 + + DEBUGVAR LastMakeSpiralResult + Var Timeout = Timeout + 1 + Var ChangeTimeout = ChangeTimeout - 1 + Var CheckAckCodeTimer = CheckAckCodeTimer - 1 + Var SetFlagCoinQRTimer = SetFlagCoinQRTimer - 1 + Var TimeSwapVDO = TimeSwapVDO + 1 + If TimeSwapVDO > 5 Then + If SwapVDO = 0 Then + Var SwapVDO = 1 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp02.mp4" + Else + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + EndIf + EndIf + + + + If Timeout = 3 Then + Var ChangeOK = 2 + Var VendingTSIDTmp = Seeker.VendingTSI + If Seeker.TNumberTaobinCredit = "" Then + Var TelephoneNumber = "0899999999" + Var PayO2 = "" + Else + Var TelephoneNumber = Seeker.TNumberTaobinCredit + Var PayO2 = Seeker.CoffeePinNumber + EndIf + Var Canout = CoinAmount + If Canout > 0 Then + Var GotoStoreCredit0 = 1 + Var StoreCreditAmount = Canout + Var SetFlagCoinQR = 1 + Var SetFlagCoinQRTimer = 30 + Change StoreCreditAmount + EndIf + EndIf + + If ChangeTimeout < 1 Then + If ChangeOK = 1 Then + Var ChangeOK = 2 + Var ChangeTimeout = 60 + EndIf + EndIf + If ChangeTimeout < 1 Then + If ChangeFlag2 = 1 Then + Var ChangeOK = 3 + Var ChangeFlag2 = 2 + Var ChangeTimeout = 60 + EndIf + EndIf + If SetFlagCoinQRTimer < 1 Then + If PayFlagCoinQR = 0 Then + Var SetFlagCoinQR = 2 + Var SetFlagCoinQRTimer = 99999 + EndIf + EndIf + + If SetFlagCoinQR = 2 Then + DEBUGVAR "tube2" + Var SetFlagCoinQR = 3 + ;Var TelephoneNumber = "0899999999" + ;Var PayO2 = "" + ;Var VendingDiscount = 0 + ;Var VendingCampaign = 0 + ;Var CreditReference = "" + ;Var ServiceType = "credit" + ;Var SessionID2 = SelectDrink + ;Var ServiceCredit = "locker" + ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + If LastMakeSpiralResult = 1 Then + If ChangeOK = 2 Then + If PayOk = 0 Then + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + Var PayOk = 1 + Var PayDetail="1/S:0/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + If waitAckPay = 0 Then + Var waitAckPay = 1 + Var SVT = "locker" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + Else + If Seeker.CreditCard = 1 Then + ;CashlessReq SUCCESS + CashlessReq FAIL + EndIf + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + EndIf + EndIf + EndIf + If LastMakeSpiralResult = 1 Then + If ChangeOK = 3 Then + If PayOk = 0 Then + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + + Var SessionID3 = SessionID3 + MachineSpiralID + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + MachineSpiralSlotID + + If SpiralCodeOk = 1 Then + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.VendingCode + Var SessionID3 = SessionID3 + "/" + Var SessionID3 = SessionID3 + Seeker.CodeNumber + EndIf + + Var PayOk = 1 + Var PayDetail="1/S:0/" + Var PayDetail = PayDetail + SessionID4 + + If Seeker.PayWithQR = 1 Then + If waitAckPay = 0 Then + Var waitAckPay = 1 + Var SVT = "locker" + Var ACC = "0899999999" + Var DEE = PayDetail + + If Seeker.TNumberTaobinCredit = "" Then + Else + Var ACC = Seeker.TNumberTaobinCredit + EndIf + PAYEXT SVT ACC VendingTSIDTmp DEE + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + Else + If Seeker.CreditCard = 1 Then + ;CashlessReq SUCCESS + CashlessReq FAIL + EndIf + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 PriceDrink ServiceCharge Donate + Open "ROOT/taobin_project/spiral/xml/page_spiral_thankyou2.xml" + EndIf + + EndIf + EndIf + EndIf + + If LastMakeSpiralResult = 2 Then + If CreditCardVoid = 0 Then + CashlessReq FAIL + Var ChangeFlag = 1 + Var CreditCardVoid = 1 + EndIf + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf + + + If Timeout > 210 Then + If CreditCardVoid = 0 Then + CashlessReq FAIL + Var ChangeFlag = 1 + Var CreditCardVoid = 1 + EndIf + Var LastMakeSpiralResult = 2 + SAVELOG "Spiral Timeout 210 sec" + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail.xml" + EndIf + + Refresh + TimerReset + + + + If SetFlagCoinQR = 1 Then + If ChangeStatus = "payout-end" Then + Var SetFlagCoinQR = 2 + Var PayFlagCoinQR = 1 + DEBUGVAR "tube1" + EndIf + EndIf + If ChangeOK = 2 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 3 + EndIf + EndIf + If ChangeOK = 1 Then + If ChangeStatus = "payout-end" Then + Var ChangeOK = 2 + Var ChangeTimeout = 999 + EndIf + EndIf + + + + + + + + + + + + If SpiralCodeOk = 1 Then + If CheckAckCode = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + DEBUGVAR SessionID2 + + DEBUGVAR SessionID2 + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "locker" + Var ECommerce = "" + Var ECommerce = "locker5/" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.VendingCode + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + Seeker.CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C:" + Var ECommerce = ECommerce + Seeker.IntVendingCampaign + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + + Var SpiralCodeOk = 2 + + Open "ROOT/taobin_project/spiral/xml/page_spiral_fail2.xml" + EndIf + EndIf + + + +; +; 89 +; 700 +; 902 +; 902 +; "ROOT/taobin_project/spiral/image/page_spiral/thankyou.png" +; + + + + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = " + + + +; +; 92 +; 650 +;150 +; 40 +; KanitTTF +; 0xB78F24 +; SwapVDO +; +; +; +; 92 +; 750 +; 40 +; KanitTTF +; 0xB78F24 +; TimeSwapVDO +; +; +; +; +; 92 +; 850 +; 40 +; KanitTTF +; 0xB78F24 +; ShowSwapVDO +; + + +; +; 292 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; "SetFlagCoinQRTimer" +; +; +; +; +; 92 +; 1250 +; 40 +; KanitTTF +; 0xB78F24 +; SetFlagCoinQRTimer +; +; +; +; +; 292 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; "PayOk" +; +; +; +; +; 92 +; 1350 +; 40 +; KanitTTF +; 0xB78F24 +; PayOk +; +; +; +; 292 +; 1400 +; 40 KanitTTF +; 0xB78F24 +; "ChangeOK" +; +; +; +; 92 +; 1400 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeOK +; +; +; +; 292 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.StoreCreditFlag" +; +; +; +; 92 +; 1450 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.StoreCreditFlag +; +; +; +; 292 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag2" +; +; +; +; +; 92 +; 1500 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag2 +; +; +; +; +; 292 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.PayWithQR" +; +; +; +; +; 92 +; 1550 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.PayWithQR +; +; +; +; 292 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; "Seeker.CodeChannel" +; +; +; +; 92 +; 1600 +; 40 +; KanitTTF +; 0xB78F24 +; Seeker.CodeChannel +; +; +; +; 292 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; "ChangeFlag" +; +; +; +; 92 +; 1650 +; 40 +; KanitTTF +; 0xB78F24 +; ChangeFlag +; +; +; +; 292 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; "Canout" +; +; +; +; 92 +; 1700 +; 40 +; KanitTTF +; 0xB78F24 +; Canout +; +; +; +; 292 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; "SpiralCodeOk" +; +; +; +; 92 +; 1750 +; 40 +; KanitTTF +; 0xB78F24 +; SpiralCodeOk +; +; +; +; 292 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; "CheckAckCodeTimer" +; +; +; +; 92 +; 1800 +; 40 +; KanitTTF +; 0xB78F24 +; CheckAckCodeTimer +; + + \ No newline at end of file diff --git a/video/brewing_adv1.mp4 b/video/brewing_adv1.mp4 new file mode 100755 index 00000000..5a078587 Binary files /dev/null and b/video/brewing_adv1.mp4 differ diff --git a/video/main_page_event.mp4 b/video/main_page_event.mp4 index 608bde83..83638459 100644 Binary files a/video/main_page_event.mp4 and b/video/main_page_event.mp4 differ diff --git a/video/script1.ev b/video/script1.ev index 815f0275..8de89870 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,27 +1,16 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize DEBUGVAR MainfileSize -If MainfileSize = 10598934 Then +If MainfileSize = 12369225 Then - If SystemDateMonthInt = 11 Then - Var EventTurnOn = 1 - EndIf + Var EventTurnOn = 1 - If SystemDateMonthInt = 12 Then - Var EventTurnOn = 1 - ;DEBUGVAR SystemTimeHourInt - ;DEBUGVAR SystemDateDayInt + If SystemDateMonthInt = 1 Then - If SystemDateDayInt > 7 Then + If SystemDateDayInt > 5 Then Var EventTurnOn = 0 EndIf - - If SystemDateDayInt = 6 Then - If SystemTimeHourInt > 9 Then - Var EventTurnOn = 0 - EndIf - EndIf EndIf If EventTurnOn = 1 Then diff --git a/video/script2.ev b/video/script2.ev index 50a42eb3..8ac4c44c 100644 --- a/video/script2.ev +++ b/video/script2.ev @@ -3,9 +3,12 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize -If MainfileSize = 2786275 Then +If MainfileSize = 3796502 Then If EventTurnOn = 1 Then Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" EndIf EndIf + +DEBUGVAR video_file_name + diff --git a/video/sync_1.file b/video/sync_1.file index 5d73e376..492abf48 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,13 +1,14 @@ -total 51828 --rw-rw---- 1 root sdcard_rw 10598934 2022-11-22 13:59 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 686 2022-11-22 17:01 script1.ev --rw-rw---- 1 root sdcard_rw 265 2022-11-22 17:01 script2.ev --rw-rw---- 1 root sdcard_rw 0 2022-11-22 17:01 sync_1.file --rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov --rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov +total 56424 +-rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 +-rw-rw---- 1 root sdcard_rw 12369225 2022-12-08 15:58 main_page_event.mp4 +-rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4 +-rw-rw---- 1 root sdcard_rw 455 2022-12-09 17:08 script1.ev +-rw-rw---- 1 root sdcard_rw 292 2022-12-13 22:19 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 17:19 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2022-06-13 18:43 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2022-06-13 18:43 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2022-06-13 18:43 taobin_save_world3.mp4 -rw-rw---- 1 root sdcard_rw 2084830 2022-06-13 18:43 taobin_thank1.mp4 --rw-rw---- 1 root sdcard_rw 2786275 2022-11-22 13:59 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 3796502 2022-12-08 15:57 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 1631940 2022-06-13 18:43 taobin_thank2.mp4 diff --git a/video/taobin_thank1_event.mp4 b/video/taobin_thank1_event.mp4 index 3474020e..44822d1b 100644 Binary files a/video/taobin_thank1_event.mp4 and b/video/taobin_thank1_event.mp4 differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 77b8f8c9..7f443300 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -79,6 +79,9 @@ out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') for spl in menu_new_list: #product_code = s + if spl[0] == "IGNORE": + continue + out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[7] out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n') @@ -331,9 +334,12 @@ out_xml( '\t ' + shw + ' \r\n') #out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') - + if "inter" in param: - out_xml( '\t StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[4] + '.Price ) \r\n') out_xml( '\t\r\n') @@ -375,7 +381,10 @@ out_xml( '\t 0xEAE6E1 \r\n') out_xml( '\t ' + shw + ' \r\n') if "inter" in param: - out_xml( '\t StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[5] + '.Price ) \r\n') out_xml( '\t\r\n') @@ -419,7 +428,10 @@ out_xml( '\t 0xEAE6E1 \r\n') out_xml( '\t ' + shw + ' \r\n') if "inter" in param: - out_xml( '\t StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[6] + '.Price ) \r\n') out_xml( '\t\r\n') @@ -776,7 +788,10 @@ out_xml( '\t ' + shw + ' \r\n') if "inter" in param: - out_xml( '\t StringFmt( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[8] + '.Price ) \r\n') @@ -820,7 +835,10 @@ out_xml( '\t 0xEAE6E1 \r\n') out_xml( '\t ' + shw + ' \r\n') if "inter" in param: - out_xml( '\t StringFmt( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[9] + '.Price ) \r\n') @@ -863,7 +881,10 @@ out_xml( '\t 0xEAE6E1 \r\n') out_xml( '\t ' + shw + ' \r\n') if "inter" in param: - out_xml( '\t StringFmt( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') + if "free" in param: + out_xml( '\t "Free" \r\n') + else: + out_xml( '\t StringFmt( $' + spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) ; test\r\n') else: out_xml( '\t Var( "฿" + $' + spl[10] + '.Price ) \r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 8daafe06..1a8d1682 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -140,7 +140,7 @@ If cock_tail_enable = "true" Then Var WheyShow = "false" Var CocktailShow = "true" - Var RoadShow = "false" + Var RoadShow = "true" Else Var WheyShow = "true" Var CocktailShow = "false" @@ -212,19 +212,8 @@ ; Zone set video main page. Var CampaignEnableStr = "false" - If SystemDateMonthInt = 11 Then - Var CampaignEnableStr = "true" - EndIf - - If SystemDateMonthInt = 12 Then - Var CampaignEnableStr = "true" - EndIf - - If SystemDateMonthInt = 1 Then - If SystemDateDayInt = 1 Then - WRITE_FILE "/mnt/sdcard/coffeevending/CampaignEnable" "off" - EndIf - EndIf + Var adver_brewing_en = 1 + TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev" @@ -313,6 +302,10 @@ Var StartUpExt = "false" ;DEBUGVAR "FlushTxRef1" ;FlushTxRef1 + + If JXMLVersionInt > 428 Then + LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv" + EndIf EndIf ;DEBUGVAR "FlushTxRef1" @@ -601,6 +594,9 @@ DEBUGVAR PreScaleConvertShow DEBUGVAR UnitPostDisplay + DEBUGVAR LanguageInit + + Var TextPriceMenuSize = 14 Var TextPriceMenuY = 264 If CountryName = "Thailand" Then @@ -623,6 +619,10 @@ DEBUGVAR LastTimeClickOrder DEBUGVAR CurrentTime + If LastTimeClickOrder = "" Then + GetLongTimeInMinute LastTimeClickOrder + EndIf + Var DiffTimeInMinute = CurrentTime - LastTimeClickOrder DEBUGVAR DiffTimeInMinute @@ -632,6 +632,14 @@ ScreenRefresh EndIf + ; Set default lang + If JXMLVersionInt > 428 Then + SetLanguage LanguageInit + EnableLanguage "THAI" + EnableLanguage "CHINA" + EnableLanguage "JAPAN" + + EndIf 1000 @@ -1046,15 +1054,18 @@ 1080 60 + If IgnoreNetCore = "true" Then - Var NextPage = "-" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Var NextPage = "-" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" - TopView "show" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 84fa79f7..529d85bf 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -46,7 +46,6 @@ If show_eng = "true" Then - ;Var DirImage = "ROOT/taobin_project/image/collect_point1_en" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" @@ -61,11 +60,15 @@ Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid_en.png" Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" - Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en" + + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + + Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv2_en.png" + Var brew_txt1 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1_en.png" Var XStraw = 336 Else - ;Var DirImage = "ROOT/taobin_project/image/collect_point1" Play "ROOT/taobin_project/sound_thai/thankyou.mp3" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" @@ -80,7 +83,12 @@ Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid.png" Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid.png" - Var CampaingFilename = "ROOT/taobin_project/image/page_campaign" + + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" + + Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv2.png" + Var brew_txt1 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1.png" Var XStraw = 382 EndIf @@ -289,21 +297,28 @@ Var CreditCardVoid = 0 - ;READ_FILE "/mnt/sdcard/coffeevending/CampaignEnable" CampaignEnableStr - If CampaignEnableStr = "true" Then - Var CampaignEnable = 1 - Var CampaignVideoTimeCountDown = 14 - Var PictureFile = CampaingFilename + "/text_desc.png" - Var VideoPlayFile = "ROOT/taobin_project/image/page_campaign/video_desc.mp4" - Else - Var CampaignEnable = 0 + If adver_brewing_en = 1 Then + Var adver_brewing_playing = 1 + Var adver_brewing_play_index = 2 + Var adver_brewing_count_down = 10 + Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png" + Var PictureFile = brew_txt1 EndIf + Var CampaignEnable = 0 + DEBUGVAR bg_lidProblem_ST + If bg_lidProblem_ST = "Invisible" Then + Var GetLidButtonState = "Enable" + Var XStraw = 265 + EndIf + + Var GetLidButtonCountDown = 0 + @@ -997,13 +1012,46 @@ DEBUGVAR CountUpBrewing ; animation video loop If AnimationOn = "true" Then - If CampaignEnable = 1 Then - If CampaignVideoTimeCountDown > 0 Then - Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1 + + If adver_brewing_playing = 1 Then + + If adver_brewing_play_index = 2 Then + DEBUGVAR adver_brewing_count_down + + If adver_brewing_count_down > 0 Then + Var adver_brewing_count_down = adver_brewing_count_down - 1 + + + Var PictureFile = brew_txt1 + + EndIf + + If adver_brewing_count_down = 0 Then + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 20 + EndIf EndIf - If CampaignVideoTimeCountDown = 0 Then - Var CampaignEnable = 0 + + If adver_brewing_play_index = 1 Then + DEBUGVAR adver_brewing_count_down + + If adver_brewing_count_down > 0 Then + Var adver_brewing_count_down = adver_brewing_count_down - 1 + + Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv1.mp4" + + Var PictureFile = brew_txt2 + + EndIf + + If adver_brewing_count_down = 0 Then + Var adver_brewing_play_index = 0 + Var adver_brewing_playing = 0 + EndIf EndIf + + DEBUGVAR VideoPlayFile + Else Var CountUpBrewing = CountUpBrewing + 1 @@ -1118,6 +1166,18 @@ EndIf + If GetLidButtonCountDown > 0 Then + Var GetLidButtonCountDown = GetLidButtonCountDown - 1 + DEBUGVAR GetLidButtonCountDown + EndIf + + If GetLidButtonCountDown = 1 Then + Var GetLidButtonState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var XStraw = 356 + + EndIf + Refresh TimerReset @@ -1332,6 +1392,26 @@ + + + + + 990 + 438 + 82 + 157 + + + + + + + 000001 + 70 + 591 + 940 + 85 + + + + + 000002 + 70 + 679 + 940 + 85 + + + +; menu row 1 + + + + +; menu row 2 + + + + + + + + + + + + +;############################################################### + + + + + + + + + +;############################################################### + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + +; Cart + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index e74d7211..c54b9972 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -6,12 +6,22 @@ SoundVolume - - DEBUGVAR RecipeTag1 - If RecipeTag1 = "HealthTurnOn" Then - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + If SpiralOnline = "true" Then + If Seeker = "next" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + Else + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" + EndIf + Else + + DEBUGVAR RecipeTag1 + If RecipeTag1 = "HealthTurnOn" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + EndIf + EndIf + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" TopView "show" diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 5316b3d6..8c3e7546 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -517,7 +517,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 12 +; menu_new_list 14 ; ==================> Len = 16 ; - 11-99-05-0001 - @@ -784,10 +784,10 @@ Soda, Ice, Malibu" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Gale Jail" - Var NameDrinkTH = "Gale Jail" - Var DrinkDescriptionTH = "Mint syrup, Limeade, Ice, Mount Gay Rum" - Var DrinkDescription = "Mint syrup, Limeade, Ice, Mount Gay Rum" + Var NameDrink = "Minty Madness" + Var NameDrinkTH = "Minty Madness" + Var DrinkDescriptionTH = "Mint syrup, Limeade, Ice, Rum" + Var DrinkDescription = "Mint syrup, Limeade, Ice, Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Gale_Jail.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -856,7 +856,7 @@ Soda, Ice, Malibu" KanitMediumTTF 0x322B26 showthaiText - "Gale Jail" + "Minty Madness" 16 @@ -866,8 +866,7 @@ Soda, Ice, Malibu" KanitMediumTTF 0x6F5F51 showthaiText - "Mint syrup, Limeade, Ice, -Mount Gay Rum" + "Mint syrup, Limeade, Ice, Rum" 16 @@ -878,7 +877,7 @@ Mount Gay Rum" KanitMediumTTF 0x322B26 showengText - "Gale Jail" + "Minty Madness" 16 @@ -888,8 +887,7 @@ Mount Gay Rum" KanitMediumTTF 0x6F5F51 showengText - "Mint syrup, Limeade, Ice, -Mount Gay Rum" + "Mint syrup, Limeade, Ice, Rum" 16 @@ -1034,8 +1032,8 @@ Mount Gay Rum" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "Third Behind Bars" - Var NameDrinkTH = "Third Behind Bars" + Var NameDrink = "Behind Bars" + Var NameDrinkTH = "Behind Bars" Var DrinkDescriptionTH = "Strawberry syrup, Limeade, Soda, Malibu" Var DrinkDescription = "Strawberry syrup, Limeade, Soda, Malibu" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Third_Behind_Bars.png" @@ -1106,7 +1104,7 @@ Mount Gay Rum" KanitMediumTTF 0x322B26 showthaiText - "Third Behind Bars" + "Behind Bars" 16 @@ -1128,7 +1126,7 @@ Soda, Malibu" KanitMediumTTF 0x322B26 showengText - "Third Behind Bars" + "Behind Bars" 16 @@ -1286,7 +1284,7 @@ Soda, Malibu" Var NameDrink = "Pinky Promise" Var NameDrinkTH = "Pinky Promise" - Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Mount Gay Rum" + Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Rum" Var DrinkDescription = "Lychee, Limeade, Soda, Mount Gay Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Pinky_Promise.png" Var OpenFromXML = CurrentXMLFileName2 @@ -1366,8 +1364,7 @@ Soda, Malibu" KanitMediumTTF 0x6F5F51 showthaiText - "Lychee, Limeade, Soda, -Mount Gay Rum" + "Lychee, Limeade, Soda, Rum" 16 @@ -1786,8 +1783,8 @@ Soda, Ice, Mount Gay Rum" Var NameDrink = "Bedroom Story" Var NameDrinkTH = "Bedroom Story" - Var DrinkDescriptionTH = "Coffee, Milk Ice, Mount Gay Rum" - Var DrinkDescription = "Coffee, Milk Ice, Mount Gay Rum" + Var DrinkDescriptionTH = "Coffee, Milk Ice, Rum" + Var DrinkDescription = "Coffee, Milk Ice, Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Bedroom_Story.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1866,8 +1863,7 @@ Soda, Ice, Mount Gay Rum" KanitMediumTTF 0x6F5F51 showthaiText - "Coffee, Milk Ice, Mount Gay -Rum" + "Coffee, Milk Ice, Rum" 16 @@ -1888,8 +1884,7 @@ Rum" KanitMediumTTF 0x6F5F51 showengText - "Coffee, Milk Ice, Mount Gay -Rum" + "Coffee, Milk Ice, Rum" 16 @@ -2036,8 +2031,8 @@ Rum" Var NameDrink = "Oriental Kink" Var NameDrinkTH = "Oriental Kink" - Var DrinkDescriptionTH = "Chrysanthemum, Mount Gay Rum" - Var DrinkDescription = "Chrysanthemum, Mount Gay Rum" + Var DrinkDescriptionTH = "Melon, Rum" + Var DrinkDescription = "Melon, Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Oriental_Kink.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2116,8 +2111,7 @@ Rum" KanitMediumTTF 0x6F5F51 showthaiText - "Chrysanthemum, Mount Gay -Rum" + "Melon, Rum" 16 @@ -2138,8 +2132,7 @@ Rum" KanitMediumTTF 0x6F5F51 showengText - "Chrysanthemum, Mount Gay -Rum" + "Melon, Rum" 16 @@ -3512,6 +3505,502 @@ Ice, Mount Gay Rum" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; - 11-99-05-0015 - + + 33 + 22 + 225 + 296 + Flag( 11-99-05-0015.Button,$Sum1199050015) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "Black lable, soda" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Black lable, soda" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Black lable, soda" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Black lable, soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $11-99-05-0015.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $11-99-05-0015.Button + StringFmt( $11-99-05-0015.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1199050015 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $11-99-05-0015.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1199050015 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; - 11-99-05-0014 - + + 33 + 22 + 225 + 296 + Flag( 11-99-05-0014.Button,$Sum1199050014) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "Black lable, water" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "Black lable, water" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Black lable, water" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Black lable, water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $11-99-05-0014.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $11-99-05-0014.Button + StringFmt( $11-99-05-0014.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1199050014 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $11-99-05-0014.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1199050014 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 1f3d3a64..664cbf8d 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -517,7 +517,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 45 +; menu_new_list 46 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -15931,15 +15931,15 @@ Sugar, Water" ; ==================> Len = 16 - ; 12-03-01-0023 12-03-02-0023 - + ; 12-01-01-0040 12-01-02-0040 - 33 22 225 296 - Flag( 12-03-01-0023.Button,12-03-02-0023.Button,$Sum12030100231203020023) + Flag( 12-01-01-0040.Button,12-01-02-0040.Button,$Sum12010100401201020040) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอริโอ้ปั่นภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "นม น้ำตาล โอริโอ้ + " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OREO SMOOTHIE +VOLCANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Sugar, Oreo, Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0009.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0009.Button + StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1203030009 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0009.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030009 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index d452e0dc..5acbc4b1 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -514,7 +514,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 13 +; menu_new_list 15 ; ==================> Len = 16 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 @@ -3777,6 +3777,258 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-03-01-0025 12-03-02-0025 12-03-03-0025 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0025.Button,12-03-02-0025.Button,12-03-03-0025.Button,$Sum120301002512030200251203030025) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ยูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ และยูซุ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Cocoa Yuzu" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Cocoa and Yuzu syrup" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0025.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0025.Button + StringFmt( $12-03-01-0025.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0025.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0025.Button + StringFmt( $12-03-02-0025.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0025.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0025.Button + StringFmt( $12-03-03-0025.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002512030200251203030025 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum120301002512030200251203030025 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0025.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0025.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0025.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum120301002512030200251203030025 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index ac7c45ba..59dab638 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -516,7 +516,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 35 +; menu_new_list 36 ; ==================> Len = 16 ; - 12-05-02-0007 12-05-03-0007 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index ee930323..0655ae79 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -516,7 +516,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 26 +; menu_new_list 27 ; ==================> Len = 11 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001 @@ -5836,7 +5836,7 @@ Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = " PLUM TEA" + Var NameDrink = " PLUM TEA" Var NameDrinkTH = "ชาบ๊วย " Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมบ๊วย" Var DrinkDescription = "Thai tea, Ume Syrup, Water" @@ -5929,7 +5929,7 @@ Water" KanitMediumTTF 0x322B26 showengText - " PLUM TEA" + " PLUM TEA" 16 @@ -7082,6 +7082,258 @@ Water" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-02-01-0038 12-02-02-0038 - + + 33 + 22 + 225 + 296 + Flag( 12-02-01-0038.Button,12-02-02-0038.Button,$Sum12020100381202020038) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชายูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไต้หวัน น้ำเชื่อมยูซุ" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "YUZU TEA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Yuzu, Taiwanese tea, Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0038.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0038.Button + StringFmt( $12-02-01-0038.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0038.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0038.Button + StringFmt( $12-02-02-0038.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12020100381202020038 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12020100381202020038 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0038.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0038.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12020100381202020038 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 04b09a87..f2043040 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -521,7 +521,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 15 +; menu_new_list 16 ; ==================> Len = 16 ; - 12-04-02-0001 - diff --git a/xml/page_drinkfail2-2.xml b/xml/page_drinkfail2-2.xml index dbfa6290..e4bbed22 100644 --- a/xml/page_drinkfail2-2.xml +++ b/xml/page_drinkfail2-2.xml @@ -41,7 +41,7 @@ Var Timeout = Timeout + 1 - If Timeout > 5 Then + If Timeout > 9 Then StrLen TelephoneNumberProblem TelNumLen If TelNumLen >= 10 Then @@ -156,11 +156,11 @@ Var( DirImage + "/text23.png" ) - - 410 - 600 - Var( DirImage + "/Businessman_sorry.png" ) - +; +; 410 +; 600 +; Var( DirImage + "/Businessman_sorry.png" ) +; 5 diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index 5b1726f6..0426bb55 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -146,6 +146,7 @@ Var xRefundChannelX = 162 EndIf + Var text22 = "/text22.png" 1000 @@ -505,9 +506,9 @@ 1783 "Enable" Tel_Confirm_State - Var( DirImage + "/bn_confirm2.png" ) - Var( DirImage + "/bp_confirm2.png" ) - Var( DirImage + "/bp_confirm2.png" ) + Var( DirImage + "/bn_confirm.png" ) + Var( DirImage + "/bp_confirm.png" ) + Var( DirImage + "/bp_confirm.png" ) "ROOT/sounds/codebuttom.wav" SoundVolume @@ -549,23 +550,23 @@ - - xRefundChannelX - 960 - Var( DirImage + textRefundChannelX ) - +; +; xRefundChannelX +; 960 +; Var( DirImage + textRefundChannelX ) +; 47 - 428 - Var( DirImage + "/text22.png" ) + 408 + Var( DirImage + text22 ) - - 410 - 524 - Var( DirImage + "/Businessman_sorry.png" ) - +; +; 410 +; 524 +; Var( DirImage + "/Businessman_sorry.png" ) +; diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 43326c78..5e79e058 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -198,10 +198,6 @@ Var DelayCount = 0 DEBUGVAR SelectDrink - If RoadShow = "true" Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf Var NOCashFlag = 0 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index c6506363..3f3377c5 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -15,6 +15,16 @@ ; Open "ROOT/taobin_project/xml/page_payment_camera.xml" ;EndIf + If CountryName = "Malaysia" Then + Open "ROOT/taobin_project/xml/page_payment_cash-MYR.xml" + EndIf + + If CountryName = "Indonesia" Then + Open "ROOT/taobin_project/xml/page_payment_cash-IDR.xml" + EndIf + + Var PreScaleCanculate = 1 + Var CashlessPayFlag = 0 Var RemainAmountStrENG = "" @@ -137,6 +147,8 @@ SAVELOG SelectDrink + Var QRCODE99 = "" + SAVELOG QRChannel SAVELOG QRCODE99 DEBUGVAR QRCODE99 @@ -632,6 +644,92 @@ Var ReqPayInfoFlag = 4 EndIf + If web_payment = "LINEPAY" Then + + Var QR_POPUP = "/img_popup9.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "LPY:2/" + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 5 + EndIf + + If web_payment = "LAZADAPAY" Then + + Var QR_POPUP = "/img_popup10.png" + Var LOADING_STATE = "Enable" + + Var FlagQROpened = 1 + Var alphaState = "Enable" + ;CoinVending OFF + VendingQR ON + + + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + Seeker.ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumberQR = "0899999999" + Var ServiceType = "coffee" + Var ECommerceQR = "" + Var ECommerceQR = ECommerceQR + PriceDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + DiscountDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SessionID2 + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + SelectDrink + Var ECommerceQR = ECommerceQR + "/" + Var ECommerceQR = ECommerceQR + "LZP:2/" + + + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + Var ReqPayInfoFlag = 6 + EndIf + EndIf @@ -690,7 +788,7 @@ If IndoQR = 1 Then Var Seeker.CampaignPayChanel = "xendit" Else - Var Seeker.CampaignPayChanel = "cash" + Var Seeker.CampaignPayChanel = "promptpay" EndIf EndIf EndIf @@ -706,6 +804,9 @@ If ReqPayInfoFlag2 = 5 Then Var Seeker.CampaignPayChanel = "linepay" EndIf + If ReqPayInfoFlag2 = 6 Then + Var Seeker.CampaignPayChanel = "lazadapay" + EndIf @@ -883,6 +984,33 @@ EndIf EndIf + If ReqPayInfoFlag = 6 Then + If VendingQRTypeResult = "LZP:2" Then + Var CashTextWarning = "" + Var QRErrorState = "Invisible" + Var QRCODE99Shoppy = "https://pre-wormhole.lazada.co.th/wow/i/th/open-loop-shadow/open-loop-csb?hybrid=1&wh_showError=true&wx_navbar_transparent=true&lzd_navbar_hidden=true&codeValue=" + Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a + SAVELOG Ext1a + SAVELOG QRCODE99Shoppy + Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21 + Var ReqPayInfoFlag = 0 + Var ReqPayInfoFlag2 = 6 + SAVELOG QRCODE99Shoppy + SAVELOG Ext21 + + Var QRCODE99 = QRCODE99Shoppy + Var LOADING_STATE = "Invisible" + + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3" + EndIf + + EndIf + EndIf + Else Var PayInfoCFlag = 1 EndIf @@ -918,34 +1046,15 @@ If ActionOKCase = 0 Then - If ReqPayInfoFlag = 1 Then - Var QRErrorFlag = 1 - If alphaState = "Enable" Then - Var QRErrorState = "Enable" - Var LOADING_STATE = "Invisible" - EndIf - EndIf - If ReqPayInfoFlag = 2 Then - Var QRErrorFlag = 1 - If alphaState = "Enable" Then - Var QRErrorState = "Enable" - Var LOADING_STATE = "Invisible" - EndIf - EndIf - If ReqPayInfoFlag = 3 Then - Var QRErrorFlag = 1 - If alphaState = "Enable" Then - Var QRErrorState = "Enable" - Var LOADING_STATE = "Invisible" - EndIf - EndIf - If ReqPayInfoFlag = 4 Then + If ReqPayInfoFlag > 0 Then Var QRErrorFlag = 1 If alphaState = "Enable" Then Var QRErrorState = "Enable" Var LOADING_STATE = "Invisible" + Var QRCODE99 = "" EndIf EndIf + Else Var PayInfoCFlag = 1 EndIf @@ -999,6 +1108,11 @@ EndIf + DEBUGVAR Timeout + DEBUGVAR PayOK + DEBUGVAR ChangeOK + DEBUGVAR CancelFlag + If CamFlag = 1 Then Var CamCount = CamCount + 1 @@ -1539,7 +1653,12 @@ ; Open "ROOT/taobin_project/xml/page_catalog.xml" ;EndIf - Var showRemaining = "คืนเงิน" + + If show_eng = "true" Then + Var showRemaining = "Refund" + Else + Var showRemaining = "คืนเงิน" + EndIf ;Open "ROOT/taobin_project/xml/page_catalog.xml" If FlagQROpened = 1 Then @@ -1564,9 +1683,19 @@ 91 1180 MenuCautionImageStage0 - "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" + eval( + If show_eng = "true" Then + Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_en.png" + Else + Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" + + EndIf +) + +; +