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/animation01/Menu Description - Sheet1_.tsv b/animation01/Menu Description - Sheet1_.tsv index b8ffe531..b258fce4 100644 --- a/animation01/Menu Description - Sheet1_.tsv +++ b/animation01/Menu Description - Sheet1_.tsv @@ -74,14 +74,14 @@ Ice 12-05-02-0017 1 23 24 32 0:32 28 Iced water 12-05-02-0018 1 23 16 24 62 1:02 29 Hot Water 12-05-01-0002 1 16 24 55 0:55 51 Coke 12-05-02-0019 0:00 #DIV/0! -Sprite 12-05-02-0020 0:00 #DIV/0! +Sprite 12-05-02-0020 1 23 18 24 20 0:20 8 7UP 12-05-02-0021 1 23 18 24 20 0:20 8 MATCHA SHAKE 12-04-02-0001 1 25 26 15 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 27 17 23 24 180 3:00 35 +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 @@ -106,7 +106,28 @@ 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 - 12-05-02-0023 +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 + Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 @@ -197,7 +218,7 @@ 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 2: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 diff --git a/image/page_drink/bn_dirty_light.png b/image/page_drink/bn_dirty_light.png new file mode 100644 index 00000000..adb08e8a Binary files /dev/null and b/image/page_drink/bn_dirty_light.png differ diff --git a/image/page_drink_disable/bn_dirty_light.png b/image/page_drink_disable/bn_dirty_light.png new file mode 100644 index 00000000..0f6d05ca Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light.png differ diff --git a/image/page_drink_press/bn_dirty_light.png b/image/page_drink_press/bn_dirty_light.png new file mode 100644 index 00000000..492a5ea9 Binary files /dev/null and b/image/page_drink_press/bn_dirty_light.png differ diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml index 0547d76b..2b5c4284 100644 --- a/xml/page_catalog_choose_drink2.pml +++ b/xml/page_catalog_choose_drink2.pml @@ -26,6 +26,8 @@ product_code.append('12-01-01-0011') product_code.append('12-01-01-0012') product_code.append('12-01-01-0017') + product_code.append('12-01-02-0018') + product_code.append('12-11-02-0001') product_code.append('12-01-02-0001') diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 6d652e34..1efb41d5 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -1564,7 +1564,100 @@ $12-01-01-0017.descriptionE - ; button i=15 12-11-02-0001 + ; button i=15 12-01-02-0018 + + 33 + 22 + 225 + 296 + $12-01-02-0018.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0018.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0018.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0018.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0018.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0018.descriptionE + + + ; button i=16 12-11-02-0001 33 22 @@ -1657,7 +1750,7 @@ $12-11-02-0001.descriptionE - ; button i=16 12-01-02-0001 + ; button i=17 12-01-02-0001 33 22 @@ -1750,7 +1843,7 @@ $12-01-02-0001.descriptionE - ; button i=17 12-01-02-0011 + ; button i=18 12-01-02-0011 33 22 @@ -1843,7 +1936,7 @@ $12-01-02-0011.descriptionE - ; button i=18 12-01-02-0002 + ; button i=19 12-01-02-0002 33 22 @@ -1936,7 +2029,7 @@ $12-01-02-0002.descriptionE - ; button i=19 12-11-02-0002 + ; button i=20 12-11-02-0002 33 22 @@ -2029,7 +2122,7 @@ $12-11-02-0002.descriptionE - ; button i=20 12-01-02-0003 + ; button i=21 12-01-02-0003 33 22 @@ -2122,7 +2215,7 @@ $12-01-02-0003.descriptionE - ; button i=21 12-01-02-0004 + ; button i=22 12-01-02-0004 33 22 @@ -2215,7 +2308,7 @@ $12-01-02-0004.descriptionE - ; button i=22 12-01-02-0005 + ; button i=23 12-01-02-0005 33 22 @@ -2308,7 +2401,7 @@ $12-01-02-0005.descriptionE - ; button i=23 12-01-02-0007 + ; button i=24 12-01-02-0007 33 22 @@ -2401,7 +2494,7 @@ $12-01-02-0007.descriptionE - ; button i=24 12-01-02-0008 + ; button i=25 12-01-02-0008 33 22 @@ -2494,7 +2587,7 @@ $12-01-02-0008.descriptionE - ; button i=25 12-01-02-0009 + ; button i=26 12-01-02-0009 33 22 @@ -2587,7 +2680,7 @@ $12-01-02-0009.descriptionE - ; button i=26 12-01-02-0017 + ; button i=27 12-01-02-0017 33 22 @@ -2680,7 +2773,7 @@ $12-01-02-0017.descriptionE - ; button i=27 11-01-02-0009 + ; button i=28 11-01-02-0009 33 22