From b41bab1712aab2d8b094ffbacbe40c7c50ca0e0d Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 20 May 2024 11:19:05 +0700 Subject: [PATCH] THAI: Update energy drink 1 bath --- .../page_energy_drink_1_bath_identity.xml | 4 +- xml/page_payment.xml | 5 +- xml/page_topping_select7.xml | 728 +++++++++--------- 3 files changed, 370 insertions(+), 367 deletions(-) diff --git a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml index 35c1e36b..ba5c42f2 100644 --- a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml +++ b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml @@ -539,8 +539,8 @@ eval( Var LegitAge = "true" Var StepGetServer = 1 - Var TestIDNum = "1104500029430" - GETACCEXT TestIDNum 33 + Var IDNum = "1104500029430" + GETACCEXT IDNum 33 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 151e19e5..3ecf7d29 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -94,9 +94,6 @@ Var PriceDrink = OriginalPrice EndIf - If FromEnergyDrink1BathPro = 1 Then - Var PriceDrink = OriginalPrice - EndIf DEBUGVAR PriceDrink DEBUGVAR PromotionPriceDrink @@ -386,7 +383,7 @@ EndIf If FromEnergyDrink1BathPro = 1 Then - Var PriceDiff = PriceDrink - PromotionPriceDrink + Var PriceDiff = PriceDrink - 1 Var Seeker.VendingCode = "FIX1" Var Seeker.IntVendingCampaign = PriceDiff Var Seeker.FreeVendingCampaign = 0 diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 12d4e1f1..4b24110b 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -572,7 +572,11 @@ Else If DoorCupPosition = "bottom" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" + If FromEnergyDrink1BathPro = 1 Then + Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml" + Else + Open "ROOT/taobin_project/xml/page_payment.xml" + EndIf EndIf EndIf @@ -6926,7 +6930,368 @@ + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + ShowNormalNextButton + + + "OnValueChange" + + PriceDrinkTmpShow + +; energy drink 1 bath + @@ -7408,19 +7773,7 @@ - - 924 - 1804 - KanitTTF - 36 - 1080 - 0xFFFFFF - - - "OnValueChange" - - PriceDrinkTmpShow - + ; next2 button Protect @@ -7457,354 +7810,7 @@ ; zone -; energy drink 1 bath - 0