diff --git a/animation01/TaoBin2_draft02_art40.mp4 b/animation01/TaoBin2_draft02_art40.mp4 new file mode 100644 index 00000000..38e270de Binary files /dev/null and b/animation01/TaoBin2_draft02_art40.mp4 differ diff --git a/animation01/TaoBin2_draft02_art41.mp4 b/animation01/TaoBin2_draft02_art41.mp4 new file mode 100644 index 00000000..3c7931b5 Binary files /dev/null and b/animation01/TaoBin2_draft02_art41.mp4 differ diff --git a/animation01/TaoBin2_draft02_art42.mp4 b/animation01/TaoBin2_draft02_art42.mp4 new file mode 100644 index 00000000..dd6b5352 Binary files /dev/null and b/animation01/TaoBin2_draft02_art42.mp4 differ diff --git a/animation01/TaoBin2_draft02_art43.mp4 b/animation01/TaoBin2_draft02_art43.mp4 new file mode 100644 index 00000000..ea94dba4 Binary files /dev/null and b/animation01/TaoBin2_draft02_art43.mp4 differ diff --git a/campaign2/page_catalog.mp4 b/campaign2/page_catalog.mp4 deleted file mode 100755 index 79455abd..00000000 Binary files a/campaign2/page_catalog.mp4 and /dev/null differ diff --git a/campaign2/page_catalog_menu.mp4 b/campaign2/page_catalog_menu.mp4 deleted file mode 100755 index 8c7a3cea..00000000 Binary files a/campaign2/page_catalog_menu.mp4 and /dev/null differ diff --git a/campaign2/page_main.mp4 b/campaign2/page_main.mp4 deleted file mode 100755 index 73757c86..00000000 Binary files a/campaign2/page_main.mp4 and /dev/null differ diff --git a/campaign3/page_catalog.mp4 b/campaign3/page_catalog.mp4 deleted file mode 100755 index 3c1b37fb..00000000 Binary files a/campaign3/page_catalog.mp4 and /dev/null differ diff --git a/campaign3/page_catalog_menu.mp4 b/campaign3/page_catalog_menu.mp4 deleted file mode 100755 index 7c051344..00000000 Binary files a/campaign3/page_catalog_menu.mp4 and /dev/null differ diff --git a/campaign3/page_main.mp4 b/campaign3/page_main.mp4 deleted file mode 100755 index a2d80950..00000000 Binary files a/campaign3/page_main.mp4 and /dev/null differ diff --git a/campaign4/page_main.mp4 b/campaign4/page_main.mp4 deleted file mode 100755 index dd868118..00000000 Binary files a/campaign4/page_main.mp4 and /dev/null differ diff --git a/image/page_drink/bn_dirty_light.png b/image/page_drink/bn_dirty_light.png index 6bfda10c..21b38a3b 100644 Binary files a/image/page_drink/bn_dirty_light.png and b/image/page_drink/bn_dirty_light.png differ diff --git a/image/page_drink/bn_dirty_light_bluedaddy.png b/image/page_drink/bn_dirty_light_bluedaddy.png index 67f80b8d..0cc2e367 100644 Binary files a/image/page_drink/bn_dirty_light_bluedaddy.png and b/image/page_drink/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink/bn_dirty_light_mozart.png b/image/page_drink/bn_dirty_light_mozart.png new file mode 100644 index 00000000..12031393 Binary files /dev/null and b/image/page_drink/bn_dirty_light_mozart.png differ diff --git a/image/page_drink/bn_hot_americano_light.png b/image/page_drink/bn_hot_americano_light.png index 0bec660a..3752575d 100644 Binary files a/image/page_drink/bn_hot_americano_light.png and b/image/page_drink/bn_hot_americano_light.png differ diff --git a/image/page_drink/bn_hot_americano_light_bluedaddy.png b/image/page_drink/bn_hot_americano_light_bluedaddy.png index 112b3736..087c3a64 100644 Binary files a/image/page_drink/bn_hot_americano_light_bluedaddy.png and b/image/page_drink/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink/bn_hot_americano_light_mozart.png b/image/page_drink/bn_hot_americano_light_mozart.png new file mode 100644 index 00000000..192cb487 Binary files /dev/null and b/image/page_drink/bn_hot_americano_light_mozart.png differ diff --git a/image/page_drink/bn_hot_espresso_light.png b/image/page_drink/bn_hot_espresso_light.png index 6755f801..09f84181 100644 Binary files a/image/page_drink/bn_hot_espresso_light.png and b/image/page_drink/bn_hot_espresso_light.png differ diff --git a/image/page_drink/bn_hot_espresso_light_bluedaddy.png b/image/page_drink/bn_hot_espresso_light_bluedaddy.png index 90096ead..8132c316 100644 Binary files a/image/page_drink/bn_hot_espresso_light_bluedaddy.png and b/image/page_drink/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink/bn_hot_espresso_light_mozart.png b/image/page_drink/bn_hot_espresso_light_mozart.png new file mode 100644 index 00000000..e3c034cb Binary files /dev/null and b/image/page_drink/bn_hot_espresso_light_mozart.png differ diff --git a/image/page_drink/bn_iced_americano_light.png b/image/page_drink/bn_iced_americano_light.png index 1774624a..2379d209 100644 Binary files a/image/page_drink/bn_iced_americano_light.png and b/image/page_drink/bn_iced_americano_light.png differ diff --git a/image/page_drink/bn_iced_americano_light_bluedaddy.png b/image/page_drink/bn_iced_americano_light_bluedaddy.png index 16c58828..b11b2623 100644 Binary files a/image/page_drink/bn_iced_americano_light_bluedaddy.png and b/image/page_drink/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink/bn_iced_americano_light_mozart.png b/image/page_drink/bn_iced_americano_light_mozart.png new file mode 100644 index 00000000..2c9d2725 Binary files /dev/null and b/image/page_drink/bn_iced_americano_light_mozart.png differ diff --git a/image/page_drink_disable/bn_dirty_light.png b/image/page_drink_disable/bn_dirty_light.png index b9a520f3..1b863c77 100644 Binary files a/image/page_drink_disable/bn_dirty_light.png and b/image/page_drink_disable/bn_dirty_light.png differ diff --git a/image/page_drink_disable/bn_dirty_light_bluedaddy.png b/image/page_drink_disable/bn_dirty_light_bluedaddy.png index e240a5e4..50e2c9bf 100644 Binary files a/image/page_drink_disable/bn_dirty_light_bluedaddy.png and b/image/page_drink_disable/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_dirty_light_mozart.png b/image/page_drink_disable/bn_dirty_light_mozart.png new file mode 100644 index 00000000..16cef546 Binary files /dev/null and b/image/page_drink_disable/bn_dirty_light_mozart.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light.png b/image/page_drink_disable/bn_hot_americano_light.png index 4790972a..1bc369e4 100644 Binary files a/image/page_drink_disable/bn_hot_americano_light.png and b/image/page_drink_disable/bn_hot_americano_light.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 index b94e5457..dd2dc69b 100644 Binary files a/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png and b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_hot_americano_light_mozart.png b/image/page_drink_disable/bn_hot_americano_light_mozart.png new file mode 100644 index 00000000..51e277d9 Binary files /dev/null and b/image/page_drink_disable/bn_hot_americano_light_mozart.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light.png b/image/page_drink_disable/bn_hot_espresso_light.png index e48bbf70..034ea0f0 100644 Binary files a/image/page_drink_disable/bn_hot_espresso_light.png and b/image/page_drink_disable/bn_hot_espresso_light.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 index 7e11c7e8..8f3266a2 100644 Binary files a/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png and b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_hot_espresso_light_mozart.png b/image/page_drink_disable/bn_hot_espresso_light_mozart.png new file mode 100644 index 00000000..353abb8d Binary files /dev/null and b/image/page_drink_disable/bn_hot_espresso_light_mozart.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light.png b/image/page_drink_disable/bn_iced_americano_light.png index 80053de2..d825804a 100644 Binary files a/image/page_drink_disable/bn_iced_americano_light.png and b/image/page_drink_disable/bn_iced_americano_light.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 index 8b021800..a017913d 100644 Binary files a/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png and b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink_disable/bn_iced_americano_light_mozart.png b/image/page_drink_disable/bn_iced_americano_light_mozart.png new file mode 100644 index 00000000..9f19778f Binary files /dev/null and b/image/page_drink_disable/bn_iced_americano_light_mozart.png differ diff --git a/image/page_drink_press/bn_dirty_light.png b/image/page_drink_press/bn_dirty_light.png index 7e98d9fe..b955b582 100644 Binary files a/image/page_drink_press/bn_dirty_light.png and b/image/page_drink_press/bn_dirty_light.png differ diff --git a/image/page_drink_press/bn_dirty_light_bluedaddy.png b/image/page_drink_press/bn_dirty_light_bluedaddy.png index 00960265..ea98a070 100644 Binary files a/image/page_drink_press/bn_dirty_light_bluedaddy.png and b/image/page_drink_press/bn_dirty_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_dirty_light_mozart.png b/image/page_drink_press/bn_dirty_light_mozart.png new file mode 100644 index 00000000..75f8d25c Binary files /dev/null and b/image/page_drink_press/bn_dirty_light_mozart.png differ diff --git a/image/page_drink_press/bn_hot_americano_light.png b/image/page_drink_press/bn_hot_americano_light.png index 51e7bc5b..478bd4da 100644 Binary files a/image/page_drink_press/bn_hot_americano_light.png and b/image/page_drink_press/bn_hot_americano_light.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 index 4c4c8568..eee84caf 100644 Binary files a/image/page_drink_press/bn_hot_americano_light_bluedaddy.png and b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_hot_americano_light_mozart.png b/image/page_drink_press/bn_hot_americano_light_mozart.png new file mode 100644 index 00000000..9a4451ad Binary files /dev/null and b/image/page_drink_press/bn_hot_americano_light_mozart.png differ diff --git a/image/page_drink_press/bn_hot_espresso_light.png b/image/page_drink_press/bn_hot_espresso_light.png index d117461d..de472c0f 100644 Binary files a/image/page_drink_press/bn_hot_espresso_light.png and b/image/page_drink_press/bn_hot_espresso_light.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 index c50856a5..4e46e3b8 100644 Binary files a/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png and b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_hot_espresso_light_mozart.png b/image/page_drink_press/bn_hot_espresso_light_mozart.png new file mode 100644 index 00000000..c4e0d8ab Binary files /dev/null and b/image/page_drink_press/bn_hot_espresso_light_mozart.png differ diff --git a/image/page_drink_press/bn_iced_americano_light.png b/image/page_drink_press/bn_iced_americano_light.png index 09a348e5..2a0b327e 100644 Binary files a/image/page_drink_press/bn_iced_americano_light.png and b/image/page_drink_press/bn_iced_americano_light.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 index 85343be8..bec6f0f4 100644 Binary files a/image/page_drink_press/bn_iced_americano_light_bluedaddy.png and b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png differ diff --git a/image/page_drink_press/bn_iced_americano_light_mozart.png b/image/page_drink_press/bn_iced_americano_light_mozart.png new file mode 100644 index 00000000..504ab10c Binary files /dev/null and b/image/page_drink_press/bn_iced_americano_light_mozart.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 025780df..5b23498f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -82,7 +82,7 @@ STRCONTAIN "whey" SaleProfile WheyShow STRCONTAIN "cocktail" SaleProfile CocktailShow - STRCONTAIN "roadshow" SaleProfile RoadShow + ;STRCONTAIN "roadshow" SaleProfile RoadShow Var TermTemOnline = "false" Var TaobinOnline = "false" diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index af919cd7..1c094aa9 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -7,9 +7,8 @@ Var y_topping_bg = 912 - If ToppingNewEnable = "false" Then - - Else + If ConfigNumer > 360 Then + SAVELOG "Recipe have smoothies" Open "ROOT/taobin_project/xml/page_topping_select2.xml" EndIf diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index 3ae28b68..81a35d29 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -121,6 +121,10 @@ Var PriceDrinkTmp = "Free" EndIf + If ShowPrice = "Invisible" Then + Var PriceDrinkTmpShow = "Free" + EndIf + Var StateImgKeto = "Invisible" @@ -677,7 +681,8 @@ Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp SAVELOG PriceDrinkTmp - Refresh + Refresh + @@ -709,12 +730,10 @@ 988 156 20 - "Enable" -; BGSugar + BGSugar ; sugar layout - "Enable" -; BGSugar + BGSugar Var( DirImage + "/bg_sugar.png" ) @@ -984,16 +1003,16 @@ SoundVolume SAVELOG "Press add shot 2" - + If showShotEnable = "Press" Then - Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 + Var showShotEnable = "Enable" + Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2 Var topping2 = toppingID2index1 Var DisableUsingCode = "false" SAVELOG "Deselect add premium shot" Else Var showShotEnable = "Press" - Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2 Var topping2 = toppingID2index2 Var DisableUsingCode = "true" SAVELOG "Select add premium shot" @@ -1002,11 +1021,11 @@ Var PriceDrinkNoTop = PriceDrinkTmp Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp - - + SAVELOG PriceDrinkTmp Refresh + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 6111e69f..08de6db4 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,7 +95,7 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.60" + Var XMLPageVersion = "5.61"