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

fix bug adddata and blink next order

Browse source
This commit is contained in:
miggaze 2022-04-05 19:34:42 +07:00
parent 25ad3df945
commit 7bc698a9e2
2 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
xml/page_brewing3.xml
View file

@ -211,6 +211,12 @@
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Enable"
Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf
; Hide ; Hide
Var bg_strawlid_ST = "Invisible" Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible" Var bg_strawProblem_ST = "Invisible"
@ -828,6 +834,17 @@
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then
If EnableSelectMenuBetweenBrewBlink = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
Else
Var EnableSelectMenuBetweenBrewBlink = "Enable"
EndIf
Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf
DEBUGVAR CountUpBrewing DEBUGVAR CountUpBrewing
; animation video loop ; animation video loop
If AnimationOn = "true" Then If AnimationOn = "true" Then
@ -993,7 +1010,7 @@
<Button> <Button>
<X> 78 </X> <X> 78 </X>
<Y> 1652 </Y> <Y> 1652 </Y>
<State>EnableSelectMenuBetweenBrew</State> <State>EnableSelectMenuBetweenBrewBlink</State>
<Filename> text_next_order </Filename> <Filename> text_next_order </Filename>
<Button> <Button>

36
xml/page_brewing3Conti.xml
View file

@ -30,6 +30,16 @@
Else Else
Var EnableSelectMenuBetweenBrew = "Enable" Var EnableSelectMenuBetweenBrew = "Enable"
EndIf EndIf
If GetFreeFromError = 1 Then
Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Enable"
Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png" Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
@ -92,12 +102,12 @@
If Seeker.TaobinErrorNetwork = 0 Then If Seeker.TaobinErrorNetwork = 0 Then
Var Cid = 11 Var Cid = 11
Var AddData = 1 Var AddData = 1
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
Else Else
Var PointCrm = "" Var PointCrm = ""
Var Cid = 14 Var Cid = 14
Var AddData = 1 Var AddData = 1
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore ;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf EndIf
Var VendingTSIDTmp1 = "" Var VendingTSIDTmp1 = ""
@ -515,9 +525,10 @@
Var PayO2 = Seeker.CoffeePinNumber Var PayO2 = Seeker.CoffeePinNumber
EndIf EndIf
If AddData = 1 Then
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf
Var ServiceType = "coffee" Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink Var ServiceCredit = SelectDrink
Var SuggestID = "" Var SuggestID = ""
@ -620,7 +631,9 @@
If ErrTimeout = 0 Then If ErrTimeout = 0 Then
Var ErrTimeout = 1 Var ErrTimeout = 1
If AddData = 1 Then
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
EndIf
If Seeker.PayWithQR = 0 Then If Seeker.PayWithQR = 0 Then
@ -717,6 +730,17 @@
Var EnableSelectMenuBetweenBrew = "Invisible" Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf EndIf
If EnableSelectMenuBetweenBrew = "Enable" Then
If EnableSelectMenuBetweenBrewBlink = "Enable" Then
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
Else
Var EnableSelectMenuBetweenBrewBlink = "Enable"
EndIf
Else
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
EndIf
DEBUGVAR CountUpBrewing DEBUGVAR CountUpBrewing
; animation video loop ; animation video loop
If AnimationOn = "true" Then If AnimationOn = "true" Then
@ -861,7 +885,7 @@
<Button> <Button>
<X> 78 </X> <X> 78 </X>
<Y> 1652 </Y> <Y> 1652 </Y>
<State>EnableSelectMenuBetweenBrew</State> <State>EnableSelectMenuBetweenBrewBlink</State>
<Filename> text_next_order </Filename> <Filename> text_next_order </Filename>
<Button> <Button>