pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

update CerealMilk -> OatMilk

Browse source
This commit is contained in:
Kenta420 2023-10-04 13:48:05 +07:00
parent fd89d1787a
commit 52dd8fec4f
2 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping2_en/bg_milk_choice_j.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

90
xml/page_topping_select7.xml
View file

@ -300,12 +300,12 @@
Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
If MilkChoiceVeganEnable = 1 Then If MilkChoiceVeganEnable = 1 Then
Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png" Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
Else Else
Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png" Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
EndIf EndIf
Var CerealMilkToppingEnable = "Invisible" Var OatMilkToppingEnable = "Invisible"
Var CerealMilkEnable = "Invisible" Var OatMilkEnable = "Invisible"
Var topping_price_refresh = 1 Var topping_price_refresh = 1
@ -354,9 +354,9 @@
EndIf EndIf
If show_eng = "true" Then If show_eng = "true" Then
Var CerealMilkX = 400 Var OatMilkX = 400
Else Else
Var CerealMilkX = 270 Var OatMilkX = 270
EndIf EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
@ -601,12 +601,18 @@
EndIf EndIf
EndIf EndIf
If MilkChoiceVeganEnable = 1 Then
Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
Else
Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
If show_eng = "true" Then If show_eng = "true" Then
Var CerealMilkX = 400 Var OatMilkX = 400
Else Else
Var CerealMilkX = 270 Var OatMilkX = 270
EndIf EndIf
Function 2 Function 2
@ -711,6 +717,8 @@
DEBUGVAR MenuCodeName1 DEBUGVAR MenuCodeName1
DEBUGVAR MenuCodeName2 DEBUGVAR MenuCodeName2
DEBUGVAR MenuCodeName1_State
DEBUGVAR MenuCodeName2_State
DEBUGVAR SubMenuOnTop1 DEBUGVAR SubMenuOnTop1
DEBUGVAR SubMenuOnTop2 DEBUGVAR SubMenuOnTop2
DEBUGVAR SubMenuOnTop3 DEBUGVAR SubMenuOnTop3
@ -1489,10 +1497,12 @@
EndIf EndIf
;topping_price_refresh = 0 ;topping_price_refresh = 0
If MenuCodeName1 = "Cereal-Milk" Then If MenuCodeName1 = "OatMilk" Then
Var CerealMilkToppingEnable = "Enable" Var OatMilkToppingEnable = "Enable"
Var CerealMilkPrice = SubMenuPrice1 Var OatMilkPrice = SubMenuPrice1
Var CerealMilkEnable = "Enable" If MenuCodeName1_State = "Enable" Then
Var OatMilkEnable = "Enable"
EndIf
EndIf EndIf
@ -2805,32 +2815,32 @@
; ;
;-BEGIN milk choice ;-BEGIN milk choice
<Block> <Block>
<State> CerealMilkToppingEnable </State> <State> OatMilkToppingEnable </State>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 157 </Height> <Height> 157 </Height>
<MarginTop> 20 </MarginTop> <MarginTop> 20 </MarginTop>
<Image> <Image>
<State> CerealMilkToppingEnable </State> <State> OatMilkToppingEnable </State>
<Filename> CerealMilkToppingBg </Filename> <Filename> OatMilkToppingBg </Filename>
</Image> </Image>
<Button> <Button>
<X> 40 </X> <X> 40 </X>
<Y> 72 </Y> <Y> 72 </Y>
<State> CerealMilkEnable </State> <State> OatMilkEnable </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename> <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
SAVELOG " CerealMilkEnable " SAVELOG " OatMilkEnable "
If CerealMilkEnable = "Press" Then If OatMilkEnable = "Press" Then
Var CerealMilkEnable = "Enable" Var OatMilkEnable = "Enable"
Else Else
Var CerealMilkEnable = "Press" Var OatMilkEnable = "Press"
EndIf EndIf
Function 2 Function 2
@ -2843,20 +2853,20 @@
<Button> <Button>
<X> 896 </X> <X> 896 </X>
<Y> 78 </Y> <Y> 78 </Y>
<State> CerealMilkEnable </State> <State> OatMilkEnable </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename> <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress> <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
SAVELOG " CerealMilkEnable " SAVELOG " OatMilkEnable "
If CerealMilkEnable = "Press" Then If OatMilkEnable = "Press" Then
Var CerealMilkEnable = "Enable" Var OatMilkEnable = "Enable"
Else Else
Var CerealMilkEnable = "Press" Var OatMilkEnable = "Press"
EndIf EndIf
Function 2 Function 2
@ -2874,7 +2884,7 @@
<State> "Enable" </State> <State> "Enable" </State>
<Size> 36 </Size> <Size> 36 </Size>
<Color> 0x84776F </Color> <Color> 0x84776F </Color>
<Value> CerealMilkPrice </Value> <Value> OatMilkPrice </Value>
</Text> </Text>
</Block> </Block>
@ -4179,21 +4189,21 @@
Machine PreparCup Machine PreparCup
EndIf EndIf
;Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop ;Var OatMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
Var CerealMilkAddAmount = 5 Var OatMilkAddAmount = 5
If CerealMilkAddAmount = 0 Then If OatMilkAddAmount = 0 Then
Var CerealMilkPrice = "(+฿5)" Var OatMilkPrice = "(+฿5)"
Else Else
Var CerealMilkPrice = "(+฿" + CerealMilkAddAmount Var OatMilkPrice = "(+฿" + OatMilkAddAmount
Var CerealMilkPrice = CerealMilkPrice + ")" Var OatMilkPrice = OatMilkPrice + ")"
Var CerealMilkPrice = "(+฿5)" Var OatMilkPrice = "(+฿5)"
EndIf EndIf
DEBUGVAR SubMenuPrice1 DEBUGVAR SubMenuPrice1
DEBUGVAR CerealMilkAddAmount DEBUGVAR OatMilkAddAmount
@ -4276,11 +4286,13 @@
EndIf EndIf
If CerealMilkEnable = "Press" Then If OatMilkEnable = "Press" Then
If MenuCodeName1 = "Cereal-Milk" Then If MenuCodeName1 = "OatMilk" Then
Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount If MenuCodeName1_State = "Enable" Then
Var DisableUsingCode = "true" Var TOPPING_PRICE = TOPPING_PRICE + OatMilkAddAmount
Var UserSelectProductCode = SubMenuProductCode1 Var DisableUsingCode = "true"
Var UserSelectProductCode = SubMenuProductCode1
EndIf
EndIf EndIf
Else Else