From 922ae67bd3269538f5c3cf9445f1a79be85ffc96 Mon Sep 17 00:00:00 2001 From: kong Date: Sun, 6 Mar 2022 23:56:08 +0700 Subject: [PATCH] Sard --- xml/menu_catalog.xml | 2 +- xml/menu_head.py | 5 + xml/page_board.xml | 4 +- xml/page_catalog.xml | 10 +- xml/page_catalog_choose_drink.xml | 2 +- xml/page_catalog_choose_drink1.xml | 2 +- xml/page_catalog_choose_drink11.xml | 2 +- xml/page_catalog_choose_drink2.xml | 2 +- xml/page_catalog_choose_drink3.xml | 2 +- xml/page_catalog_choose_drink4.xml | 2 +- xml/page_catalog_choose_drink5.xml | 2 +- xml/page_catalog_choose_drink6.xml | 2 +- xml/page_catalog_choose_drink7.xml | 2 +- xml/page_catalog_choose_drink8.xml | 2 +- xml/page_collect_point_1.xml | 4 +- xml/page_collect_point_2.xml | 4 +- xml/page_collect_point_3.xml | 4 +- xml/page_drinkok.xml | 11 +- xml/page_topping_select.xml | 1555 +-------------------------- xml/page_topping_select4.xml | 2 +- xml/page_topping_select5.xml | 60 +- 21 files changed, 90 insertions(+), 1591 deletions(-) diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index 0565e16f..e3e34e65 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -35,7 +35,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/menu_head.py b/xml/menu_head.py index 8e4c6fe8..45bf59c7 100644 --- a/xml/menu_head.py +++ b/xml/menu_head.py @@ -6,6 +6,11 @@ default_dir_press = 'ROOT/taobin_project/image/page_drink_press/' default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/' + new_default_dir = 'ROOT/taobin_project/image/page_drink_n/' + new_default_dir2 = 'ROOT/taobin_project/image/page_drink_select_n/' + new_default_dir_press = 'ROOT/taobin_project/image/page_drink_press_n/' + new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n/' + menu_count = 0 x1 = 44 diff --git a/xml/page_board.xml b/xml/page_board.xml index 04493235..ebb6541f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -558,7 +558,7 @@ EndIf - + If Seeker = "curr" Then If DoorCupPosition = "bottom" Then @@ -567,7 +567,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_show_error.xml" + ;Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 92decf96..29863dc1 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -140,6 +140,10 @@ Var ButtontoTopupMenu = "Disable" EndIf + + READ_FILE "/mnt/sdcard/new_layout" new_layout + + 1000 @@ -271,7 +275,11 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" + If new_layout = "true" Then + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" + EndIf diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 6f593c1e..de6fbe4d 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -107,7 +107,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 9a4149da..f3d0fb5b 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -174,7 +174,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink11.xml b/xml/page_catalog_choose_drink11.xml index 6888b950..32bdcafc 100644 --- a/xml/page_catalog_choose_drink11.xml +++ b/xml/page_catalog_choose_drink11.xml @@ -162,7 +162,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index c93f159b..78b10491 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -150,7 +150,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 57b0acf3..4b33f6a3 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -149,7 +149,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index cdf757ba..c1b9ea08 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -147,7 +147,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index b81e526a..0d706e3f 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -140,7 +140,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 8f0783f4..2d674f8e 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -146,7 +146,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index 1b3ffd42..4e5eabaa 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -162,7 +162,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 8373c2e0..c8b7ef72 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -142,7 +142,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 37123646..766766c2 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -84,8 +84,8 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - + Var CountDownBrewing = BREW_CNT + ; run test; ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 3a8756e1..850f1c34 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -32,8 +32,8 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 0246e88e..ec74ca56 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -619,9 +619,7 @@ 1000 - Var CountDownBrewing = CountDownBrewing - 1 - - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 556f1c38..fd7cb774 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -214,11 +214,14 @@ If CART_INDEX < CART_COUNT Then If HaveCup = "false" Then + If CupChecking = "false" Then - Var CART_INDEX = CART_INDEX + 1 - Cart "PreparID" CART_INDEX - Cart "MakeID" CART_INDEX - Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + Var CART_INDEX = CART_INDEX + 1 + Cart "PreparID" CART_INDEX + Cart "MakeID" CART_INDEX + Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + + EndIf Else If CupOnArm = "true" Then diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 97169574..4e74144e 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -13,6 +13,13 @@ DEBUGVAR EnableSelectMenuBetweenBrew + READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow + DEBUGVAR ToppingNewShow + + If ToppingNewShow = "true" Then + Open "ROOT/taobin_project/xml/page_topping_select5.xml" + EndIf + If JXMLVersionInt >= 369 Then If EnableSelectMenuBetweenBrew = "Enable" Then Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -21,119 +28,7 @@ Open "ROOT/taobin_project/xml/page_topping_select3.xml" - - DEBUGVAR BrewVersionInt - If BrewVersionInt >= 419 Then - If ConfigNumer >= 380 Then - Open "ROOT/taobin_project/xml/page_topping_select4.xml" - EndIf - EndIf - If JXMLVersionInt > 356 Then - If ConfigNumer >= 380 Then - Open "ROOT/taobin_project/xml/page_topping_select3.xml" - EndIf - EndIf - If ConfigNumer > 360 Then - SAVELOG "Recipe have smoothies" - Open "ROOT/taobin_project/xml/page_topping_select2.xml" - EndIf - - DEBUGVAR video_menu_0 - - Var DisableUsingCode = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - Var ShowCollagenOnly = "Invisible" - - ; On open - Var lidAndStrawOldPageIgnore = "true" - Var SugarState1 = "Invisible" - Var SugarState2 = "Invisible" - Var SugarState3 = "Invisible" - Var SugarState4 = "Invisible" - Var SugarState5 = "Invisible" - Var AddShotEnable = "Invisible" - - Var BGSugar = "Invisible" - Var ShotCoffeeBG = "Invisible" - Var showShotEnable = "Invisible" - Var ShotCoffeePremium = "Invisible" - - - Var StarwState = "Enable" - - ; On open - Var LidState = Lid1Status - - ;SAVELOG PreviseXMLFileName2 - - - Var topping1 = "1" - Var topping2 = "31" - Var topping3 = "31" - - - Var BugFlag = 0 - - If show_eng = "true" Then - - Var DirImage = "ROOT/taobin_project/image/topping_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - Var showname = NameDrink - Var showdesc = DrinkDescription - - - Var lid_straw_bg_iamge = DirImage + "/block_strawonly.png" - - Else - - Var DirImage = "ROOT/taobin_project/image/topping" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Var showname = NameDrinkTH - Var showdesc = DrinkDescriptionTH - - - EndIf - - ; Move to catalog. - ;Machine DoorClose - - - - - Var backGroundAddExtra = DirImage + "/img_ontop_shot.png" - Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png" - - CRLFToSpace showname - CRLFToSpace showdesc - - ;- Begin - Var PriceDrinkNoTop = PriceDrink - Var PriceDrinkTmp = PriceDrink - Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp - Var Timeout = 0 - - SAVELOG PriceDrinkTmp - ;- End - - If RoadShow = "true" Then - Var PriceDrinkTmp = "Free" - EndIf - - If ShowPrice = "Invisible" Then - Var PriceDrinkTmpShow = "Free" - EndIf - - STRCONTAIN "ID=1058" MaterialAvailable sugarKeto - DEBUGVAR sugarKeto - If sugarKeto = "true" Then - Open "ROOT/taobin_project/xml/page_topping_select2.xml" - EndIf - - Var ToppingGotoPayment = "true" Var ButtonNext = "false" @@ -153,395 +48,9 @@ - - - - -; back - - - DEBUGVAR TOPPING1 - DEBUGVAR TOPPING2 - DEBUGVAR TOPPING3 - DEBUGVAR TOPPING4 - DEBUGVAR toppingID1index1 - DEBUGVAR toppingID1index2 - DEBUGVAR toppingID1index3 - DEBUGVAR toppingID1index4 - DEBUGVAR toppingID1index5 - DEBUGVAR toppingID1index6 - DEBUGVAR toppingID1index7 - DEBUGVAR toppingID1index8 - DEBUGVAR toppingID1index9 - - DEBUGVAR toppingID2index1 - DEBUGVAR toppingID2index2 - DEBUGVAR toppingID2index3 - DEBUGVAR toppingID2index4 - DEBUGVAR toppingID2index5 - - - - - - DEBUGVAR MenuCodeName - DEBUGVAR toppingID1Default - DEBUGVAR toppingID2Default - DEBUGVAR toppingID3Default - - - DEBUGVAR toppingID2price2 - DEBUGVAR toppingID3price2 - - DEBUGVAR BrewParam - - If BugFlag = 1 Then - - Else - STRCONTAIN "9701" BrewParam IgnoreLidStraw - - DEBUGVAR BrewParam - DEBUGVAR IgnoreLidStraw - - - - If IgnoreLidStraw = "true" Then - Var IgnoreLidStraw = "false" - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - - Else - If LidState = "Enable" Then - Var ShowLidStraw = "Enable" - Var ShowLidOnly = "Invisible" - Else - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Enable" - EndIf - EndIf - - If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - - EndIf - - ;PressForever - If TOPPING1 = "Sugar" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 1 - Var SugarState1 = "Enable" - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState1 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index5 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 1 - Var SugarState1 = "Enable" - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState1 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index5 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - - If TOPPING1 = "Sugar Premix 25" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 2 - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar Premix 50" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 3 - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - If TOPPING1 = "Powder Sugar Premix 25" Then - Var BGSugar = "Enable" - Var ShiftSugarStep = 2 - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If toppingID1index1 = toppingID1Default Then - Var SugarState2 = "PressForever" - EndIf - - If toppingID1index2 = toppingID1Default Then - Var SugarState3 = "PressForever" - EndIf - - If toppingID1index3 = toppingID1Default Then - Var SugarState4 = "PressForever" - EndIf - - If toppingID1index4 = toppingID1Default Then - Var SugarState5 = "PressForever" - EndIf - - EndIf - - - - Var ShowCollagenOnly = "Enable" - - Var BugFlag = 1 - - Var topping1 = toppingID1Default - - Var ToppingGotoPayment = "false" - - If BGSugar = "Enable" Then - If show_eng = "true" Then - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" - Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" - EndIf - EndIf - Refresh - - Var collagenShow = "true" -;-BEGIN shot layout - - Var topping3 = toppingID3Default - Var shot_h_layout = 218 - - If TOPPING2 = "shot coffee" Then - - Var ShotCoffeeBG = "Enable" - Var showShotEnable = "Enable" - - DEBUGVAR TOPPING3 - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - Refresh - EndIf - - - If TOPPING2 = "shot coffee termtem" Then - - Var ShotCoffeeBG = "Enable" - Var showShotEnable = "Enable" - - DEBUGVAR TOPPING2 - Refresh - EndIf - - If TOPPING2 = "shot coffee 1003" Then - - Var ShotCoffeePremium = "Enable" - Var showShotEnable = "Enable" - - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - DEBUGVAR TOPPING2 - Refresh - EndIf - - If TOPPING2 = "shot coffee 1007" Then - - Var ShotCoffeePremium = "Enable" - Var showShotEnable = "Enable" - - If TOPPING3 = "Collagen" Then - - Var ShowCollagenOnly = "Invisible" - Var backGroundAddExtra = DirImage + "/img_ontop_shot_col.png" - Var shot_h_layout = 310 - - EndIf - DEBUGVAR TOPPING2 - Refresh - EndIf -;-END - If TOPPING3 = "Collagen" Then - Var CollagenState = "Enable" - Else - Var CollagenState = "Invisible" - Var ShowCollagenOnly = "Invisible" - EndIf - - - - SAVELOG ToppingGotoPayment - If ToppingGotoPayment = "true" Then - Topping "Select" SelectDrink - ; Pack - Topping "Pack" ExtendData - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - - - If RoadShow = "true" Then - Var PriceShowValue = "Free" - EndIf - - SAVELOG toppingID2price1 - SAVELOG toppingID2price2 - SAVELOG toppingID2price3 - EndIf - - @@ -564,1054 +73,4 @@ - - 374 - 436 - 331 - 436 - PictureDrink - - - - 0 - 752 - 1080 - Center - 72 - KanitMediumTTF - 0x513C2F - showname - - - - 0 - 836 - 1080 - Center - 24 - KanitLightTTF - 0x6F5F51 - showdesc - - -; -; 0 -; 880 -; BGSugar -; 1080 -; Center -; 18 -; KanitTTF -; 0xEE8C62 -; "*ห้ามดื่มเกินวันละ 2 แก้ว เพราะหัวใจสั่น นอนไม่หลับ เด็กและสตรีมีครรภ์ไม่ควรดื่ม ผู้ป่วยควรปรึกษาแพทย์ก่อน" -; - - - - -; back - - - -; add backet - - -; next - - - - - 924 - 1804 - KanitTTF - 36 - 1080 - 0xFFFFFF - - - "OnValueChange" - - PriceDrinkTmpShow - - -;- FRAME SCORELLL - - 44 - y_topping_bg - 1080 - "auto-all" - "Vertical" - 1 - - -;- Begin topping1 - - 986 - 210 - 5 - BGSugar -; sugar layout - - BGSugar - Var( DirImage + "/img_sugar.png" ) - - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -; sugar5 - -;- END topping1 - -; -; -; -; -; -; -; -; -; -;-BEGIN shot layout - - 986 - shot_h_layout - 5 - ShotCoffeeBG - - backGroundAddExtra - - -; - - -; - - - -; Collagen left - - - - - -;-END -; -; -; -; -; -; -; -; -; -;-BEGIN shot layout - - 986 - 224 - 5 - ShotCoffeePremium - - backGroundAddExtra2 - - -; - - -; - - - -; Collagen left - - - - -;-END -; -; -; -; -; -; -; -; -; -;-BEGIN Collagen - - 986 - 242 - 5 - ShowCollagenOnly - - "Enable" - Var( DirImage + "/img_ontop_collagen.png" ) - - - -; straw left - - - - - -;- END -; -; -; -;-BEGIN Lid straw - - 986 - 232 - 10 - ShowLidOnly - - "Enable" - Var( DirImage + "/block_strawonly.png" ) - - - -; straw left - - - - - -;- END -; -; -; -; -; -; -; -; -; - -;-BEGIN Lid straw - - 986 - 274 - 10 - ShowLidStraw - - Var( DirImage + "/block_strawlid.png" ) - - -; straw left - - - - -; LID left - - - - -; -; -; -; -; -; -; -; -; - - - - Open "/media/bt/xml/security_alarm.xml" - - - diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index b2c0c307..1ba47568 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -197,7 +197,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index b2c0c307..9d5afd99 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -197,7 +197,7 @@ Else Var EmergencyStop = "true" - Open "ROOT/taobin_project/xml/page_back_to_error.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -1252,14 +1252,37 @@ ;-BEGIN shot layout 986 - 157 + 280 20 - ShotCoffeeBG + "Enable" + - backGroundAddExtra + 0 + 10 + Var( DirImage + "/block_top.png" ) + + 0 + 184 + Var( DirImage + "/block_bottom.png" ) + ; + + + + + 0 + 68 + Var( DirImage + "/block_middle.png" ) + + + + 40 + 70 + Var( DirImage + "/img_shot_esp.png" ) + + -; + + + 0 + 140 + Var( DirImage + "/block_middle.png" ) + + + 40 + 142 + Var( DirImage + "/img_shot_esp.png" ) + - - showText4 - 602 - 64 - Var( DirImage + "/text4.png" ) - ;-END ;