From c7b6139a5d8533baaeaf11cecfc88b04c0a653a3 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 2 May 2023 16:47:17 +0700 Subject: [PATCH 1/5] DO --- xml/event/tricker.ev | 1 - xml/page_identityChildren_verification.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 1dad0e60..131677c3 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -68,7 +68,6 @@ EndIf Var OreoForFreeLimit = "" READ_FILE "/mnt/sdcard/oreo_for_free_limit" OreoForFreeLimit -;Var OreoForFreeLimit = "true" Var SoundBackToSchoolEnable = 1 diff --git a/xml/page_identityChildren_verification.xml b/xml/page_identityChildren_verification.xml index ec59a95f..48e42b1b 100644 --- a/xml/page_identityChildren_verification.xml +++ b/xml/page_identityChildren_verification.xml @@ -295,7 +295,6 @@ DEBUGVAR CountDownDelayReadCardID DEBUGVAR ShutterResult DEBUGVAR IDCardState - DEBUGVAR load_gif_stage If IDBirthdate = "" Then Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1 From d1ef5ea7da159399d000e848afffd4ddea199357 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 2 May 2023 16:59:46 +0700 Subject: [PATCH 2/5] change --- xml/event/big_logo_back_to_school.inc | 22 +++++++++++----------- xml/event/page_recommend_backToSchool.xml | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xml/event/big_logo_back_to_school.inc b/xml/event/big_logo_back_to_school.inc index 9b2cc7c3..c8128114 100644 --- a/xml/event/big_logo_back_to_school.inc +++ b/xml/event/big_logo_back_to_school.inc @@ -58,21 +58,21 @@ ) - Var NameDrink = "OREO SMOOTHIE VOLCANO" - Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ" + Var NameDrink = "SUPER OREO VOLCANO" + Var NameDrinkTH = "ซูเปอร์โอริภูเขาไฟ" Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ " Var DrinkDescription = "Milk, Sugar, Oreo" - Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png" + Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_super_oreo_volcano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price Var PriceD2 = $-.Price - Var PriceD3 = $12-03-03-0009.Price + Var PriceD3 = $12-03-03-0032.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####" - Var PD_CODE3 = "12-03-03-0009" + Var PD_CODE3 = "12-03-03-0032" Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = "Disable2" - Var PD_STAGE_3 = $12-03-03-0009.Button + Var PD_STAGE_3 = $12-03-03-0032.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -88,7 +88,7 @@ Var DefaultDrinkType = 3 EndIf - Topping "Load" "12-03-03-0009" + Topping "Load" "12-03-03-0032" Var menu_name_eng_hot = $##-##-##-####.NameE Var menu_desc_eng_hot = $##-##-##-####.descriptionE @@ -100,10 +100,10 @@ Var menu_name_thai_cold = $##-##-##-####.Name Var menu_desc_thai_cold = $##-##-##-####.description - Var menu_name_eng_blender = $12-03-03-0009.NameE - Var menu_desc_eng_blender = $12-03-03-0009.descriptionE - Var menu_name_thai_blender = $12-03-03-0009.Name - Var menu_desc_thai_blender = $12-03-03-0009.description + Var menu_name_eng_blender = $12-03-03-0032.NameE + Var menu_desc_eng_blender = $12-03-03-0032.descriptionE + Var menu_name_thai_blender = $12-03-03-0032.Name + Var menu_desc_thai_blender = $12-03-03-0032.description DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 diff --git a/xml/event/page_recommend_backToSchool.xml b/xml/event/page_recommend_backToSchool.xml index e7802cbd..c1b01866 100644 --- a/xml/event/page_recommend_backToSchool.xml +++ b/xml/event/page_recommend_backToSchool.xml @@ -8972,21 +8972,21 @@ LIMENADE SODA" ) - Var NameDrink = "OREO SMOOTHIE VOLCANO" - Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ" + Var NameDrink = "SUPER OREO VOLCANO" + Var NameDrinkTH = "ซูเปอร์โอริภูเขาไฟ" Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ " Var DrinkDescription = "Milk, Sugar, Oreo" - Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png" + Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_super_oreo_volcano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price Var PriceD2 = $-.Price - Var PriceD3 = $12-03-03-0009.Price + Var PriceD3 = $12-03-03-0032.Price Var PD_CODE1 = "##-##-##-####" Var PD_CODE2 = "##-##-##-####" - Var PD_CODE3 = "12-03-03-0009" + Var PD_CODE3 = "12-03-03-0032" Var PD_STAGE_1 = "Disable2" Var PD_STAGE_2 = "Disable2" - Var PD_STAGE_3 = $12-03-03-0009.Button + Var PD_STAGE_3 = $12-03-03-0032.Button Var SelectCountDrinkType = 0 Var DefaultDrinkType = 0 If PD_STAGE_1 = "Enable" Then @@ -9002,7 +9002,7 @@ LIMENADE SODA" Var DefaultDrinkType = 3 EndIf - Topping "Load" "12-03-03-0009" + Topping "Load" "12-03-03-0032" Var menu_name_eng_hot = $##-##-##-####.NameE Var menu_desc_eng_hot = $##-##-##-####.descriptionE @@ -9014,10 +9014,10 @@ LIMENADE SODA" Var menu_name_thai_cold = $##-##-##-####.Name Var menu_desc_thai_cold = $##-##-##-####.description - Var menu_name_eng_blender = $12-03-03-0009.NameE - Var menu_desc_eng_blender = $12-03-03-0009.descriptionE - Var menu_name_thai_blender = $12-03-03-0009.Name - Var menu_desc_thai_blender = $12-03-03-0009.description + Var menu_name_eng_blender = $12-03-03-0032.NameE + Var menu_desc_eng_blender = $12-03-03-0032.descriptionE + Var menu_name_thai_blender = $12-03-03-0032.Name + Var menu_desc_thai_blender = $12-03-03-0032.description DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 From c093729ad9871d773d5642851a08835ef231bb04 Mon Sep 17 00:00:00 2001 From: worawut Date: Tue, 2 May 2023 17:20:53 +0700 Subject: [PATCH 3/5] freetaobin --- xml/event/tricker.ev | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 131677c3..131699db 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -59,9 +59,11 @@ EndIf If BoxID = 172527 Then Var OreoDueEnable = 1 + Var OreoForFreeEnable = 0 EndIf If BoxID = 173149 Then + Var OreoDueEnable = 0 Var OreoForFreeEnable = 1 EndIf From 725328b792612feccd92cfb9452ea52d814f1124 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 2 May 2023 17:36:35 +0700 Subject: [PATCH 4/5] DO --- xml/event/tricker.ev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 131677c3..d7823509 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -53,7 +53,7 @@ EndIf If BoxID = 172644 Then - Var OreoDueEnable = 0 + Var OreoDueEnable = 1 Var OreoForFreeEnable = 0 EndIf From f3b0e0e55b3ec113654c8bae181a6200926dbb6f Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 3 May 2023 10:27:40 +0700 Subject: [PATCH 5/5] DO --- video/script1.ev | 6 ------ xml/event/tricker.ev | 4 ++-- xml/page_catalog_with_vending.xml | 8 ++------ xml/page_topping_select6.xml | 26 +------------------------- 4 files changed, 5 insertions(+), 39 deletions(-) diff --git a/video/script1.ev b/video/script1.ev index d86b9aa5..881acdaf 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,11 +1,5 @@ Var MainfileSize = 0 DEBUGVAR BoxID -If BoxID = 173149 Then - Var EventTurnOn = 1 -EndIf -If BoxID = 200001 Then - Var EventTurnOn = 1 -EndIf If SystemDateMonthInt = 4 Then GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 89eaa16b..1881f893 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -52,8 +52,8 @@ EndIf -If BoxID = 172644 Then - Var OreoDueEnable = 1 +If BoxID = 200001 Then + Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 EndIf diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index d5de7762..405a5d4e 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -292,12 +292,8 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - ; zone promote - If SongkranEnable = 1 Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - EndIf + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 34b9b2f9..74c2aa47 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -2956,29 +2956,6 @@ - - - showText8 - 600 - 6 - Var( DirImage + "/text8.png" ) - - - - - oreo_topping_wed_free - text_x_free_topping - 6 - "ROOT/taobin_project/image/page3/img_oreo_wed_free.png" - - - oreo_topping_wed_topping - text_x_free_topping - 6 - "ROOT/taobin_project/image/page3/img_oreo_wed_topping.png" - - - @@ -3480,8 +3457,7 @@ If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - ;Open "ROOT/taobin_project/xml/page_identity_verification.xml" - Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml" + Open "ROOT/taobin_project/xml/page_identity_verification.xml" EndIf EndIf