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

Test 6.51

Browse source
This commit is contained in:
kong 2022-06-14 13:09:11 +07:00
parent d8000cdf75
commit c7523273da
6 changed files with 48 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/page_cannotConti.xml
View file

@ -438,10 +438,7 @@
If NextOrderStatus = "Disable" Then If NextOrderStatus = "Disable" Then
Var PayDetail="1/F:1221/0/" Var PayDetail="1/F:1221/0/"
Else Else
DEBUGVAR error_code_stop_now DEBUGVAR error_code_stop_now
If error_code_stop_now > 0 Then If error_code_stop_now > 0 Then
@ -499,8 +496,7 @@
If NextOrderStatus = "Disable" Then If NextOrderStatus = "Disable" Then
Var PayDetail="1/F:1221/0/" Var PayDetail="1/F:1221/0/"
Else Else
DEBUGVAR error_code_stop_now DEBUGVAR error_code_stop_now
If error_code_stop_now > 0 Then If error_code_stop_now > 0 Then
@ -554,7 +550,6 @@
Var PayDetail="1/F:1221/0/" Var PayDetail="1/F:1221/0/"
Else Else
DEBUGVAR error_code_stop_now DEBUGVAR error_code_stop_now
If error_code_stop_now > 0 Then If error_code_stop_now > 0 Then
Var PayDetail="1/F:" + error_code_stop_now Var PayDetail="1/F:" + error_code_stop_now

32
xml/page_drinkfail3.xml
View file

@ -34,24 +34,6 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If NextOrder = "true" Then
Else
If Timeout > 240 Then
If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
If Door_Open_flagBlink = 0 Then If Door_Open_flagBlink = 0 Then
Var Door_Open_flagBlink = 1 Var Door_Open_flagBlink = 1
Var Door_Open_State="Enable" Var Door_Open_State="Enable"
@ -96,6 +78,20 @@
EndIf EndIf
EndIf EndIf
If Timeout > 240 Then
If NextOrder = "true" Then
SAVELOG "TIME OUT 240"
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset

14
xml/page_drinkok.xml
View file

@ -356,6 +356,20 @@
Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
Else Else
If NextOrder = "true" Then If NextOrder = "true" Then
; Fast-forward to page_cannotConti
If RejectOrder = "true" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by RejectOrder"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
; END
EndIf
; next order set. Havecup and checkup value must false. Certain cup not on any arm. ; next order set. Havecup and checkup value must false. Certain cup not on any arm.

8
xml/page_payment.xml
View file

@ -156,9 +156,17 @@
If CupChecking = "true" Then If CupChecking = "true" Then
If HaveCup = "true" Then If HaveCup = "true" Then
SAVELOG "Have cup"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf EndIf
EndIf EndIf
If DoorCupPosition = "bottom" Then
Else
SAVELOG "DoorCupPosition not bottom"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf EndIf
Else Else

41
xml/page_thankyouConti.xml
View file

@ -6,6 +6,7 @@
<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound> <Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
; This page Seeker must curr
; On open ; On open
Var CountDownThankyou = 4 Var CountDownThankyou = 4
Var CountDownBrewing = BrewTime Var CountDownBrewing = BrewTime
@ -95,16 +96,6 @@
; Pack ; Pack
Topping "Pack" ExtendDataCurr Topping "Pack" ExtendDataCurr
;Var Seeker.ExtendData = ExtendData ; because save in Seeker.
;Var MachineStage = "NextOrder"
;Var SessionID2 = SelectSlot + ":"
;Var SessionID2 = SessionID2 + ExtendData
;DEBUGVAR SessionID2
Topping "ClearNextOrder" "-" Topping "ClearNextOrder" "-"
EndIf EndIf
@ -129,7 +120,6 @@
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1 Var CountDownBrewing = CountDownBrewing - 1
;Var CountDownThankyou = CountDownThankyou - 1
DEBUGVAR MachineStage DEBUGVAR MachineStage
DEBUGVAR stop_now DEBUGVAR stop_now
@ -142,13 +132,6 @@
DEBUGVAR DoorCupPosition DEBUGVAR DoorCupPosition
DEBUGVAR CountUpDoorCupOpen DEBUGVAR CountUpDoorCupOpen
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
If HaveCup = "true" Then If HaveCup = "true" Then
Var Timeout = 0 Var Timeout = 0
Else Else
@ -201,24 +184,18 @@
EndIf EndIf
If MachineStage = "close-maintenance" Then
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then If stop_now = "true" Then
If NextOrder = "true" Then Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf EndIf
EndIf EndIf
If RejectOrder = "true" Then
SAVELOG "RejectOrder page_thankyouConti"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
If Timeout = 2 Then If Timeout = 2 Then

4
xml_main/startup.xml_new_layout
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "6.50" Var XMLPageVersion = "6.51"
Var XMLPageVersionInt = 650 Var XMLPageVersionInt = 651
</EventOpen> </EventOpen>
<Text> <Text>