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

fix frozen

Browse source
This commit is contained in:
wanlop run 2025-05-08 11:59:13 +07:00
parent 478e2cb321
commit 86588e10c0
4 changed files with 37 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

51
inter/tha/xml/multi/page_catalog.lxml
View file

@ -74,9 +74,9 @@
DEBUGVAR MAT_ID_2301
Var SpiralModeFrozenFruit = 0
Var SpiralModeGoods = 0
Var ButtonFrozenSmoothie = "Invisible"
If SpiralOnline = "true" Then
If MAT_ID_2301 = "Enable" Then
@ -270,12 +270,12 @@
EndIf
EndIf
DEBUGVAR SpiralOnline
RootLayoutVisible 13 "hide"
</EventOpen>
<Timeout> 1000 </Timeout>
@ -297,21 +297,24 @@
EndIf
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
If Seeker = "curr" Then
Var buttonRemoveCup = "Invisible"
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
EndIf
@ -329,10 +332,10 @@
Var Inst9MenuLoaded = "done"
Var Inst10MenuLoaded = "done"
Var Inst11MenuLoaded = "done"
EndIf
If MultiProcess = "Enable" Then
If SelectedMenu = "coffee" Then
Var MultiProcessTimer = MultiProcessTimer + 1
@ -602,7 +605,7 @@
If SpiralModeFrozenFruit = 1 Then
Var ColumnOverride[0] = 3
EndIf
If SpiralModeGoods = 1 Then
Var ColumnOverride[0] = 3
EndIf
@ -612,10 +615,10 @@
Var MenuKidButtonState = "Invisible"
EndIf
EndIf
Var ColumnOverride[1] = 3
Var ColumnOverride[2] = 3

12
inter/tha/xml/page_payment_pack_and_send.xml
View file

@ -28,11 +28,10 @@
Var OverrideVideoThankyou = 1
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR TimeOutSmoothiesProcess
;SAVELOG SoundPlaying
If TimeOutSmoothiesProcess > 0 Then
@ -43,6 +42,15 @@
If TimeOutSmoothiesProcess = 0 Then
Var OverrideVideoThankyou = 1
Var SelectDrink = Seeker.selected_a_drink
Var SelectSugarID = ""
SAVELOG "============================= Select ======================================="
Machine StrawOrder
Topping "Select" SelectDrink
SAVELOG "============================= MakeDrinkV1 ======================================="
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"

6
inter/tha/xml/page_smoothie_suggest_and_process.xml
View file

@ -254,13 +254,7 @@
If SmoothieProcessState = "blendnow" Then
Var TextDoorButtonID = 001206
Var SelectDrink = Seeker.selected_a_drink
Var SelectSugarID = ""
Machine StrawOrder
Topping "Select" SelectDrink
Var SmoothieProcessState = "blending"

10
menu/new-layout.tsv
View file

@ -1382,15 +1382,6 @@ Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt
Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_topping_frozen_fruit_select.lxml,parameter=show-blend-only
<<<<<<< HEAD
มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - -
มะม่วงเต่าปั่น Mango Tao Pun มะม่วง Real Mango - - 12-06-03-0001 blended_mango_only.png
มะม่่วงลิ้นจี่เต่าปั่น Mango Lychee Tao Pun มะม่วง ลิ้นจี่ Real Mango Lychee - - 12-06-03-0002 blended_mango_lychee.png
มะม่วงสตรอเบอรีเต่าปั่น Mango Strawberry Tao Pun มะม่วง สตรอเบอรี Real Mango Strawberry - - 12-06-03-0003 blended_mango_strawberry.png
มะม่วงสละเต่าปั่น Mango Salak Tao Pun มะม่วง สละ Real Mango Salak - - 12-06-03-0004 blended_mango_sala.png
มะม่วงมัทฉะเต่าปั่น Mango Pure Matcha Tao Pun มะม่วง มัทฉะ Real Mango Matcha - - 12-06-03-0005 blended_mango_greentea.png
มะม่วงชาไต้หวันเต่าปั่น Mango Taiwanese Tea Tao Pun มะม่วง ชาไต้หวัน Real Mango TaiwaneseTea - - 12-06-03-0006 blended_mango_taiwanese_tea.png
=======
มะม่วงปั่น Mango Smoothie มะม่วงปั่น แช่แข็ง Frozen mango smoothies - - 12-00-07-0000 bn_frozen_mango.png - - - posi1 - - - -
มะม่วงเต่าปั่น Mango Tao Pun มะม่วง Real Mango - - 12-06-03-0001 blended_mango_only.png - - - posi1 - - - -
มะม่่วงลิ้นจี่เต่าปั่น Mango Lychee Tao Pun มะม่วง ลิ้นจี่ Real Mango Lychee - - 12-06-03-0002 blended_mango_lychee.png - - - posi1 - - - -
@ -1398,7 +1389,6 @@ Name=FrozenFruit,file=page_catalog_group_frozen_fruit.skt,topping_xml_file=page_
มะม่วงสละเต่าปั่น Mango Salak Tao Pun มะม่วง สละ Real Mango Salak - - 12-06-03-0004 blended_mango_sala.png - - - posi1 - - - -
มะม่วงมัทฉะเต่าปั่น Mango Pure Matcha Tao Pun มะม่วง มัทฉะ Real Mango Matcha - - 12-06-03-0005 blended_mango_greentea.png - - - posi1 - - - -
มะม่วงชาไต้หวันเต่าปั่น Mango Taiwanese Tea Tao Pun มะม่วง ชาไต้หวัน Real Mango TaiwaneseTea - - 12-06-03-0006 blended_mango_taiwanese_tea.png - - - posi1 - - - -
>>>>>>> 6467e5f893ec61fc1c783c5b4e790ea2d74d664c

Can't render this file because it has a wrong number of fields in line 3.