diff --git a/.gitignore b/.gitignore index e43b0f98..dbb2edc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +video/_main_page.mp4 .DS_Store diff --git a/image/page2_inter/bn_HealthyOption.png b/image/page2_inter/bn_HealthyOption.png new file mode 100644 index 00000000..96349b72 Binary files /dev/null and b/image/page2_inter/bn_HealthyOption.png differ diff --git a/image/page2_inter/bn_appfast.png b/image/page2_inter/bn_appfast.png new file mode 100644 index 00000000..2a026a1c Binary files /dev/null and b/image/page2_inter/bn_appfast.png differ diff --git a/image/page2_inter/bn_cho_caramel.png b/image/page2_inter/bn_cho_caramel.png new file mode 100644 index 00000000..83b24ffd Binary files /dev/null and b/image/page2_inter/bn_cho_caramel.png differ diff --git a/image/page2_inter/bn_coffee.png b/image/page2_inter/bn_coffee.png new file mode 100644 index 00000000..4d2482b9 Binary files /dev/null and b/image/page2_inter/bn_coffee.png differ diff --git a/image/page2_inter/bn_diy.png b/image/page2_inter/bn_diy.png new file mode 100644 index 00000000..91efc0f9 Binary files /dev/null and b/image/page2_inter/bn_diy.png differ diff --git a/image/page2_inter/bn_kidmenu.png b/image/page2_inter/bn_kidmenu.png new file mode 100644 index 00000000..070756b8 Binary files /dev/null and b/image/page2_inter/bn_kidmenu.png differ diff --git a/image/page2_inter/bn_protein.png b/image/page2_inter/bn_protein.png new file mode 100644 index 00000000..c60c2625 Binary files /dev/null and b/image/page2_inter/bn_protein.png differ diff --git a/image/page2_inter/bn_soda_coke.png b/image/page2_inter/bn_soda_coke.png new file mode 100644 index 00000000..865f08dd Binary files /dev/null and b/image/page2_inter/bn_soda_coke.png differ diff --git a/image/page2_inter/bn_tea.png b/image/page2_inter/bn_tea.png new file mode 100644 index 00000000..1ebebbae Binary files /dev/null and b/image/page2_inter/bn_tea.png differ diff --git a/image/page2_inter/bn_vending_machine.png b/image/page2_inter/bn_vending_machine.png new file mode 100644 index 00000000..77334251 Binary files /dev/null and b/image/page2_inter/bn_vending_machine.png differ diff --git a/image/page2_inter/bp_HealthyOption.png b/image/page2_inter/bp_HealthyOption.png new file mode 100644 index 00000000..c0f9c356 Binary files /dev/null and b/image/page2_inter/bp_HealthyOption.png differ diff --git a/image/page2_inter/bp_appfast.png b/image/page2_inter/bp_appfast.png new file mode 100644 index 00000000..f74f454d Binary files /dev/null and b/image/page2_inter/bp_appfast.png differ diff --git a/image/page2_inter/bp_cho_caramel.png b/image/page2_inter/bp_cho_caramel.png new file mode 100644 index 00000000..b2fe26e4 Binary files /dev/null and b/image/page2_inter/bp_cho_caramel.png differ diff --git a/image/page2_inter/bp_coffee.png b/image/page2_inter/bp_coffee.png new file mode 100644 index 00000000..a5c7f219 Binary files /dev/null and b/image/page2_inter/bp_coffee.png differ diff --git a/image/page2_inter/bp_diy.png b/image/page2_inter/bp_diy.png new file mode 100644 index 00000000..7cfc743e Binary files /dev/null and b/image/page2_inter/bp_diy.png differ diff --git a/image/page2_inter/bp_kidmenu.png b/image/page2_inter/bp_kidmenu.png new file mode 100644 index 00000000..74dce815 Binary files /dev/null and b/image/page2_inter/bp_kidmenu.png differ diff --git a/image/page2_inter/bp_protein.png b/image/page2_inter/bp_protein.png new file mode 100644 index 00000000..27efbcbd Binary files /dev/null and b/image/page2_inter/bp_protein.png differ diff --git a/image/page2_inter/bp_soda_coke.png b/image/page2_inter/bp_soda_coke.png new file mode 100644 index 00000000..90509077 Binary files /dev/null and b/image/page2_inter/bp_soda_coke.png differ diff --git a/image/page2_inter/bp_tea.png b/image/page2_inter/bp_tea.png new file mode 100644 index 00000000..366e5208 Binary files /dev/null and b/image/page2_inter/bp_tea.png differ diff --git a/image/page2_inter/bp_vending_machine.png b/image/page2_inter/bp_vending_machine.png new file mode 100644 index 00000000..2541bb0d Binary files /dev/null and b/image/page2_inter/bp_vending_machine.png differ diff --git a/image/page_doing/bn_get_lid.png b/image/page_doing/bn_get_lid.png new file mode 100644 index 00000000..2955b331 Binary files /dev/null and b/image/page_doing/bn_get_lid.png differ diff --git a/image/page_doing/bn_get_lid_en.png b/image/page_doing/bn_get_lid_en.png new file mode 100644 index 00000000..579e8750 Binary files /dev/null and b/image/page_doing/bn_get_lid_en.png differ diff --git a/image/page_doing/bn_send_report_lid.png b/image/page_doing/bn_send_report_lid.png new file mode 100644 index 00000000..ba87525b Binary files /dev/null and b/image/page_doing/bn_send_report_lid.png differ diff --git a/image/page_doing/bn_send_report_lid_en.png b/image/page_doing/bn_send_report_lid_en.png new file mode 100644 index 00000000..1a7bc3e4 Binary files /dev/null and b/image/page_doing/bn_send_report_lid_en.png differ diff --git a/image/page_doing/bp_get_lid.png b/image/page_doing/bp_get_lid.png new file mode 100644 index 00000000..272cc711 Binary files /dev/null and b/image/page_doing/bp_get_lid.png differ diff --git a/image/page_doing/bp_get_lid_en.png b/image/page_doing/bp_get_lid_en.png new file mode 100644 index 00000000..92748ea3 Binary files /dev/null and b/image/page_doing/bp_get_lid_en.png differ diff --git a/image/page_doing/bp_send_report_lid.png b/image/page_doing/bp_send_report_lid.png new file mode 100644 index 00000000..a3d775df Binary files /dev/null and b/image/page_doing/bp_send_report_lid.png differ diff --git a/image/page_doing/bp_send_report_lid_en.png b/image/page_doing/bp_send_report_lid_en.png new file mode 100644 index 00000000..a9e65de3 Binary files /dev/null and b/image/page_doing/bp_send_report_lid_en.png differ diff --git a/spiral/product.json b/spiral/product.json deleted file mode 100644 index ef0d2384..00000000 --- a/spiral/product.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "products": [ - { - "id": 1, - "code": "03-02-01-0001", - "name": "ขนมปังอบกรอบ\nรสเนย", - "nameE": "After You the nugget", - "desc": "After You (อาฟเตอร์ ยู)", - "descE": "After You Dessert Cafe", - "image": "03-02-01-0001.png", - "detail1": "ขนมปังอบกรอบรสเนย", - "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", - "detail2": "มีแป้งสาลี นม ถั่วเหลือง และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ไข่ ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์", - "detail1E": "After You the nugget ", - "header2E": "Allergen Contains:", - "detail2E": "Gluten, milk, Soybean May Contains: egg, oat, treenuts, peanuts, sesame seeds, fish, sulphites", - "price": 100 - }, - { - "id": 2, - "code": "03-02-01-0002", - "name": "ขนมปังอบกรอบ\nรสซาวครีมและหัวหอม", - "nameE": "Sour cream and\nonion nuggets", - "desc": "After You (อาฟเตอร์ ยู)", - "descE": "After You Dessert Cafe", - "image": "03-02-01-0002.png", - "detail1": "ขนมปังอบกรอบรสซาวครีมและหัวหอม", - "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", - "detail2": "มีแป้งสาลี นม ถั่วเหลือง ไข่ และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์", - "detail1E": "Sour cream and onion nuggets", - "header2E": "Allergen Contains:", - "detail2E": "Gluten, milk, Soybean, egg May Contains: oat, treenuts, peanuts, sesame seeds, fish, sulphites", - "price": 115 - }, - { - "id": 3, - "code": "03-02-01-0003", - "name": "ขนมปังอบกรอบ\nรสไข่เค็ม", - "nameE": "Salted egg nugget", - "desc": "After You (อาฟเตอร์ ยู)", - "descE": "After You Dessert Cafe", - "image": "03-02-01-0003.png", - "detail1": "ขนมปังอบกรอบรสไข่เค็ม", - "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", - "detail2": "มีแป้งสาลี นม ถั่วเหลือง ไข่ และอาจมีถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์", - "detail1E": "Salted egg nugget", - "header2E": "Allergen Contains:", - "detail2E": "Gluten, milk, Soybean, egg May Contains: oat, treenuts, peanuts, sesame seeds, fish, sulphites", - "price": 115 - }, - { - "id": 4, - "code": "03-02-01-0004", - "name": "คุกกี้ธัญพืช", - "nameE": "After You cornflake\ncookie", - "desc": "After You (อาฟเตอร์ ยู)", - "descE": "After You Dessert Cafe", - "image": "03-02-01-0004.png", - "detail1": "คุกกี้ธัญพืช", - "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", - "detail2": "มีแป้งสาลี นม ไข่ และอาจมีถั่วเหลือง ถั่วเปลือกแข็ง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์", - "detail1E": "After You cornflake cookie", - "header2E": "Allergen Contains:", - "detail2E": "Gluten, milk, egg May Contains: Soybean, treenuts, peanuts, oat, sesame seeds, fish, sulphites", - "price": 85 - }, - { - "id": 5, - "code": "03-02-01-0005", - "name": "เมอแรงค์ถั่วแมค\nคาเดเมีย", - "nameE": "Macadamia\nMeringue", - "desc": "After You (อาฟเตอร์ ยู)", - "descE": "After You Dessert Cafe", - "image": "03-02-01-0005.png", - "detail1": "เมอแรงค์ถั่วแมคคาเดเมีย", - "header2": "ข้อมูลสำหรับผู้แพ้อาหาร:", - "detail2": "มีไข่ ถั่วเปลือกแข็ง และอาจมีแป้งสาลี นม ถั่วเหลือง ถั่วลิสง ข้าวโอ๊ต เมล็ดงา ปลา ซัลไฟต์", - "detail1E": "Macadamia Meringue", - "header2E": "Allergen Contains:", - "detail2E": "egg, treenuts, May Contains: Gluten, milk, Soybean, peanuts, oat, sesame seeds, fish, sulphites", - "price": 120 - } - ] -} \ No newline at end of file diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 66ed7662..5d99dfc0 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -9,7 +9,7 @@ "0xeae6e1" SoundVolume - Var SpiralSoftwareVersion = "1.01" + Var SpiralSoftwareVersion = "1.02" Var ColorBrown = 0x746253 Var ColorBrown2 = 0x513C2F @@ -104,6 +104,12 @@ ;Var Menu22Selected = "Enable" Var Menu22Selected = "Invisible" + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; spiral Var MenuVSelected2 = "PressForever" @@ -179,21 +185,25 @@ + ; back @@ -1217,38 +1227,38 @@ - ; button i=1 01-00-00-0006 + ; button i=1 03-02-01-0006 33 22 225 296 - $01-00-00-0006.Button + $03-02-01-0006.Button + + 49 + 117 + + eval( + If $03-02-01-0006.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0006.Button + text_unavailable + center-vertical-horizontal + + + 10 251 @@ -1277,7 +1318,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0006.Price + $03-02-01-0006.Price @@ -1302,7 +1343,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0006.Name + $03-02-01-0006.Name @@ -1313,7 +1354,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0006.description + $03-02-01-0006.description @@ -1325,7 +1366,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0006.NameE + $03-02-01-0006.NameE @@ -1336,44 +1377,44 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0006.descriptionE + $03-02-01-0006.descriptionE -; button i=1 01-00-00-0007 +; button i=1 03-02-01-0007 33 22 225 296 - $01-00-00-0007.Button + $03-02-01-0007.Button + + 49 + 117 + + eval( + If $03-02-01-0007.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0007.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1402,7 +1473,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0007.Price + $03-02-01-0007.Price @@ -1427,7 +1498,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0007.Name + $03-02-01-0007.Name @@ -1438,7 +1509,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0007.description + $03-02-01-0007.description @@ -1450,7 +1521,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0007.NameE + $03-02-01-0007.NameE @@ -1461,45 +1532,45 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0007.descriptionE + $03-02-01-0007.descriptionE -; button i=1 01-00-00-0008 +; button i=1 03-02-01-0008 33 22 225 296 - $01-00-00-0008.Button + $03-02-01-0008.Button + + 49 + 117 + + eval( + If $03-02-01-0008.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0008.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1528,7 +1629,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0008.Price + $03-02-01-0008.Price @@ -1553,7 +1654,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0008.Name + $03-02-01-0008.Name @@ -1564,7 +1665,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0008.description + $03-02-01-0008.description @@ -1576,7 +1677,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0008.NameE + $03-02-01-0008.NameE @@ -1587,7 +1688,7 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0008.descriptionE + $03-02-01-0008.descriptionE @@ -1595,38 +1696,38 @@ - ; button i=1 01-00-00-0009 + ; button i=1 03-02-01-0009 33 22 225 296 - $01-00-00-0009.Button + $03-02-01-0009.Button + + 49 + 117 + + eval( + If $03-02-01-0009.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0009.Button + text_unavailable + center-vertical-horizontal + + 10 251 @@ -1655,7 +1786,7 @@ 17 KanitMediumTTF ColorBrown2 - $01-00-00-0009.Price + $03-02-01-0009.Price @@ -1680,7 +1811,7 @@ KanitMediumTTF ColorBlack1 showthaiText - $01-00-00-0009.Name + $03-02-01-0009.Name @@ -1691,7 +1822,7 @@ KanitMediumTTF ColorBrown showthaiText - $01-00-00-0009.description + $03-02-01-0009.description @@ -1703,7 +1834,7 @@ KanitMediumTTF ColorBlack1 showengText - $01-00-00-0009.NameE + $03-02-01-0009.NameE @@ -1714,7 +1845,7 @@ KanitMediumTTF ColorBrown showengText - $01-00-00-0009.descriptionE + $03-02-01-0009.descriptionE diff --git a/video/main_page_event.mp4 b/video/main_page_event.mp4 index 608bde83..83638459 100644 Binary files a/video/main_page_event.mp4 and b/video/main_page_event.mp4 differ diff --git a/video/script1.ev b/video/script1.ev index 3d07d447..8de89870 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,23 +1,18 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize DEBUGVAR MainfileSize -If MainfileSize = 10598934 Then - If SystemDateMonthInt = 11 Then - Var EventTurnOn = 1 - EndIf - If SystemDateMonthInt = 12 Then - Var EventTurnOn = 1 - ;DEBUGVAR SystemTimeHourInt - ;DEBUGVAR SystemDateDayInt - If SystemDateDayInt > 7 Then +If MainfileSize = 12369225 Then + + Var EventTurnOn = 1 + + + If SystemDateMonthInt = 1 Then + + If SystemDateDayInt > 5 Then Var EventTurnOn = 0 EndIf - If SystemDateDayInt = 6 Then - If SystemTimeHourInt > 9 Then - Var EventTurnOn = 0 - EndIf - EndIf EndIf + If EventTurnOn = 1 Then Var CountDownShowButton = 0 Var ShowButtonClickFull = "Invisible" diff --git a/video/script2.ev b/video/script2.ev index 50a42eb3..0fdf8a74 100644 --- a/video/script2.ev +++ b/video/script2.ev @@ -3,7 +3,7 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize -If MainfileSize = 2786275 Then +If MainfileSize = 3796502 Then If EventTurnOn = 1 Then Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" diff --git a/video/sync_1.file b/video/sync_1.file index 5d73e376..a78a92c9 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,13 +1,15 @@ -total 51828 --rw-rw---- 1 root sdcard_rw 10598934 2022-11-22 13:59 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 686 2022-11-22 17:01 script1.ev --rw-rw---- 1 root sdcard_rw 265 2022-11-22 17:01 script2.ev --rw-rw---- 1 root sdcard_rw 0 2022-11-22 17:01 sync_1.file +total 54540 +-rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 _main_page.mp4 +-rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 +-rw-rw---- 1 root sdcard_rw 12369225 2022-12-08 15:58 main_page_event.mp4 +-rw-rw---- 1 root sdcard_rw 455 2022-12-09 17:08 script1.ev +-rw-rw---- 1 root sdcard_rw 265 2022-12-09 17:09 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2022-12-09 17:08 sync_1.file -rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov -rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov -rw-rw---- 1 root sdcard_rw 4806758 2022-06-13 18:43 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2022-06-13 18:43 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2022-06-13 18:43 taobin_save_world3.mp4 -rw-rw---- 1 root sdcard_rw 2084830 2022-06-13 18:43 taobin_thank1.mp4 --rw-rw---- 1 root sdcard_rw 2786275 2022-11-22 13:59 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 3796502 2022-12-08 15:57 taobin_thank1_event.mp4 -rw-rw---- 1 root sdcard_rw 1631940 2022-06-13 18:43 taobin_thank2.mp4 diff --git a/video/taobin_thank1_event.mp4 b/video/taobin_thank1_event.mp4 index 3474020e..44822d1b 100644 Binary files a/video/taobin_thank1_event.mp4 and b/video/taobin_thank1_event.mp4 differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 441ad212..77b8f8c9 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -223,6 +223,8 @@ out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') + out_xml( '\t\tVar SelectDrinkType = 0\r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') @@ -666,7 +668,8 @@ out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') - + out_xml( '\t\tVar SelectDrinkType = 0\r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') if "inter" in param: diff --git a/xml/page_board.xml b/xml/page_board.xml index 127f24d5..10861ca0 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -313,6 +313,10 @@ Var StartUpExt = "false" ;DEBUGVAR "FlushTxRef1" ;FlushTxRef1 + + If JXMLVersionInt > 428 Then + LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv" + EndIf EndIf ;DEBUGVAR "FlushTxRef1" @@ -597,7 +601,7 @@ DEBUGVAR CountryName DEBUGVAR LanguageShow DEBUGVAR DisplayFormat - DEBUGVAR PreScaleConvert + DEBUGVAR ScaleValueForCalculation DEBUGVAR PreScaleConvertShow DEBUGVAR UnitPostDisplay @@ -613,7 +617,7 @@ EndIf If CountryName = "Indonesia" Then - Var TextPriceMenuSize = 12 + Var TextPriceMenuSize = 14 EndIf Machine __arm_toggle @@ -1046,15 +1050,18 @@ 1080 60 + If IgnoreNetCore = "true" Then - Var NextPage = "-" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Var NextPage = "-" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" - TopView "show" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 878857e5..18c13138 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -58,8 +58,14 @@ Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" + Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid_en.png" + Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" + Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en" + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" + Var XStraw = 336 Else ;Var DirImage = "ROOT/taobin_project/image/collect_point1" @@ -74,8 +80,15 @@ Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png" + Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid.png" + Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid.png" + Var CampaingFilename = "ROOT/taobin_project/image/page_campaign" + Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" + Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" + + Var XStraw = 382 EndIf @@ -292,8 +305,19 @@ Else Var CampaignEnable = 0 EndIf - + + DEBUGVAR bg_lidProblem_ST + + + If bg_lidProblem_ST = "Invisible" Then + Var GetLidButtonState = "Enable" + Var XStraw = 265 + EndIf + + + Var GetLidButtonCountDown = 0 + @@ -1108,6 +1132,18 @@ EndIf + If GetLidButtonCountDown > 0 Then + Var GetLidButtonCountDown = GetLidButtonCountDown - 1 + DEBUGVAR GetLidButtonCountDown + EndIf + + If GetLidButtonCountDown = 1 Then + Var GetLidButtonState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var XStraw = 356 + + EndIf + Refresh TimerReset @@ -1304,6 +1340,45 @@ + + + + + + + + + + + + 70 + 583 + Var(DirImage + "/text1.png") + + + + +; menu row 1 + + + + +; menu row 2 + + + + + + + + + + + + + + + + + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + +; Cart + + + + + 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 + + + + + + + diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index e74d7211..c54b9972 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -6,12 +6,22 @@ SoundVolume - - DEBUGVAR RecipeTag1 - If RecipeTag1 = "HealthTurnOn" Then - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + If SpiralOnline = "true" Then + If Seeker = "next" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + Else + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" + EndIf + Else + + DEBUGVAR RecipeTag1 + If RecipeTag1 = "HealthTurnOn" Then + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + EndIf + EndIf + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" TopView "show" diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 0ff50fe4..dd868f50 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -599,6 +599,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -849,6 +850,7 @@ essential nutrients" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1098,6 +1100,7 @@ essential nutrients" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1348,6 +1351,7 @@ essential nutrients" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1598,6 +1602,7 @@ essential nutrients" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 9d6ab394..5316b3d6 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -590,6 +590,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -839,6 +840,7 @@ Soda, Ice, Malibu" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1088,6 +1090,7 @@ Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1337,6 +1340,7 @@ Soda, Malibu" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1586,6 +1590,7 @@ Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1835,6 +1840,7 @@ Soda, Ice, Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2084,6 +2090,7 @@ Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2333,6 +2340,7 @@ Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2582,6 +2590,7 @@ juice Ice, Malibu" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2831,6 +2840,7 @@ Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3080,6 +3090,7 @@ Ice, Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3327,6 +3338,7 @@ Ice, Mount Gay Rum" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index e61ee379..1f3d3a64 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -590,6 +590,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -839,6 +840,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1089,6 +1091,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1339,6 +1342,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1590,6 +1594,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1839,6 +1844,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2089,6 +2095,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2344,6 +2351,7 @@ Strawberry, Orange, Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2599,6 +2607,7 @@ Note: Blue Berry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2854,6 +2863,7 @@ Note: Strawberry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3109,6 +3119,7 @@ Note: Jasmine & Honey" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3364,6 +3375,7 @@ Note: Whisky & Vanilla" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3619,6 +3631,7 @@ Note: Peach, tea, chocolate" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3873,6 +3886,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4125,6 +4139,7 @@ GEISHA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4379,6 +4394,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4625,6 +4641,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4872,6 +4889,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5127,6 +5145,7 @@ Strawberry, Orange, Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5382,6 +5401,7 @@ Note: Blue Berry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5637,6 +5657,7 @@ Note: Strawberry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5892,6 +5913,7 @@ Note: Whisky & Vanilla" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6147,6 +6169,7 @@ Note: Jasmine & Honey" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6402,6 +6425,7 @@ Note: Peach, tea, chocolate" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6656,6 +6680,7 @@ AMERICANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6909,6 +6934,7 @@ AMERICANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7164,6 +7190,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7415,6 +7442,7 @@ Note: Blue Berry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7666,6 +7694,7 @@ Note: Strawberry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7917,6 +7946,7 @@ Note: Whisky & Vanilla" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8168,6 +8198,7 @@ Note: Jasmine & Honey" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8419,6 +8450,7 @@ Strawberry, Orange, Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8670,6 +8702,7 @@ Note: Peach, tea, chocolate" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8920,6 +8953,7 @@ ALMOST DIRTY" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9169,6 +9203,7 @@ ALMOST DIRTY" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9420,6 +9455,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9666,6 +9702,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9913,6 +9950,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -10162,6 +10200,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -10412,6 +10451,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -10661,6 +10701,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -10911,6 +10952,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -11160,6 +11202,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -11410,6 +11453,7 @@ ICED ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -11661,6 +11705,7 @@ Caramel Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -11913,6 +11958,7 @@ Caramel Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -12164,6 +12210,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -12416,6 +12463,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -12667,6 +12715,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -12919,6 +12968,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -13171,6 +13221,7 @@ Kokuto syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -13424,6 +13475,7 @@ Kokuto syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -13675,6 +13727,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -13927,6 +13980,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -14179,6 +14233,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -14432,6 +14487,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -14682,6 +14738,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -14933,6 +14990,7 @@ CAFÉ LATTE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -15185,6 +15243,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -15438,6 +15497,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -15689,6 +15749,7 @@ Sugar, Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -15941,6 +16002,7 @@ Sugar, Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -16192,6 +16254,7 @@ Sugar, Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 1cbc06ef..9c1253e4 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -599,6 +599,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -850,6 +851,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1101,6 +1103,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1353,6 +1356,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1601,6 +1605,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1852,6 +1857,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2103,6 +2109,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2352,6 +2359,7 @@ SMOOTHIE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2600,6 +2608,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2848,6 +2857,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3095,6 +3105,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3342,6 +3353,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3590,6 +3602,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 24087c5f..cc30146f 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -590,6 +590,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -841,6 +842,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1093,6 +1095,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1343,6 +1346,7 @@ Foamed milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1594,6 +1598,7 @@ Foamed milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1845,6 +1850,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2097,6 +2103,7 @@ Milk, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2347,6 +2354,7 @@ Foamed milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2598,6 +2606,7 @@ Foamed milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2849,6 +2858,7 @@ Foamed milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3102,6 +3112,7 @@ and Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3353,6 +3364,7 @@ and Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3604,6 +3616,7 @@ and Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3855,6 +3868,7 @@ and Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4107,6 +4121,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4358,6 +4373,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4612,6 +4628,7 @@ Water, and Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4863,6 +4880,7 @@ Water, and Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5114,6 +5132,7 @@ Water, and Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5365,6 +5384,7 @@ Water, and Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5616,6 +5636,7 @@ Water, and Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 857a17e1..d452e0dc 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -587,6 +587,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -838,6 +839,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1089,6 +1091,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1342,6 +1345,7 @@ Caramel Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1594,6 +1598,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1842,6 +1847,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2093,6 +2099,7 @@ MILK" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2342,6 +2349,7 @@ SMOOTHIE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2591,6 +2599,7 @@ SMOOTHIE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2840,6 +2849,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3091,6 +3101,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3339,6 +3350,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3587,6 +3599,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index ed4cde5a..ac7c45ba 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -589,6 +589,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -836,6 +837,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1085,6 +1087,7 @@ DRINK SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1333,6 +1336,7 @@ DRINK SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1581,6 +1585,7 @@ DRINK SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1829,6 +1834,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2076,6 +2082,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2326,6 +2333,7 @@ Limenade, Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2574,6 +2582,7 @@ Limenade, Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2824,6 +2833,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3071,6 +3081,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3318,6 +3329,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3565,6 +3577,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3814,6 +3827,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4061,6 +4075,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4311,6 +4326,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4558,6 +4574,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4805,6 +4822,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5052,6 +5070,7 @@ Soda & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5300,6 +5319,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5547,6 +5567,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5794,6 +5815,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6042,6 +6064,7 @@ SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6291,6 +6314,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6539,6 +6563,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6787,6 +6812,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7036,6 +7062,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7287,6 +7314,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7534,6 +7562,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7782,6 +7811,7 @@ Water & Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8030,6 +8060,7 @@ Water, Ice" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8282,6 +8313,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8533,6 +8565,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8780,6 +8813,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9027,6 +9061,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 2a90cf5e..ccadee66 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -630,6 +630,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -882,6 +883,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1133,6 +1135,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1382,6 +1385,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1632,6 +1636,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1881,6 +1886,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2131,6 +2137,7 @@ PLANT PROTEIN" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2386,6 +2393,7 @@ Strawberry, Orange, Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2641,6 +2649,7 @@ Note: Blue Berry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2896,6 +2905,7 @@ Note: Strawberry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3151,6 +3161,7 @@ Note: Jasmine & Honey" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3406,6 +3417,7 @@ Note: Whisky & Vanilla" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3661,6 +3673,7 @@ Note: Peach, tea, chocolate" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3915,6 +3928,7 @@ ESPRESSO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4167,6 +4181,7 @@ GEISHA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4421,6 +4436,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4676,6 +4692,7 @@ ETHIOPAI GUJI" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4931,6 +4948,7 @@ Note: Blue Berry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5186,6 +5204,7 @@ Note: Strawberry & Floral" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5441,6 +5460,7 @@ Note: Whisky & Vanilla" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5696,6 +5716,7 @@ Note: Jasmine & Honey" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5951,6 +5972,7 @@ Note: Peach, tea, chocolate" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6205,6 +6227,7 @@ AMERICANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6458,6 +6481,7 @@ AMERICANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6713,6 +6737,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6965,6 +6990,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7216,6 +7242,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7467,6 +7494,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7718,6 +7746,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -7969,6 +7998,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8220,6 +8250,7 @@ Pink​ Rose & Berry" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8469,6 +8500,7 @@ Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8718,6 +8750,7 @@ SMOOTHIE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -8969,6 +9002,7 @@ SMOOTHIE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9218,6 +9252,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9466,6 +9501,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9713,6 +9749,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -9960,6 +9997,7 @@ VOLCANO" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -10208,6 +10246,7 @@ DRINK SODA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 09f29181..ee930323 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -589,6 +589,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -840,6 +841,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1091,6 +1093,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1342,6 +1345,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1593,6 +1597,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1845,6 +1850,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2096,6 +2102,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2347,6 +2354,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2598,6 +2606,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2849,6 +2858,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3100,6 +3110,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3351,6 +3362,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3602,6 +3614,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3853,6 +3866,7 @@ GINGER TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4106,6 +4120,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4357,6 +4372,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4610,6 +4626,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4863,6 +4880,7 @@ TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5114,6 +5132,7 @@ TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5365,6 +5384,7 @@ TEA" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5618,6 +5638,7 @@ Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -5871,6 +5892,7 @@ Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6122,6 +6144,7 @@ Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6373,6 +6396,7 @@ Water" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6625,6 +6649,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -6877,6 +6902,7 @@ LIMENADE" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 66ce52e5..04b09a87 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -594,6 +594,7 @@ DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -842,6 +843,7 @@ Matcha, & Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1090,6 +1092,7 @@ Matcha, & Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1338,6 +1341,7 @@ Cocoa, & Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1588,6 +1592,7 @@ Strawberry Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -1838,6 +1843,7 @@ Strawberry Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2087,6 +2093,7 @@ Melon Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2335,6 +2342,7 @@ Melon Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2583,6 +2591,7 @@ Thai Tea, & Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -2831,6 +2840,7 @@ Thai Tea, & Milk" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3081,6 +3091,7 @@ Kokuto syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3331,6 +3342,7 @@ Taiwanese Tea, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3581,6 +3593,7 @@ Taiwanese Tea, Sugar" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -3830,6 +3843,7 @@ Caramel Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" @@ -4077,6 +4091,7 @@ Caramel Syrup" DEBUGVAR PD_STAGE_1 DEBUGVAR PD_STAGE_2 DEBUGVAR PD_STAGE_3 + Var SelectDrinkType = 0 Open "ROOT/taobin_project/xml/page_topping_select6.xml" diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index b58097d5..856741a2 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -83,12 +83,16 @@ Machine StrawOrder Var LedLidBlink = "true" Var SaveTheWorldCount = SaveTheWorldCount + 1 + + Var bg_lidProblem_ST = "Invisible" EndIf If Seeker.get_a_lid = "Press" Then Machine LidOrder Var LedLidBlink = "true" Var SaveTheWorldCount = SaveTheWorldCount + 1 + + Var bg_lidProblem_ST = "Enable" EndIf Topping "Select" Seeker.selected_a_drink diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 0a443351..b873b06b 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -296,7 +296,8 @@ Var SubMenuGroupIDSlot6_1 = 0 - + Var bg_lidProblem_ST = "Invisible" + Var GetLidButtonState = "Invisible" @@ -3305,7 +3306,11 @@ If LidState = "Press" Then Machine LidOrder Var LedLidBlink = "true" + Var bg_lidProblem_ST = "Enable" + Else + Var bg_lidProblem_ST = "Invisible" EndIf + If SelectDrinkType = 0 Then Else diff --git a/xml_main/startup.xml b/xml_main/startup.xml index cd3f4987..201d5aaa 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.79" - Var XMLPageVersionInt = 679 + Var XMLPageVersion = "6.80" + Var XMLPageVersionInt = 680