diff --git a/adv/taobin_adv_15.mp4 b/adv/taobin_adv_15.mp4 old mode 100644 new mode 100755 index a3b7e0c5..cedfcc48 Binary files a/adv/taobin_adv_15.mp4 and b/adv/taobin_adv_15.mp4 differ diff --git a/adv/taobin_adv_15_.mp4 b/adv/taobin_adv_15_.mp4 new file mode 100644 index 00000000..a3b7e0c5 Binary files /dev/null and b/adv/taobin_adv_15_.mp4 differ diff --git a/adv/taobin_adv_menu2_15.mp4 b/adv/taobin_adv_menu2_15.mp4 old mode 100644 new mode 100755 index 9e9ca5db..f765e32c Binary files a/adv/taobin_adv_menu2_15.mp4 and b/adv/taobin_adv_menu2_15.mp4 differ diff --git a/adv/taobin_adv_menu2_15_.mp4 b/adv/taobin_adv_menu2_15_.mp4 new file mode 100644 index 00000000..9e9ca5db Binary files /dev/null and b/adv/taobin_adv_menu2_15_.mp4 differ diff --git a/adv/taobin_adv_menu_15.mp4 b/adv/taobin_adv_menu_15.mp4 old mode 100644 new mode 100755 index c2480121..278e768f Binary files a/adv/taobin_adv_menu_15.mp4 and b/adv/taobin_adv_menu_15.mp4 differ diff --git a/adv/taobin_adv_menu_15_.mp4 b/adv/taobin_adv_menu_15_.mp4 new file mode 100644 index 00000000..c2480121 Binary files /dev/null and b/adv/taobin_adv_menu_15_.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 478ffc2d..079f5221 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -220,9 +220,17 @@ HOT MELON TAIWANESE 12-02-01-0035 1 6 7 10 25 24 120 7:00 23 เป๊ปซี่บ๊วยปั่น 12-05-03-0046 1 14 33 23 41 13 24 120 3:00 23 เป๊ปซี่เมล่อน 12-05-02-0047 1 14 52 23 13 24 120 4:00 23 เป๊ปซี่เมล่อนปั่น 12-05-03-0047 1 14 52 23 41 13 24 120 5:00 23 - - - + 24 120 6:00 23 +สตอเบอร์รี่ปั่นโอริโอ้ภูเขาไฟ 12-03-03-0027 1 17 23 19 40 41 24 120 7:00 23 +เมล่อนปั่นโอริโอ้ภูเขาไฟ 12-03-03-0028 1 17 23 52 40 41 24 120 8:00 23 +นมกล้วยปั่นโอริโอ้ภูเขาไฟ 12-03-03-0029 1 17 23 56 40 41 24 120 9:00 23 +โกโก้ปั่นโอริโอ้ภูเขาไฟ 12-03-03-0030 1 17 23 15 40 41 24 120 10:00 23 +นมคาราเมลปั่นโอริโอ้ภูเขาไฟ 12-03-03-0031 1 17 23 22 40 41 24 120 11:00 23 +ลาเต้ปั่น โอริโอ้ภูเขาไฟ 12-01-03-0043 1 17 23 5 40 41 24 120 12:00 23 +โฮจิฉะโอริโอ้ภูเขาไฟ 12-02-03-0043 1 17 23 55 40 41 24 120 13:00 23 +ชานมไทยโอริโอ้ภูเขาไฟ 12-02-03-0044 1 17 23 55 40 41 24 120 14:00 23 +PEPSI YUZU 12-05-02-0053 1 14 53 23 13 24 120 4:00 23 +PEPSI BANANA 12-05-02-0054 1 14 56 23 13 24 120 4:00 23 diff --git a/image/page_doing/brewing_txt_adv3.png b/image/page_doing/brewing_txt_adv3.png index 50485370..7c98f304 100644 Binary files a/image/page_doing/brewing_txt_adv3.png and b/image/page_doing/brewing_txt_adv3.png differ diff --git a/image/page_doing/brewing_txt_adv3_en.png b/image/page_doing/brewing_txt_adv3_en.png index 9486809c..1723b9ab 100644 Binary files a/image/page_doing/brewing_txt_adv3_en.png and b/image/page_doing/brewing_txt_adv3_en.png differ diff --git a/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..6ccc8842 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png b/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..04c89584 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png b/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..a66a558e Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_n/bn_iced_energy_drink_melon_soda.png b/image/page_drink_n/bn_iced_energy_drink_melon_soda.png new file mode 100644 index 00000000..8affa2d0 Binary files /dev/null and b/image/page_drink_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/image/page_drink_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..a3e8bd0f Binary files /dev/null and b/image/page_drink_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_Banana.png b/image/page_drink_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..fe4134a8 Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_n/bn_iced_pepsi_yuzu.png b/image/page_drink_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..f0004c8d Binary files /dev/null and b/image/page_drink_n/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png b/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png new file mode 100644 index 00000000..056e818e Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..74c172ae Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png b/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..762fc653 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png b/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..bc6bb3fd Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png differ diff --git a/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png b/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png new file mode 100644 index 00000000..9c3a70aa Binary files /dev/null and b/image/page_drink_press_n/bn_iced_energy_drink_plum_soda.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_Banana.png b/image/page_drink_press_n/bn_iced_pepsi_Banana.png new file mode 100644 index 00000000..364388c3 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_Banana.png differ diff --git a/image/page_drink_press_n/bn_iced_pepsi_yuzu.png b/image/page_drink_press_n/bn_iced_pepsi_yuzu.png new file mode 100644 index 00000000..4ae51615 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_pepsi_yuzu.png differ diff --git a/sound_thai.zip b/sound_thai.zip new file mode 100644 index 00000000..e67a77f4 Binary files /dev/null and b/sound_thai.zip differ diff --git a/video/brewing_adv1.mp4 b/video/brewing_adv1.mp4 deleted file mode 100755 index 5a078587..00000000 Binary files a/video/brewing_adv1.mp4 and /dev/null differ diff --git a/video/brewing_adv3.mp4 b/video/brewing_adv3.mp4 old mode 100755 new mode 100644 index bcc1ec1e..2b2e25ec Binary files a/video/brewing_adv3.mp4 and b/video/brewing_adv3.mp4 differ diff --git a/xml/android_info.xml b/xml/android_info.xml new file mode 100644 index 00000000..b9d1ef13 --- /dev/null +++ b/xml/android_info.xml @@ -0,0 +1,326 @@ + + + 1080 + 1312 + SoundVolume + "ROOT/image/BG1SLOT_TAB.bmp" + + ; On open + + Var info_startX = 11 + Var info_1Y = 250 + Var info_2Y = 320 + Var info_3Y = 390 + Var info_4Y = 460 + Var info_5Y = 530 + Var info_6Y = 600 + Var info_7Y = 670 + Var info_8Y = 740 + Var info_9Y = 810 + + Var info_10Y = 880 + Var info_11Y = 950 + Var info_12Y = 1020 + Var info_13Y = 1090 + + Var info_cancel_y = info_13Y + 50 + + + Var info1_text_startX = info_startX + 22 + Var info_text_1Y = info_1Y + 18 + Var info_text_2Y = info_2Y + 18 + Var info_text_3Y = info_3Y + 18 + Var info_text_4Y = info_4Y + 18 + Var info_text_5Y = info_5Y + 18 + Var info_text_6Y = info_6Y + 18 + Var info_text_7Y = info_7Y + 18 + Var info_text_8Y = info_8Y + 18 + Var info_text_9Y = info_9Y + 18 + + Var info_text_10Y = info_10Y + 18 + Var info_text_11Y = info_11Y + 18 + Var info_text_12Y = info_12Y + 18 + Var info_text_13Y = info_13Y + 18 + + + Var info2_startX = 550 + Var info2_text_startX = info2_startX + 22 + + DEBUGVAR AndroidBoardTemp10 + + Var android_text1_1 = AndroidBoardTemp0 + + Var Timeout = 0 + + + 1000 + + + Var Timeout = Timeout + 1 + If Timeout > 20 Then + Open "ROOT/taobin_project/xml/page_board.xml" + EndIf + + + Refresh + TimerReset + + + + + + info_startX + info_1Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info_startX + info_2Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info_startX + info_3Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info_startX + info_4Y + "ROOT/taobin_project/image/tab_1.png" + + + + + info_startX + info_5Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + + info2_startX + info_1Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + + info2_startX + info_2Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info2_startX + info_3Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info2_startX + info_4Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info2_startX + info_5Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + + info1_startX + info_6Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info2_startX + info_6Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info1_startX + info_7Y + "ROOT/taobin_project/image/tab_1.png" + + + + + info2_startX + info_7Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info1_startX + info_8Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info2_startX + info_8Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + info1_startX + info_9Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info2_startX + info_9Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + + + info1_startX + info_10Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + + info2_startX + info_10Y + "ROOT/taobin_project/image/tab_1.png" + + + + + + + info1_text_startX + info_text_1Y + 30 + fontType1 + 0x000000 + android_text1_1 + + + + info2_text_startX + info_text_1Y + 30 + fontType1 + 0x000000 + android_text1_2 + + + + info1_text_startX + info_text_2Y + 30 + fontType1 + 0x000000 + android_text2_1 + + + + info2_text_startX + info_text_2Y + 30 + fontType1 + 0x000000 + android_text2_2 + + + + info1_text_startX + info_text_3Y + 30 + fontType1 + 0x000000 + android_text3_1 + + + + + info2_text_startX + info_text_3Y + 30 + fontType1 + 0x000000 + android_text3_2 + + + + + + + + Var IDCardState = "Enable" + + SAVELOG IDFullNameEng + + + + + + + diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 0fded35b..b33b42ad 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -179,7 +179,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index a4147e1b..ec472a3c 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -158,6 +158,7 @@ STRCONTAIN "1046" MaterialAvailable WheyEnable STRCONTAIN "1208" MaterialAvailable PromoteYuzuEnable + STRCONTAIN "1058" MaterialAvailable OreoEnable DEBUGVAR PromoteYuzuEnable @@ -666,6 +667,7 @@ EndIf + Var PromotionOreoVolcanoEnable = 0 If SystemDateMonthInt = 2 Then @@ -726,7 +728,33 @@ EndIf - + Var ShowPromoitonOreo = 1 + + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 30 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateDayInt = 31 Then + Var ShowPromoitonOreo = 0 + EndIf + EndIf + + If SystemDateMonthInt = 4 Then + Var ShowPromoitonOreo = 0 + + EndIf + If SystemDateMonthInt = 5 Then + Var ShowPromoitonOreo = 0 + EndIf + + ;Var ShowPromoitonOreo = 0 + + If ShowPromoitonOreo = 0 Then + Var PromotionOreoVolcanoEnable = 0 + Var PromotionOreoToppingFreeEnable = 0 + EndIf + + DEBUGVAR $12-03-03-0009.Button If PromotionOreoVolcanoEnable = 1 Then @@ -745,10 +773,21 @@ Var PromotionIDCurrentOrder = 0 - DEBUGVAR PromotionOreoToppingFreeEnable - DEBUGVAR PromotionOreoVolcanoEnable + If OreoEnable = "true" Then + + Else + Var PromotionOreoVolcanoEnable = 0 + Var PromotionOreoToppingFreeEnable = 0 + Var ShowPromoitonOreo = 0 + EndIf + DEBUGVAR PromotionOreoToppingFreeEnable + DEBUGVAR PromotionOreoVolcanoEnable + DEBUGVAR OreoEnable + + DEBUGVAR $12-03-03-0026.Button + RootLayoutVisible 3 "hide" @@ -872,8 +911,12 @@ Var PromotionOreoVolcanoEnable = 0 EndIf - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml" - + + If ShowPromoitonOreo = 1 Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf Machine DoorClose diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index c7becfbf..400e99a2 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -301,6 +301,11 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf + If NeedReboot = "true" Then + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1 = "Invisible" + EndIf + DEBUGVAR NeedUpgrade Var bg_lidProblem_ST2 = bg_lidProblem_ST @@ -1096,15 +1101,23 @@ EndIf If adver_brewing_count_down = 0 Then + GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size DEBUGVAR brewing_adv_size - If brewing_adv_size = 4606739 Then + If brewing_adv_size = 8321419 Then Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 20 Else Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 0 EndIf + + If ShowPromoitonOreo = 1 Then + + Else + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 0 + EndIf EndIf EndIf diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 9d95a9d5..cccaf002 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -6,6 +6,104 @@ SoundVolume + Var PromotionOreoVolcanoEnable = 0 + + If SystemDateMonthInt = 2 Then + If SystemDateDayInt = 20 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + If SystemDateDayInt = 24 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + + If SystemDateDayInt = 27 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + EndIf + + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 6 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + If SystemDateDayInt = 13 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + If SystemDateDayInt = 20 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + If SystemDateDayInt = 27 Then + Var PromotionOreoVolcanoEnable = 1 + EndIf + EndIf + + Var PromotionOreoToppingFreeEnable = 0 + + If SystemDateMonthInt = 2 Then + If SystemDateDayInt = 21 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + If SystemDateDayInt = 24 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + EndIf + + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 1 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + If SystemDateDayInt = 8 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + If SystemDateDayInt = 15 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + If SystemDateDayInt = 22 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + If SystemDateDayInt = 29 Then + Var PromotionOreoToppingFreeEnable = 1 + EndIf + EndIf + + + + DEBUGVAR $12-03-03-0009.Button + + If PromotionOreoVolcanoEnable = 1 Then + Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1_final.png" + Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1_final.png" + Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1_final.png" + Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1_final.png" + + Else + + Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png" + Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png" + Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png" + Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png" + EndIf + + + Var PromotionIDCurrentOrder = 0 + DEBUGVAR PromotionOreoToppingFreeEnable + DEBUGVAR PromotionOreoVolcanoEnable + + + If SystemDateMonthInt = 3 Then + If SystemDateDayInt = 30 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateDayInt = 31 Then + Var ShowPromoitonOreo = 0 + EndIf + EndIf + + If SystemDateMonthInt = 4 Then + Var ShowPromoitonOreo = 0 + EndIf + If SystemDateMonthInt = 5 Then + Var ShowPromoitonOreo = 0 + EndIf If SpiralOnline = "true" Then diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 0f5374a4..11b8c45e 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -336,9 +336,11 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - - Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" - + If ShowPromoitonOreo = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index a3dd96cf..27936687 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -326,7 +326,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 6323e1f0..68f63c48 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index cd8d3d70..098f893e 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf @@ -518,7 +522,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 49 +; menu_new_list 53 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -2790,6 +2794,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0046 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0046.Button,.Button,.Button,$Sum1201010046) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0046.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0046.Button + StringFmt( $12-01-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.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 + + If $Sum1201010046 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum1201010046 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0046.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum1201010046 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0049 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0049.Button,.Button,.Button,$Sum1201010049) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0049.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0049.Button + StringFmt( $12-01-01-0049.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.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 + + If $Sum1201010049 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum1201010049 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0049.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum1201010049 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -5840,6 +6352,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0047 12-01-02-0047 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0047.Button,12-01-02-0047.Button,$Sum12010100471201020047) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0047.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0047.Button + StringFmt( $12-01-01-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0047.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0047.Button + StringFmt( $12-01-02-0047.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 + + If $Sum12010100471201020047 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum12010100471201020047 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0047.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0047.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" + $Sum12010100471201020047 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0050 12-01-02-0050 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0050.Button,12-01-02-0050.Button,$Sum12010100501201020050) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0050.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0050.Button + StringFmt( $12-01-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0050.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0050.Button + StringFmt( $12-01-02-0050.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 + + If $Sum12010100501201020050 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum12010100501201020050 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0050.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0050.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" + $Sum12010100501201020050 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index f8d21237..5d14e764 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -327,7 +327,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 5433a6de..d8d55cb0 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 90534d39..b4161f64 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -316,7 +316,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 4e67f318..c75740d7 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -314,7 +314,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf @@ -2037,7 +2041,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CARAMEL MILK OREO VOLCANO" + Var NameDrink = "12-01-01-0043" Var NameDrinkTH = "นมคาราเมลปั่น โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล Oreo" Var DrinkDescription = "Caramel Syrup, Milk, Sugar, Oreo" @@ -2132,8 +2136,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CARAMEL MILK OREO -VOLCANO" + "12-01-01-0043" 16 @@ -2289,7 +2292,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "HOJICHA OREO SMOOTHIE" + Var NameDrink = "HOJICHA OREO VOLCANO" Var NameDrinkTH = "โฮจิฉะ โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล Oreo" Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" @@ -2384,7 +2387,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "HOJICHA OREO SMOOTHIE" + "HOJICHA OREO VOLCANO" 16 @@ -2540,7 +2543,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI MILK TEA OREO SMOOTHIE" + Var NameDrink = "THAI MILK TEA OREO VOLCANO" Var NameDrinkTH = "ชานมไทย โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล Oreo" Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" @@ -2635,7 +2638,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "THAI MILK TEA OREO SMOOTHIE" + "THAI MILK TEA OREO VOLCANO" 16 @@ -2791,7 +2794,7 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CAFE LATTE OREO SMOOTHIE" + Var NameDrink = "CAFE LATTE OREO VOLCANO" Var NameDrinkTH = "ลาเต้ปั่น โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล Oero" Var DrinkDescription = "Coffee, Milk, Sugar, Oreo" @@ -2886,7 +2889,7 @@ Sugar, Oreo" KanitMediumTTF 0x322B26 showengText - "CAFE LATTE OREO SMOOTHIE" + "CAFE LATTE OREO VOLCANO" 16 diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index eedd4ff8..5081a38f 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -317,7 +317,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf @@ -517,7 +521,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 36 +; menu_new_list 38 ; ==================> Len = 16 ; - 12-05-02-0007 12-05-03-0007 @@ -4749,6 +4753,502 @@ Soda & Ice" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 11 + ; - 12-05-02-0053 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0053.Button,$Sum1205020053) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่ยูซุ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEPSI YUZU" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Yuzu Syrup& Ice" + + + 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-05-02-0053.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0053.Button + StringFmt( $12-05-02-0053.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 $Sum1205020053 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0053.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" + $Sum1205020053 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 11 + ; - 12-05-02-0054 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0054.Button,$Sum1205020054) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่กล้วย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ น้ำเชื่อมกล้วย โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEPSI BANANA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Banana Syrup& Ice" + + + 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-05-02-0054.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0054.Button + StringFmt( $12-05-02-0054.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 $Sum1205020054 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0054.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" + $Sum1205020054 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 0fa911a4..1cad6e4e 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -324,7 +324,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf @@ -557,7 +561,7 @@ testservice -; menu_new_list 40 +; menu_new_list 44 ; ==================> Len = 16 ; 12-06-01-0001 - - @@ -5120,6 +5124,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0046 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0046.Button,.Button,.Button,Disable=Invisible,$Sum1201010046) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0046.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0046.Button + StringFmt( $12-01-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.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 + + If $Sum1201010046 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum1201010046 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0046.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum1201010046 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0049 + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0049.Button,.Button,.Button,Disable=Invisible,$Sum1201010049) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เอสเพรสโซ่ช็อต +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +ESPRESSO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0049.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0049.Button + StringFmt( $12-01-01-0049.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.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 + + If $Sum1201010049 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum1201010049 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0049.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum1201010049 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -7677,6 +8189,514 @@ Note: Strawberry & Floral" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0047 12-01-02-0047 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0047.Button,12-01-02-0047.Button,Disable=Invisible,$Sum12010100471201020047) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +MANDARINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MANDARINE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0047.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0047.Button + StringFmt( $12-01-01-0047.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0047.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0047.Button + StringFmt( $12-01-02-0047.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 + + If $Sum12010100471201020047 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum12010100471201020047 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0047.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0047.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" + $Sum12010100471201020047 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 16 + ; 12-01-01-0050 12-01-02-0050 - + + 33 + 22 + 225 + 296 + Flag( 12-01-01-0050.Button,12-01-02-0050.Button,Disable=Invisible,$Sum12010100501201020050) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "อเมริกาโน +OPUS ONE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "OPUS ONE +AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-01-01-0050.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-01-0050.Button + StringFmt( $12-01-01-0050.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-01-02-0050.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0050.Button + StringFmt( $12-01-02-0050.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 + + If $Sum12010100501201020050 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum12010100501201020050 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0050.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0050.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" + $Sum12010100501201020050 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 8452b1b5..d2870653 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -318,7 +318,11 @@ SAVELOG "Click rec" Var NextPage = "-" + If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf @@ -520,7 +524,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 27 +; menu_new_list 28 ; ==================> Len = 11 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001 @@ -7340,6 +7344,499 @@ Water" ; - - - + ; ==================> Len = 13 + ; 12-02-02-0043 + + 33 + 22 + 225 + 296 + Flag( .Button,12-02-02-0043.Button,.Button,$Sum1202020043) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาดำปาโป่ง" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย มะนาว โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Thai tea, Limenade,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-02-02-0043.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0043.Button + StringFmt( $12-02-02-0043.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 $Sum1202020043 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0043.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" + $Sum1202020043 + text_unavailable + center-vertical-horizontal + + + ; + + 33 + 22 + 225 + 296 + Flag( .Button,.Button,.Button,$Sum) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาดำปาโป่ง" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาไทย มะนาว โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Thai tea, Limenade,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" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 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 $Sum = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum + text_unavailable + center-vertical-horizontal + + ; Cart diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 222a3f4c..1e944051 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -321,6 +321,13 @@ EndIf + If ShowPromoitonOreo = 1 Then + + Else + Var oreo_topping_wed_free = "Invisible" + Var oreo_topping_wed_topping = "Invisible" + EndIf + DEBUGVAR PromotionIDCurrentOrder diff --git a/xml/vending_info.xml b/xml/vending_info.xml index c231a080..9b69fbb8 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -111,6 +111,8 @@ Var GoToCamera = 0 + DEBUGVAR AndroidBoardTemp10 + 1000 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 06c55609..6b753c78 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.02" - Var XMLPageVersionInt = 702 + Var XMLPageVersion = "7.04" + Var XMLPageVersionInt = 704