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"
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue