merge master

This commit is contained in:
kong 2020-11-02 21:21:31 +07:00
commit ae15637ebb
8 changed files with 112 additions and 20 deletions

View file

@ -44,7 +44,7 @@
Var XPosiShowCountDownBrew = 768
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
@ -58,13 +58,13 @@
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
If MachineStage = "drink-failed" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf