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

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2022-04-04 16:15:14 +07:00
commit 0fba08e702
4 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/text_add_order.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_payment_en/page_payment/text_add_order.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

18
xml/page_brewing3.xml
View file

@ -170,6 +170,7 @@
Var next_pic_bn = DirImage + "/bn_add_order.png" Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png" Var next_pic_bp = DirImage + "/bp_add_order.png"
Var text_next_order = DirImage + "/text_add_order.png"
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
Var bg_strawlid_ST = "Enable" Var bg_strawlid_ST = "Enable"
@ -981,11 +982,18 @@
<Filename> PictureFile</Filename> <Filename> PictureFile</Filename>
</Image> </Image>
<Image> ;<Image>
<X> 60 </X> ;<X> 60 </X>
<Y> 1649 </Y> ;<Y> 1649 </Y>
<Filename> BottomText </Filename> ;<Filename> BottomText </Filename>
</Image> ;</Image>
<Button>
<X> 78 </X>
<Y> 1652 </Y>
<State>EnableSelectMenuBetweenBrew</State>
<Filename> text_next_order </Filename>
<Button>

22
xml/page_brewing3Conti.xml
View file

@ -23,6 +23,7 @@
Var next_pic_bn = DirImage + "/bn_add_order.png" Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png" Var next_pic_bp = DirImage + "/bp_add_order.png"
Var text_next_order = DirImage + "/text_add_order.png"
If NextOrder = "true" Then If NextOrder = "true" Then
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
@ -712,6 +713,10 @@
EndIf EndIf
EndIf EndIf
If MachineState_Result > 0 Then
Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
DEBUGVAR CountUpBrewing DEBUGVAR CountUpBrewing
; animation video loop ; animation video loop
If AnimationOn = "true" Then If AnimationOn = "true" Then
@ -847,11 +852,18 @@
<Filename> PictureFile</Filename> <Filename> PictureFile</Filename>
</Image> </Image>
<Image> ;<Image>
<X> 60 </X> ;<X> 60 </X>
<Y> 1649 </Y> ;<Y> 1649 </Y>
<Filename> BottomText </Filename> ;<Filename> BottomText </Filename>
</Image> ;</Image>
<Button>
<X> 78 </X>
<Y> 1652 </Y>
<State>EnableSelectMenuBetweenBrew</State>
<Filename> text_next_order </Filename>
<Button>