diff --git a/image/page_drink_disable_n2/bn_cursed_coffee.png b/image/page_drink_disable_n2/bn_cursed_coffee.png index 7d9c7cc6..ae224f3e 100644 Binary files a/image/page_drink_disable_n2/bn_cursed_coffee.png and b/image/page_drink_disable_n2/bn_cursed_coffee.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_harvert.png b/image/page_drink_disable_n2/bn_haunted_harvert.png index 85335ad1..392b56a8 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_harvert.png and b/image/page_drink_disable_n2/bn_haunted_harvert.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_haza.png b/image/page_drink_disable_n2/bn_haunted_haza.png index 4265154f..e973283c 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_haza.png and b/image/page_drink_disable_n2/bn_haunted_haza.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods.png b/image/page_drink_disable_n2/bn_haunted_woods.png index 7f4ff485..f449a508 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_woods.png and b/image/page_drink_disable_n2/bn_haunted_woods.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods_50.png b/image/page_drink_disable_n2/bn_haunted_woods_50.png new file mode 100644 index 00000000..84fd4fcd Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_woods_50.png differ diff --git a/image/page_drink_disable_n2/bn_haunting_hag_of_village.png b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png index f16f490f..bdf0c85a 100644 Binary files a/image/page_drink_disable_n2/bn_haunting_hag_of_village.png and b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png differ diff --git a/image/page_drink_disable_n2/bn_haunting_of_the_past.png b/image/page_drink_disable_n2/bn_haunting_of_the_past.png index 04fbfb8a..f5b90942 100644 Binary files a/image/page_drink_disable_n2/bn_haunting_of_the_past.png and b/image/page_drink_disable_n2/bn_haunting_of_the_past.png differ diff --git a/image/page_drink_disable_n2/bn_midnight_enigma.png b/image/page_drink_disable_n2/bn_midnight_enigma.png index 2e12c8c8..29b21eee 100644 Binary files a/image/page_drink_disable_n2/bn_midnight_enigma.png and b/image/page_drink_disable_n2/bn_midnight_enigma.png differ diff --git a/image/page_drink_disable_n2/bn_mysterious_music_box.png b/image/page_drink_disable_n2/bn_mysterious_music_box.png index 6fe62a6a..f0326fa7 100644 Binary files a/image/page_drink_disable_n2/bn_mysterious_music_box.png and b/image/page_drink_disable_n2/bn_mysterious_music_box.png differ diff --git a/image/page_drink_disable_n2/bn_redmoon.png b/image/page_drink_disable_n2/bn_redmoon.png index 1d92901e..2e806e68 100644 Binary files a/image/page_drink_disable_n2/bn_redmoon.png and b/image/page_drink_disable_n2/bn_redmoon.png differ diff --git a/image/page_drink_disable_n2/bn_room_no_13.png b/image/page_drink_disable_n2/bn_room_no_13.png index 84552b9f..9e0a4be8 100644 Binary files a/image/page_drink_disable_n2/bn_room_no_13.png and b/image/page_drink_disable_n2/bn_room_no_13.png differ diff --git a/image/page_drink_disable_n2/bn_the_dark_lord.png b/image/page_drink_disable_n2/bn_the_dark_lord.png index eef2e9f1..cc9a5eb7 100644 Binary files a/image/page_drink_disable_n2/bn_the_dark_lord.png and b/image/page_drink_disable_n2/bn_the_dark_lord.png differ diff --git a/image/page_drink_disable_n2/bn_unbelievers_demise.png b/image/page_drink_disable_n2/bn_unbelievers_demise.png index 18cfc435..a889e3dd 100644 Binary files a/image/page_drink_disable_n2/bn_unbelievers_demise.png and b/image/page_drink_disable_n2/bn_unbelievers_demise.png differ diff --git a/image/page_drink_disable_n2/bn_white_lady.png b/image/page_drink_disable_n2/bn_white_lady.png index dcac22ad..8962c550 100644 Binary files a/image/page_drink_disable_n2/bn_white_lady.png and b/image/page_drink_disable_n2/bn_white_lady.png differ diff --git a/image/page_drink_n/bn_haunted_woods50.png b/image/page_drink_n/bn_haunted_woods50.png deleted file mode 100644 index 9141423f..00000000 Binary files a/image/page_drink_n/bn_haunted_woods50.png and /dev/null differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods50.png b/image/page_drink_n/bn_haunted_woods_50.png similarity index 100% rename from image/page_drink_disable_n2/bn_haunted_woods50.png rename to image/page_drink_n/bn_haunted_woods_50.png diff --git a/image/page_drink_press_n/bn_cursed_coffee.png b/image/page_drink_press_n/bn_cursed_coffee.png index 7d9c7cc6..d02fc17f 100644 Binary files a/image/page_drink_press_n/bn_cursed_coffee.png and b/image/page_drink_press_n/bn_cursed_coffee.png differ diff --git a/image/page_drink_press_n/bn_haunted_harvert.png b/image/page_drink_press_n/bn_haunted_harvert.png index 85335ad1..7cb36aa7 100644 Binary files a/image/page_drink_press_n/bn_haunted_harvert.png and b/image/page_drink_press_n/bn_haunted_harvert.png differ diff --git a/image/page_drink_press_n/bn_haunted_haza.png b/image/page_drink_press_n/bn_haunted_haza.png index 4265154f..a7593051 100644 Binary files a/image/page_drink_press_n/bn_haunted_haza.png and b/image/page_drink_press_n/bn_haunted_haza.png differ diff --git a/image/page_drink_press_n/bn_haunted_woods.png b/image/page_drink_press_n/bn_haunted_woods.png index 7f4ff485..df80c7dd 100644 Binary files a/image/page_drink_press_n/bn_haunted_woods.png and b/image/page_drink_press_n/bn_haunted_woods.png differ diff --git a/image/page_drink_press_n/bn_haunted_woods50.png b/image/page_drink_press_n/bn_haunted_woods50.png deleted file mode 100644 index 9141423f..00000000 Binary files a/image/page_drink_press_n/bn_haunted_woods50.png and /dev/null differ diff --git a/image/page_drink_press_n/bn_haunted_woods_50.png b/image/page_drink_press_n/bn_haunted_woods_50.png new file mode 100644 index 00000000..df6cc0a5 Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_woods_50.png differ diff --git a/image/page_drink_press_n/bn_haunting_hag_of_village.png b/image/page_drink_press_n/bn_haunting_hag_of_village.png index f16f490f..07351b19 100644 Binary files a/image/page_drink_press_n/bn_haunting_hag_of_village.png and b/image/page_drink_press_n/bn_haunting_hag_of_village.png differ diff --git a/image/page_drink_press_n/bn_haunting_of_the_past.png b/image/page_drink_press_n/bn_haunting_of_the_past.png index 04fbfb8a..8cb78f8d 100644 Binary files a/image/page_drink_press_n/bn_haunting_of_the_past.png and b/image/page_drink_press_n/bn_haunting_of_the_past.png differ diff --git a/image/page_drink_press_n/bn_midnight_enigma.png b/image/page_drink_press_n/bn_midnight_enigma.png index 2e12c8c8..dbdb16d4 100644 Binary files a/image/page_drink_press_n/bn_midnight_enigma.png and b/image/page_drink_press_n/bn_midnight_enigma.png differ diff --git a/image/page_drink_press_n/bn_mysterious_music_box.png b/image/page_drink_press_n/bn_mysterious_music_box.png index 6fe62a6a..835943a3 100644 Binary files a/image/page_drink_press_n/bn_mysterious_music_box.png and b/image/page_drink_press_n/bn_mysterious_music_box.png differ diff --git a/image/page_drink_press_n/bn_redmoon.png b/image/page_drink_press_n/bn_redmoon.png index 1d92901e..4f39ad75 100644 Binary files a/image/page_drink_press_n/bn_redmoon.png and b/image/page_drink_press_n/bn_redmoon.png differ diff --git a/image/page_drink_press_n/bn_room_no_13.png b/image/page_drink_press_n/bn_room_no_13.png index 84552b9f..14f431d9 100644 Binary files a/image/page_drink_press_n/bn_room_no_13.png and b/image/page_drink_press_n/bn_room_no_13.png differ diff --git a/image/page_drink_press_n/bn_the_dark_lord.png b/image/page_drink_press_n/bn_the_dark_lord.png index eef2e9f1..2ad0f111 100644 Binary files a/image/page_drink_press_n/bn_the_dark_lord.png and b/image/page_drink_press_n/bn_the_dark_lord.png differ diff --git a/image/page_drink_press_n/bn_unbelievers_demise.png b/image/page_drink_press_n/bn_unbelievers_demise.png index 18cfc435..7d6a952d 100644 Binary files a/image/page_drink_press_n/bn_unbelievers_demise.png and b/image/page_drink_press_n/bn_unbelievers_demise.png differ diff --git a/image/page_drink_press_n/bn_white_lady.png b/image/page_drink_press_n/bn_white_lady.png index dcac22ad..5c23f265 100644 Binary files a/image/page_drink_press_n/bn_white_lady.png and b/image/page_drink_press_n/bn_white_lady.png differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 530475b7..bb928a91 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -385,15 +385,14 @@ Name=Momday,file=page_catalog_momday.skt Name=pepween,file=page_catalog_group_pro_pepween.skt พระจันทร์สีเลือด Red Moon เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ ผงมะนาว และโซดา Pepsi, Strawberry, Limenade and Soda - 12-99-05-0053 - bn_redmoon.png - - - สุภาพสตรีสีขาว White Lady เป๊ปซี่ ชามะลิ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา Pepsi, Jasmine Tea, Lychee Lime and Soda - 12-99-05-0054 - bn_white_lady.png - - - - เสียงดนตรีตอนตี 3 Mysterious music box เป๊ปซี่ ขิง ผงมะนาว และโซดา Pepsi, Ginger, Lime and Soda - 12-99-05-0055 - bn_mysterious_music_box.png - - - - หมอกควันแห่งความมืด Haunted Haze เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee, Plum and Soda - 12-99-05-0056 - bn_haunted_haza.png - - - - พยาบาทชาติที่แล้ว The Haunting of the Past เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา Pepsi Energy, Lime and Soda - 12-99-05-0057 - bn_haunting_of_the_past.png - - - - ท่านเคาท์เขย่าขวัญ The dark lord เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา Pepsi Salak, Lime and Soda - 12-99-05-0058 - bn_the_dark_load.png - - - - ห้องเชือดหมายเลข 13 Room no.13 เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา pepsi, lychee , Lime and Soda - 12-99-05-0059 - bn_room_no_13.png - - - - ค่ำคืนคอยหลอน Haunted Harvest เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - bn_huanted_harvert.png - - - + เสียงดนตรีตอนตี 3 Mysterious\nmusic box เป๊ปซี่ ขิง ผงมะนาว และโซดา Pepsi, Ginger, Lime and Soda - 12-99-05-0055 - bn_mysterious_music_box.png - - - + หมอกควัน\nแห่งความมืด Haunted Haze เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee, Plum and Soda - 12-99-05-0056 - bn_haunted_haza.png - - - + พยาบาทชาติที่แล้ว The Haunting of\nthe Past เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา Pepsi Energy, Lime and Soda - 12-99-05-0057 - bn_haunting_of_the_past.png - - - + ท่านเคาท์เขย่าขวัญ The dark lord เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา Pepsi Salak, Lime and Soda - 12-99-05-0058 - bn_the_dark_lord.png - - - + ห้องเชือด\nหมายเลข 13 Room no.13 เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา pepsi, lychee , Lime and Soda - 12-99-05-0059 - bn_room_no_13.png - - - + ค่ำคืนคอยหลอน Haunted Harvest เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - bn_haunted_harvert.png - - - แม่ชีไร้หัว Cursed Coffee เป๊ปซี่ กาแฟ น้ำเชื่อมยูซุ และโซดา Pepsi, Coffee, Yuzu and Soda - 12-99-05-0061 - bn_cursed_coffee.png - - - - คุณยายท้ายหมู่บ้าน The Haunting Hag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - - - คำเตือนของซาตาน Jasmine Jinx เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา Pepsi Jasmine Yuzu and Soda - 12-99-05-0063 - bn_jasmin_jinx.png - - - + คุณยายท้ายหมู่บ้าน The Haunting\nHag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - - อาถรรพ์คืนวันพุธ Midnight's Enigma เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา Pepsi Plum Lime and Soda - 12-99-05-0064 - bn_midnight_enigma.png - - - ล้า ท้า หลอน Unbelievers' Demise เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน และโซดา Pepsi Jasmine Melon and Soda - 12-99-05-0065 - bn_unbelievers_demise.png - - - ดิน 7 ป่าช้า 7 Haunted Woods ? (เป๊ปซี่ นม และโอริโอ้ ) ? (pepsi oreo) - - 12-99-03-0066 bn_haunted_woods.png - - - @@ -441,3 +440,4 @@ Name=Obsolete,file=page_obsolete.skt โฮจิฉะ HOJICHA ชาเขียวคั่ว Hojicha 12-02-01-0036 12-02-02-0036 12-02-03-0036 bn_hot_hojicha_tea_sing.png #N/A #N/A #N/A #N/A #N/A บลูเบอร์รี่โปรตีน BLUEBERRY SHAKE เวย์โปรตีน นม \nน้ำเชื่อมบลูเบอร์รี่ Whey protein,\nBlueberry Syrup & Milk - 12-04-02-0007 - bn_protein_Blueberry.png - #N/A - #N/A #N/A โตเกียวบานาน่าโปรตีน BANANA SHAKE เวย์โปรตีน นม \nน้ำเชื่อมโตเกียวบานาน่า Whey protein, Milk,\nTokyo Banana syrup - 12-04-02-0019 - bn_protein_Banana.png - - - - ฿65.00 - NN NN + คำเตือนของซาตาน Jasmine Jinx เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา Pepsi Jasmine Yuzu and Soda - 12-99-05-0063 - bn_jasmin_jinx.png - - - diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index bfaa27bf..1727be56 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -5,7 +5,7 @@ touch_less_gen = True else: touch_less_gen = False - + print ("######################################################################################################") idx_of_eng = 2 out_xml(' \r\n') @@ -260,6 +260,16 @@ out_xml( '\t\r\n') out_xml( '\t\r\n') + + + menu_color_font = None + desc_color_font = None + + sppromo = pd_code_2.split("-") if pd_code_2 != "##-##-##-####" else pd_code_3.split("-") + if int(sppromo[len(sppromo) - 1][2:]) > 52 and int(sppromo[len(sppromo) - 1][2:]) < 67: + + menu_color_font = '0xFFFFFF' + desc_color_font = '0xFFFFFF' if spl[1] != "None": @@ -270,7 +280,7 @@ out_xml( '\t220\r\n') out_xml( '\t "multi2" \r\n') out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') + out_xml( '\t 0x322B26 \r\n' if menu_color_font == None else '\t '+menu_color_font+' \r\n') out_xml( '\t showthaiText \r\n') out_xml( '\t "' + spl[0].replace("\\n", "\n") + '" \r\n') out_xml( '\t\r\n') @@ -281,7 +291,7 @@ out_xml( '\t 14 \r\n') out_xml( '\t220\r\n') out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t 0x6F5F51 \r\n' if menu_color_font == None else '\t '+menu_color_font+' \r\n') out_xml( '\t showthaiText \r\n') out_xml( '\t "' + spl[2].replace("\\n", "\n") + '" \r\n') out_xml( '\t\r\n') @@ -294,7 +304,7 @@ out_xml( '\t220\r\n') out_xml( '\t "multi2" \r\n') out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x322B26 \r\n') + out_xml( '\t 0x322B26 \r\n' if menu_color_font == None else '\t '+menu_color_font+' \r\n') out_xml( '\t showengText \r\n') out_xml( '\t "' + spl[1].replace("\\n", "\n") + '" \r\n') out_xml( '\t\r\n') @@ -305,7 +315,7 @@ out_xml( '\t 14 \r\n') out_xml( '\t220\r\n') out_xml( '\t KanitMediumTTF \r\n') - out_xml( '\t 0x6F5F51 \r\n') + out_xml( '\t 0x6F5F51 \r\n' if menu_color_font == None else '\t '+menu_color_font+' \r\n') out_xml( '\t showengText \r\n') out_xml( '\t "' + spl[3].replace("\\n", "\n") + '" \r\n') out_xml( '\t\r\n') diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml index d3e71d44..f98645bb 100644 --- a/xml/page_catalog_group_pro_pepween.xml +++ b/xml/page_catalog_group_pro_pepween.xml @@ -1,528 +1,528 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - - - - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - - ; zone cup on arm - If CupOnArm = "true" Then - - If CheckCupStateDoorCupClose = "" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - - If CheckCupStateDoorCupClose = "done" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - Refresh - EndIf - EndIf - - - Var Timeout = Timeout + 1 - TimerReset - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - Var web_readyOK = web_ready - Var web_telnumOK = web_telnum - - Var web_app_prepar = "true" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" - - EndIf - Else - EndIf - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + EndIf + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + + ; zone cup on arm + If CupOnArm = "true" Then + + If CheckCupStateDoorCupClose = "" Then + If buttonRemoveCup = "Enable" Then + + Else + Refresh + EndIf + + Var buttonRemoveCup = "Enable" + + EndIf + + If CheckCupStateDoorCupClose = "done" Then + If buttonRemoveCup = "Enable" Then + + Else + Refresh + EndIf + + Var buttonRemoveCup = "Enable" + + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + Refresh + EndIf + EndIf + + + Var Timeout = Timeout + 1 + TimerReset + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + + + + 10 497 @@ -534,7 +534,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 14 +; menu_new_list 13 ; ==================> Len = 11 ; - 12-99-05-0053 - @@ -621,7 +621,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "พระจันทร์สีเลือด" @@ -631,7 +631,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ ผงมะนาว และโซดา" @@ -642,7 +642,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "Red Moon" @@ -652,7 +652,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi, Strawberry, Limenade and Soda" @@ -869,7 +869,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "สุภาพสตรีสีขาว" @@ -879,7 +879,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ ชามะลิ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา" @@ -890,7 +890,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "White Lady" @@ -900,7 +900,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi, Jasmine Tea, Lychee Lime and Soda" @@ -1117,7 +1117,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "เสียงดนตรีตอนตี 3" @@ -1127,7 +1127,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ ขิง ผงมะนาว และโซดา" @@ -1138,9 +1138,10 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText - "Mysterious music box" + "Mysterious +music box" 16 @@ -1148,7 +1149,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi, Ginger, Lime and Soda" @@ -1296,7 +1297,7 @@ SoundVolume Var NameDrink = "Haunted Haze" - Var NameDrinkTH = "หมอกควันแห่งความมืด" + Var NameDrinkTH = "หมอกควัน แห่งความมืด" Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา" Var DrinkDescription = "Pepsi, Lychee, Plum and Soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_haunted_haza.png" @@ -1365,9 +1366,10 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText - "หมอกควันแห่งความมืด" + "หมอกควัน +แห่งความมืด" 16 @@ -1375,7 +1377,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา" @@ -1386,7 +1388,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "Haunted Haze" @@ -1396,7 +1398,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi, Lychee, Plum and Soda" @@ -1613,7 +1615,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "พยาบาทชาติที่แล้ว" @@ -1623,7 +1625,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา" @@ -1634,9 +1636,10 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText - "The Haunting of the Past" + "The Haunting of +the Past" 16 @@ -1644,7 +1647,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi Energy, Lime and Soda" @@ -1785,15 +1788,9 @@ Flag( 12-99-05-0058.Button,$Sum1299050058) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "คำเตือนของซาตาน" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "Jasmine Jinx" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Pepsi Jasmine Yuzu and Soda" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-99-05-0063.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-99-05-0063.Button - StringFmt( $12-99-05-0063.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1299050063 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-99-05-0063.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1299050063 - text_unavailable - center-vertical-horizontal - - -======= -; -; 33 -; 22 -; 225 -; 296 -; Flag( 12-99-05-0063.Button,$Sum1299050063) -; -; -; 16 -; 164 -; 24 -; 220 -; "multi2" -; KanitMediumTTF -; 0x322B26 -; showthaiText -; "คำเตือนของซาตาน" -; -; -; 16 -; 220 -; 14 -; 220 -; KanitMediumTTF -; 0x6F5F51 -; showthaiText -; "เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา" -; -; -; 16 -; 164 -; 22 -; 220 -; "multi2" -; KanitMediumTTF -; 0x322B26 -; showengText -; "Jasmine Jinx" -; -; -; 16 -; 220 -; 14 -; 220 -; KanitMediumTTF -; 0x6F5F51 -; showengText -; "Pepsi Jasmine Yuzu and Soda" -; -; -; 16 -; 264 -; Var( DirImage2 + "option_deactive.png" ) -; -; -; 16 -; 264 -; "Invisible" -; Var( DirImage2 + "hot.png" ) -; Var( DirImage2 + "hot_db.png" ) -; -; -; 50 -; TextPriceMenuY -; TextPriceMenuSize -; 220 -; KanitMediumTTF -; 0x6F5F51 -; 0xEAE6E1 -; "Invisible" -; StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test -; -; -; 81 -; 264 -; Var( DirImage2 + "cold.png" ) -; Var( DirImage2 + "cold_db.png" ) -; $12-99-05-0063.Button -; -; -; 115 -; TextPriceMenuY -; TextPriceMenuSize -; 220 -; KanitMediumTTF -; 0x6F5F51 -; 0xEAE6E1 -; $12-99-05-0063.Button -; StringFmt( $12-99-05-0063.Price , DisplayFormat, PreScaleConvertShow) ; test -; -; -; 146 -; 264 -; Var( DirImage2 + "blend.png" ) -; Var( DirImage2 + "blend_db.png" ) -; "Invisible" -; -; -; 180 -; TextPriceMenuY -; TextPriceMenuSize -; 220 -; KanitRegularTTF -; 0x6F5F51 -; 0xEAE6E1 -; "Invisible" -; StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test -; -; -; 81 -; 264 -; -; eval( -; If ICE_PROCESS_STATUS = 2 Then -; -; Var ice_tab_process_show = "Invisible" -; -; Else -; Var ice_tab_process_show = "Invisible" -; EndIf -; Var return = ice_tab_process_show -; ) -; -; "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" -; "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" -; -; -; 49 -; 117 -; -; eval( -; If $Sum1299050063 = "Disable" Then -; STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable -; STRCONTAIN "ERR" $12-99-05-0063.TAG tag2_is_disable -; STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable -; Var return = "Invisible" -; If tag1_is_disable = "true" Then -; Var return = "Enable" -; EndIf -; If tag2_is_disable = "true" Then -; Var return = "Enable" -; EndIf -; If tag3_is_disable = "true" Then -; Var return = "Enable" -; EndIf -; Else -; Var return = "Invisible" -; EndIf -; ) -; -; "ROOT/taobin_project/image//img_menu_err2.png" -; -; -; 84 -; 266 -; 10 -; OpunMediumTTF -; 0xDE794E -; ice_tab_process_show -; ice_show_open -; -; -; 48 -; 116 -; 32 -; 128 -; 64 -; MITRegularTTF -; 0x5A5A5A -; "disable-show" -; $Sum1299050063 -; text_unavailable -; center-vertical-horizontal -; -; ->>>>>>> 1d5ee46326b4156fc4ae9dfd8fe6bc496f77a176 ; - - - ; ==================> Len = 11 ; - 12-99-05-0064 - @@ -3617,7 +3106,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "อาถรรพ์คืนวันพุธ" @@ -3627,7 +3116,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา" @@ -3638,7 +3127,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "Midnight's Enigma" @@ -3648,7 +3137,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi Plum Lime and Soda" @@ -3865,7 +3354,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "ล้า ท้า หลอน" @@ -3875,7 +3364,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน และโซดา" @@ -3886,7 +3375,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "Unbelievers' Demise" @@ -3896,7 +3385,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "Pepsi Jasmine Melon and Soda" @@ -4113,7 +3602,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showthaiText "ดิน 7 ป่าช้า" @@ -4123,7 +3612,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showthaiText "? (เป๊ปซี่ นม และโอริโอ้ )" @@ -4134,7 +3623,7 @@ 220 "multi2" KanitMediumTTF - 0x322B26 + 0xFFFFFF showengText "7 Haunted Woods" @@ -4144,7 +3633,7 @@ 14 220 KanitMediumTTF - 0x6F5F51 + 0xFFFFFF showengText "? (pepsi oreo)" @@ -4289,8 +3778,8 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - + + + + +