diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index 9b3edf4a..a48e128f 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -129,6 +129,13 @@ 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 + + Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 double espresso 14-11-01-0001 1 2 3 4 5 116 1:56 28 diff --git a/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv index b258fce4..9b3edf4a 100644 --- a/animation01/Menu Description - Sheet1_.tsv +++ b/animation01/Menu Description - Sheet1_.tsv @@ -127,7 +127,7 @@ 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 Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 diff --git a/image/page2/bn_diy.png b/image/page2/bn_diy.png index 4e46021c..4f5d5ca1 100644 Binary files a/image/page2/bn_diy.png and b/image/page2/bn_diy.png differ diff --git a/image/page2/bp_diy.png b/image/page2/bp_diy.png index 73ba1765..fd472fe0 100644 Binary files a/image/page2/bp_diy.png and b/image/page2/bp_diy.png differ diff --git a/image/page2_en/page2/bn_diy.png b/image/page2_en/page2/bn_diy.png index 8700bee4..a8ba447c 100644 Binary files a/image/page2_en/page2/bn_diy.png and b/image/page2_en/page2/bn_diy.png differ diff --git a/image/page2_en/page2/bp_diy.png b/image/page2_en/page2/bp_diy.png index 41676f50..f1049816 100644 Binary files a/image/page2_en/page2/bp_diy.png and b/image/page2_en/page2/bp_diy.png differ diff --git a/image/page3/bn_bestseller.png b/image/page3/bn_bestseller.png index 52f7f5ff..86d21be3 100644 Binary files a/image/page3/bn_bestseller.png and b/image/page3/bn_bestseller.png differ diff --git a/image/page3/bp_bestseller.png b/image/page3/bp_bestseller.png index 813c0818..4fcd91bc 100644 Binary files a/image/page3/bp_bestseller.png and b/image/page3/bp_bestseller.png differ diff --git a/image/page3_en/bn_bestseller.png b/image/page3_en/bn_bestseller.png index b69fd96d..aa692af8 100644 Binary files a/image/page3_en/bn_bestseller.png and b/image/page3_en/bn_bestseller.png differ diff --git a/image/page3_en/bp_bestseller.png b/image/page3_en/bp_bestseller.png index 40b388e7..2fb6b092 100644 Binary files a/image/page3_en/bp_bestseller.png and b/image/page3_en/bp_bestseller.png differ diff --git a/image/page_drink/bn_iced_Ginger_soda.png b/image/page_drink/bn_iced_Ginger_soda.png index a48cb3f0..0bfd8e99 100644 Binary files a/image/page_drink/bn_iced_Ginger_soda.png and b/image/page_drink/bn_iced_Ginger_soda.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 1fa2f5ab..7688f12d 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -1,4 +1,5 @@ 17/1/21 +12-01-02-0018 12-05-02-0029 12-01-01-0001 12-01-01-0003 diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml index cdeb82d3..5c559e8a 100644 --- a/xml/page_catalog_choose_drink3.pml +++ b/xml/page_catalog_choose_drink3.pml @@ -8,6 +8,8 @@ product_code.append('12-02-01-0001') product_code.append('12-02-01-0002') + product_code.append('12-02-01-0020') + product_code.append('12-02-01-0003') product_code.append('12-02-01-0004') @@ -15,6 +17,8 @@ #product_code.append('12-02-01-0005') #HOT BLACK TEA product_code.append('12-02-01-0006') + product_code.append('12-02-01-0021') + product_code.append('12-02-01-0007') product_code.append('12-02-01-0008') product_code.append('12-02-01-0019') @@ -24,6 +28,8 @@ product_code.append('12-02-01-0012') product_code.append('12-02-01-0017') + product_code.append('12-02-02-0020') + product_code.append('12-02-02-0001') product_code.append('12-02-02-0002') product_code.append('12-02-02-0003') diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 1c61942a..7663b0f2 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -447,7 +447,100 @@ $12-02-01-0002.descriptionE - ; button i=3 12-02-01-0003 + ; button i=3 12-02-01-0020 + + 33 + 22 + 225 + 296 + $12-02-01-0020.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-01-0020.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-01-0020.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-01-0020.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-01-0020.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-01-0020.descriptionE + + + ; button i=4 12-02-01-0003 33 22 @@ -540,7 +633,7 @@ $12-02-01-0003.descriptionE - ; button i=4 12-02-01-0004 + ; button i=5 12-02-01-0004 33 22 @@ -633,7 +726,7 @@ $12-02-01-0004.descriptionE - ; button i=5 12-02-01-0006 + ; button i=6 12-02-01-0006 33 22 @@ -726,7 +819,100 @@ $12-02-01-0006.descriptionE - ; button i=6 12-02-01-0007 + ; button i=7 12-02-01-0021 + + 33 + 22 + 225 + 296 + $12-02-01-0021.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-01-0021.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-01-0021.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-01-0021.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-01-0021.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-01-0021.descriptionE + + + ; button i=8 12-02-01-0007 33 22 @@ -819,7 +1005,7 @@ $12-02-01-0007.descriptionE - ; button i=7 12-02-01-0008 + ; button i=9 12-02-01-0008 33 22 @@ -912,7 +1098,7 @@ $12-02-01-0008.descriptionE - ; button i=8 12-02-01-0019 + ; button i=10 12-02-01-0019 33 22 @@ -1005,7 +1191,7 @@ $12-02-01-0019.descriptionE - ; button i=9 12-02-01-0009 + ; button i=11 12-02-01-0009 33 22 @@ -1098,7 +1284,7 @@ $12-02-01-0009.descriptionE - ; button i=10 12-02-01-0010 + ; button i=12 12-02-01-0010 33 22 @@ -1191,7 +1377,7 @@ $12-02-01-0010.descriptionE - ; button i=11 12-02-01-0011 + ; button i=13 12-02-01-0011 33 22 @@ -1284,7 +1470,7 @@ $12-02-01-0011.descriptionE - ; button i=12 12-02-01-0012 + ; button i=14 12-02-01-0012 33 22 @@ -1377,7 +1563,7 @@ $12-02-01-0012.descriptionE - ; button i=13 12-02-01-0017 + ; button i=15 12-02-01-0017 33 22 @@ -1470,7 +1656,100 @@ $12-02-01-0017.descriptionE - ; button i=14 12-02-02-0001 + ; button i=16 12-02-02-0020 + + 33 + 22 + 225 + 296 + $12-02-02-0020.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0020.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0020.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0020.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0020.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0020.descriptionE + + + ; button i=17 12-02-02-0001 33 22 @@ -1563,7 +1842,7 @@ $12-02-02-0001.descriptionE - ; button i=15 12-02-02-0002 + ; button i=18 12-02-02-0002 33 22 @@ -1656,7 +1935,7 @@ $12-02-02-0002.descriptionE - ; button i=16 12-02-02-0003 + ; button i=19 12-02-02-0003 33 22 @@ -1749,7 +2028,7 @@ $12-02-02-0003.descriptionE - ; button i=17 12-02-02-0004 + ; button i=20 12-02-02-0004 33 22 @@ -1842,7 +2121,7 @@ $12-02-02-0004.descriptionE - ; button i=18 12-02-02-0005 + ; button i=21 12-02-02-0005 33 22 @@ -1935,7 +2214,7 @@ $12-02-02-0005.descriptionE - ; button i=19 12-02-02-0006 + ; button i=22 12-02-02-0006 33 22 @@ -2028,7 +2307,7 @@ $12-02-02-0006.descriptionE - ; button i=20 12-02-02-0007 + ; button i=23 12-02-02-0007 33 22 @@ -2121,7 +2400,7 @@ $12-02-02-0007.descriptionE - ; button i=21 12-02-02-0008 + ; button i=24 12-02-02-0008 33 22 @@ -2214,7 +2493,7 @@ $12-02-02-0008.descriptionE - ; button i=22 12-02-02-0019 + ; button i=25 12-02-02-0019 33 22 @@ -2307,7 +2586,7 @@ $12-02-02-0019.descriptionE - ; button i=23 12-02-02-0009 + ; button i=26 12-02-02-0009 33 22 @@ -2400,7 +2679,7 @@ $12-02-02-0009.descriptionE - ; button i=24 12-02-02-0010 + ; button i=27 12-02-02-0010 33 22 @@ -2493,7 +2772,7 @@ $12-02-02-0010.descriptionE - ; button i=25 12-02-02-0011 + ; button i=28 12-02-02-0011 33 22 @@ -2586,7 +2865,7 @@ $12-02-02-0011.descriptionE - ; button i=26 12-02-02-0012 + ; button i=29 12-02-02-0012 33 22 @@ -2679,7 +2958,7 @@ $12-02-02-0012.descriptionE - ; button i=27 12-05-02-0027 + ; button i=30 12-05-02-0027 33 22 diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml index 1d40d083..1bf14187 100644 --- a/xml/page_catalog_choose_drink6.pml +++ b/xml/page_catalog_choose_drink6.pml @@ -18,15 +18,18 @@ product_code.append('12-05-02-0012') product_code.append('12-05-02-0013') - product_code.append('12-05-02-0025') product_code.append('12-05-02-0031') product_code.append('12-05-02-0008') product_code.append('12-05-02-0009') product_code.append('12-05-02-0024') - product_code.append('12-05-02-0029') + product_code.append('12-05-02-0038') + product_code.append('12-05-02-0029') # LIMENADE group + product_code.append('12-05-02-0025') + product_code.append('12-05-02-0039') + product_code.append('12-05-02-0014') product_code.append('12-05-02-0015') diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index ef09f4f7..8732d388 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -1193,100 +1193,7 @@ $12-05-02-0013.descriptionE - ; button i=11 12-05-02-0025 - - 33 - 22 - 225 - 296 - $12-05-02-0025.Button - - - 182 - 12 - ShowPrice - "Hurr" - 150 - 27 - KanitTTF - 0xB78F24 - $12-05-02-0025.Price - - - 164 - 12 - ShowPrice - 20 - 27 - KanitTTF - 0xB78F24 - "฿"" - - - 16 - 190 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - $12-05-02-0025.Name - - - 16 - 246 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - $12-05-02-0025.description - - - 16 - 190 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - $12-05-02-0025.NameE - - - 16 - 246 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - $12-05-02-0025.descriptionE - - - ; button i=12 12-05-02-0031 + ; button i=11 12-05-02-0031 33 22 @@ -1379,7 +1286,7 @@ $12-05-02-0031.descriptionE - ; button i=13 12-05-02-0008 + ; button i=12 12-05-02-0008 33 22 @@ -1472,7 +1379,7 @@ $12-05-02-0008.descriptionE - ; button i=14 12-05-02-0009 + ; button i=13 12-05-02-0009 33 22 @@ -1565,7 +1472,7 @@ $12-05-02-0009.descriptionE - ; button i=15 12-05-02-0024 + ; button i=14 12-05-02-0024 33 22 @@ -1657,6 +1564,99 @@ showengText $12-05-02-0024.descriptionE + + ; button i=15 12-05-02-0038 + + 33 + 22 + 225 + 296 + $12-05-02-0038.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0038.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0038.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0038.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0038.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0038.descriptionE + ; button i=16 12-05-02-0029 @@ -1751,7 +1751,193 @@ $12-05-02-0029.descriptionE - ; button i=17 12-05-02-0014 + ; button i=17 12-05-02-0025 + + 33 + 22 + 225 + 296 + $12-05-02-0025.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0025.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0025.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0025.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0025.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0025.descriptionE + + + ; button i=18 12-05-02-0039 + + 33 + 22 + 225 + 296 + $12-05-02-0039.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0039.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0039.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0039.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0039.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0039.descriptionE + + + ; button i=19 12-05-02-0014 33 22 @@ -1844,7 +2030,7 @@ $12-05-02-0014.descriptionE - ; button i=18 12-05-02-0015 + ; button i=20 12-05-02-0015 33 22 @@ -1937,7 +2123,7 @@ $12-05-02-0015.descriptionE - ; button i=19 12-05-01-0001 + ; button i=21 12-05-01-0001 33 22 @@ -2030,7 +2216,7 @@ $12-05-01-0001.descriptionE - ; button i=20 12-05-02-0001 + ; button i=22 12-05-02-0001 33 22 @@ -2123,7 +2309,7 @@ $12-05-02-0001.descriptionE - ; button i=21 12-05-02-0034 + ; button i=23 12-05-02-0034 33 22 @@ -2216,7 +2402,7 @@ $12-05-02-0034.descriptionE - ; button i=22 12-05-02-0004 + ; button i=24 12-05-02-0004 33 22 @@ -2309,7 +2495,7 @@ $12-05-02-0004.descriptionE - ; button i=23 12-05-02-0032 + ; button i=25 12-05-02-0032 33 22 @@ -2402,7 +2588,7 @@ $12-05-02-0032.descriptionE - ; button i=24 12-05-02-0005 + ; button i=26 12-05-02-0005 33 22 @@ -2495,7 +2681,7 @@ $12-05-02-0005.descriptionE - ; button i=25 12-05-02-0006 + ; button i=27 12-05-02-0006 33 22 @@ -2588,7 +2774,7 @@ $12-05-02-0006.descriptionE - ; button i=26 12-05-02-0026 + ; button i=28 12-05-02-0026 33 22 @@ -2681,7 +2867,7 @@ $12-05-02-0026.descriptionE - ; button i=27 12-05-02-0030 + ; button i=29 12-05-02-0030 33 22 @@ -2774,7 +2960,7 @@ $12-05-02-0030.descriptionE - ; button i=28 12-05-02-0002 + ; button i=30 12-05-02-0002 33 22 @@ -2867,7 +3053,7 @@ $12-05-02-0002.descriptionE - ; button i=29 12-05-02-0003 + ; button i=31 12-05-02-0003 33 22 @@ -2960,7 +3146,7 @@ $12-05-02-0003.descriptionE - ; button i=30 12-05-02-0016 + ; button i=32 12-05-02-0016 33 22 @@ -3053,7 +3239,7 @@ $12-05-02-0016.descriptionE - ; button i=31 12-05-02-0017 + ; button i=33 12-05-02-0017 33 22 @@ -3146,7 +3332,7 @@ $12-05-02-0017.descriptionE - ; button i=32 12-05-02-0018 + ; button i=34 12-05-02-0018 33 22 @@ -3239,7 +3425,7 @@ $12-05-02-0018.descriptionE - ; button i=33 12-05-01-0002 + ; button i=35 12-05-01-0002 33 22 diff --git a/xml/page_drinkfail3.xml b/xml/page_drinkfail3.xml index 6160d43c..960f082c 100644 --- a/xml/page_drinkfail3.xml +++ b/xml/page_drinkfail3.xml @@ -34,8 +34,8 @@ Var Timeout = Timeout + 1 - If Timeout > 240 Then - ;If Timeout > 10 Then + ;If Timeout > 10 Then + If Timeout > 240 Then Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 41b1f21b..051b7418 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -199,6 +199,11 @@ "ROOT/taobin_project/image/tab_1.png" Open "ROOT/xml/test_coin.xml" + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail3.xml" + + ;TopView "show" + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"