From 7c37df7702d61cd228433fbede745995f72878f3 Mon Sep 17 00:00:00 2001 From: Pakin Date: Mon, 7 Jul 2025 13:20:51 +0700 Subject: [PATCH 1/2] change ledv4 ev cmd to send as group --- xml/process/temp_ledv4_blinkall_horizontal.ev | 13 ++----------- xml/process/temp_ledv4_offall_horizontal.ev | 12 +----------- xml/process/temp_ledv4_page_drinkok.ev | 12 +----------- xml/process/temp_ledv4_page_thankyou.ev | 12 +----------- 4 files changed, 5 insertions(+), 44 deletions(-) diff --git a/xml/process/temp_ledv4_blinkall_horizontal.ev b/xml/process/temp_ledv4_blinkall_horizontal.ev index 9439222c..4175918f 100644 --- a/xml/process/temp_ledv4_blinkall_horizontal.ev +++ b/xml/process/temp_ledv4_blinkall_horizontal.ev @@ -1,16 +1,7 @@ If FrontDoorVersionInt > 19999 Then - LEDv2 LedV4#103 On 200 20 0 255 10 - LEDv2 LedV4#104 On 200 20 0 255 10 - LEDv2 LedV4#105 On 200 20 0 255 10 - LEDv2 LedV4#106 On 200 20 0 255 10 - LEDv2 LedV4#107 On 200 20 0 255 10 - LEDv2 LedV4#108 On 200 20 0 255 10 - LEDv2 LedV4#109 On 200 20 0 255 10 - LEDv2 LedV4#110 On 200 20 0 255 10 - LEDv2 LedV4#111 On 200 20 0 255 10 - LEDv2 LedV4#112 On 200 20 0 255 10 - LEDv2 LedV4#113 On 200 20 0 255 10 + + LEDv2 LedDoorCupV2 On 200 20 0 255 10 SAVELOG "LEDv4.SlowBrinkHorizontal" EndIf \ No newline at end of file diff --git a/xml/process/temp_ledv4_offall_horizontal.ev b/xml/process/temp_ledv4_offall_horizontal.ev index b384cdbd..2350d1ce 100644 --- a/xml/process/temp_ledv4_offall_horizontal.ev +++ b/xml/process/temp_ledv4_offall_horizontal.ev @@ -1,16 +1,6 @@ DEBUGVAR "AllOffv4" If FrontDoorVersionInt > 19999 Then - LEDv2 LedV4#103 Off 0 0 0 1 0 - LEDv2 LedV4#104 Off 0 0 0 1 0 - LEDv2 LedV4#105 Off 0 0 0 1 0 - LEDv2 LedV4#106 Off 0 0 0 1 0 - LEDv2 LedV4#107 Off 0 0 0 1 0 - LEDv2 LedV4#108 Off 0 0 0 1 0 - LEDv2 LedV4#109 Off 0 0 0 1 0 - LEDv2 LedV4#110 Off 0 0 0 1 0 - LEDv2 LedV4#111 Off 0 0 0 1 0 - LEDv2 LedV4#112 Off 0 0 0 1 0 - LEDv2 LedV4#113 Off 0 0 0 1 0 + LEDv2 LedDoorCupV2 Off 0 0 0 1 0 SAVELOG "LEDv4.AllOffHorizontal" EndIf \ No newline at end of file diff --git a/xml/process/temp_ledv4_page_drinkok.ev b/xml/process/temp_ledv4_page_drinkok.ev index 5a1a990f..302b204c 100644 --- a/xml/process/temp_ledv4_page_drinkok.ev +++ b/xml/process/temp_ledv4_page_drinkok.ev @@ -3,17 +3,7 @@ If FrontDoorVersionInt > 19999 Then LEDv2 LedV4All On 100 20 0 255 0 - LEDv2 LedV4#103 On 200 20 0 255 10 - LEDv2 LedV4#104 On 200 20 0 255 10 - LEDv2 LedV4#105 On 200 20 0 255 10 - LEDv2 LedV4#106 On 200 20 0 255 10 - LEDv2 LedV4#107 On 200 20 0 255 10 - LEDv2 LedV4#108 On 200 20 0 255 10 - LEDv2 LedV4#109 On 200 20 0 255 10 - LEDv2 LedV4#110 On 200 20 0 255 10 - LEDv2 LedV4#111 On 200 20 0 255 10 - LEDv2 LedV4#112 On 200 20 0 255 10 - LEDv2 LedV4#113 On 200 20 0 255 10 + LEDv2 LedDoorCupV2 On 200 20 0 255 10 SAVELOG "LEDv4.PageDrinkOk" EndIf \ No newline at end of file diff --git a/xml/process/temp_ledv4_page_thankyou.ev b/xml/process/temp_ledv4_page_thankyou.ev index 55f1df67..e07f29d0 100644 --- a/xml/process/temp_ledv4_page_thankyou.ev +++ b/xml/process/temp_ledv4_page_thankyou.ev @@ -5,17 +5,7 @@ If FrontDoorVersionInt > 19999 Then LEDv2 LedV4Mid Blink 100 20 0 4 10 LEDv2 LedV4Bottom On 100 20 0 255 0 - LEDv2 LedV4#103 Blink 200 20 0 4 10 - LEDv2 LedV4#104 Blink 200 20 0 4 10 - LEDv2 LedV4#105 Blink 200 20 0 4 10 - LEDv2 LedV4#106 Blink 200 20 0 4 10 - LEDv2 LedV4#107 Blink 200 20 0 4 10 - LEDv2 LedV4#108 Blink 200 20 0 4 10 - LEDv2 LedV4#109 Blink 200 20 0 4 10 - LEDv2 LedV4#110 Blink 200 20 0 4 10 - LEDv2 LedV4#111 Blink 200 20 0 4 10 - LEDv2 LedV4#112 Blink 200 20 0 4 10 - LEDv2 LedV4#113 Blink 200 20 0 4 10 + LEDv2 LedDoorCupV2 Blink 200 20 0 4 10 SAVELOG "LEDv4.PageThankYou" From 450e10f92fdd117858662ce289b9f50612a7e410 Mon Sep 17 00:00:00 2001 From: Pakin Date: Wed, 9 Jul 2025 10:34:36 +0700 Subject: [PATCH 2/2] update json profile, extend blocks vending task pre main, MYS: handle case free coupon 30 shells for e-invoice & disable some wordings --- .../xml/e_receipt/page_prompt_e_receipt.lxml | 17 ++- inter/mys/xml/page_collect_point_3.lxml | 52 +++++--- xml/vending_tasks_pre_main.xml | 2 +- xmlprofile/y18IDCardCaffeine.json | 112 +++++++++++++++++ xmlprofile/y18IDCardExTeaMilk.json | 118 +++++++++++++++++- xmlprofile/y18IDCardSoda.json | 112 +++++++++++++++++ 6 files changed, 391 insertions(+), 22 deletions(-) diff --git a/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml b/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml index 1afd8fe3..11a83ef2 100644 --- a/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml +++ b/inter/mys/xml/e_receipt/page_prompt_e_receipt.lxml @@ -41,6 +41,8 @@ DEBUGVAR bn_no DEBUGVAR bp_yes DEBUGVAR bp_no +DEBUGVAR Seeker.TriggerGetFree + 1000 @@ -55,7 +57,12 @@ If Timeout > 15 Then Open "ROOT/taobin_project/xml/page_board.xml" Else - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If Seeker.TriggerGetFree = 1 Then + Var Seeker.TriggerGetFree = 0 + Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf EndIf @@ -117,7 +124,13 @@ TimerReset Var Seeker.e_receipt = "false" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If Seeker.TriggerGetFree = 1 Then + Var Seeker.TriggerGetFree = 0 + Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + diff --git a/inter/mys/xml/page_collect_point_3.lxml b/inter/mys/xml/page_collect_point_3.lxml index 477b2ad0..833e59b7 100644 --- a/inter/mys/xml/page_collect_point_3.lxml +++ b/inter/mys/xml/page_collect_point_3.lxml @@ -269,7 +269,7 @@ EndIf If TaobinLevel = "3" Then - Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp + Var TaobinLevelDesc1 = "Flying turtle level" Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff @@ -290,7 +290,7 @@ EndIf If TaobinLevel = "4" Then - Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp + Var TaobinLevelDesc1 = "Master turtle level" Var TaobinLevelDesc2 = "" @@ -684,10 +684,30 @@ If Timeout > 5 Then ; goto lid straw + Var Seeker.TriggerGetFree = 0 If CoffeePoint > 29 Then + Var Seeker.TriggerGetFree = 1 + If eReceiptFlag = 1 Then + If CountryName = "Malaysia" Then + Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml" + DEBUGVAR RecieptPromptPage + Open RecieptPromptPage + EndIf + EndIf + Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else If Seeker.FromConsent = 1 Then + Var Seeker.TriggerGetFree = 1 + If eReceiptFlag = 1 Then + If CountryName = "Malaysia" Then + Var RecieptPromptPage = CountryRootPath + "/xml/e_receipt/page_prompt_e_receipt.lxml" + DEBUGVAR RecieptPromptPage + Open RecieptPromptPage + EndIf + EndIf + + Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else @@ -821,11 +841,11 @@ - - 243 - 860 - Var( DirImage + "/text4.png" ) - +; +; 243 +; 860 +; Var( DirImage + "/text4.png" ) +; @@ -1171,15 +1191,15 @@ Telnum-mask-1 - - 250 - 890 - 50 - 120 - KanitRegularTTF - 0xDE794E - CoffeePointRank - +; +; 250 +; 890 +; 50 +; 120 +; KanitRegularTTF +; 0xDE794E +; CoffeePointRank +;