From ba51ac0615107a284c00379ca56ecdb00ff2e782 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 2 May 2023 15:06:46 +0700 Subject: [PATCH] DO --- image/topping2/bn_childrenFree.png | Bin 0 -> 4200 bytes image/topping2_en/bn_childrenFree.png | Bin 0 -> 4569 bytes xml/event/big_logo_back_to_school.inc | 2 +- xml/event/page_recommend_backToSchool.xml | 4 +- .../page_recommend_oreo_buy2_save_more.xml | 2 +- xml/event/tricker.ev | 5 +- xml/page_board.xml | 2 +- xml/page_catalog2.xml | 4 +- xml/page_catalog_group_recommend.skt | 2 +- xml/page_catalog_group_recommend.xml | 2 +- xml/page_catalog_group_recommend3.xml | 2 +- xml/page_topping_select6.xml | 261 +++++++++++++++++- 12 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 image/topping2/bn_childrenFree.png create mode 100644 image/topping2_en/bn_childrenFree.png diff --git a/image/topping2/bn_childrenFree.png b/image/topping2/bn_childrenFree.png new file mode 100644 index 0000000000000000000000000000000000000000..fd5205f370e8cb65b90df07ff8f19404386cdb9b GIT binary patch literal 4200 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 Machine RemoveCup Machine DoorLidOpen - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" @@ -9024,10 +9024,10 @@ LIMENADE SODA" DEBUGVAR PD_STAGE_3 Var SelectDrinkType = 0 - Var BackToSchoolForFreeEnable = 1 If OreoForFreeLimit = "true" Then Else + Var BackToSchoolForFreeEnable = 1 Open "ROOT/taobin_project/xml/page_topping_select6.xml" EndIf diff --git a/xml/event/page_recommend_oreo_buy2_save_more.xml b/xml/event/page_recommend_oreo_buy2_save_more.xml index 736b6048..49259f99 100644 --- a/xml/event/page_recommend_oreo_buy2_save_more.xml +++ b/xml/event/page_recommend_oreo_buy2_save_more.xml @@ -8906,7 +8906,7 @@ LIMENADE SODA" Machine RemoveCup Machine DoorLidOpen - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index e7f24ec5..1dad0e60 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -54,7 +54,7 @@ EndIf If BoxID = 172644 Then Var OreoDueEnable = 0 - Var OreoForFreeEnable = 1 + Var OreoForFreeEnable = 0 EndIf If BoxID = 172527 Then @@ -68,7 +68,8 @@ EndIf Var OreoForFreeLimit = "" READ_FILE "/mnt/sdcard/oreo_for_free_limit" OreoForFreeLimit -Var OreoForFreeLimit = "true" +;Var OreoForFreeLimit = "true" + Var SoundBackToSchoolEnable = 1 DEBUGVAR OreoForFreeLimit diff --git a/xml/page_board.xml b/xml/page_board.xml index 3b57ff6b..7fa52adc 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1176,7 +1176,7 @@ Machine DoorLidOpen Var CheckCupStateDoorCupClose = "reset" - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index e1eb02ba..27e2921a 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -646,10 +646,10 @@ - Var SongkranEnable = 0 + WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "-" - Var SongkranEnable = 1 + WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true" diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index d4de5d16..56e820ad 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -70,7 +70,7 @@ Machine RemoveCup Machine DoorLidOpen - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 058e3ec8..770cf1cd 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -7926,7 +7926,7 @@ LIMENADE SODA" Machine RemoveCup Machine DoorLidOpen - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" diff --git a/xml/page_catalog_group_recommend3.xml b/xml/page_catalog_group_recommend3.xml index 7c52a1ee..b76a5bf6 100644 --- a/xml/page_catalog_group_recommend3.xml +++ b/xml/page_catalog_group_recommend3.xml @@ -8906,7 +8906,7 @@ LIMENADE SODA" Machine RemoveCup Machine DoorLidOpen - Var buttonRemoveCup = "Invisible" + ;Var buttonRemoveCup = "Invisible" diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 8500f234..34b9b2f9 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -305,22 +305,23 @@ DEBUGVAR PromotionIDCurrentOrder - Var DiscountWithIdentifyState = "Enable" - - ;Var DiscountWithIdentifyState = "Invisible" + Var DiscountWithIdentifyState = "Invisible" + Var BackToSchoolForFreeButtonState = "Invisible" DEBUGVAR Price5Active DEBUGVAR EnableLiveness DEBUGVAR DiscountWithIdentifyState - - Var ChildrenFree = 0 + DEBUGVAR BackToSchoolForFreeEnable If BackToSchoolForFreeEnable = 1 Then - + Var BackToSchoolForFreeEnable = 0 + Var BackToSchoolForFreeButtonState = "Enable" EndIf + DEBUGVAR BackToSchoolForFreeButtonState + If EnableLiveness = "true" Then If CameraCount = 1 Then ; echo -n true > /mnt/sdcard/enable_discount_price5 @@ -333,7 +334,6 @@ EndIf EndIf - 1000 @@ -3285,8 +3285,8 @@ DiscountWithIdentifyState 285 1785 - Var( DirImage + "/bp_childrenFree.png" ) - Var( DirImage + "/bp_childrenFree.png" ) + Var( DirImage + "/bn_price5baht.png" ) + Var( DirImage + "/bp_price5baht.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -3514,6 +3514,7 @@ + ; next + + + 0 380 @@ -4226,4 +4468,5 @@ +