diff --git a/animation01/TaoBin2_draft02_art36.mp4 b/animation01/TaoBin2_draft02_art36.mp4 new file mode 100644 index 00000000..4e1ff8c1 Binary files /dev/null and b/animation01/TaoBin2_draft02_art36.mp4 differ diff --git a/image/main_page/bn_remove_cup.png b/image/main_page/bn_remove_cup.png index 1f724b90..70adf3fa 100644 Binary files a/image/main_page/bn_remove_cup.png and b/image/main_page/bn_remove_cup.png differ diff --git a/image/main_page/bp_remove_cup-1.png b/image/main_page/bp_remove_cup-1.png new file mode 100644 index 00000000..bf94f568 Binary files /dev/null and b/image/main_page/bp_remove_cup-1.png differ diff --git a/image/main_page/bp_remove_cup.png b/image/main_page/bp_remove_cup.png index b4296bde..4dfef076 100644 Binary files a/image/main_page/bp_remove_cup.png and b/image/main_page/bp_remove_cup.png differ diff --git a/image/page_doing/txt_23.png b/image/page_doing/txt_23.png index bff759aa..c1478061 100644 Binary files a/image/page_doing/txt_23.png and b/image/page_doing/txt_23.png differ diff --git a/image/page_doing/txt_36.png b/image/page_doing/txt_36.png new file mode 100644 index 00000000..6c745a5b Binary files /dev/null and b/image/page_doing/txt_36.png differ diff --git a/image/page_doing/txt_36_en.png b/image/page_doing/txt_36_en.png new file mode 100644 index 00000000..8239a3f1 Binary files /dev/null and b/image/page_doing/txt_36_en.png differ diff --git a/image/page_drink/bn_dirty_light_bluedaddy.png b/image/page_drink/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..9f853105 Binary files /dev/null and b/image/page_drink/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink/bn_hot_americano_light_bluedaddy.png b/image/page_drink/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..ce037e47 Binary files /dev/null and b/image/page_drink/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink/bn_hot_espresso_light_bluedaddy.png b/image/page_drink/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..79fa825e Binary files /dev/null and b/image/page_drink/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink/bn_iced_americano_light_bluedaddy.png b/image/page_drink/bn_iced_americano_light_bluedaddy.png new file mode 100644 index 00000000..983658e0 Binary files /dev/null and b/image/page_drink/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_dirty_light_bluedaddy.png b/image/page_drink_disable/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..a0a4297a Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..4203495e Binary files /dev/null and b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..4c988a54 Binary files /dev/null and b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png new file mode 100644 index 00000000..51cdb7ef Binary files /dev/null and b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_dirty_light_bluedaddy.png b/image/page_drink_press/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..5c163454 Binary files /dev/null and b/image/page_drink_press/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_hot_americano_light_bluedaddy.png b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..8fdf06a6 Binary files /dev/null and b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..5c4116eb Binary files /dev/null and b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_iced_americano_light_bluedaddy.png b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png new file mode 100644 index 00000000..c693c6bd Binary files /dev/null and b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink_select/bn_dirty_light_bluedaddy.png b/image/page_drink_select/bn_dirty_light_bluedaddy.png new file mode 100644 index 00000000..c0e607ad Binary files /dev/null and b/image/page_drink_select/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_select/bn_hot_americano_light_bluedaddy.png b/image/page_drink_select/bn_hot_americano_light_bluedaddy.png new file mode 100644 index 00000000..4d6a1b7b Binary files /dev/null and b/image/page_drink_select/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png b/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png new file mode 100644 index 00000000..bf0573f2 Binary files /dev/null and b/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_select/bn_iced_americano_light_bluedaddy.png b/image/page_drink_select/bn_iced_americano_light_bluedaddy.png new file mode 100644 index 00000000..b83eca7e Binary files /dev/null and b/image/page_drink_select/bn_iced_americano_light_bluedaddy.png differ diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 7688f12d..e05861df 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -1,5 +1,6 @@ 17/1/21 12-01-02-0018 +12-01-02-0020 12-05-02-0029 12-01-01-0001 12-01-01-0003 diff --git a/xml/page_board.xml b/xml/page_board.xml index 2dd86069..114c9acf 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -415,6 +415,7 @@ EndIf ;DEBUGVAR CupOnArm + ;Var CupOnArm = "true" If CupOnArm = "true" Then Var buttonRemoveCup = "Enable" @@ -581,11 +582,11 @@ + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0020.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0020.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0020.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0020.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0020.descriptionE + + + ; button i=4 12-11-01-0001 33 22 @@ -541,7 +634,7 @@ $12-11-01-0001.descriptionE - ; button i=4 12-01-01-0003 + ; button i=5 12-01-01-0003 33 22 @@ -634,7 +727,7 @@ $12-01-01-0003.descriptionE - ; button i=5 12-01-01-0014 + ; button i=6 12-01-01-0014 33 22 @@ -727,7 +820,100 @@ $12-01-01-0014.descriptionE - ; button i=6 12-01-01-0004 + ; button i=7 12-01-01-0019 + + 33 + 22 + 225 + 296 + $12-01-01-0019.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0019.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0019.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0019.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0019.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0019.descriptionE + + + ; button i=8 12-01-01-0004 33 22 @@ -820,7 +1006,7 @@ $12-01-01-0004.descriptionE - ; button i=7 12-01-01-0005 + ; button i=9 12-01-01-0005 33 22 @@ -913,7 +1099,7 @@ $12-01-01-0005.descriptionE - ; button i=8 12-01-01-0006 + ; button i=10 12-01-01-0006 33 22 @@ -1006,7 +1192,7 @@ $12-01-01-0006.descriptionE - ; button i=9 12-01-01-0007 + ; button i=11 12-01-01-0007 33 22 @@ -1099,7 +1285,7 @@ $12-01-01-0007.descriptionE - ; button i=10 12-01-01-0009 + ; button i=12 12-01-01-0009 33 22 @@ -1192,7 +1378,7 @@ $12-01-01-0009.descriptionE - ; button i=11 12-01-01-0010 + ; button i=13 12-01-01-0010 33 22 @@ -1285,7 +1471,7 @@ $12-01-01-0010.descriptionE - ; button i=12 12-01-01-0011 + ; button i=14 12-01-01-0011 33 22 @@ -1378,7 +1564,7 @@ $12-01-01-0011.descriptionE - ; button i=13 12-01-01-0012 + ; button i=15 12-01-01-0012 33 22 @@ -1471,7 +1657,7 @@ $12-01-01-0012.descriptionE - ; button i=14 12-01-01-0017 + ; button i=16 12-01-01-0017 33 22 @@ -1564,7 +1750,7 @@ $12-01-01-0017.descriptionE - ; button i=15 12-01-02-0018 + ; button i=17 12-01-02-0018 33 22 @@ -1657,7 +1843,100 @@ $12-01-02-0018.descriptionE - ; button i=16 12-11-02-0001 + ; button i=18 12-01-02-0020 + + 33 + 22 + 225 + 296 + $12-01-02-0020.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0020.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0020.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0020.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0020.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0020.descriptionE + + + ; button i=19 12-11-02-0001 33 22 @@ -1750,7 +2029,7 @@ $12-11-02-0001.descriptionE - ; button i=17 12-01-02-0001 + ; button i=20 12-01-02-0001 33 22 @@ -1843,7 +2122,7 @@ $12-01-02-0001.descriptionE - ; button i=18 12-01-02-0011 + ; button i=21 12-01-02-0011 33 22 @@ -1936,7 +2215,100 @@ $12-01-02-0011.descriptionE - ; button i=19 12-01-02-0002 + ; button i=22 12-01-02-0019 + + 33 + 22 + 225 + 296 + $12-01-02-0019.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0019.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0019.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0019.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0019.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0019.descriptionE + + + ; button i=23 12-01-02-0002 33 22 @@ -2029,7 +2401,7 @@ $12-01-02-0002.descriptionE - ; button i=20 12-11-02-0002 + ; button i=24 12-11-02-0002 33 22 @@ -2122,7 +2494,7 @@ $12-11-02-0002.descriptionE - ; button i=21 12-01-02-0003 + ; button i=25 12-01-02-0003 33 22 @@ -2215,7 +2587,7 @@ $12-01-02-0003.descriptionE - ; button i=22 12-01-02-0004 + ; button i=26 12-01-02-0004 33 22 @@ -2308,7 +2680,7 @@ $12-01-02-0004.descriptionE - ; button i=23 12-01-02-0005 + ; button i=27 12-01-02-0005 33 22 @@ -2401,7 +2773,7 @@ $12-01-02-0005.descriptionE - ; button i=24 12-01-02-0007 + ; button i=28 12-01-02-0007 33 22 @@ -2494,7 +2866,7 @@ $12-01-02-0007.descriptionE - ; button i=25 12-01-02-0008 + ; button i=29 12-01-02-0008 33 22 @@ -2587,7 +2959,7 @@ $12-01-02-0008.descriptionE - ; button i=26 12-01-02-0009 + ; button i=30 12-01-02-0009 33 22 @@ -2680,7 +3052,7 @@ $12-01-02-0009.descriptionE - ; button i=27 12-01-02-0017 + ; button i=31 12-01-02-0017 33 22 @@ -2773,7 +3145,7 @@ $12-01-02-0017.descriptionE - ; button i=28 11-01-02-0009 + ; button i=32 11-01-02-0009 33 22