Merge origin/masterpiece into smoothie_tbp
This commit is contained in:
commit
678a79ae83
80 changed files with 10192 additions and 14079 deletions
|
|
@ -43,10 +43,12 @@
|
|||
Var Seeker = "next"
|
||||
Var Seeker.thankLidFlag = 0
|
||||
Var Seeker.thankStrawFlag = 0
|
||||
Var Seeker.SmoothieToPayment = 0
|
||||
|
||||
Var Seeker = "curr"
|
||||
Var Seeker.thankLidFlag = 0
|
||||
Var Seeker.thankStrawFlag = 0
|
||||
Var Seeker.SmoothieToPayment = 0
|
||||
|
||||
DEBUGVAR web_ref
|
||||
DEBUGVAR web_payment
|
||||
|
|
@ -2167,7 +2169,7 @@ PRICE "Reset" "-"
|
|||
; Original value is 40
|
||||
If EnableMultiInstance = "true" Then
|
||||
|
||||
If CountUpReloadAll > 150 Then
|
||||
If CountUpReloadAll > 120 Then
|
||||
Var NeedReboot = "false"
|
||||
|
||||
Var StartUpExt = "-"
|
||||
|
|
@ -2178,7 +2180,7 @@ PRICE "Reset" "-"
|
|||
|
||||
|
||||
Else
|
||||
If CountUpReloadAll > 100 Then
|
||||
If CountUpReloadAll > 50 Then
|
||||
Var NeedReboot = "false"
|
||||
|
||||
Var StartUpExt = "-"
|
||||
|
|
@ -2583,7 +2585,7 @@ PRICE "Reset" "-"
|
|||
<EventClick>
|
||||
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
SAVELOG " NEXT PAGE NEXT PAGE NEXT PAGE "
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue