fix merge
This commit is contained in:
commit
52762af9fa
29 changed files with 4369 additions and 54 deletions
|
|
@ -433,12 +433,15 @@
|
|||
CRLFToSpace showname
|
||||
CRLFToSpace showdesc
|
||||
|
||||
If BGSugar = "Enable" Then
|
||||
If SugarSoundFlag = 1 Then
|
||||
If SelectDrinkType = 1 Then
|
||||
If show_eng = "true" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
|
||||
|
||||
; Play Sound #zone
|
||||
Play PlaySoundLag
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -490,6 +493,7 @@
|
|||
Var text_x_add_oreo_price = 510
|
||||
Var text_show_normal_x = 408
|
||||
Var text_show_blend_x = 872
|
||||
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -1109,12 +1113,35 @@
|
|||
|
||||
Var ToppingGotoPayment = "false"
|
||||
|
||||
Var SugarSoundFlag = 0
|
||||
If BGSugarNew = "Enable" Then
|
||||
Var SugarSoundFlag = 1
|
||||
|
||||
EndIf
|
||||
If BGSugar = "Enable" Then
|
||||
Var SugarSoundFlag = 1
|
||||
|
||||
EndIf
|
||||
|
||||
If BGSugarHotHealthy = "Enable" Then
|
||||
Var SugarSoundFlag = 1
|
||||
EndIf
|
||||
If BGSugarColdHealthy = "Enable" Then
|
||||
Var SugarSoundFlag = 1
|
||||
EndIf
|
||||
If BGSugarNew = "Enable" Then
|
||||
Var SugarSoundFlag = 1
|
||||
EndIf
|
||||
|
||||
If SugarSoundFlag = 1 Then
|
||||
If SelectDrinkType = 1 Then
|
||||
If show_eng = "true" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
|
||||
|
||||
; Play Sound #zone
|
||||
Play PlaySoundLag
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue