Merge remote-tracking branch 'origin/masterpiece' into th_mmr
This commit is contained in:
commit
020098b2af
457 changed files with 95264 additions and 50614 deletions
|
|
@ -15,7 +15,7 @@
|
|||
Var CountUpWhenBREW_CNT = 0
|
||||
DEBUGVAR TxRef1
|
||||
|
||||
SAVELOG "page_Newbrewing3.xml version 2"
|
||||
SAVELOG "page_Newbrewing3.xml version 3"
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR Seeker.ORDER_ID
|
||||
|
||||
|
|
@ -764,26 +764,13 @@
|
|||
; TODO
|
||||
DEBUGVAR EnableDoubleCupNoError
|
||||
DEBUGVAR HURR_FOREVER
|
||||
If EnableDoubleCupNoError = 1 Then
|
||||
If HURR_FOREVER = "F:1028" Then
|
||||
Var SavePayDetail = HURR_FOREVER
|
||||
Open "ROOT/taobin_project/xml/page_pickup_cup_from_error.xml"
|
||||
EndIf
|
||||
If HURR_FOREVER = "F:1029" Then
|
||||
Var SavePayDetail = HURR_FOREVER
|
||||
Open "ROOT/taobin_project/xml/page_pickup_cup_from_error.xml"
|
||||
EndIf
|
||||
If HURR_FOREVER = "F:1030" Then
|
||||
Var SavePayDetail = HURR_FOREVER
|
||||
Open "ROOT/taobin_project/xml/page_pickup_cup_from_error.xml"
|
||||
EndIf
|
||||
If HURR_FOREVER = "F:1031" Then
|
||||
Var SavePayDetail = HURR_FOREVER
|
||||
Open "ROOT/taobin_project/xml/page_pickup_cup_from_error.xml"
|
||||
EndIf
|
||||
DEBUGVAR RequestPickupCupAlert
|
||||
If RequestPickupCupAlert = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_pickup_cup_between_order.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If Timeout > 540 Then
|
||||
SAVELOG "back_to_main from line > 217."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue