8.62
This commit is contained in:
parent
324e18880d
commit
b5b55ffe3c
4 changed files with 45 additions and 41 deletions
|
|
@ -4821,19 +4821,19 @@ Soda & Ice" </Value>
|
|||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; 12-05-02-0105 12-05-03-0105
|
||||
; - 12-05-02-0105 12-05-03-0105
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
|
||||
<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
|
||||
<Button>
|
||||
<State> $Sum12050201051205030105 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
|
|
@ -4843,7 +4843,7 @@ Soda & Ice" </Value>
|
|||
Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $.Price
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0105.Price
|
||||
Var PriceD3 = $12-05-03-0105.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
|
|
@ -4852,7 +4852,7 @@ Soda & Ice" </Value>
|
|||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0105.Button
|
||||
Var PD_STAGE_3 = $12-05-03-0105.Button
|
||||
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -4872,7 +4872,7 @@ Soda & Ice" </Value>
|
|||
Topping "Load" "12-05-02-0105"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" ""
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "12-05-03-0105"
|
||||
EndIf
|
||||
|
|
@ -4965,7 +4965,7 @@ Soda & Ice" </Value>
|
|||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
|
|
@ -5574,19 +5574,19 @@ Soda & Ice" </Value>
|
|||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; 12-05-02-0106 -
|
||||
; - 12-05-02-0106 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State>
|
||||
<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
|
||||
<Button>
|
||||
<State> $Sum1205020106 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
|
|
@ -5596,7 +5596,7 @@ Soda & Ice" </Value>
|
|||
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $.Price
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0106.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
|
|
@ -5605,7 +5605,7 @@ Soda & Ice" </Value>
|
|||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0106.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -5625,7 +5625,7 @@ Soda & Ice" </Value>
|
|||
Topping "Load" "12-05-02-0106"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" ""
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "-"
|
||||
EndIf
|
||||
|
|
@ -5718,7 +5718,7 @@ Soda & Ice" </Value>
|
|||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
|
|
|
|||
|
|
@ -1796,19 +1796,19 @@
|
|||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; 12-05-02-0105 12-05-03-0105
|
||||
; - 12-05-02-0105 12-05-03-0105
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
|
||||
<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
|
||||
<Button>
|
||||
<State> $Sum12050201051205030105 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
|
|
@ -1818,7 +1818,7 @@
|
|||
Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $.Price
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0105.Price
|
||||
Var PriceD3 = $12-05-03-0105.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
|
|
@ -1827,7 +1827,7 @@
|
|||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0105.Button
|
||||
Var PD_STAGE_3 = $12-05-03-0105.Button
|
||||
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -1847,7 +1847,7 @@
|
|||
Topping "Load" "12-05-02-0105"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" ""
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "12-05-03-0105"
|
||||
EndIf
|
||||
|
|
@ -1940,7 +1940,7 @@
|
|||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
|
|
@ -2549,19 +2549,19 @@
|
|||
</Block>
|
||||
; - - -
|
||||
; ==================> Len = 12
|
||||
; 12-05-02-0106 -
|
||||
; - 12-05-02-0106 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State>
|
||||
<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
|
||||
<Button>
|
||||
<State> $Sum1205020106 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
|
|
@ -2571,7 +2571,7 @@
|
|||
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $.Price
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0106.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
|
|
@ -2580,7 +2580,7 @@
|
|||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0106.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -2600,7 +2600,7 @@
|
|||
Topping "Load" "12-05-02-0106"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" ""
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "-"
|
||||
EndIf
|
||||
|
|
@ -2693,7 +2693,7 @@
|
|||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
|
|
|
|||
|
|
@ -76,17 +76,6 @@
|
|||
|
||||
EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
Else
|
||||
If Timeout = 0 Then
|
||||
If CupChecking = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
|
|
@ -155,6 +144,21 @@
|
|||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
Else
|
||||
If Timeout = 0 Then
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
If CupChecking = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue