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

fix Conflict merge

Browse source
This commit is contained in:
miggaze 2021-11-10 15:46:37 +07:00
commit cea1107abf
60 changed files with 4728 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

39
xml/page_topping_select2.xml
View file

@ -7,6 +7,10 @@
<EventOpen>
Var y_topping_bg = 912
;Machine DoorClose
Machine DoorLidClose
DEBUGVAR video_menu_0
DEBUGVAR SelectDrink
@ -86,8 +90,14 @@
Var bg_straw_only = DirImage + "/bg_straw_only.png"
Var bg_lid_only = DirImage + "/bg_lid_only.png"
; Move to catalog.
;Machine DoorClose
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
;Var blendedState = "Enable"
@ -99,12 +109,6 @@
Var ShiftSugarStep = 1
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
CRLFToSpace showname
CRLFToSpace showdesc
@ -194,8 +198,19 @@
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
Var bg_strawlid = DirImage + "/bg_strawlid.png"
Var bg_straw_only = DirImage + "/bg_straw_only.png"
Var bg_lid_only = DirImage + "/bg_lid_only.png"
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
CRLFToSpace showname
CRLFToSpace showdesc
@ -546,6 +561,14 @@
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Enable"
DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "shot coffee 1008" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Enable"
DEBUGVAR TOPPING2
Refresh
EndIf