Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
fd89d1787a
1 changed files with 8 additions and 12 deletions
|
|
@ -300,12 +300,11 @@
|
|||
Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
|
||||
|
||||
If MilkChoiceVeganEnable = 1 Then
|
||||
Var CerealMilkToppingEnable = "Invisible"
|
||||
Var CerealMilkToppingVegan = "Enable"
|
||||
Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
|
||||
Else
|
||||
Var CerealMilkToppingEnable = "Enable"
|
||||
Var CerealMilkToppingVegan = "Invisible"
|
||||
Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png"
|
||||
EndIf
|
||||
Var CerealMilkToppingEnable = "Invisible"
|
||||
Var CerealMilkEnable = "Invisible"
|
||||
|
||||
|
||||
|
|
@ -2806,17 +2805,13 @@
|
|||
;
|
||||
;-BEGIN milk choice
|
||||
<Block>
|
||||
<State> "Enable" </State>
|
||||
<State> CerealMilkToppingEnable </State>
|
||||
<Width> 986 </Width>
|
||||
<Height> 157 </Height>
|
||||
<MarginTop> 20 </MarginTop>
|
||||
<Image>
|
||||
<State> CerealMilkToppingEnable </State>
|
||||
<Filename> Var( DirImage + "/bg_milk_choice.png" )</Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<State> CerealMilkToppingVegan </State>
|
||||
<Filename> Var( DirImage + "/bg_milk_choice_j.png" )</Filename>
|
||||
<Filename> CerealMilkToppingBg </Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
|
|
@ -4184,8 +4179,9 @@
|
|||
Machine PreparCup
|
||||
EndIf
|
||||
|
||||
Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
|
||||
|
||||
;Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
|
||||
Var CerealMilkAddAmount = 5
|
||||
|
||||
If CerealMilkAddAmount = 0 Then
|
||||
Var CerealMilkPrice = "(+฿5)"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue