Merge remote-tracking branch 'origin/masterpiece' into th_inter
This commit is contained in:
commit
5f26b723dc
289 changed files with 80292 additions and 34111 deletions
|
|
@ -795,15 +795,11 @@
|
|||
EndIf
|
||||
EndIf
|
||||
If Timeout = 9 Then
|
||||
If OpenFromCollectPoint3 = 0 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
Else
|
||||
If Timeout = 4 Then
|
||||
If OpenFromCollectPoint3 = 0 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue