From 7eb2025801c7cdb5ac0dd9fee5209f252f0a0184 Mon Sep 17 00:00:00 2001 From: Pakin Date: Wed, 25 Sep 2024 15:33:17 +0700 Subject: [PATCH] WTC+SGP: fix drinkfail 3 not in theme & popup not enough change in payment case --- inter/sgp/xml/page_brewing3_blue.lxml | 3 + inter/sgp/xml/page_drinkfail_sg.lxml | 10 +- .../sgp/xml/page_drinkfail3-SGP_blue.xml | 215 ++++++++++++++++++ .../sgp/xml/page_payment_cash-SGP_blue.xml | 26 ++- xml/page_payment_cash-SGP.xml | 2 + 5 files changed, 241 insertions(+), 15 deletions(-) create mode 100644 inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml diff --git a/inter/sgp/xml/page_brewing3_blue.lxml b/inter/sgp/xml/page_brewing3_blue.lxml index 743e524e..ebdba62f 100644 --- a/inter/sgp/xml/page_brewing3_blue.lxml +++ b/inter/sgp/xml/page_brewing3_blue.lxml @@ -1940,6 +1940,9 @@ ; test drinkfail + + Var MachineStage = "remove-cup" + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" diff --git a/inter/sgp/xml/page_drinkfail_sg.lxml b/inter/sgp/xml/page_drinkfail_sg.lxml index 508d660b..1090f3c3 100644 --- a/inter/sgp/xml/page_drinkfail_sg.lxml +++ b/inter/sgp/xml/page_drinkfail_sg.lxml @@ -46,9 +46,13 @@ Var StepX = 1 Var Ext1a = "" + Var DrinkFail3Page = "ROOT/taobin_project/xml/page_drinkfail3.xml" + If UsePepsiTheme = 1 Then Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing/" + Var DrinkFail3Page = "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml" + EndIf @@ -94,7 +98,7 @@ If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Open DrinkFail3Page Else If NextOrder = "true" Then Var NextOrder = "false" @@ -236,9 +240,9 @@ EndIf - + DEBUGVAR MachineStage If MachineStage = "remove-cup" Then - Open "ROOT/taobin_project/xml/page_drinkfail3.xml" + Open DrinkFail3Page Else If NextOrder = "true" Then diff --git a/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml new file mode 100644 index 00000000..e9471aca --- /dev/null +++ b/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml @@ -0,0 +1,215 @@ + + "Enable" + 1080 + 1920 + BackgroundColor + SoundVolume + + + ; On open + + + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/" + + Else + Var DirImage = "ROOT/taobin_project/image/collectiing/" + EndIf + + + Var Timeout = 0 + + Var Door_Open_State="Invisible" + Var Door_Open_flagBlink = 0 + + + + If HaveCup = "true" Then + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + Var CheckCupStateDoorCupCloseCnt = 15 + + 1000 + + + + + Var Timeout = Timeout + 1 + + DEBUGVAR Timeout + DEBUGVAR MachineStage + DEBUGVAR NextOrder + DEBUGVAR HaveCup + + If Door_Open_flagBlink = 0 Then + Var Door_Open_flagBlink = 1 + Var Door_Open_State="Enable" + Else + Var Door_Open_flagBlink = 0 + Var Door_Open_State="Invisible" + EndIf + + If HaveCup = "true" Then + DEBUGVAR CheckCupStateDoorCupClose + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "reset" Then + + If CheckCupStateDoorCupCloseCnt = 0 Then + Var CheckCupStateDoorCupClose = "" + Else + Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 + + EndIf + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + If buttonRemoveCup = "Invisible" Then + Var Door_Open_State = "Invisible" + EndIf + + DEBUGVAR buttonRemoveCup + DEBUGVAR Door_Open_State + + If MachineStage = "remove-cup" Then + + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + SAVELOG "Remove cup" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + ; must remove cup. + If HaveCup = "true" Then + + Else + If NextOrder = "true" Then + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + SAVELOG "Have Cup" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + + If Timeout > 240 Then + If NextOrder = "true" Then + SAVELOG "TIME OUT 240" + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + Refresh + TimerReset + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + + + + + + + + + + 53 + 473 + Var( DirImage + "/img_popup12.png" ) + + + + + + + + + + \ No newline at end of file diff --git a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml index c2fe3177..ddb13176 100644 --- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml @@ -2154,9 +2154,7 @@ EndIf 182 748 alphaState3 - eval( - Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png" -) + Var( DirImage + "/img_popup12_NotEnoughCoin.png" )