diff --git a/image/lang/lang_bg_bottom.png b/image/lang/lang_bg_bottom.png new file mode 100644 index 00000000..40306e2b Binary files /dev/null and b/image/lang/lang_bg_bottom.png differ diff --git a/image/lang/lang_bg_center.png b/image/lang/lang_bg_center.png new file mode 100644 index 00000000..95ef4bd4 Binary files /dev/null and b/image/lang/lang_bg_center.png differ diff --git a/image/lang/lang_bg_top.png b/image/lang/lang_bg_top.png new file mode 100644 index 00000000..e7e0e648 Binary files /dev/null and b/image/lang/lang_bg_top.png differ diff --git a/image/page_doing/brewing_txt_adv1.png b/image/page_doing/brewing_txt_adv1.png new file mode 100644 index 00000000..6e8b5a98 Binary files /dev/null and b/image/page_doing/brewing_txt_adv1.png differ diff --git a/image/page_doing/brewing_txt_adv1_en.png b/image/page_doing/brewing_txt_adv1_en.png new file mode 100644 index 00000000..fe30b8b2 Binary files /dev/null and b/image/page_doing/brewing_txt_adv1_en.png differ diff --git a/image/page_doing/tao_adv1.png b/image/page_doing/tao_adv1.png new file mode 100644 index 00000000..e540a6c8 Binary files /dev/null and b/image/page_doing/tao_adv1.png differ diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 18c13138..86f62048 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -296,7 +296,6 @@ Var CreditCardVoid = 0 - ;READ_FILE "/mnt/sdcard/coffeevending/CampaignEnable" CampaignEnableStr If CampaignEnableStr = "true" Then Var CampaignEnable = 1 Var CampaignVideoTimeCountDown = 14 @@ -1011,6 +1010,7 @@ DEBUGVAR CountUpBrewing ; animation video loop If AnimationOn = "true" Then + If CampaignEnable = 1 Then If CampaignVideoTimeCountDown > 0 Then Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1 diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 95d04cde..41f9deb4 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -271,6 +271,9 @@ 990 438 + 82 + 157 + diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index b36324bb..f0d402a0 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -3320,7 +3320,7 @@ ; If RoadShow = "true" Then - Var SelectDrink = SaveSelectDrinkRoadShow + Var SelectDrink = UserSelectProductCode Else Var SelectDrink = UserSelectProductCode EndIf @@ -3784,6 +3784,8 @@ If RoadShow = "true" Then Var PriceDrinkTmp = 0 Var PriceDrinkTmpShow = "Free" + + DEBUGVAR SelectDrink DEBUGVAR PriceDrinkTmpShow EndIf