diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index 7ca49596..fbccfb9f 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -141,6 +141,11 @@ 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 36 2 3 4 5 16 24 88 1:28 32 +ICED AMERICANO BLUE DADDY 12-01-02-0019 1 36 2 3 4 5 23 16 24 133 2:13 32 +ESPRESSO BLUE DADDY 12-01-01-0020 1 36 2 3 4 5 24 66 1:06 32 + Espresso 14-01-01-0001 1 2 3 4 5 24 66 1:06 16 diff --git a/image/page_doing/txt_36.png b/image/page_doing/txt_36.png index 6c745a5b..19a82131 100644 Binary files a/image/page_doing/txt_36.png 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 index 8239a3f1..4ce7cd7a 100644 Binary files a/image/page_doing/txt_36_en.png 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 index 9f853105..67f80b8d 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_hot_americano_light_bluedaddy.png b/image/page_drink/bn_hot_americano_light_bluedaddy.png index ce037e47..112b3736 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_espresso_light_bluedaddy.png b/image/page_drink/bn_hot_espresso_light_bluedaddy.png index 79fa825e..90096ead 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_iced_americano_light_bluedaddy.png b/image/page_drink/bn_iced_americano_light_bluedaddy.png index 983658e0..16c58828 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_disable/bn_dirty_light_bluedaddy.png b/image/page_drink_disable/bn_dirty_light_bluedaddy.png index a0a4297a..e240a5e4 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_hot_americano_light_bluedaddy.png b/image/page_drink_disable/bn_hot_americano_light_bluedaddy.png index 4203495e..b94e5457 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_espresso_light_bluedaddy.png b/image/page_drink_disable/bn_hot_espresso_light_bluedaddy.png index 4c988a54..7e11c7e8 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_iced_americano_light_bluedaddy.png b/image/page_drink_disable/bn_iced_americano_light_bluedaddy.png index 51cdb7ef..8b021800 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_press/bn_dirty_light_bluedaddy.png b/image/page_drink_press/bn_dirty_light_bluedaddy.png index 5c163454..00960265 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_hot_americano_light_bluedaddy.png b/image/page_drink_press/bn_hot_americano_light_bluedaddy.png index 8fdf06a6..4c4c8568 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_espresso_light_bluedaddy.png b/image/page_drink_press/bn_hot_espresso_light_bluedaddy.png index 5c4116eb..c50856a5 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_iced_americano_light_bluedaddy.png b/image/page_drink_press/bn_iced_americano_light_bluedaddy.png index c693c6bd..85343be8 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_select/bn_dirty_light_bluedaddy.png b/image/page_drink_select/bn_dirty_light_bluedaddy.png index c0e607ad..77933135 100644 Binary files a/image/page_drink_select/bn_dirty_light_bluedaddy.png 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 index 4d6a1b7b..11d19ae7 100644 Binary files a/image/page_drink_select/bn_hot_americano_light_bluedaddy.png 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 index bf0573f2..5566e157 100644 Binary files a/image/page_drink_select/bn_hot_espresso_light_bluedaddy.png 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 index b83eca7e..30fad228 100644 Binary files a/image/page_drink_select/bn_iced_americano_light_bluedaddy.png and b/image/page_drink_select/bn_iced_americano_light_bluedaddy.png differ diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 88ec3c2f..59b1d84f 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -465,6 +465,21 @@ Refresh EndIf + If TOPPING2 = "shot coffee 1007" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + If TOPPING3 = "Collagen" Then + + Var ShowCollagenOnly = "Invisible" + Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" + Var shot_h_layout = 310 + + EndIf + DEBUGVAR TOPPING2 + Refresh + EndIf ;-END If TOPPING3 = "Collagen" Then Var CollagenState = "Enable" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 09b53694..75bbd15c 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,7 +95,7 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.54" + Var XMLPageVersion = "5.55"