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

Merge

Browse source
This commit is contained in:
wanlop run 2025-05-06 16:37:32 +07:00
commit 988d25d8ee
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
inter/tha/xml/page_topping_frozen_fruit_select.lxml
View file

@ -13,6 +13,12 @@
CRLFToSpace showname CRLFToSpace showname
CRLFToSpace showdesc CRLFToSpace showdesc
<<<<<<< HEAD
=======
Var MachineEvent = 0
Var MatchineSpiralStage = "-"
>>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
;- Begin ;- Begin
Var PriceDrinkNoTop = PriceDrink Var PriceDrinkNoTop = PriceDrink
@ -173,8 +179,10 @@
EndIf EndIf
EndIf EndIf
DEBUGVAR MatchineSpiralStage DEBUGVAR MatchineSpiralStage
If MachineEvent = 1 Then
If MatchineSpiralStage = "spiral-valid" Then If MatchineSpiralStage = "spiral-valid" Then
Function 2 Function 2
Else Else
@ -182,6 +190,7 @@
DEBUGVAR MachineSpiralErrorCode DEBUGVAR MachineSpiralErrorCode
Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml" Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
EndIf EndIf
EndIf
Refresh Refresh
TimerReset TimerReset
@ -324,12 +333,19 @@
Else Else
Var MachineEvent = 1
DEBUGVAR LinkProductCodeAnotherMachine[0] DEBUGVAR LinkProductCodeAnotherMachine[0]
DEBUGVAR LinkProductCodeAnotherMachine[1] DEBUGVAR LinkProductCodeAnotherMachine[1]
DEBUGVAR LinkProductCodeAnotherMachine[2] DEBUGVAR LinkProductCodeAnotherMachine[2]
<<<<<<< HEAD
Var MatchinePrialStage = "-" Var MatchinePrialStage = "-"
=======
Var MatchineSpiralStage = "-"
>>>>>>> 25887b3556a64b1276a34f39bee2f62991f23df1
GenHashWithTimeStamp SpiralRef GenHashWithTimeStamp SpiralRef
SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef