diff --git a/adv/sync_0.file b/adv/sync_0.file new file mode 100644 index 00000000..eee13a31 --- /dev/null +++ b/adv/sync_0.file @@ -0,0 +1,37 @@ +total 86416 +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 14:57 sync_0.file +-rw-rw---- 1 root sdcard_rw 2609 2021-12-25 13:13 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 14:58 sync_2.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 +-rw-rw---- 1 root sdcard_rw 4349971 2021-04-21 11:53 taobin_adv_03.mp4 +-rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4 +-rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4 +-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4 +-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 1598810 2021-09-23 11:27 taobin_adv_09.mp4 +-rw-rw---- 1 root sdcard_rw 4001486 2022-01-11 19:09 taobin_adv_10.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4 +-rw-rw---- 1 root sdcard_rw 2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4 +-rw-rw---- 1 root sdcard_rw 2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4 +-rw-rw---- 1 root sdcard_rw 3111677 2021-04-21 14:21 taobin_adv_menu2_03.mp4 +-rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4 +-rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4 +-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 1970490 2021-09-23 11:27 taobin_adv_menu2_09.mp4 +-rw-rw---- 1 root sdcard_rw 3365496 2022-01-11 19:08 taobin_adv_menu2_10.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4 +-rw-rw---- 1 root sdcard_rw 2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4 +-rw-rw---- 1 root sdcard_rw 2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4 +-rw-rw---- 1 root sdcard_rw 3117015 2021-04-21 14:21 taobin_adv_menu_03.mp4 +-rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4 +-rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4 +-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 1967036 2021-09-23 11:27 taobin_adv_menu_09.mp4 +-rw-rw---- 1 root sdcard_rw 3354961 2022-01-11 19:08 taobin_adv_menu_10.mp4 diff --git a/adv/sync_2.file b/adv/sync_2.file new file mode 100644 index 00000000..eee13a31 --- /dev/null +++ b/adv/sync_2.file @@ -0,0 +1,37 @@ +total 86416 +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 14:57 sync_0.file +-rw-rw---- 1 root sdcard_rw 2609 2021-12-25 13:13 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 14:58 sync_2.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 +-rw-rw---- 1 root sdcard_rw 4349971 2021-04-21 11:53 taobin_adv_03.mp4 +-rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4 +-rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4 +-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4 +-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 1598810 2021-09-23 11:27 taobin_adv_09.mp4 +-rw-rw---- 1 root sdcard_rw 4001486 2022-01-11 19:09 taobin_adv_10.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4 +-rw-rw---- 1 root sdcard_rw 2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4 +-rw-rw---- 1 root sdcard_rw 2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4 +-rw-rw---- 1 root sdcard_rw 3111677 2021-04-21 14:21 taobin_adv_menu2_03.mp4 +-rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4 +-rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4 +-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4 +-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 1970490 2021-09-23 11:27 taobin_adv_menu2_09.mp4 +-rw-rw---- 1 root sdcard_rw 3365496 2022-01-11 19:08 taobin_adv_menu2_10.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4 +-rw-rw---- 1 root sdcard_rw 2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4 +-rw-rw---- 1 root sdcard_rw 2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4 +-rw-rw---- 1 root sdcard_rw 3117015 2021-04-21 14:21 taobin_adv_menu_03.mp4 +-rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4 +-rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4 +-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4 +-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 1967036 2021-09-23 11:27 taobin_adv_menu_09.mp4 +-rw-rw---- 1 root sdcard_rw 3354961 2022-01-11 19:08 taobin_adv_menu_10.mp4 diff --git a/adv/taobin_adv_10.mp4 b/adv/taobin_adv_10.mp4 old mode 100755 new mode 100644 index cb1a8b3e..bf42e901 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 old mode 100755 new mode 100644 index 51564926..ae26eb95 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 old mode 100755 new mode 100644 index d718797f..ea84e592 Binary files a/adv/taobin_adv_menu_10.mp4 and b/adv/taobin_adv_menu_10.mp4 differ diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index 74ceb33f..2c73906f 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -159,10 +159,10 @@ SNOWWHITE 12-01-01-0023 1 2 45 3 4 5 16 24 88 1:28 32 SNOWWHITE 12-01-02-0023 1 2 45 3 4 5 23 16 24 133 2:13 32 SNOWWHITE 12-01-01-0024 1 2 45 3 4 5 24 66 1:06 32 - - - - +PEACHER 12-01-02-0028 1 7 47 3 3 4 5 24 100 22:40 32 +PEACHER 12-01-01-0027 1 2 47 3 4 5 16 24 88 1:28 32 +PEACHER 12-01-02-0027 1 2 47 3 4 5 23 16 24 133 2:13 32 +PEACHER 12-01-01-0028 1 2 47 3 4 5 24 66 1:06 32 โกโก้สตอเบอร์รี่เย็น 12-03-02-0010 1 15 17 19 23 24 125 2:05 40 diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv deleted file mode 100644 index e8e1ae08..00000000 --- a/animation01/Menu Description - Sheet1_.tsv +++ /dev/null @@ -1,338 +0,0 @@ -name New Code เล่น 4 วินาที ขั้นตอน 1 ขั้นตอน 2 ขั้นตอน 3 ขั้นตอน 4 ขั้นตอน 5 ขั้นตอน 6 ขั้นตอน 7 ขั้นตอน 8 จบ Time (sec) นาทีและวินาที ความยาวการเล่นของแต่ละขั้นตอน -Espresso 12-01-01-0001 1 2 3 4 5 24 66 1:06 16 -double espresso 12-11-01-0001 1 2 3 4 5 116 1:56 28 -Hot Americano 12-01-01-0003 1 2 3 4 5 16 24 88 1:28 17 -Hot Latte 12-01-01-0004 1 2 3 4 5 6 7 24 117 1:57 19 -Hot Cappucino 12-01-01-0005 1 2 3 4 5 6 7 24 136 2:16 22 -Hot Mocha 12-01-01-0006 1 2 3 4 5 15 7 24 135 2:15 22 -Hot Caramel Latte 12-01-01-0007 1 22 2 3 4 5 7 24 135 2:15 22 -Hot Matcha café Latte 12-01-01-0008 1 2 3 4 5 8 9 7 24 140 2:20 19 -Hot Taiwanese Tea café Latte 12-01-01-0009 1 2 3 4 5 10 24 136 2:16 26 -Hot Thai Tea café Latte 12-01-01-0010 1 2 3 4 5 6 7 10 24 161 2:41 22 -Hot Kokuto café Latte 12-01-01-0011 1 2 3 4 5 6 7 27 24 125 2:05 17 -Lychee Americano 12-01-01-0012 1 2 3 4 5 11 16 24 98 1:38 16 -Iced Espresso 12-11-02-0001 1 2 3 4 5 6 7 23 24 208 3:28 29 -Iced Americano 12-01-02-0001 1 2 3 4 5 23 16 24 133 2:13 22 -Iced Cafe Latte 12-01-02-0002 1 2 3 4 5 6 7 23 24 186 3:06 26 -Iced Cappuccino 12-11-02-0002 1 2 3 4 5 6 7 23 24 190 3:10 27 -Iced Mocha 12-01-02-0003 1 2 3 4 5 15 7 23 24 167 2:47 23 -Iced Caramel café Latte 12-01-02-0004 1 22 2 3 4 5 7 23 24 182 3:02 25 -Iced Matcha café Latte 12-01-02-0005 1 2 3 4 5 8 9 7 23 24 204 3:24 25 -Iced Taiwanese Tea café Latte 12-01-02-0006 1 2 3 4 5 10 23 24 178 2:58 29 -Iced Thai Tea café Latte 12-01-02-0007 1 2 3 4 5 6 7 10 23 24 190 3:10 23 -Iced Kokuto café Latte 12-01-02-0008 1 2 3 4 5 6 7 27 23 24 186 3:06 23 -Iced Lychee Americano 12-01-02-0009 1 2 3 4 5 11 16 23 24 105 1:45 14 -Hot Caramel milk 12-03-01-0001 1 22 6 7 24 84 1:24 27 -Hot Cocoa 12-03-01-0002 1 15 6 7 24 135 2:15 44 -Hot Kokuto Milk 12-03-01-0003 1 27 6 7 24 84 1:24 27 -Hot Caramel cocoa 12-03-01-0004 1 15 22 6 7 24 145 2:25 35 -Hot Milk 12-03-01-0005 1 6 7 24 102 1:42 49 -Iced Caramel milk 12-03-02-0001 1 22 17 23 24 113 1:53 36 -Iced Cocoa 12-03-02-0002 1 15 17 23 24 125 2:05 40 -Iced Kokuto Milk 12-03-02-0003 1 27 17 23 24 119 1:59 38 -Iced Caramel cocoa 12-03-02-0004 1 15 22 17 23 24 166 2:46 41 -Milk with Iced 12-03-02-0005 1 17 23 24 110 1:50 53 -Iced Pink milk 12-03-02-0006 1 21 17 23 24 129 2:09 42 -hot chrysanths tea 12-02-01-0001 1 10 24 65 1:05 61 -Hot thai milk tea 12-02-01-0002 1 6 7 10 24 78 1:18 25 -Hot Taiwanese Tea 12-02-01-0003 1 6 7 10 24 90 1:30 29 -Hot matcha latte 12-02-01-0004 1 6 7 8 9 24 149 2:29 36 -Hot black tea 12-02-01-0005 -Hot Kokuto Tea 12-02-01-0006 1 6 7 10 27 24 133 2:13 32 -Hot Limeade tea 12-02-01-0007 1 10 12 24 112 1:52 54 -Hot Lychee tea 12-02-01-0008 1 10 11 24 112 1:52 54 -Hot strawberry tea 12-02-01-0009 1 10 19 24 90 1:30 43 -Hot blueberry tea 12-02-01-0010 1 10 20 24 87 1:27 42 -Iced Chrysanths Tea 12-02-02-0001 1 10 23 24 88 1:28 42 -Iced Thai milk Tea 12-02-02-0002 1 6 7 10 23 24 165 2:45 40 -Iced Taiwanese Tea 12-02-02-0003 1 6 7 10 23 24 104 1:44 25 -Iced matcha latte 12-02-02-0004 1 6 7 8 9 23 24 175 2:55 34 -Iced black tea รอเทสชาดำใหม่ 12-02-02-0005 -Iced Kokuto Tea 12-02-02-0006 1 6 7 10 27 23 24 131 2:11 25 -Iced Lime tea 12-02-02-0007 1 10 12 23 24 130 2:10 42 -Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 12-02-02-0008 1 10 11 23 24 129 2:09 42 -Iced strawberrry tea 12-02-02-0009 1 10 19 23 24 85 1:25 27 -Iced blueberry tea 12-02-02-0010 1 10 20 23 24 85 1:25 27 -HOT LIMENADE 12-05-01-0001 1 16 12 24 76 1:16 36 -ICED LIMENADE 12-05-02-0001 1 16 12 23 24 100 1:40 32 -ICED SALAK 12-05-02-0002 1 16 21 23 24 59 0:59 18 -ICED LIME SALAK 12-05-02-0003 1 16 12 21 23 24 79 1:19 19 -ICED LYCHEE 12-05-02-0004 1 16 11 23 24 82 1:22 26 -ICED STRAWBERRY 12-05-02-0005 1 16 19 23 24 75 1:15 24 -ICED BLUEBERRY 12-05-02-0006 1 16 20 23 24 75 1:15 24 -Pepsi 12-05-02-0007 1 23 14 24 49 0:49 23 -SALAK SODA 12-05-02-0008 1 21 23 13 24 44 0:44 13 -LIME SALAK SODA 12-05-02-0009 1 21 23 12 13 24 79 1:19 19 -LIMENADE SODA 12-05-02-0010 1 12 23 13 24 107 1:47 34 -ICED LYCHEE SODA 12-05-02-0011 1 11 23 13 24 65 1:05 20 -STRAWBERRY SODA 12-05-02-0012 1 19 23 13 24 55 0:55 17 -BLUEBERRY SODA 12-05-02-0013 1 20 23 13 24 75 1:15 24 -Soda 12-05-02-0014 1 13 24 24 0:24 20 -Ice Soda 12-05-02-0015 1 23 13 24 27 0:27 12 -DRINKING WATER 12-05-02-0016 1 16 24 60 1:00 56 -Ice 12-05-02-0017 1 23 24 32 0:32 28 -Iced water 12-05-02-0018 1 23 16 24 62 1:02 29 -Hot Water 12-05-01-0002 1 16 24 55 0:55 51 -Sprite 12-05-02-0020 1 23 18 24 20 0:20 8 -7UP 12-05-02-0021 1 23 18 24 20 0:20 8 -MATCHA SHAKE 12-04-02-0001 1 25 26 9 6 7 23 24 181 3:01 30 -CHOCOLATE SHAKE 12-04-02-0002 1 25 26 6 7 15 23 24 219 3:39 36 -STRAWBERRY SHAKE 12-04-02-0003 1 25 26 19 17 23 24 178 2:58 35 -ESPRESSO SHAKE 12-04-02-0004 1 25 26 2 3 4 5 17 23 24 230 3:50 28 -THAI TEA SHAKE 12-04-02-0005 1 25 26 6 7 10 23 24 223 3:43 37 -KOKUTO SHAKE 12-04-02-0006 1 25 26 26 17 23 24 180 3:00 35 -BLUEBERRY SHAKE 12-04-02-0007 1 25 26 20 17 23 24 171 2:51 33 -TAIWANESE TEA SHAKE 12-04-02-0008 1 25 26 10 17 23 24 197 3:17 39 -CARAMEL SHAKE 12-04-02-0009 1 25 26 22 17 23 24 196 3:16 38 -MILK SHAKE 12-04-02-0010 1 25 26 6 7 23 24 120 2:00 23 -PLAIN PROTEIN 12-04-02-0011 1 25 26 23 24 100 1:40 32 -HOT PLUM TEA 12-02-01-0016 1 33 16 24 100 2:40 32 -HOT \nCANNABIS TEA 12-02-01-0017 1 32 16 24 100 3:40 32 -ICED PLUM TEA 12-02-02-0017 1 33 10 24 100 4:40 32 -ICED \nCANNABIS TEA 12-02-02-0018 1 32 10 23 24 100 5:40 32 -ICED PLUM SODA 12-05-02-0024 1 33 23 13 24 100 6:40 32 -ICED PLUM LIMENADE SODA 12-05-02-0025 1 33 12 23 13 24 100 7:40 32 -ICED PLUM DRINK 12-05-02-0026 1 33 23 24 100 8:40 32 -ICED \nCANNABIS DRINK 12-05-02-0027 1 32 23 24 100 9:40 32 -ICED \nCANNABIS SODA 12-05-02-0028 1 32 23 13 24 100 10:40 32 -ICED LIMENADE \nCANNABIS SODA 12-05-02-0029 1 32 12 23 13 24 100 11:40 32 -MANGO DRINK 12-05-02-0030 1 31 23 24 100 12:40 32 -MANGO SODA 12-05-02-0031 1 31 23 13 24 100 13:40 32 -HOT MATCHA 12-02-01-0011 1 16 8 9 24 100 14:40 32 -ICED MATCHA 12-02-02-0011 1 16 8 9 23 24 100 15:40 32 -HOT AMERICANO ETHIOPAI GUJI 12-01-01-0014 1 2 3 4 5 16 24 88 1:28 32 -ICED AMERICANO ETHIOPAI GUJI 12-01-02-0011 1 2 3 4 5 23 16 24 133 2:13 32 -ESPRESSO ETHIOPAI GUJI 12-01-01-0013 1 2 3 4 5 24 66 1:06 32 -ICED MATCHA LIMENADE 12-02-02-0012 1 8 9 12 23 24 1 1 32 -HOT MATCHA LIMENADE 12-02-01-0012 1 8 9 12 16 24 1 1 32 -Energy drink 12-05-02-0034 1 34 23 24 100 3:40 32 -Energy drink soda 12-05-02-0035 1 34 13 23 24 100 3:40 32 -Mango milk 12-03-02-0007 1 31 7 31 23 24 100 4:40 32 -ENERGY DRINK PEPSI 12-05-02-0036 1 34 14 23 24 100 5:40 32 -ENERGY DRINK SODA 12-05-02-0035 1 34 13 23 24 100 6:40 32 -ENERGY DRINK LIMENADE 12-05-02-0037 1 34 12 24 100 7:40 32 -ICED ENERGY DRINK 12-05-02-0034 1 34 23 24 100 8:40 32 -ICED BLACK TEA 12-02-02-0005 1 23 24 100 9:40 32 -STRAWBERRY MILK 12-03-02-0007 1 23 24 100 10:40 32 -ICED LYCHEE LIMENADE SODA 12-05-02-0022 1 11 13 23 24 100 11:40 32 -iced strawlimenade soda 12-05-02-0023 1 19 13 23 24 100 12:40 32 -none 12-02-02-0013 1 12 13 24 100 13:40 32 -iced espresso L 12-01-02-0012 1 12 13 24 100 14:40 32 -iced cappu L 12-01-02-0013 1 12 13 24 100 15:40 32 -iced thai tea L 12-02-02-0015 1 12 13 24 100 16:40 32 -ICED LYCHEE 12-05-02-0032 1 11 16 23 24 100 17:40 32 -ICED LYCHEE SODA 12-05-02-0033 1 11 13 23 24 100 18:40 32 -HOT LYCHEE TEA 12-02-01-0019 1 11 16 24 100 19:40 32 -ICED LYCHEE TEA 12-02-02-0019 1 11 16 23 24 100 20:40 32 -HOT LYCHEE AMERICANO 12-01-01-0017 1 2 3 4 5 11 16 24 100 21:40 32 -ICED LYCHEE AMERICANO 12-01-02-0017 1 2 3 4 5 11 16 23 24 100 22:40 32 -ETHIOPAI GUJI DIRTY 12-01-02-0018 1 7 2 3 4 5 24 100 22:40 32 - -HOT GINGER TEA 12-02-01-0020 1 10 24 88 1:28 42 -HOT LIME \nGINGER TEA 12-02-01-0021 1 10 12 24 88 1:28 42 -ICED GINGER TEA 12-02-02-0020 1 10 23 24 88 2:28 42 -GINGER SODA 12-05-02-0038 1 10 13 23 24 88 3:28 42 -GINGER LIME \nSODA 12-05-02-0039 1 10 13 12 23 24 88 4:28 42 - -STRAWBERRY SODA 12-05-02-0041 1 19 23 13 24 55 0:55 17 -ICED STRAWBERRY 12-05-02-0040 1 16 19 23 24 75 1:15 24 -Hot strawberry tea 12-02-01-0022 1 10 19 24 90 1:30 43 -Iced strawberrry tea 12-02-02-0022 1 10 19 23 24 85 1:25 27 -STRAWBERRY SHAKE 12-04-02-0013 1 25 26 19 17 23 24 178 2:58 35 - -ETHIOPAI BLUE DADDY DIRTY 12-01-02-0020 1 7 36 2 3 4 5 24 100 22:40 32 -HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 36 3 4 5 16 24 88 1:28 32 -ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 36 3 4 5 23 16 24 133 2:13 32 -ESPRESSO BLUE DADDY 12-01-01-0020 1 2 36 3 4 5 24 66 1:06 32 - -Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23 - -OREO SMOOTHIE VOLCANO 12-03-03-0009 1 17 23 40 41 24 110 1:50 53 - - -Iced Espresso 12-11-03-0001 1 2 3 4 5 6 7 23 41 24 208 3:28 29 -Iced Americano 12-01-03-0001 1 2 3 4 5 23 16 41 24 133 2:13 22 -Iced Cafe Latte 12-01-03-0002 1 2 3 4 5 6 7 23 41 24 186 3:06 26 -Iced Cappuccino 12-11-03-0002 1 2 3 4 5 6 7 23 41 24 190 3:10 27 -Iced Mocha 12-01-03-0003 1 2 3 4 5 15 7 23 41 24 167 2:47 23 -Iced Caramel café Latte 12-01-03-0004 1 22 2 3 4 5 7 23 41 24 182 3:02 25 -Iced Matcha café Latte 12-01-03-0005 2 3 4 5 8 9 7 23 41 24 204 3:24 25 -Iced Taiwanese Tea café Latte 12-01-03-0006 1 2 3 4 5 10 23 41 24 178 2:58 29 -Iced Thai Tea café Latte 12-01-03-0007 2 3 4 5 6 7 10 23 41 24 190 3:10 23 -Iced Kokuto café Latte 12-01-03-0008 2 3 4 5 6 7 27 23 41 24 186 3:06 23 -Iced Lychee Americano 12-01-03-0009 1 2 3 4 5 11 16 23 41 24 105 1:45 14 -Iced Caramel milk 12-03-03-0001 1 22 17 23 41 24 113 1:53 36 -Iced Cocoa 12-03-03-0002 1 15 17 23 41 24 125 2:05 40 -Iced Kokuto Milk 12-03-03-0003 1 27 17 23 41 24 119 1:59 38 -Iced Caramel cocoa 12-03-03-0004 1 15 22 17 23 41 24 166 2:46 41 -Milk with Iced 12-03-03-0005 1 17 23 41 24 110 1:50 53 -Iced Pink milk 12-03-03-0006 1 21 17 23 41 24 129 2:09 42 -Iced Chrysanths Tea 12-02-03-0001 1 10 23 41 24 88 1:28 42 -Iced Thai milk Tea 12-02-03-0002 1 6 7 10 23 41 24 165 2:45 40 -Iced Taiwanese Tea 12-02-03-0003 1 6 7 10 23 41 24 104 1:44 25 -Iced matcha latte 12-02-03-0004 1 6 7 8 9 23 41 24 175 2:55 34 -Iced Kokuto Tea 12-02-03-0006 1 6 7 10 27 23 41 24 131 2:11 25 -Iced Lime tea 12-02-03-0007 1 10 12 23 41 24 130 2:10 42 -Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 12-02-03-0008 1 10 11 23 41 24 129 2:09 42 -ICED LIMENADE 12-05-03-0001 1 16 12 23 41 24 100 1:40 32 -ICED SALAK 12-05-03-0002 1 16 21 23 41 24 59 0:59 18 -ICED LIME SALAK 12-05-03-0003 1 16 12 21 23 41 24 79 1:19 19 -ICED LYCHEE 12-05-03-0004 1 16 11 23 41 24 82 1:22 26 -Pepsi 12-05-03-0007 1 23 14 41 24 49 0:49 23 -SALAK SODA 12-05-03-0008 1 21 23 13 41 24 44 0:44 13 -LIME SALAK SODA 12-05-03-0009 1 21 23 12 13 41 24 79 1:19 19 -LIMENADE SODA 12-05-03-0010 1 12 23 13 41 24 107 1:47 34 -ICED LYCHEE SODA 12-05-03-0011 1 11 23 13 41 24 65 1:05 20 -Sprite 12-05-03-0020 1 23 18 41 24 20 0:20 8 -7UP 12-05-03-0021 1 23 18 41 24 20 0:20 8 -MATCHA SHAKE 12-04-03-0001 1 25 26 9 6 7 23 41 24 181 3:01 30 -CHOCOLATE SHAKE 12-04-03-0002 1 25 26 6 7 15 23 41 24 219 3:39 36 -STRAWBERRY SHAKE 12-04-03-0003 1 25 26 19 17 23 41 24 178 2:58 35 -ESPRESSO SHAKE 12-04-03-0004 1 25 26 2 3 4 5 17 23 41 230 3:50 28 -THAI TEA SHAKE 12-04-03-0005 1 25 26 6 7 10 23 41 24 223 3:43 37 -KOKUTO SHAKE 12-04-03-0006 1 25 26 26 17 23 41 24 180 3:00 35 -TAIWANESE TEA SHAKE 12-04-03-0008 1 25 26 10 17 23 41 24 197 3:17 39 -CARAMEL SHAKE 12-04-03-0009 1 25 26 22 17 23 41 24 196 3:16 38 -MILK SHAKE 12-04-03-0010 1 25 26 6 7 23 41 24 120 2:00 23 -PLAIN PROTEIN 12-04-03-0011 1 25 26 23 41 24 100 1:40 32 -ICED PLUM TEA 12-02-03-0017 1 33 10 24 100 4:40 32 -ICED PLUM SODA 12-05-03-0024 1 33 23 13 41 24 100 6:40 32 -ICED PLUM LIMENADE SODA 12-05-03-0025 1 33 12 23 13 41 24 100 7:40 32 -ICED PLUM DRINK 12-05-03-0026 1 33 23 41 24 100 8:40 32 -ICED \nCANNABIS DRINK 12-05-03-0027 1 32 23 41 24 100 9:40 32 -ICED \nCANNABIS SODA 12-05-03-0028 1 32 23 13 41 24 100 10:40 32 -ICED LIMENADE \nCANNABIS SODA 12-05-03-0029 1 32 12 23 13 41 24 100 11:40 32 -ICED MATCHA 12-02-03-0011 1 16 8 9 23 41 24 100 15:40 32 -ICED AMERICANO ETHIOPAI GUJI 12-01-03-0011 1 2 3 4 5 23 16 41 24 133 2:13 32 -ICED MATCHA LIMENADE 12-02-03-0012 1 8 9 12 23 41 24 1 1 32 -Energy drink 12-05-03-0034 1 34 23 41 24 100 3:40 32 -Energy drink soda 12-05-03-0035 1 34 13 23 41 24 100 3:40 32 -ENERGY DRINK PEPSI 12-05-03-0036 1 34 14 23 41 24 100 5:40 32 -ENERGY DRINK SODA 12-05-03-0035 1 34 13 23 41 24 100 6:40 32 -ENERGY DRINK LIMENADE 12-05-03-0037 1 34 12 41 24 100 7:40 32 -ICED ENERGY DRINK 12-05-03-0034 1 34 23 41 24 100 8:40 32 -ICED LYCHEE LIMENADE SODA 12-05-03-0022 1 11 13 23 41 24 100 11:40 32 -ICED LYCHEE 12-05-03-0032 1 11 16 23 41 24 100 17:40 32 -ICED LYCHEE SODA 12-05-03-0033 1 11 13 23 41 24 100 18:40 32 -ICED LYCHEE TEA 12-02-03-0019 1 11 16 23 41 24 100 20:40 32 -ICED LYCHEE AMERICANO 12-01-03-0017 1 2 3 4 5 11 16 23 41 24 100 22:40 32 -ICED GINGER TEA 12-02-03-0020 1 10 23 41 24 88 2:28 42 -GINGER SODA 12-05-03-0038 1 10 13 23 41 24 88 3:28 42 -GINGER LIME \nSODA 12-05-03-0039 1 10 13 12 23 24 88 4:28 42 -STRAWBERRY SODA 12-05-03-0041 1 19 23 13 41 24 55 0:55 17 -ICED STRAWBERRY 12-05-03-0040 1 16 19 23 41 24 75 1:15 24 -Iced strawberrry tea 12-02-03-0022 1 10 19 23 41 24 85 1:25 27 -STRAWBERRY SHAKE 12-04-03-0013 1 25 26 19 17 23 41 24 178 2:58 35 -ICED AMERICANO BLUE DADDY 12-01-03-0019 1 2 36 3 4 5 23 16 41 24 133 2:13 32 -Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23 - -ILYSB 11-99-05-0001 1 23 27 28 24 49 1:01 23 -Gale Jail 11-99-05-0002 1 23 27 28 24 49 2:01 23 -Third Behind Bars 11-99-05-0003 1 23 27 28 24 49 3:01 23 -Love Potion 11-99-05-0005 1 23 27 28 24 49 4:01 23 -Pinky Promise 11-99-05-0004 1 23 27 28 24 49 5:01 23 -Oriental Kink 11-99-05-0007 1 23 27 28 24 49 6:01 23 -Bedroom Story 11-99-05-0006 1 23 27 28 24 49 7:01 23 -Good Night Kiss 11-99-05-0009 1 23 27 28 24 49 8:01 23 -Forever Love 11-99-05-0010 1 23 27 28 24 49 9:01 23 -Long Night 11-99-05-0008 1 23 27 28 24 49 10:01 23 -Forever Love 11-99-05-0012 1 23 27 28 24 49 9:01 23 -Long Night 11-99-05-0013 1 23 27 28 24 49 10:01 23 - - - - -Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 -double espresso 14-11-01-0001 1 2 3 4 5 116 1:56 28 -Hot Americano 14-01-01-0003 1 2 3 4 5 16 24 88 1:28 17 -Hot Latte 14-01-01-0004 1 2 3 4 5 6 7 24 117 1:57 19 -Hot Cappucino 14-01-01-0005 1 2 3 4 5 6 7 24 136 2:16 22 -Hot Mocha 14-01-01-0006 1 2 3 4 5 15 7 24 135 2:15 22 -Hot Caramel Latte 14-01-01-0007 1 22 2 3 4 5 7 24 135 2:15 22 -Hot Matcha café Latte 14-01-01-0008 1 2 3 4 5 8 9 7 24 140 2:20 19 -Hot Taiwanese Tea café Latte 14-01-01-0009 1 2 3 4 5 10 24 136 2:16 26 -Hot Thai Tea café Latte 14-01-01-0010 1 2 3 4 5 6 7 10 24 161 2:41 22 -Hot Kokuto café Latte 14-01-01-0011 1 2 3 4 5 6 7 27 24 125 2:05 17 -Lychee Americano 14-01-01-0012 1 2 3 4 5 11 16 24 98 1:38 16 -Iced Espresso 14-11-02-0001 1 2 3 4 5 6 7 23 24 208 3:28 29 -Iced Americano 14-01-02-0001 1 2 3 4 5 23 16 24 133 2:13 22 -Iced Cafe Latte 14-01-02-0002 1 2 3 4 5 6 7 23 24 186 3:06 26 -Iced Cappuccino 14-11-02-0002 1 2 3 4 5 6 7 23 24 190 3:10 27 -Iced Mocha 14-01-02-0003 1 2 3 4 5 15 7 23 24 167 2:47 23 -Iced Caramel café Latte 14-01-02-0004 1 22 2 3 4 5 7 23 24 182 3:02 25 -Iced Matcha café Latte 14-01-02-0005 1 2 3 4 5 8 9 7 23 24 204 3:24 25 -Iced Taiwanese Tea café Latte 14-01-02-0006 1 2 3 4 5 10 23 24 178 2:58 29 -Iced Thai Tea café Latte 14-01-02-0007 1 2 3 4 5 6 7 10 23 24 190 3:10 23 -Iced Kokuto café Latte 14-01-02-0008 1 2 3 4 5 6 7 27 23 24 186 3:06 23 -Iced Lychee Americano 14-01-02-0009 1 2 3 4 5 11 16 23 24 105 1:45 14 -Hot Caramel milk 14-03-01-0001 1 22 6 7 24 84 1:24 27 -Hot Cocoa 14-03-01-0002 1 15 6 7 24 135 2:15 44 -Hot Kokuto Milk 14-03-01-0003 1 27 6 7 24 84 1:24 27 -Hot Caramel cocoa 14-03-01-0004 1 15 22 6 7 24 145 2:25 35 -Hot Milk 14-03-01-0005 1 6 7 24 102 1:42 49 -Iced Caramel milk 14-03-02-0001 1 22 17 23 24 113 1:53 36 -Iced Cocoa 14-03-02-0002 1 15 17 23 24 125 2:05 40 -Iced Kokuto Milk 14-03-02-0003 1 27 17 23 24 119 1:59 38 -Iced Caramel cocoa 14-03-02-0004 1 15 22 17 23 24 166 2:46 41 -Milk with Iced 14-03-02-0005 1 17 23 24 110 1:50 53 -Iced Pink milk 14-03-02-0006 1 21 17 23 24 129 2:09 42 -hot chrysanths tea 14-02-01-0001 1 10 24 65 1:05 61 -Hot thai milk tea 14-02-01-0002 1 6 7 10 24 78 1:18 25 -Hot Taiwanese Tea 14-02-01-0003 1 6 7 10 24 90 1:30 29 -Hot matcha latte 14-02-01-0004 1 6 7 8 9 24 149 2:29 36 -Hot black tea 14-02-01-0005 -Hot Kokuto Tea 14-02-01-0006 1 6 7 10 27 24 133 2:13 32 -Hot Limeade tea 14-02-01-0007 1 10 12 24 112 1:52 54 -Hot Lychee tea 14-02-01-0008 1 10 11 24 112 1:52 54 -Hot strawberry tea 14-02-01-0009 1 10 19 24 90 1:30 43 -Hot blueberry tea 14-02-01-0010 1 10 20 24 87 1:27 42 -Iced Chrysanths Tea 14-02-02-0001 1 10 23 24 88 1:28 42 -Iced Thai milk Tea 14-02-02-0002 1 6 7 10 23 24 165 2:45 40 -Iced Taiwanese Tea 14-02-02-0003 1 6 7 10 23 24 104 1:44 25 -Iced matcha latte 14-02-02-0004 1 6 7 8 9 23 24 175 2:55 34 -Iced black tea รอเทสชาดำใหม่ 14-02-02-0005 -Iced Kokuto Tea 14-02-02-0006 1 6 7 10 27 23 24 131 2:11 25 -Iced Lime tea 14-02-02-0007 1 10 12 23 24 130 2:10 42 -Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 14-02-02-0008 1 10 11 23 24 129 2:09 42 -Iced strawberrry tea 14-02-02-0009 1 10 19 23 24 85 1:25 27 -Iced blueberry tea 14-02-02-0010 1 10 20 23 24 85 1:25 27 -HOT LIMENADE 14-05-01-0001 1 16 12 24 76 1:16 36 -ICED LIMENADE 14-05-02-0001 1 16 12 23 24 100 1:40 32 -ICED SALAK 14-05-02-0002 1 16 21 23 24 59 0:59 18 -ICED LIME SALAK 14-05-02-0003 1 16 12 21 23 24 79 1:19 19 -ICED LYCHEE 14-05-02-0004 1 16 11 23 24 82 1:22 26 -ICED STRAWBERRY 14-05-02-0005 1 16 19 23 24 75 1:15 24 -ICED BLUEBERRY 14-05-02-0006 1 16 20 23 24 75 1:15 24 -Pepsi 14-05-02-0007 1 23 14 24 49 0:49 23 -SALAK SODA 14-05-02-0008 1 21 23 13 24 44 0:44 13 -LIME SALAK SODA 14-05-02-0009 1 21 23 12 13 24 79 1:19 19 -LIMENADE SODA 14-05-02-0010 1 12 23 13 24 107 1:47 34 -ICED LYCHEE SODA 14-05-02-0011 1 11 23 13 24 65 1:05 20 -STRAWBERRY SODA 14-05-02-0012 1 19 23 13 24 55 0:55 17 -BLUEBERRY SODA 14-05-02-0013 1 20 23 13 24 75 1:15 24 -Soda 14-05-02-0014 1 13 24 24 0:24 20 -Ice Soda 14-05-02-0015 1 23 13 24 27 0:27 12 -DRINKING WATER 14-05-02-0016 1 16 24 60 1:00 56 -Ice 14-05-02-0017 1 23 24 32 0:32 28 -Iced water 14-05-02-0018 1 23 16 24 62 1:02 29 -Hot Water 14-05-01-0002 1 16 24 55 0:55 51 -Coke 14-05-02-0019 0:00 #DIV/0! -Sprite 14-05-02-0020 0:00 #DIV/0! -7UP 14-05-02-0021 1 23 18 24 20 0:20 8 -MATCHA SHAKE 14-04-02-0001 1 25 26 15 6 7 23 24 181 3:01 30 -CHOCOLATE SHAKE 14-04-02-0002 1 25 26 6 7 15 23 24 219 3:39 36 -STRAWBERRY SHAKE 14-04-02-0003 1 25 26 19 17 23 24 178 2:58 35 -ESPRESSO SHAKE 14-04-02-0004 1 25 26 2 3 4 5 17 23 24 230 3:50 28 -THAI TEA SHAKE 14-04-02-0005 1 25 26 6 7 10 23 24 223 3:43 37 -KOKUTO SHAKE 14-04-02-0006 1 25 26 27 17 23 24 180 3:00 35 -BLUEBERRY SHAKE 14-04-02-0007 1 25 26 20 17 23 24 171 2:51 33 -TAIWANESE TEA SHAKE 14-04-02-0008 1 25 26 10 17 23 24 197 3:17 39 -CARAMEL SHAKE 14-04-02-0009 1 25 26 22 17 23 24 196 3:16 38 -MILK SHAKE 14-04-02-0010 1 25 26 6 7 23 24 120 2:00 23 -PLAIN PROTEIN 14-04-02-0011 1 25 26 23 24 100 1:40 32 -Energy drink 14-05-02-0034 1 34 23 24 100 3:40 32 -Energy drink soda 14-05-02-0035 1 34 13 23 24 100 3:40 32 -Energy drink Pepsi 14-05-02-0036 1 34 14 23 24 100 4:40 32 -Energy drink lime soda 14-05-02-0037 1 34 12 13 23 24 100 5:40 32 -ICED MANGO 14-05-02-0030 1 31 23 24 100 12:40 32 -ICED MANGO SODA 14-05-02-0031 1 31 23 13 24 100 13:40 32 \ No newline at end of file diff --git a/animation01/TaoBin2_draft02_art24_.mp4 b/animation01/TaoBin2_draft02_art24_.mp4 deleted file mode 100644 index 1a8824d6..00000000 Binary files a/animation01/TaoBin2_draft02_art24_.mp4 and /dev/null differ diff --git a/animation01/TaoBin2_draft02_art46.mp4 b/animation01/TaoBin2_draft02_art46.mp4 new file mode 100644 index 00000000..f588e190 Binary files /dev/null and b/animation01/TaoBin2_draft02_art46.mp4 differ diff --git a/animation01/TaoBin2_draft02_art47.mp4 b/animation01/TaoBin2_draft02_art47.mp4 new file mode 100644 index 00000000..aec9d994 Binary files /dev/null and b/animation01/TaoBin2_draft02_art47.mp4 differ diff --git a/animation01/sync_1.file b/animation01/sync_1.file new file mode 100644 index 00000000..7c01f8d7 --- /dev/null +++ b/animation01/sync_1.file @@ -0,0 +1,43 @@ +-rw-rw---- 1 root sdcard_rw 948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4 +-rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4 +-rw-rw---- 1 root sdcard_rw 3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4 +-rw-rw---- 1 root sdcard_rw 2523981 2020-11-15 20:04 TaoBin2_draft02_art12.mp4 +-rw-rw---- 1 root sdcard_rw 3033922 2020-11-15 20:04 TaoBin2_draft02_art13.mp4 +-rw-rw---- 1 root sdcard_rw 1504005 2020-11-15 20:05 TaoBin2_draft02_art14.mp4 +-rw-rw---- 1 root sdcard_rw 3485911 2020-11-15 20:05 TaoBin2_draft02_art15.mp4 +-rw-rw---- 1 root sdcard_rw 3116323 2020-11-15 20:05 TaoBin2_draft02_art16.mp4 +-rw-rw---- 1 root sdcard_rw 3221745 2020-11-15 20:06 TaoBin2_draft02_art17.mp4 +-rw-rw---- 1 root sdcard_rw 1375111 2020-11-15 20:06 TaoBin2_draft02_art18.mp4 +-rw-rw---- 1 root sdcard_rw 1478218 2020-11-15 20:06 TaoBin2_draft02_art19.mp4 +-rw-rw---- 1 root sdcard_rw 4333281 2020-11-15 19:54 TaoBin2_draft02_art2.mp4 +-rw-rw---- 1 root sdcard_rw 1416127 2020-11-15 20:07 TaoBin2_draft02_art20.mp4 +-rw-rw---- 1 root sdcard_rw 1495680 2020-11-15 20:07 TaoBin2_draft02_art21.mp4 +-rw-rw---- 1 root sdcard_rw 1469930 2020-11-15 20:07 TaoBin2_draft02_art22.mp4 +-rw-rw---- 1 root sdcard_rw 1920522 2020-11-15 20:08 TaoBin2_draft02_art23.mp4 +-rw-rw---- 1 root sdcard_rw 1319272 2021-11-19 00:07 TaoBin2_draft02_art24.mp4 +-rw-rw---- 1 root sdcard_rw 2879806 2020-12-05 21:17 TaoBin2_draft02_art25.mp4 +-rw-rw---- 1 root sdcard_rw 3161811 2020-12-05 21:18 TaoBin2_draft02_art26.mp4 +-rw-rw---- 1 root sdcard_rw 5410752 2020-12-15 14:22 TaoBin2_draft02_art27.mp4 +-rw-rw---- 1 root sdcard_rw 6889815 2020-12-15 14:21 TaoBin2_draft02_art28.mp4 +-rw-rw---- 1 root sdcard_rw 1966646 2020-11-15 19:54 TaoBin2_draft02_art3.mp4 +-rw-rw---- 1 root sdcard_rw 1876379 2021-04-21 21:02 TaoBin2_draft02_art31.mp4 +-rw-rw---- 1 root sdcard_rw 1796407 2021-04-21 21:02 TaoBin2_draft02_art32.mp4 +-rw-rw---- 1 root sdcard_rw 1840993 2021-04-21 21:02 TaoBin2_draft02_art33.mp4 +-rw-rw---- 1 root sdcard_rw 4730836 2021-04-21 21:02 TaoBin2_draft02_art34.mp4 +-rw-rw---- 1 root sdcard_rw 1375111 2020-11-15 20:06 TaoBin2_draft02_art35.mp4 +-rw-rw---- 1 root sdcard_rw 10750801 2021-08-25 10:14 TaoBin2_draft02_art36.mp4 +-rw-rw---- 1 root sdcard_rw 1504005 2020-11-15 20:05 TaoBin2_draft02_art37.mp4 +-rw-rw---- 1 root sdcard_rw 1595611 2020-11-15 19:54 TaoBin2_draft02_art4.mp4 +-rw-rw---- 1 root sdcard_rw 3055256 2021-09-24 18:44 TaoBin2_draft02_art40.mp4 +-rw-rw---- 1 root sdcard_rw 3605634 2021-09-24 18:44 TaoBin2_draft02_art41.mp4 +-rw-rw---- 1 root sdcard_rw 9350285 2021-09-24 18:44 TaoBin2_draft02_art42.mp4 +-rw-rw---- 1 root sdcard_rw 9643046 2021-09-24 18:44 TaoBin2_draft02_art43.mp4 +-rw-rw---- 1 root sdcard_rw 9973864 2021-12-14 11:13 TaoBin2_draft02_art44.mp4 +-rw-rw---- 1 root sdcard_rw 11954724 2021-12-14 11:13 TaoBin2_draft02_art45.mp4 +-rw-rw---- 1 root sdcard_rw 2273091 2022-01-17 10:49 TaoBin2_draft02_art46.mp4 +-rw-rw---- 1 root sdcard_rw 10876491 2022-01-05 10:53 TaoBin2_draft02_art47.mp4 +-rw-rw---- 1 root sdcard_rw 2041924 2020-11-16 00:25 TaoBin2_draft02_art5.mp4 +-rw-rw---- 1 root sdcard_rw 3843048 2020-11-15 20:18 TaoBin2_draft02_art6.mp4 +-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 diff --git a/image/page2/bn_protein.png b/image/page2/bn_protein.png index 029497e3..5b398d9f 100644 Binary files a/image/page2/bn_protein.png and b/image/page2/bn_protein.png differ diff --git a/image/page2/bp_protein.png b/image/page2/bp_protein.png index 9dc91de7..9e271a4c 100644 Binary files a/image/page2/bp_protein.png and b/image/page2/bp_protein.png differ diff --git a/image/page_doing/txt_15_en.png b/image/page_doing/txt_15_en.png index 80b2cc82..c715a3f3 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_37.png b/image/page_doing/txt_37.png index 6bd0d934..e9324143 100644 Binary files a/image/page_doing/txt_37.png and b/image/page_doing/txt_37.png differ diff --git a/image/page_doing/txt_46.png b/image/page_doing/txt_46.png new file mode 100644 index 00000000..a56cc542 Binary files /dev/null and b/image/page_doing/txt_46.png differ diff --git a/image/page_doing/txt_46_en.png b/image/page_doing/txt_46_en.png new file mode 100644 index 00000000..be498b6b Binary files /dev/null and b/image/page_doing/txt_46_en.png differ diff --git a/image/page_doing/txt_47.png b/image/page_doing/txt_47.png index 185bd488..8490826a 100644 Binary files a/image/page_doing/txt_47.png and b/image/page_doing/txt_47.png differ diff --git a/image/page_drink/bn_Congee.png b/image/page_drink/bn_Congee.png new file mode 100644 index 00000000..190641f5 Binary files /dev/null and b/image/page_drink/bn_Congee.png differ diff --git a/image/page_drink/bn_protein_Blueberry.png b/image/page_drink/bn_protein_Blueberry.png index 139ed2f4..32973b03 100644 Binary files a/image/page_drink/bn_protein_Blueberry.png and b/image/page_drink/bn_protein_Blueberry.png differ diff --git a/image/page_drink/bn_protein_Chocolate.png b/image/page_drink/bn_protein_Chocolate.png index 8703b116..64e932c7 100644 Binary files a/image/page_drink/bn_protein_Chocolate.png and b/image/page_drink/bn_protein_Chocolate.png differ diff --git a/image/page_drink/bn_protein_Mango.png b/image/page_drink/bn_protein_Mango.png index 400367bd..a427d44f 100644 Binary files a/image/page_drink/bn_protein_Mango.png and b/image/page_drink/bn_protein_Mango.png differ diff --git a/image/page_drink/bn_protein_Matcha.png b/image/page_drink/bn_protein_Matcha.png index 89fdf073..1161ed64 100644 Binary files a/image/page_drink/bn_protein_Matcha.png and b/image/page_drink/bn_protein_Matcha.png differ diff --git a/image/page_drink/bn_protein_Strawberry.png b/image/page_drink/bn_protein_Strawberry.png index 393be2e0..ad5691e8 100644 Binary files a/image/page_drink/bn_protein_Strawberry.png and b/image/page_drink/bn_protein_Strawberry.png differ diff --git a/image/page_drink/bn_protein_Taiwantea.png b/image/page_drink/bn_protein_Taiwantea.png index ca092fe3..339cbc2b 100644 Binary files a/image/page_drink/bn_protein_Taiwantea.png and b/image/page_drink/bn_protein_Taiwantea.png differ diff --git a/image/page_drink/bn_protein_Thaitea.png b/image/page_drink/bn_protein_Thaitea.png index 40813cb0..75c5c7c8 100644 Binary files a/image/page_drink/bn_protein_Thaitea.png and b/image/page_drink/bn_protein_Thaitea.png differ diff --git a/image/page_drink/bn_protein_caramel.png b/image/page_drink/bn_protein_caramel.png index 9816daa5..e1aac354 100644 Binary files a/image/page_drink/bn_protein_caramel.png and b/image/page_drink/bn_protein_caramel.png differ diff --git a/image/page_drink/bn_protein_espresso.png b/image/page_drink/bn_protein_espresso.png index 29c83a95..87187643 100644 Binary files a/image/page_drink/bn_protein_espresso.png and b/image/page_drink/bn_protein_espresso.png differ diff --git a/image/page_drink/bn_protein_isolated.png b/image/page_drink/bn_protein_isolated.png index f5657225..dc3476fd 100644 Binary files a/image/page_drink/bn_protein_isolated.png and b/image/page_drink/bn_protein_isolated.png differ diff --git a/image/page_drink/bn_protein_kokuto.png b/image/page_drink/bn_protein_kokuto.png index aa100332..a08ebec0 100644 Binary files a/image/page_drink/bn_protein_kokuto.png and b/image/page_drink/bn_protein_kokuto.png differ diff --git a/image/page_drink/bn_protein_milk.png b/image/page_drink/bn_protein_milk.png index abbac9ee..d68c835a 100644 Binary files a/image/page_drink/bn_protein_milk.png and b/image/page_drink/bn_protein_milk.png differ diff --git a/image/page_drink/bn_protein_oreo.png b/image/page_drink/bn_protein_oreo.png index 3fa74c7d..0b0e6b4a 100644 Binary files a/image/page_drink/bn_protein_oreo.png and b/image/page_drink/bn_protein_oreo.png differ diff --git a/image/page_drink_disable/bn_Congee.png b/image/page_drink_disable/bn_Congee.png new file mode 100644 index 00000000..0768d44c Binary files /dev/null and b/image/page_drink_disable/bn_Congee.png differ diff --git a/image/page_drink_disable/bn_dirty_light__peacher.png b/image/page_drink_disable/bn_dirty_light__peacher.png index 899e026e..0d1f309e 100644 Binary files a/image/page_drink_disable/bn_dirty_light__peacher.png and b/image/page_drink_disable/bn_dirty_light__peacher.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light_peacher.png b/image/page_drink_disable/bn_hot_americano_light_peacher.png index f415da68..d46a11c9 100644 Binary files a/image/page_drink_disable/bn_hot_americano_light_peacher.png and b/image/page_drink_disable/bn_hot_americano_light_peacher.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light_peacher.png b/image/page_drink_disable/bn_hot_espresso_light_peacher.png index 6c40a777..7db9dc1c 100644 Binary files a/image/page_drink_disable/bn_hot_espresso_light_peacher.png and b/image/page_drink_disable/bn_hot_espresso_light_peacher.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light_peacher.png b/image/page_drink_disable/bn_iced_americano_light_peacher.png index a8df4e5f..b26fef50 100644 Binary files a/image/page_drink_disable/bn_iced_americano_light_peacher.png and b/image/page_drink_disable/bn_iced_americano_light_peacher.png differ diff --git a/image/page_drink_press/bn_Congee.png b/image/page_drink_press/bn_Congee.png new file mode 100644 index 00000000..7d46debb Binary files /dev/null and b/image/page_drink_press/bn_Congee.png differ diff --git a/image/page_drink_press/bn_protein_Blueberry.png b/image/page_drink_press/bn_protein_Blueberry.png index b3a6fd86..194fe281 100644 Binary files a/image/page_drink_press/bn_protein_Blueberry.png and b/image/page_drink_press/bn_protein_Blueberry.png differ diff --git a/image/page_drink_press/bn_protein_Chocolate.png b/image/page_drink_press/bn_protein_Chocolate.png index 4188e942..094fbb5f 100644 Binary files a/image/page_drink_press/bn_protein_Chocolate.png and b/image/page_drink_press/bn_protein_Chocolate.png differ diff --git a/image/page_drink_press/bn_protein_Mango.png b/image/page_drink_press/bn_protein_Mango.png index a305917c..6202d145 100644 Binary files a/image/page_drink_press/bn_protein_Mango.png and b/image/page_drink_press/bn_protein_Mango.png differ diff --git a/image/page_drink_press/bn_protein_Matcha.png b/image/page_drink_press/bn_protein_Matcha.png index 1d528f32..04a0dc49 100644 Binary files a/image/page_drink_press/bn_protein_Matcha.png and b/image/page_drink_press/bn_protein_Matcha.png differ diff --git a/image/page_drink_press/bn_protein_Strawberry.png b/image/page_drink_press/bn_protein_Strawberry.png index 086d359c..c073287e 100644 Binary files a/image/page_drink_press/bn_protein_Strawberry.png and b/image/page_drink_press/bn_protein_Strawberry.png differ diff --git a/image/page_drink_press/bn_protein_Taiwantea.png b/image/page_drink_press/bn_protein_Taiwantea.png index b087c561..c110b62a 100644 Binary files a/image/page_drink_press/bn_protein_Taiwantea.png and b/image/page_drink_press/bn_protein_Taiwantea.png differ diff --git a/image/page_drink_press/bn_protein_Thaitea.png b/image/page_drink_press/bn_protein_Thaitea.png index 0885eb37..a2bbccd1 100644 Binary files a/image/page_drink_press/bn_protein_Thaitea.png and b/image/page_drink_press/bn_protein_Thaitea.png differ diff --git a/image/page_drink_press/bn_protein_caramel.png b/image/page_drink_press/bn_protein_caramel.png index a3b5e715..332af86b 100644 Binary files a/image/page_drink_press/bn_protein_caramel.png and b/image/page_drink_press/bn_protein_caramel.png differ diff --git a/image/page_drink_press/bn_protein_espresso.png b/image/page_drink_press/bn_protein_espresso.png index 0cd27ca3..d33fc5e1 100644 Binary files a/image/page_drink_press/bn_protein_espresso.png and b/image/page_drink_press/bn_protein_espresso.png differ diff --git a/image/page_drink_press/bn_protein_isolated.png b/image/page_drink_press/bn_protein_isolated.png index a82c74b5..fe498c0a 100644 Binary files a/image/page_drink_press/bn_protein_isolated.png and b/image/page_drink_press/bn_protein_isolated.png differ diff --git a/image/page_drink_press/bn_protein_kokuto.png b/image/page_drink_press/bn_protein_kokuto.png index a3b6f38a..8718c63f 100644 Binary files a/image/page_drink_press/bn_protein_kokuto.png and b/image/page_drink_press/bn_protein_kokuto.png differ diff --git a/image/page_drink_press/bn_protein_milk.png b/image/page_drink_press/bn_protein_milk.png index 2ea915ff..49911231 100644 Binary files a/image/page_drink_press/bn_protein_milk.png and b/image/page_drink_press/bn_protein_milk.png differ diff --git a/image/page_drink_press/bn_protein_oreo.png b/image/page_drink_press/bn_protein_oreo.png index 69e5c389..22238f25 100644 Binary files a/image/page_drink_press/bn_protein_oreo.png and b/image/page_drink_press/bn_protein_oreo.png differ diff --git a/image/page_drink_select/bn_dirty_light__snowwhite.png b/image/page_drink_select/bn_dirty_light__snowwhite.png index 2b75bbfe..81804f9b 100644 Binary files a/image/page_drink_select/bn_dirty_light__snowwhite.png and b/image/page_drink_select/bn_dirty_light__snowwhite.png differ diff --git a/image/page_drink_select/bn_hot_americano_light_snowwhite.png b/image/page_drink_select/bn_hot_americano_light_snowwhite.png index bb10a94a..94e3cd40 100644 Binary files a/image/page_drink_select/bn_hot_americano_light_snowwhite.png and b/image/page_drink_select/bn_hot_americano_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_hot_espresso_light_snowwhite.png b/image/page_drink_select/bn_hot_espresso_light_snowwhite.png index f6fe5864..c467c097 100644 Binary files a/image/page_drink_select/bn_hot_espresso_light_snowwhite.png and b/image/page_drink_select/bn_hot_espresso_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_iced_americano_light_snowwhite.png b/image/page_drink_select/bn_iced_americano_light_snowwhite.png index e20626be..b8eaf1ef 100644 Binary files a/image/page_drink_select/bn_iced_americano_light_snowwhite.png and b/image/page_drink_select/bn_iced_americano_light_snowwhite.png differ diff --git a/image/page_drink_select/bn_protein_Matcha.png b/image/page_drink_select/bn_protein_Matcha.png index 9e523fbe..bad780a6 100644 Binary files a/image/page_drink_select/bn_protein_Matcha.png and b/image/page_drink_select/bn_protein_Matcha.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index eee36de5..beff9184 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -18,6 +18,10 @@ 12-01-01-0025 12-01-02-0025 12-01-01-0026 +12-01-02-0028 +12-01-01-0027 +12-01-02-0027 +12-01-01-0028 12-01-02-0024 12-01-01-0023 12-01-02-0023 diff --git a/xml/page_board.xml b/xml/page_board.xml index 8c7caa49..2b8881aa 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -34,7 +34,7 @@ Var web_readyOK = "false" Var GetFreeFromError = 0 - Var taobin_version = "2.00" + Var taobin_version = "2.03" Cart "DeleteMenuID" "ALL" Var MultiPayEnable = "true" @@ -108,8 +108,8 @@ ;Var IgnoreNetCore = "false" ;DEBUGVAR SaleProfile - STRCONTAIN "whey" SaleProfile WheyShow - STRCONTAIN "cocktail" SaleProfile CocktailShow + ;STRCONTAIN "whey" SaleProfile WheyShow + ;STRCONTAIN "cocktail" SaleProfile CocktailShow ;STRCONTAIN "roadshow" SaleProfile RoadShow Var cock_tail_str = "" @@ -226,7 +226,7 @@ LED LedDoorLid Off 255 255 255 255 - DEBUGVAR AdvertiseProfile + SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1 SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2 @@ -378,6 +378,25 @@ Machine CancelWepApp + + ;StrLen AdvertiseProfile AdvertiseProfileLen + ; + ;If AdvertiseProfileLen = 0 Then + ; CacheVarStr "get" AdvertiseProfile + ;Else + ; + ; STRCONTAIN "00/00" AdvertiseProfile advPro + ; + ; If advPro = "true" Then + ; CacheVarStr "get" AdvertiseProfile + ; Else + ; CacheVarStr "put" AdvertiseProfile + ; EndIf + ;EndIf + + DEBUGVAR AdvertiseProfile + + 1000 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 17c694dc..809094a4 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -425,11 +425,18 @@ EndIf - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS + If NextOrderStatus = "Disable" Then + Var PayDetail="1/F:1221/0/" + Else + + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + EndIf @@ -471,11 +478,18 @@ Var PayO2 = Seeker.CoffeePinNumber EndIf - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS + + If NextOrderStatus = "Disable" Then + Var PayDetail="1/F:1221/0/" + Else + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + EndIf ;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" @@ -510,11 +524,19 @@ Var ACC = Seeker.TNumberTaobinMember EndIf - Var PayDetail = "1/" + HURR_FOREVER - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + SAMESALARY - Var PayDetail = PayDetail + "/" - Var PayDetail = PayDetail + NOBONUS + + If NextOrderStatus = "Disable" Then + Var PayDetail="1/F:1221/0/" + Else + + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + EndIf diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml index d28d8209..93cf59c1 100644 --- a/xml/page_catalog_choose_drink2.pml +++ b/xml/page_catalog_choose_drink2.pml @@ -14,6 +14,7 @@ product_code.append('12-01-01-0022') product_code.append('12-01-01-0026') product_code.append('12-01-01-0024') + product_code.append('12-01-01-0028') # Normal esp product_code.append('12-11-01-0001') @@ -25,6 +26,7 @@ product_code.append('12-01-01-0021') product_code.append('12-01-01-0025') product_code.append('12-01-01-0023') + product_code.append('12-01-01-0027') # End product_code.append('12-01-01-0004') @@ -44,6 +46,7 @@ product_code.append('12-01-02-0022') product_code.append('12-01-02-0026') product_code.append('12-01-02-0024') + product_code.append('12-01-02-0028') # End product_code.append('12-11-02-0001') @@ -55,6 +58,7 @@ product_code.append('12-01-02-0021') product_code.append('12-01-02-0025') product_code.append('12-01-02-0023') + product_code.append('12-01-02-0027') # End product_code.append('12-01-02-0002') diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 183ecac2..ea930fe6 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -930,7 +930,113 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=7 12-11-01-0001 + ; button i=7 12-01-01-0028 + + 33 + 22 + 225 + 296 + $12-01-01-0028.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0028.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0028.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0028.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0028.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0028.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0028.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=8 12-11-01-0001 33 22 @@ -1036,7 +1142,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=8 12-01-01-0003 + ; button i=9 12-01-01-0003 33 22 @@ -1142,7 +1248,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=9 12-01-01-0014 + ; button i=10 12-01-01-0014 33 22 @@ -1248,7 +1354,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=10 12-01-01-0019 + ; button i=11 12-01-01-0019 33 22 @@ -1354,7 +1460,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=11 12-01-01-0021 + ; button i=12 12-01-01-0021 33 22 @@ -1460,7 +1566,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=12 12-01-01-0025 + ; button i=13 12-01-01-0025 33 22 @@ -1566,7 +1672,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=13 12-01-01-0023 + ; button i=14 12-01-01-0023 33 22 @@ -1672,7 +1778,113 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=14 12-01-01-0004 + ; button i=15 12-01-01-0027 + + 33 + 22 + 225 + 296 + $12-01-01-0027.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0027.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0027.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0027.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0027.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0027.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=16 12-01-01-0004 33 22 @@ -1778,7 +1990,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=15 12-01-01-0005 + ; button i=17 12-01-01-0005 33 22 @@ -1884,7 +2096,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=16 12-01-01-0006 + ; button i=18 12-01-01-0006 33 22 @@ -1990,7 +2202,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=17 12-01-01-0007 + ; button i=19 12-01-01-0007 33 22 @@ -2096,7 +2308,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=18 12-01-01-0009 + ; button i=20 12-01-01-0009 33 22 @@ -2202,7 +2414,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=19 12-01-01-0010 + ; button i=21 12-01-01-0010 33 22 @@ -2308,7 +2520,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=20 12-01-01-0011 + ; button i=22 12-01-01-0011 33 22 @@ -2414,7 +2626,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=21 12-01-01-0012 + ; button i=23 12-01-01-0012 33 22 @@ -2520,7 +2732,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=22 12-01-01-0017 + ; button i=24 12-01-01-0017 33 22 @@ -2626,7 +2838,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=23 12-01-02-0018 + ; button i=25 12-01-02-0018 33 22 @@ -2732,7 +2944,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=24 12-01-02-0020 + ; button i=26 12-01-02-0020 33 22 @@ -2838,7 +3050,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=25 12-01-02-0022 + ; button i=27 12-01-02-0022 33 22 @@ -2944,7 +3156,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=26 12-01-02-0026 + ; button i=28 12-01-02-0026 33 22 @@ -3050,7 +3262,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=27 12-01-02-0024 + ; button i=29 12-01-02-0024 33 22 @@ -3156,7 +3368,113 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=28 12-11-02-0001 + ; button i=30 12-01-02-0028 + + 33 + 22 + 225 + 296 + $12-01-02-0028.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0028.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0028.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0028.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0028.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0028.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0028.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=31 12-11-02-0001 33 22 @@ -3262,7 +3580,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=29 12-01-02-0001 + ; button i=32 12-01-02-0001 33 22 @@ -3368,7 +3686,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=30 12-01-02-0011 + ; button i=33 12-01-02-0011 33 22 @@ -3474,7 +3792,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=31 12-01-02-0019 + ; button i=34 12-01-02-0019 33 22 @@ -3580,7 +3898,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=32 12-01-02-0021 + ; button i=35 12-01-02-0021 33 22 @@ -3686,7 +4004,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=33 12-01-02-0025 + ; button i=36 12-01-02-0025 33 22 @@ -3792,7 +4110,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=34 12-01-02-0023 + ; button i=37 12-01-02-0023 33 22 @@ -3898,7 +4216,113 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=35 12-01-02-0002 + ; button i=38 12-01-02-0027 + + 33 + 22 + 225 + 296 + $12-01-02-0027.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0027.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0027.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0027.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0027.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0027.descriptionE + + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + ; button i=39 12-01-02-0002 33 22 @@ -4004,7 +4428,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=36 12-11-02-0002 + ; button i=40 12-11-02-0002 33 22 @@ -4110,7 +4534,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=37 12-01-02-0003 + ; button i=41 12-01-02-0003 33 22 @@ -4216,7 +4640,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=38 12-01-02-0004 + ; button i=42 12-01-02-0004 33 22 @@ -4322,7 +4746,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=39 12-01-02-0005 + ; button i=43 12-01-02-0005 33 22 @@ -4428,7 +4852,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=40 12-01-02-0007 + ; button i=44 12-01-02-0007 33 22 @@ -4534,7 +4958,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=41 12-01-02-0008 + ; button i=45 12-01-02-0008 33 22 @@ -4640,7 +5064,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=42 12-01-02-0009 + ; button i=46 12-01-02-0009 33 22 @@ -4746,7 +5170,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=43 12-01-02-0017 + ; button i=47 12-01-02-0017 33 22 @@ -4852,7 +5276,7 @@ "ROOT/taobin_project/image/topping2/blender_icon.png" - ; button i=44 12-01-02-0006 + ; button i=48 12-01-02-0006 33 22 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 5939d5b8..556f1c38 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -249,6 +249,7 @@ TransferVar "next" "curr" Var Seeker = "curr" + SAVELOG "Make next order by take-cup" Open "ROOT/taobin_project/xml/page_thankyouConti.xml" EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 9952409f..fc75eb73 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -71,6 +71,9 @@ SAVELOG MachineStage + + READ_FILE "/mnt/sdcard/can_sell" ReadyForBrew + If ReadyForBrew = "false" Then Open "ROOT/taobin_project/xml/page_back_to_main.xml" Var ReadyForBrew = "false" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 0d91ce25..bbde5301 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -370,6 +370,8 @@ EndIf + __CMD "prepar-cup-from-order" 0 "-" "-" + diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 10a33a7f..f5208d61 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -213,7 +213,11 @@ Else Var CART_INDEX = 0 - MakeDrinkV1 SelectDrink SelectSugarID + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf EndIf diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index 0d8e461e..5abb42bc 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -60,7 +60,12 @@ Else Var CART_INDEX = 0 - MakeDrinkV1 SelectDrink SelectSugarID + If Seeker = "curr" Then + MakeDrinkV1 SelectDrink SelectSugarID + Else + DEBUGVAR Seeker + EndIf + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf EndIf diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 6c6a6c77..44659598 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -125,7 +125,7 @@ If CART_INDEX = 0 Then DEBUGVAR Seeker.selected_a_drink - If NextOrderStatus = "fail" Then + If NextOrderStatus = "Disable" Then Var LastMakeDrinkResult = "fail" Else diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index d7b51c1d..97169574 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -12,6 +12,7 @@ DEBUGVAR EnableSelectMenuBetweenBrew + If JXMLVersionInt >= 369 Then If EnableSelectMenuBetweenBrew = "Enable" Then Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml index fa353126..95c5f8e0 100644 --- a/xml/page_topping_select3.xml +++ b/xml/page_topping_select3.xml @@ -650,7 +650,16 @@ DEBUGVAR TOPPING2 Refresh EndIf - If TOPPING2 = "add-show-1010" Then + If TOPPING2 = "add-show-1101" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1102" Then Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index ef542332..3bf3c97c 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -13,6 +13,14 @@ DEBUGVAR SelectDrink DEBUGVAR PictureDrink + + If SelectDrinkLen = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + + If PriceDrink = 0 Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf Var SaveProductCodeSelect = SelectDrink Var UserSelectProductCode = SelectDrink @@ -641,6 +649,32 @@ Refresh EndIf + If TOPPING2 = "add-show-1009" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "add-show-1101" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + + If TOPPING2 = "add-show-1102" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf + ;-END If TOPPING3 = "Collagen" Then Var CollagenState = "Enable" @@ -1554,8 +1588,12 @@ ;Var Seeker = "curr" - - Var Seeker.PriceDrink = PriceDrinkTmp + DEBUGVAR PriceDrinkTmp + + ;Var Seeker.PriceDrink = PriceDrinkTmp + + Var PriceDrink = PriceDrinkTmp + SAVELOG "USER press next ( topping ) - new" Var Seeker.topping1 = topping1 diff --git a/xml/video_loop2.xml b/xml/video_loop2.xml index ba748efc..dab64583 100644 --- a/xml/video_loop2.xml +++ b/xml/video_loop2.xml @@ -12,7 +12,7 @@ Var ClickCountMainTe = 0 - 14000 + 33000 Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_" Var AdvImageFile = AdvImageFile + FileNumber diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e7cc6fed..60723d0b 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.88" - Var XMLPageVersionInt = 588 + Var XMLPageVersion = "5.92" + Var XMLPageVersionInt = 592