From e20203652382ea72cc05eecc0655aef6b5396e3b Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 20 Jan 2023 15:05:31 +0700 Subject: [PATCH] 10 Day --- xml/menu_catalog_new.lxml | 16 ++++++++-- xml/page_catalog_group_appfast.lxml | 16 ++++++++-- xml/page_catalog_group_cocktail.lxml | 16 ++++++++-- xml/page_catalog_group_coffee.lxml | 16 ++++++++-- xml/page_catalog_group_forkid.lxml | 16 ++++++++-- xml/page_catalog_group_health.lxml | 16 ++++++++-- xml/page_catalog_group_milk.lxml | 16 ++++++++-- xml/page_catalog_group_other.lxml | 16 ++++++++-- xml/page_catalog_group_recommend.lxml | 16 ++++++++-- xml/page_catalog_group_tea.lxml | 16 ++++++++-- xml/page_catalog_group_whey.lxml | 16 ++++++++-- xml/page_collect_point_3.xml | 8 +---- xml/page_display_get_free.xml | 6 ---- xml/page_topping_select6.xml | 46 +++++++++++++++++++++++++++ 14 files changed, 201 insertions(+), 35 deletions(-) diff --git a/xml/menu_catalog_new.lxml b/xml/menu_catalog_new.lxml index 300635af..fda32969 100644 --- a/xml/menu_catalog_new.lxml +++ b/xml/menu_catalog_new.lxml @@ -84,7 +84,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -148,7 +158,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index 0ce37810..a3b62e21 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -231,7 +231,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -295,7 +305,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_cocktail.lxml b/xml/page_catalog_group_cocktail.lxml index 965a7b30..446a1903 100644 --- a/xml/page_catalog_group_cocktail.lxml +++ b/xml/page_catalog_group_cocktail.lxml @@ -223,7 +223,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -287,7 +297,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_coffee.lxml b/xml/page_catalog_group_coffee.lxml index 90c72dc4..62de5924 100644 --- a/xml/page_catalog_group_coffee.lxml +++ b/xml/page_catalog_group_coffee.lxml @@ -223,7 +223,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -287,7 +297,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_forkid.lxml b/xml/page_catalog_group_forkid.lxml index 212dc9c6..02c36dc7 100644 --- a/xml/page_catalog_group_forkid.lxml +++ b/xml/page_catalog_group_forkid.lxml @@ -232,7 +232,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -296,7 +306,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_health.lxml b/xml/page_catalog_group_health.lxml index 1771034a..204d2e88 100644 --- a/xml/page_catalog_group_health.lxml +++ b/xml/page_catalog_group_health.lxml @@ -223,7 +223,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -287,7 +297,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_milk.lxml b/xml/page_catalog_group_milk.lxml index 140351a5..70bb5440 100644 --- a/xml/page_catalog_group_milk.lxml +++ b/xml/page_catalog_group_milk.lxml @@ -221,7 +221,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -285,7 +295,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index a6b83010..129abc54 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -222,7 +222,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -286,7 +296,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_recommend.lxml b/xml/page_catalog_group_recommend.lxml index 9de9ca93..67cd8215 100644 --- a/xml/page_catalog_group_recommend.lxml +++ b/xml/page_catalog_group_recommend.lxml @@ -229,7 +229,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -293,7 +303,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_tea.lxml b/xml/page_catalog_group_tea.lxml index de5723a8..0d945032 100644 --- a/xml/page_catalog_group_tea.lxml +++ b/xml/page_catalog_group_tea.lxml @@ -223,7 +223,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -287,7 +297,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_catalog_group_whey.lxml b/xml/page_catalog_group_whey.lxml index 0cb8a61e..e1265d22 100644 --- a/xml/page_catalog_group_whey.lxml +++ b/xml/page_catalog_group_whey.lxml @@ -228,7 +228,17 @@ - Refresh + DEBUGVAR LanguageShow + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + EndIf + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + RefreshAll @@ -292,7 +302,9 @@ -; + + + 1080 "auto" diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index e4ec3e65..bfaf3158 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -671,9 +671,6 @@ Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - If TaobinLevel = "3" Then - Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" - EndIf Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -827,10 +824,7 @@ Open "ROOT/taobin_project/xml/page_display_get_free.xml" EndIf - If TaobinLevel = "3" Then - Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" - EndIf - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 23f6cc77..9fa329c8 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -86,9 +86,6 @@ If Timeout > 5 Then ; goto lid straw - If TaobinLevel = "3" Then - Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" - EndIf Open "ROOT/taobin_project/xml/page_lid_straw.xml" ;Open "ROOT/taobin_project/xml/page_catalog.xml" @@ -176,9 +173,6 @@ ; goto lid straw - If TaobinLevel = "3" Then - Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" - EndIf Open "ROOT/taobin_project/xml/page_lid_straw.xml" diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index f2d0bbe3..091b4f6f 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -809,7 +809,53 @@ If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" EndIf + + EndIf + If TOPPING1 = "Powder Sugar for Hot" Then + + If RecipeTag2 = "Topping6Step" Then + Var BGSugar = "Invisible" + Var BGSugarNew = "Enable" + Else + Var BGSugar = "Enable" + EndIf + + Var ShiftSugarStep = 1 + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + If toppingID1index1 = toppingID1Default Then + Var SugarState1 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index2 = toppingID1Default Then + Var SugarState2 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index3 = toppingID1Default Then + Var SugarState3 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index4 = toppingID1Default Then + Var SugarState4 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If toppingID1index5 = toppingID1Default Then + Var SugarState5 = "PressForever" + Var sugar_default_flag = 1 + EndIf + + If sugar_default_flag = 0 Then + Var SugarState1 = "PressForever" + EndIf EndIf