diff --git a/inter/tha/video/script_thank.ev b/inter/tha/video/script_thank.ev index 08b82822..238fb196 100644 --- a/inter/tha/video/script_thank.ev +++ b/inter/tha/video/script_thank.ev @@ -14,10 +14,10 @@ Else Var video_file_name = video_file_name + ".mp4" If EventTurnOn = 1 Then - GetFileSizeK "taobin_project/inter/aus/video/taobin_thank1_event.mp4" MainfileSize + GetFileSizeK "taobin_project/inter/tha/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize If MainfileSize = 6749397 Then - Var video_file_name = "ROOT/taobin_project/inter/aus/video/taobin_thank1_event.mp4" + Var video_file_name = "ROOT/taobin_project/inter/tha/video/taobin_thank1_event.mp4" EndIf EndIf EndIf diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index dba0b7ce..f609679b 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -53,6 +53,7 @@ Var Seeker.showname = " Smoothie " Var Seeker.PictureDrink = "" Var Seeker.CollectPointMain = 1 + MakeDrinkV1 SelectDrink SelectSugarID ;Open "ROOT/taobin_project/xml/page_payment.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml" diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 5db4d0a1..bfc9a8bf 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -239,7 +239,7 @@ If SmoothieProcessState = "blendnow" Then Var TextDoorButtonID = 001206 - Var SelectDrink = "12-01-07-0001" + Var SelectDrink = Seeker.selected_a_drink Var SelectSugarID = "" Topping "Select" SelectDrink diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml index 4fd21517..81a4cec2 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml @@ -164,7 +164,7 @@ If SmoothieProcessState = "blendnow" Then Var TextDoorButtonID = 001206 - Var SelectDrink = "12-01-07-0001" + Var SelectDrink = Seeker.selected_a_drink Var SelectSugarID = "" Topping "Select" SelectDrink diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml index 832bbcf6..fff71430 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml @@ -131,7 +131,7 @@ If SmoothieProcessState = "blendnow" Then Var TextDoorButtonID = 001206 - Var SelectDrink = "12-01-07-0001" + Var SelectDrink = Seeker.selected_a_drink Var SelectSugarID = "" Topping "Select" SelectDrink diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index e46914da..d0e6e16a 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -9,6 +9,7 @@ Var ChildrenFree = 0 Var KBankCashlessMachine = 0 +Var SmoothieToPayment = 0 Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml index 5706ffaa..dbbecd4b 100644 --- a/xml/page_spiral_sell.xml +++ b/xml/page_spiral_sell.xml @@ -30,6 +30,8 @@ ; Var LastMakeSpiralResult = 2 ;EndIf + DEBUGVAR LastMakeSpiralResult + If LastMakeSpiralResult = 1 Then Var SessionID4 = MachineSpiralID @@ -44,7 +46,7 @@ Var SessionID4 = SessionID4 + ":" Var SessionID4 = SessionID4 + MachineSpiralRemaining - Var PayDetail="S:0:" + Var PayDetail="locker:S:0:" Var PayDetail = PayDetail + SessionID4 __CMD "SprialPayDetail" PayDetail "-" "-"