From 81424ead8e9476d09dad371b5c625ff2c7a2365b Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Fri, 9 May 2025 18:08:49 +0700 Subject: [PATCH] THAI-INTER: reset flag at catalog --- inter/tha/xml/multi/page_catalog.lxml | 1 + xml/event/tricker.ev | 1 - xml/page_board.xml | 2 ++ xml/page_brewing3Multi.xml | 1 + xml/page_catalog.lxml | 1 + xml/page_catalog.xml | 1 + xml/page_catalog2.xml | 1 + xml/page_catalog3.xml | 1 + xml/page_catalog_beer_trap.xml | 1 + xml/page_catalog_cocktail.xml | 1 + xml/page_catalog_cocktail.xml_bkn | 1 + xml/page_catalog_with_vending.xml | 1 + xml/sometime/make_drink.xml | 6 +++--- 13 files changed, 15 insertions(+), 4 deletions(-) diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index e7f67f64..c111ab6f 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -44,6 +44,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 9007f24a..a4047703 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -9,7 +9,6 @@ Var ChildrenFree = 0 Var KBankCashlessMachine = 0 -Var SmoothieToPayment = 0 Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index 237502aa..e5f718b5 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -43,10 +43,12 @@ Var Seeker = "next" Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 Var Seeker = "curr" Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 DEBUGVAR web_ref DEBUGVAR web_payment diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index 2c840f13..317fabd2 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -182,6 +182,7 @@ Var LidStateX = "Enable" Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 91fe2d53..69b2f4eb 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -60,6 +60,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 44b30c5d..2ae6f226 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -55,6 +55,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 7badedca..880515f5 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -34,6 +34,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog3.xml b/xml/page_catalog3.xml index c2e4bb23..1a95864e 100644 --- a/xml/page_catalog3.xml +++ b/xml/page_catalog3.xml @@ -28,6 +28,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog_beer_trap.xml b/xml/page_catalog_beer_trap.xml index a6d61faf..eab62dbf 100644 --- a/xml/page_catalog_beer_trap.xml +++ b/xml/page_catalog_beer_trap.xml @@ -14,6 +14,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog_cocktail.xml b/xml/page_catalog_cocktail.xml index 16f0d241..895f8ac6 100644 --- a/xml/page_catalog_cocktail.xml +++ b/xml/page_catalog_cocktail.xml @@ -24,6 +24,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog_cocktail.xml_bkn b/xml/page_catalog_cocktail.xml_bkn index 8a0fe720..07619ed2 100644 --- a/xml/page_catalog_cocktail.xml_bkn +++ b/xml/page_catalog_cocktail.xml_bkn @@ -14,6 +14,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index 4833449a..0966d1bd 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -24,6 +24,7 @@ Var Seeker.thankLidFlag = 0 Var Seeker.thankStrawFlag = 0 + Var Seeker.SmoothieToPayment = 0 WEB "DISABLE" diff --git a/xml/sometime/make_drink.xml b/xml/sometime/make_drink.xml index 9a97eaf3..ce5313e7 100644 --- a/xml/sometime/make_drink.xml +++ b/xml/sometime/make_drink.xml @@ -1,11 +1,11 @@ SAVELOG "[MAKE_DRINK]" DEBUGVAR Seeker -DEBUGVAR SmoothieToPayment +DEBUGVAR Seeker.SmoothieToPayment If Seeker = "curr" Then If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - If SmoothieToPayment = 1 Then + If Seeker.SmoothieToPayment = 1 Then ; do nothing Else MakeDrinkV1 SelectDrink SelectSugarID @@ -19,7 +19,7 @@ Else Var DrinkPaid = SelectDrink Var PaidPaymentFromNextStage = 1 EndIf -If SmoothieToPayment = 1 Then +If Seeker.SmoothieToPayment = 1 Then Open "ROOT/taobin_project/xml/page_spiral_sell.xml" Else Open "ROOT/taobin_project/xml/page_thankyou.xml"