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

changed image bx_add_order, remove check show-menu,show next order after cancel and adddata 24 auto

Browse source
This commit is contained in:
miggaze 2022-04-04 12:32:43 +07:00
parent a770eba892
commit f6ca11fb44
8 changed files with 48 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_payment/bn_add_order.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
image/page_payment_en/page_payment/bn_add_order.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

14
xml/page_brewing3.xml
View file

@ -168,7 +168,8 @@
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf
Var next_pic_bg = DirImage + "/bn_add_order.png"
Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png"
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
Var bg_strawlid_ST = "Enable"
@ -792,9 +793,9 @@
If MachineStage = "show-menu" Then
If MachineState_Result = 0 Then
SAVELOG "back_to_main from line > 714."
;SAVELOG "back_to_main from line > 714."
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
Var MachineState_Result = 1
;Var MachineState_Result = 1
EndIf
EndIf
@ -1076,10 +1077,11 @@
<Button>
<X> 10 </X>
<Y> 424 </Y>
<X> 733 </X>
<Y> 1787 </Y>
<State>EnableSelectMenuBetweenBrew</State>
<Filename> next_pic_bg </Filename>
<Filename> next_pic_bn </Filename>
<FilenamePress> next_pic_bp </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then

32
xml/page_brewing3Conti.xml
View file

@ -14,11 +14,23 @@
EndIf
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf
Var next_pic_bn = DirImage + "/bn_add_order.png"
Var next_pic_bp = DirImage + "/bp_add_order.png"
If NextOrder = "true" Then
Var EnableSelectMenuBetweenBrew = "Invisible"
Else
Var EnableSelectMenuBetweenBrew = "Enable"
EndIf
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
If Seeker.thankLidFlag = 1 Then
Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
@ -861,6 +873,26 @@
<Value> ShowCountDownBrewing </Value>
</Text>
<Button>
<X> 733 </X>
<Y> 1787 </Y>
<State>EnableSelectMenuBetweenBrew</State>
<Filename> next_pic_bn </Filename>
<FilenamePress> next_pic_bp </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then
SAVELOG "User click next button"
Var Seeker = "next"
Var MultiPayEnable = "false"
CoinPause
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
</Button>
<Button>
<X> 10 </X>
<Y> 500 </Y>

4
xml/page_brewing3Multi.xml
View file

@ -691,9 +691,9 @@
If MachineStage = "show-menu" Then
If MachineState_Result = 0 Then
SAVELOG "back_to_main from line > 655."
;SAVELOG "back_to_main from line > 655."
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
Var MachineState_Result = 1
;Var MachineState_Result = 1
EndIf
EndIf

6
xml/page_payment_credit2.xml
View file

@ -785,6 +785,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR "USER BN_BACK"
If ReqAdddata22 = 1 Then
Var BmiYear = PayAmount
Var GetScore = "useCredit"
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
Open "ROOT/taobin_project/xml/page_payment_credit.xml"
</EventClick>
</Button>