DO
This commit is contained in:
wanlop run
parent
79fc27dc9b
commit
19ffebde48
6 changed files with 125 additions and 117 deletions
|
|
@ -784,7 +784,6 @@ Name=coconut,file=page_catalog_group_pro_nam_hom_coconut.skt
|
|||
โจรบุกหาดสวนสน\n(ใจไหม) Pirates in Suan Son Beach ยูซุมินต์โซดา Mint Syrup, Yuzu Syrup Soda & Ice - 12-05-02-0064 - BN_Yuzu_Mint_Soda_pro.png - - - posi1
|
||||
โจรบุกหาดยาว\n(ไปยาวไป) Pirates in Long Beach เป๊ปซี่มินต์ Pepsi, Mint Syrup and Soda - 12-05-02-0067 - bn_Mint_pepsi_pro.png - - - posi1
|
||||
|
||||
|
||||
Name=cocoa7.7,file=page_catalog_group_pro_cocoa_77.skt
|
||||
มอคค่า MOCHA กาแฟ นม โกโก้ และ น้ำตาล Espresso, Cocoa, Milk, Sugar 12-01-01-0006 12-01-02-0003 12-01-03-0003 bn_hot_Mocha_cocoa77 12-21-01-0006 12-21-02-0003 12-21-03-0003 posi1 ฿40.00 ฿45.00 ฿50.00 TRUE TRUE
|
||||
มอคค่า MOCHA กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล Espresso, Cocoa,\nMilk, Sugar 12-01-01-1006 12-01-02-1003 - cocoa_mocha_Healthy_cocoa77 12-21-01-1006 12-21-02-1003 - posi1 #N/A #N/A - #N/A #N/A
|
||||
|
|
@ -805,6 +804,17 @@ Name=cocoa7.7,file=page_catalog_group_pro_cocoa_77.skt
|
|||
เป๊ปซี่โกโก้โอริโอ้ภูเขาไฟ PEPSI COCOA OREO \nVOLCANO เป๊ปซี่ โกโก้ นม และโอริโอ้ Pepsi, Cocoa, Milk, Oreo and Ice - - 12-99-03-0067 bn_ChocoOreo_PEPSI_smoothie_cocoa77 - - - posi1
|
||||
เป๊ปซี่โกโก้โอริโอ้ภูเขาไฟ PEPSI COCOA OREO \nVOLCANO เป๊ปซี่ โกโก้ นม และโอริโอ้ Pepsi, Cocoa, Milk, Oreo and Ice - - 12-99-03-0068 bn_ChocoOreo_PEPSI_smoothie_cocoa77 - - - posi1
|
||||
|
||||
Name=mint_something_idk,file=page_catalog_group_pro_.skt
|
||||
กาแฟมินต์ลาเต้ MINT CAFE LATTE กาแฟ น้ำ นม และ มินต์ Espresso, Mint Syrup,\nSugar, Milk - 12-01-02-0057 - bn_Iced_Mint_Latte_pro.png - 12-21-02-0057 - posi1
|
||||
มินต์กาโน่ MINTCANO กาแฟ น้ำ และ มินต์ Espresso, Mint Syrup,\nSugar, Water - 12-01-02-0058 - bn_Mint_Americano_pro.png - 12-21-02-0058 - posi1
|
||||
มัทฉะลาเต้มินต์ MATCHA LATTE MINT ชาเขียวมัทฉะ น้ำเชื่อมมินต์ และนมอุ่น Matcha, Mint Syrup &Milk - - 12-02-03-0050 bn_Matcha_latte_mint_smoothie_pro.png - - - posi1
|
||||
มิมต์มอคค่า MINT MOCHA มิมต์มอคค่า Espresso, Mint Syrup, Milk - 12-01-02-0064 - bn_Iced_Mint_Mocha_pro.png - 12-21-02-0064 - posi1
|
||||
โกโก้มินต์ COCOA MINT น้ำเชื่อมมินต์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa - 12-03-02-0035 - bn_Mint_Cocoa_pro.png - - - posi1
|
||||
มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 Mint_SuperVocano_pro.png - - - posi1
|
||||
นมสตรอเบอร์รี่มินต์ STRAWBERRY\nMINT MILK น้ำเชื่อมมินต์ น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำตาล Mint Syrup, Milk,\nStrawberry Syrup - - 12-03-03-0037 bn_Mint_Milk_Straw_Smoothie_pro.png - - - posi1
|
||||
สตรอเบอร์รี่\nมินต์โซดา STRAWBERRY\nMINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Mint Syrup, Strawberry Syrup, Lime, Soda & Ice - 12-05-02-0063 - bn_Mint_Strawberry_Soda_pro.png - - - posi1
|
||||
ยูซุมินต์โซดา YUZU MINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมยูซุ และโซดา Mint Syrup, Yuzu Syrup Soda & Ice - 12-05-02-0064 - BN_Yuzu_Mint_Soda_pro.png - - - posi1
|
||||
เป๊ปซี่มินต์ PEPSI MINT เป๊ปซี่ น้ำเชื่อมมินต์ ผงมะนาว และโซดา Pepsi, Mint Syrup Lime & Ice - 12-05-02-0067 - bn_Mint_pepsi_pro.png - - - posi1
|
||||
|
||||
7up
|
||||
อัพเงินเดือนเถอะครับหัวหน้า Up my salary, please, boss! เซเว่นอัพ 7UP & Ice 12-05-02-0095
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 3.
|
|
|
@ -12806,6 +12806,91 @@ LIMENADE SODA" </Value>
|
|||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<EventOnClick>
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
|
||||
|
||||
</EventOnClick>
|
||||
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
||||
<EventUnitTest1>
|
||||
Var BigButtonEnable = "Enable"
|
||||
Refresh
|
||||
</EventUnitTest1>
|
||||
<EventUnitTest2>
|
||||
Var BigButtonEnable = "Invisible"
|
||||
Refresh
|
||||
</EventUnitTest2>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 780 </X>
|
||||
|
|
|
|||
|
|
@ -1108,6 +1108,8 @@
|
|||
Var ShowButtonClick2 = "Invisible"
|
||||
EndIf
|
||||
|
||||
Machine OrderCheck
|
||||
|
||||
DEBUGVAR CLOSE_ORDER_NOW
|
||||
|
||||
; move to TRY actoin.
|
||||
|
|
@ -1220,7 +1222,12 @@
|
|||
|
||||
<EventUnitTest4>
|
||||
PRICE "Load" "-"
|
||||
PRICE "Check" XMLProfile
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
|
||||
</EventUnitTest4>
|
||||
|
||||
<EventDrink>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
Var NightTime = 0
|
||||
|
||||
Machine WakeUp
|
||||
Machine OrderCheck
|
||||
|
||||
DEBUGVAR ToppingNewShow
|
||||
|
||||
|
|
|
|||
|
|
@ -44,10 +44,7 @@
|
|||
|
||||
LED LedDoorDoor 5 255 255 255 255
|
||||
|
||||
Var TimeoutInstance0 = 0
|
||||
Var CheckCupStateDoorCupClose = "-"
|
||||
Var CheckCupStateDoorCupCloseCnt = 0
|
||||
Var CoundUpDelayCertainStage = 0
|
||||
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -63,102 +60,7 @@
|
|||
;DEBUGVAR CupArmMove
|
||||
;DEBUGVAR buttonRemoveCup
|
||||
|
||||
; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
|
||||
If HaveCup = "false" Then
|
||||
If MachineStage = "show-menu" Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
If Timeout > 15 Then
|
||||
Var Timeout = 0
|
||||
EndIf
|
||||
|
||||
Var TimeoutInstance0 = TimeoutInstance0 + 1
|
||||
|
||||
If TimeoutInstance0 > 600 Then
|
||||
Var TimeoutInstance0 = 0
|
||||
SAVELOG "Check Cup all"
|
||||
Machine CheckCupAll
|
||||
EndIf
|
||||
|
||||
; Logic have differrent drinkfail3.xml
|
||||
; protect lock
|
||||
;
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt > 0 Then
|
||||
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
|
||||
DEBUGVAR CheckCupStateDoorCupCloseCnt
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt = 0 Then
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If HaveCup = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var CoundUpDelayCertainStage = 0
|
||||
EndIf
|
||||
|
||||
If CupArmMove = "true" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = "Please wait."
|
||||
Else
|
||||
Var MachineErrorDetailAll = "กรุณารอสักครู่"
|
||||
EndIf
|
||||
Else
|
||||
If CupArmMove = "false" Then
|
||||
If HaveCup = "true" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If buttonRemoveCup = "Invisible" Then
|
||||
Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
|
||||
If CoundUpDelayCertainStage > 2 Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
Else
|
||||
If Timeout = 0 Then
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
If CupChecking = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
@ -166,6 +68,20 @@
|
|||
|
||||
</EventTimeout>
|
||||
|
||||
<EventMachineCupReady>
|
||||
SAVELOG "EventMachineCupReady"
|
||||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var HaveCup = "false"
|
||||
Refresh
|
||||
|
||||
</EventMachineCupReady>
|
||||
|
||||
<EventMachineCupNotReady>
|
||||
SAVELOG "EventMachineCupNotReady"
|
||||
Var CoundUpDelayCertainStage = 5
|
||||
</EventMachineCupNotReady>
|
||||
|
||||
<EventDrink>
|
||||
SAVELOG "EventDrink"
|
||||
DEBUGVAR HaveCup
|
||||
|
|
@ -174,13 +90,9 @@
|
|||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CupArmMove
|
||||
|
||||
If HaveCup = "true" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
</EventDrink>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 852 </Y>
|
||||
|
|
@ -198,15 +110,8 @@
|
|||
<EventClick>
|
||||
|
||||
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
;include=ROOT/taobin_project/inc/remove_cup_button.inc
|
||||
|
||||
; protect value update too slow.
|
||||
Var DoorCupPosition = "-"
|
||||
|
||||
Var CheckCupStateDoorCupClose = "reset"
|
||||
Var CheckCupStateDoorCupCloseCnt = 30
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -108,8 +108,8 @@
|
|||
Var RandomPromotionMyworld = 0
|
||||
Var RandomSalePackage = 0
|
||||
|
||||
Var XMLPageVersion = "8.65"
|
||||
Var XMLPageVersionInt = 865
|
||||
Var XMLPageVersion = "8.66"
|
||||
Var XMLPageVersionInt = 866
|
||||
;Oreo
|
||||
Var OreoGuarantee = 0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue