This commit is contained in:
wanlop run 2025-03-06 16:00:09 +07:00
parent 85f8dcdb17
commit 02d3f13abe
74 changed files with 3640 additions and 3624 deletions

View file

@ -211,7 +211,8 @@
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
STRCONTAIN "1050" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1062" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine

View file

@ -2086,9 +2086,9 @@ Tea" </Value>
<State> Flag( 12-02-01-0027.Button,12-02-02-0027.Button,12-02-03-0027.Button,$Sum120201002712020200271202030027) </State>
<Button>
<State> $Sum120201002712020200271202030027 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_sing.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_sing.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_sing.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0027, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -2097,7 +2097,7 @@ Tea" </Value>
Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
Var DrinkDescriptionTH = "ชาเขียว และน้ำ"
Var DrinkDescription = "Matcha & Water "
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_sing.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0027.Price
Var PriceD2 = $12-02-02-0027.Price

View file

@ -557,9 +557,9 @@
<State> Flag( 12-02-01-0047.Button,12-02-02-0047.Button,$Sum12020100471202020047) </State>
<Button>
<State> $Sum12020100471202020047 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_limeblack_tea_tea_time.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_limeblack_tea_tea_time.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_limeblack_tea_tea_time.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_limeblack_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_limeblack_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_limeblack_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0047, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -568,7 +568,7 @@
Var NameDrinkTH = "ชาดำ"
Var DrinkDescriptionTH = "ชาไทย และน้ำ"
Var DrinkDescription = "Thai Tea, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_limeblack_tea_tea_time.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_limeblack_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0047.Price
Var PriceD2 = $12-02-02-0047.Price

View file

@ -819,9 +819,9 @@
<State> Flag( 12-02-01-0026.Button,12-02-02-0026.Button,12-02-03-0026.Button,$Sum120201002612020200261202030026) </State>
<Button>
<State> $Sum120201002612020200261202030026 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_milk_tea_sing.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_milk_tea_sing.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_milk_tea_sing.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_milk_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_milk_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_milk_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0026, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -830,7 +830,7 @@
Var NameDrinkTH = "มัทฉะลาเต้ "
Var DrinkDescriptionTH = "ชาเขียวมัทฉะ และ นมอุ่น"
Var DrinkDescription = "Matcha, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0026.Price
Var PriceD2 = $12-02-02-0026.Price
@ -7196,9 +7196,9 @@ Ginger Tea" </Value>
<State> Flag( 12-02-01-0027.Button,12-02-02-0027.Button,12-02-03-0027.Button,$Sum120201002712020200271202030027) </State>
<Button>
<State> $Sum120201002712020200271202030027 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea_sing.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea_sing.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea_sing.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_matcha_tea.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_matcha_tea.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_hot_matcha_tea.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-0027, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -7207,7 +7207,7 @@ Ginger Tea" </Value>
Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
Var DrinkDescriptionTH = "ชาเขียว และน้ำ"
Var DrinkDescription = "Matcha & Water "
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_sing.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-0027.Price
Var PriceD2 = $12-02-02-0027.Price
@ -7459,7 +7459,7 @@ Ginger Tea" </Value>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Matcha Limenade"
Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว "
Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว"
Var DrinkDescriptionTH = "ชาเขียว มะนาว "
Var DrinkDescription = "Matcha, Limenade, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png"
@ -7532,8 +7532,7 @@ Ginger Tea" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "ชาเขียวญี่ปุ่นมะนาว
" </Value>
<Value> "ชาเขียวญี่ปุ่นมะนาว" </Value>
</Text>
<Text>
<X> 16 </X>
@ -7971,7 +7970,7 @@ Limenade" </Value>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Matcha Limenade"
Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว "
Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว"
Var DrinkDescriptionTH = "ชาเขียว น้ำ มะนาว "
Var DrinkDescription = "Matcha, Limenade, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png"
@ -8044,8 +8043,7 @@ Limenade" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "ชาเขียวญี่ปุ่นมะนาว
" </Value>
<Value> "ชาเขียวญี่ปุ่นมะนาว" </Value>
</Text>
<Text>
<X> 16 </X>

View file

@ -1500,82 +1500,51 @@
Else
If TOPPING6 = "Topping-Volcano" Then
Var SelectToppingType = 1
Var SelectToppingType = 0
Var SelectedToppingCount = 0
Var text_color_6 = "0x84776F"
If toppingID6price2 > 0 Then
If toppingID6price2 > 0 Then
DEBUGVAR toppingID6price2
DEBUGVAR DisplayFormat
Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow)
DEBUGVAR toppingID6price2Conv
Var text_price_6 = ""
Var text_price_6 = toppingID6price2Conv + ")"
Var text_price_6 = "(+" + text_price_6
DEBUGVAR text_price_6
DEBUGVAR text_color_6
Else
Var text_price_6 = ""
EndIf
Var CustomSyrup = "Invisible"
Var showOvaltineEnable = "Invisible"
Var showCocoaEnable = "Invisible"
If blend_button_state = "PressForever" Then
Var SpecialMix = "Enable"
Var CustomSyrup = "Enable"
Var showOreoAddEnable = "Enable"
Var showOvaltineEnable = "Enable"
Var showCocoaEnable = "Enable"
Var showStrawberryEnable = "Enable"
Var showYuzuEnable = "Enable"
Var showText8 = "Invisible"
; Var showCustomCoffee = "Enable"
; Var showCoffeeWater = "Enable"
; Var showCoffeeQuantity = "Enable"
; Var showCoffeeLevel = "Enable"
; Var showCoffeeTamping = "Enable"
If toppingSelectState = "Enable" Then
Var CustomOreoState = "Enable"
Var CustomOvaltineState = "Enable"
Var CustomCocoaState = "Enable"
Var CustomCollagenState = "Enable"
Var PopupToppingSelect = "Enable"
Var CustomOreoCheckState = "Enable"
Var CustomOvaltineCheckState = "Enable"
Var CustomCocoaCheckState = "Enable"
EndIf
Var showText8 = "Invisible"
Else
;Var showOreoAddEnable = "Disable"
;Var showOvaltineEnable = "Disable"
Var showOreoAddEnable = "Disable"
Var showText8 = "Enable"
; Var showCustomCoffee = "Invisible"
; Var showCoffeeWater = "Invisible"
; Var showCoffeeQuantity = "Invisible"
; Var showCoffeeLevel = "Invisible"
; Var showCoffeeTamping = "Invisible"
EndIf
Var ExtraTopping = "Enable"
@ -1583,17 +1552,10 @@
If hot_button_state = "Disable2" Then
If cold_button_state = "PressForever" Then
Var showOreoAddEnable = "Enable"
Var showOvaltineEnable = "Enable"
Var showCocoaEnable = "Enable"
Var showText8 = "Invisible"
Var showText8 = "Invisible"
EndIf
EndIf
EndIf
Else
If blend_button_state = "PressForever" Then
Var SelectToppingType = 1
EndIf
EndIf
If TOPPING6 = "all-volcano" Then
@ -1622,6 +1584,30 @@
Var text_price_6 = ""
EndIf
If cold_button_state = "PressForever" Then
Var SpecialMix = "Enable"
Var CustomSyrup = "Enable"
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showStrawberryEnable = "Disable"
Var showYuzuEnable = "Disable"
EndIf
If hot_button_state = "PressForever" Then
Var SpecialMix = "Enable"
Var CustomSyrup = "Enable"
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showStrawberryEnable = "Disable"
Var showYuzuEnable = "Disable"
EndIf
If blend_button_state = "PressForever" Then
Var SpecialMix = "Enable"
@ -1657,8 +1643,15 @@
Var CustomCocoaCheckState = "Enable"
EndIf
Else
;Var showOreoAddEnable = "Disable"
;Var showOvaltineEnable = "Disable"
Var SpecialMix = "Enable"
Var CustomSyrup = "Enable"
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showStrawberryEnable = "Disable"
Var showYuzuEnable = "Disable"
Var showText8 = "Enable"
; Var showCustomCoffee = "Invisible"
@ -2164,14 +2157,22 @@
;Var SelectedToppingCount = 0
Else
If SubMenuGroupIDSlot6_1 = 300 Then
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
If TOPPING6 = "all-volcano" Then
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showYuzuEnable = "Disable"
Var showStrawberryEnable = "Disable"
Var showYuzuEnable = "Disable"
Var showStrawberryEnable = "Disable"
Var showText8 = "Enable"
Var showText8 = "Enable"
EndIf
If TOPPING6 = "Topping-Volcano" Then
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Invisible"
Var showCocoaEnable = "Invisible"
EndIf
Var ExtraTopping = "Enable"
EndIf
EndIf
@ -3588,8 +3589,8 @@
<X> 52 </X>
<Y> 680 </Y>
<Width> 1080 </Width>
<Height> 1080 </Height>
<ScrollHeight> 1080 </ScrollHeight>
<Height> 880 </Height>
<ScrollHeight> 880 </ScrollHeight>
<Scroll> "Vertical" </Scroll>
<Column> 1 </Column>
@ -3606,7 +3607,6 @@
</Image>
<Button>
<X> 456 </X>
<Y> 72 </Y>