Merge branch 'masterpiece' into sgp_blue
This commit is contained in:
commit
84445e1be4
78 changed files with 15546 additions and 492 deletions
|
|
@ -704,6 +704,10 @@
|
|||
If BoxID = 200002 Then
|
||||
Var UseSlideShowVideo = 1
|
||||
EndIf
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/event_profile.ev"
|
||||
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
|
@ -1266,7 +1270,7 @@
|
|||
DEBUGVAR CountDownPauseVideo2
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
|
||||
;Machine NewPaymentOpenBrewingXMLEnable
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue