Merge branch 'smoothie_tbp' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into smoothie_tbp
This commit is contained in:
commit
300be0c6d6
7 changed files with 10 additions and 6 deletions
|
|
@ -14,10 +14,10 @@ Else
|
||||||
Var video_file_name = video_file_name + ".mp4"
|
Var video_file_name = video_file_name + ".mp4"
|
||||||
|
|
||||||
If EventTurnOn = 1 Then
|
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
|
DEBUGVAR MainfileSize
|
||||||
If MainfileSize = 6749397 Then
|
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
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@
|
||||||
Var Seeker.showname = " Smoothie "
|
Var Seeker.showname = " Smoothie "
|
||||||
Var Seeker.PictureDrink = ""
|
Var Seeker.PictureDrink = ""
|
||||||
Var Seeker.CollectPointMain = 1
|
Var Seeker.CollectPointMain = 1
|
||||||
|
MakeDrinkV1 SelectDrink SelectSugarID
|
||||||
|
|
||||||
;Open "ROOT/taobin_project/xml/page_payment.xml"
|
;Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||||
|
|
|
||||||
|
|
@ -239,7 +239,7 @@
|
||||||
If SmoothieProcessState = "blendnow" Then
|
If SmoothieProcessState = "blendnow" Then
|
||||||
Var TextDoorButtonID = 001206
|
Var TextDoorButtonID = 001206
|
||||||
|
|
||||||
Var SelectDrink = "12-01-07-0001"
|
Var SelectDrink = Seeker.selected_a_drink
|
||||||
Var SelectSugarID = ""
|
Var SelectSugarID = ""
|
||||||
|
|
||||||
Topping "Select" SelectDrink
|
Topping "Select" SelectDrink
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@
|
||||||
If SmoothieProcessState = "blendnow" Then
|
If SmoothieProcessState = "blendnow" Then
|
||||||
Var TextDoorButtonID = 001206
|
Var TextDoorButtonID = 001206
|
||||||
|
|
||||||
Var SelectDrink = "12-01-07-0001"
|
Var SelectDrink = Seeker.selected_a_drink
|
||||||
Var SelectSugarID = ""
|
Var SelectSugarID = ""
|
||||||
|
|
||||||
Topping "Select" SelectDrink
|
Topping "Select" SelectDrink
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,7 @@
|
||||||
If SmoothieProcessState = "blendnow" Then
|
If SmoothieProcessState = "blendnow" Then
|
||||||
Var TextDoorButtonID = 001206
|
Var TextDoorButtonID = 001206
|
||||||
|
|
||||||
Var SelectDrink = "12-01-07-0001"
|
Var SelectDrink = Seeker.selected_a_drink
|
||||||
Var SelectSugarID = ""
|
Var SelectSugarID = ""
|
||||||
|
|
||||||
Topping "Select" SelectDrink
|
Topping "Select" SelectDrink
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
Var ChildrenFree = 0
|
Var ChildrenFree = 0
|
||||||
|
|
||||||
Var KBankCashlessMachine = 0
|
Var KBankCashlessMachine = 0
|
||||||
|
Var SmoothieToPayment = 0
|
||||||
|
|
||||||
Var OreoDueEnable = 0
|
Var OreoDueEnable = 0
|
||||||
Var OreoForFreeEnable = 0
|
Var OreoForFreeEnable = 0
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,8 @@
|
||||||
; Var LastMakeSpiralResult = 2
|
; Var LastMakeSpiralResult = 2
|
||||||
;EndIf
|
;EndIf
|
||||||
|
|
||||||
|
DEBUGVAR LastMakeSpiralResult
|
||||||
|
|
||||||
If LastMakeSpiralResult = 1 Then
|
If LastMakeSpiralResult = 1 Then
|
||||||
|
|
||||||
Var SessionID4 = MachineSpiralID
|
Var SessionID4 = MachineSpiralID
|
||||||
|
|
@ -44,7 +46,7 @@
|
||||||
Var SessionID4 = SessionID4 + ":"
|
Var SessionID4 = SessionID4 + ":"
|
||||||
Var SessionID4 = SessionID4 + MachineSpiralRemaining
|
Var SessionID4 = SessionID4 + MachineSpiralRemaining
|
||||||
|
|
||||||
Var PayDetail="S:0:"
|
Var PayDetail="locker:S:0:"
|
||||||
Var PayDetail = PayDetail + SessionID4
|
Var PayDetail = PayDetail + SessionID4
|
||||||
|
|
||||||
__CMD "SprialPayDetail" PayDetail "-" "-"
|
__CMD "SprialPayDetail" PayDetail "-" "-"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue