From bd1e48627d8c3d04655490fb5d365c055fe3a61d Mon Sep 17 00:00:00 2001 From: worawut Date: Mon, 31 Oct 2022 11:11:06 +0700 Subject: [PATCH] spiral makedrink --- spiral/xml/page_spiral_payment_cash.xml | 6 +- spiral/xml/page_spiral_payment_code.xml | 2 +- spiral/xml/page_spiral_payment_codeAIS.xml | 2 +- spiral/xml/page_spiral_payment_codeDtac.xml | 2 +- spiral/xml/page_spiral_payment_codeGLX.xml | 2 +- spiral/xml/page_spiral_payment_codeLH.xml | 2 +- spiral/xml/page_spiral_payment_codeLotus.xml | 2 +- spiral/xml/page_spiral_payment_codeSCG.xml | 2 +- spiral/xml/page_spiral_payment_codeThe1.xml | 2 +- spiral/xml/page_spiral_payment_codeTrue.xml | 2 +- spiral/xml/page_spiral_payment_credit2.xml | 2 +- spiral/xml/page_spiral_payment_credit3.xml | 2 +- spiral/xml/page_spiral_thankyou.xml | 87 +++++++++++++------- 13 files changed, 70 insertions(+), 45 deletions(-) diff --git a/spiral/xml/page_spiral_payment_cash.xml b/spiral/xml/page_spiral_payment_cash.xml index 3b662f1b..8e9b1650 100644 --- a/spiral/xml/page_spiral_payment_cash.xml +++ b/spiral/xml/page_spiral_payment_cash.xml @@ -184,7 +184,7 @@ Var Seeker.FreeVendingCampaign = 1 CoinVending OFF If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID EndIf Open "ROOT/taobin_project/xml/page_thankyou.xml" @@ -1116,7 +1116,7 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate @@ -1790,7 +1790,7 @@ 60 If IgnoreNetCore = "true" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/spiral/xml/page_spiral_payment_code.xml b/spiral/xml/page_spiral_payment_code.xml index 6b263e99..6b37986a 100644 --- a/spiral/xml/page_spiral_payment_code.xml +++ b/spiral/xml/page_spiral_payment_code.xml @@ -220,7 +220,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeAIS.xml b/spiral/xml/page_spiral_payment_codeAIS.xml index 084f6322..4ff4a406 100644 --- a/spiral/xml/page_spiral_payment_codeAIS.xml +++ b/spiral/xml/page_spiral_payment_codeAIS.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeDtac.xml b/spiral/xml/page_spiral_payment_codeDtac.xml index 69f88241..68fde42e 100644 --- a/spiral/xml/page_spiral_payment_codeDtac.xml +++ b/spiral/xml/page_spiral_payment_codeDtac.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeGLX.xml b/spiral/xml/page_spiral_payment_codeGLX.xml index c87ff52d..4a1c7b1a 100644 --- a/spiral/xml/page_spiral_payment_codeGLX.xml +++ b/spiral/xml/page_spiral_payment_codeGLX.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeLH.xml b/spiral/xml/page_spiral_payment_codeLH.xml index b4409afb..faa3fbf4 100644 --- a/spiral/xml/page_spiral_payment_codeLH.xml +++ b/spiral/xml/page_spiral_payment_codeLH.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeLotus.xml b/spiral/xml/page_spiral_payment_codeLotus.xml index 19449894..53873c9d 100644 --- a/spiral/xml/page_spiral_payment_codeLotus.xml +++ b/spiral/xml/page_spiral_payment_codeLotus.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeSCG.xml b/spiral/xml/page_spiral_payment_codeSCG.xml index 92aa4b19..1d7b3e56 100644 --- a/spiral/xml/page_spiral_payment_codeSCG.xml +++ b/spiral/xml/page_spiral_payment_codeSCG.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeThe1.xml b/spiral/xml/page_spiral_payment_codeThe1.xml index 9d75df92..f741a5e6 100644 --- a/spiral/xml/page_spiral_payment_codeThe1.xml +++ b/spiral/xml/page_spiral_payment_codeThe1.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_codeTrue.xml b/spiral/xml/page_spiral_payment_codeTrue.xml index 1c014fb6..d04cbb9b 100644 --- a/spiral/xml/page_spiral_payment_codeTrue.xml +++ b/spiral/xml/page_spiral_payment_codeTrue.xml @@ -140,7 +140,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Var TxRef1 = "" CreateTxRef1 TxRef1 Else diff --git a/spiral/xml/page_spiral_payment_credit2.xml b/spiral/xml/page_spiral_payment_credit2.xml index a0d31fac..bb5a2c90 100644 --- a/spiral/xml/page_spiral_payment_credit2.xml +++ b/spiral/xml/page_spiral_payment_credit2.xml @@ -177,7 +177,7 @@ Var CART_INDEX = 0 Var ChangeOK = 3 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Else DEBUGVAR Seeker EndIf diff --git a/spiral/xml/page_spiral_payment_credit3.xml b/spiral/xml/page_spiral_payment_credit3.xml index 6227c111..e18ba15e 100644 --- a/spiral/xml/page_spiral_payment_credit3.xml +++ b/spiral/xml/page_spiral_payment_credit3.xml @@ -152,7 +152,7 @@ Var CART_INDEX = 0 If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + ; MakeDrinkV1 SelectDrink SelectSugarID Else DEBUGVAR Seeker EndIf diff --git a/spiral/xml/page_spiral_thankyou.xml b/spiral/xml/page_spiral_thankyou.xml index c41f4d2e..bfe3bf4a 100644 --- a/spiral/xml/page_spiral_thankyou.xml +++ b/spiral/xml/page_spiral_thankyou.xml @@ -6,6 +6,11 @@ ; "ROOT/taobin_project/sounds/chaching.mp3" SoundVolume + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + + Var PayFlagCoinQR = 0 Var SetFlagCoinQR = 0 Var SetFlagCoinQRTimer = 999999 @@ -59,6 +64,20 @@ Var ChangeTimeout = ChangeTimeout - 1 Var CheckAckCodeTimer = CheckAckCodeTimer - 1 Var SetFlagCoinQRTimer = SetFlagCoinQRTimer - 1 + Var TimeSwapVDO = TimeSwapVDO + 1 + If TimeSwapVDO > 5 Then + If SwapVDO = 0 Then + Var SwapVDO = 1 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp02.mp4" + Else + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + EndIf + EndIf + + If Timeout = 3 Then If Seeker.PayWithQR = 0 Then @@ -447,7 +466,8 @@ 840 "Reload" "true" - "ROOT/taobin_project/spiral/video/sp01.mp4" + ShowSwapVDO +;Filename> "ROOT/taobin_project/spiral/video/sp01.mp4" @@ -519,37 +539,42 @@ video_menu_0 + Var SwapVDO = 0 + Var TimeSwapVDO = 0 + Var ShowSwapVDO = " + + + + + 92 + 650 +150 + 40 + KanitTTF + 0xB78F24 + SwapVDO + + + + 92 + 750 + 40 + KanitTTF + 0xB78F24 + TimeSwapVDO + + + + + 92 + 850 + 40 + KanitTTF + 0xB78F24 + ShowSwapVDO + + -; -; 92 -; 1121 -;150 -; 40 -; KanitTTF -; 0xB78F24 -; Timeout -; -; -; -; 92 -; 1181 -; 40 -; KanitTTF -; 0xB78F24 -; ChangeTimeout -; -; -; -; -; 92 -; 650 -; 40 -; KanitTTF -; 0xB78F24 -; LastMakeSpiralResult -; -; -; ; ; 292 ; 1250