diff --git a/animation01/TaoBin2_draft02_art63.mp4 b/animation01/TaoBin2_draft02_art63.mp4 new file mode 100755 index 00000000..83bf36b8 Binary files /dev/null and b/animation01/TaoBin2_draft02_art63.mp4 differ diff --git a/animation01/sync_1.file b/animation01/sync_1.file index dc8018f7..a989b25c 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,4 +1,4 @@ -total 241228 +total 249484 -rw-rw---- 1 root sdcard_rw 948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4 @@ -51,11 +51,12 @@ total 241228 -rw-rw---- 1 root sdcard_rw 2287421 2023-12-07 10:26 TaoBin2_draft02_art60.mp4 -rw-rw---- 1 root sdcard_rw 3824693 2024-04-25 15:27 TaoBin2_draft02_art61.mp4 -rw-rw---- 1 root sdcard_rw 1797839 2024-04-25 17:00 TaoBin2_draft02_art62.mp4 +-rw-rw---- 1 root sdcard_rw 8448873 2024-09-25 13:35 TaoBin2_draft02_art63.mp4 -rw-rw---- 1 root sdcard_rw 3740266 2023-09-18 18:44 TaoBin2_draft02_art7.mp4 -rw-rw---- 1 root sdcard_rw 3740266 2023-09-18 18:44 TaoBin2_draft02_art70.mp4 -rw-rw---- 1 root sdcard_rw 3998856 2023-09-18 18:44 TaoBin2_draft02_art8.mp4 -rw-rw---- 1 root sdcard_rw 3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4 -rw-rw---- 1 root sdcard_rw 9159813 2024-09-04 13:55 TaoBinShowCoffeeProcess.mp4 -rw-rw---- 1 root sdcard_rw 326 2024-08-26 13:31 last-cmd --rw-rw---- 1 root sdcard_rw 71508 2024-09-21 19:45 play_list.tsv --rw-rw---- 1 root sdcard_rw 0 2024-09-21 20:47 sync_1.file +-rw-rw---- 1 root sdcard_rw 71508 2024-09-27 14:02 play_list.tsv +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:06 sync_1.file diff --git a/image/page_doing/brewing_txt_adv15.png b/image/page_doing/brewing_txt_adv15.png new file mode 100644 index 00000000..1bc11590 Binary files /dev/null and b/image/page_doing/brewing_txt_adv15.png differ diff --git a/image/page_doing/brewing_txt_adv15_en.png b/image/page_doing/brewing_txt_adv15_en.png new file mode 100644 index 00000000..21b2ada7 Binary files /dev/null and b/image/page_doing/brewing_txt_adv15_en.png differ diff --git a/image/page_doing/txt_63.png b/image/page_doing/txt_63.png new file mode 100644 index 00000000..7d5bb306 Binary files /dev/null and b/image/page_doing/txt_63.png differ diff --git a/image/page_doing/txt_63_en.png b/image/page_doing/txt_63_en.png new file mode 100644 index 00000000..42a8d2df Binary files /dev/null and b/image/page_doing/txt_63_en.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no.png b/image/page_drink_disable_n2/bn_hot_america_no.png index 3778579f..621ba1c5 100644 Binary files a/image/page_drink_disable_n2/bn_hot_america_no.png and b/image/page_drink_disable_n2/bn_hot_america_no.png differ diff --git a/image/page_drink_disable_n2/bn_hot_blackcoffee.png b/image/page_drink_disable_n2/bn_hot_blackcoffee.png index 458c1a5e..47b2c26a 100644 Binary files a/image/page_drink_disable_n2/bn_hot_blackcoffee.png and b/image/page_drink_disable_n2/bn_hot_blackcoffee.png differ diff --git a/image/page_drink_n/bn_hot_america_no.png b/image/page_drink_n/bn_hot_america_no.png index 19a484da..32238a8a 100644 Binary files a/image/page_drink_n/bn_hot_america_no.png and b/image/page_drink_n/bn_hot_america_no.png differ diff --git a/image/page_drink_n/bn_hot_blackcoffee.png b/image/page_drink_n/bn_hot_blackcoffee.png index 80e0f633..20ad3942 100644 Binary files a/image/page_drink_n/bn_hot_blackcoffee.png and b/image/page_drink_n/bn_hot_blackcoffee.png differ diff --git a/image/page_drink_picture2_n/bn_hot_america_no.png b/image/page_drink_picture2_n/bn_hot_america_no.png index 1f10a015..ac6312a4 100644 Binary files a/image/page_drink_picture2_n/bn_hot_america_no.png and b/image/page_drink_picture2_n/bn_hot_america_no.png differ diff --git a/image/page_drink_picture2_n/bn_hot_blackcoffee.png b/image/page_drink_picture2_n/bn_hot_blackcoffee.png index 4ee95b38..3d7bdd95 100644 Binary files a/image/page_drink_picture2_n/bn_hot_blackcoffee.png and b/image/page_drink_picture2_n/bn_hot_blackcoffee.png differ diff --git a/image/page_drink_press_n/bn_hot_america_no.png b/image/page_drink_press_n/bn_hot_america_no.png index 8a35f7ab..f4e28c87 100644 Binary files a/image/page_drink_press_n/bn_hot_america_no.png and b/image/page_drink_press_n/bn_hot_america_no.png differ diff --git a/image/page_drink_press_n/bn_hot_blackcoffee.png b/image/page_drink_press_n/bn_hot_blackcoffee.png index 8b3998bc..b4adcf27 100644 Binary files a/image/page_drink_press_n/bn_hot_blackcoffee.png and b/image/page_drink_press_n/bn_hot_blackcoffee.png differ diff --git a/inc/remove_cup_button.inc b/inc/remove_cup_button.inc index edbab6a8..b8aafb5f 100644 --- a/inc/remove_cup_button.inc +++ b/inc/remove_cup_button.inc @@ -6,4 +6,5 @@ Var buttonRemoveCup = "Invisible" Var DoorCupPosition = "-" Var CheckCupStateDoorCupClose = "reset" -Var CheckCupStateDoorCupCloseCnt = 30 \ No newline at end of file +Var CheckCupStateDoorCupCloseCnt = 30 +Var TimeoutForProtectButtonHideLongTime = 0 diff --git a/inc/remove_cup_event_open.inc b/inc/remove_cup_event_open.inc index a1247f2b..89ae6a7b 100644 --- a/inc/remove_cup_event_open.inc +++ b/inc/remove_cup_event_open.inc @@ -4,7 +4,9 @@ Var CheckCupStateDoorCupCloseCnt = 0 Var CoundUpDelayCertainStage = 0 Var TimeoutForProtectButtonHideLongTime = 0 + Var TiemoutForDoorCupOpenLongTime = 0 Var Timeout = 0 + If show_eng = "true" Then diff --git a/inc/remove_cup_step.inc b/inc/remove_cup_step.inc index 4d51676a..fd538ff6 100644 --- a/inc/remove_cup_step.inc +++ b/inc/remove_cup_step.inc @@ -1,9 +1,10 @@ DEBUGVAR TimeoutForProtectButtonHideLongTime +DEBUGVAR TiemoutForDoorCupOpenLongTime Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1 -If TimeoutForProtectButtonHideLongTime > 120 Then +If TimeoutForProtectButtonHideLongTime > 45 Then Var TimeoutForProtectButtonHideLongTime = 0 If buttonRemoveCup = "Enable" Then @@ -17,6 +18,18 @@ If TimeoutForProtectButtonHideLongTime > 120 Then EndIf +Var TiemoutForDoorCupOpenLongTime = TiemoutForDoorCupOpenLongTime + 1 +If TiemoutForDoorCupOpenLongTime > 120 Then + Var TiemoutForDoorCupOpenLongTime = 0 + + If DoorCupPosition = "bottom" Then + Var TiemoutForDoorCupOpenLongTime = 0 + Else + Machine DoorClose + EndIf +EndIf + + If show_eng = "true" Then Else @@ -31,13 +44,22 @@ Else EndIf EndIf EndIf + If CupArmMove = "false" Then + If DoorCupPosition = "bottom" Then + If InternationalEnable = 1 Then + + Else + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + EndIf + EndIf EndIf EndIf EndIf Var Timeout = Timeout + 1 -If Timeout > 15 Then + Var Timeout = 0 DEBUGVAR HaveCup @@ -46,11 +68,11 @@ If Timeout > 15 Then DEBUGVAR CupChecking DEBUGVAR CupArmMove DEBUGVAR buttonRemoveCup -EndIf + Var TimeoutInstance0 = TimeoutInstance0 + 1 -If TimeoutInstance0 > 600 Then +If TimeoutInstance0 > 360 Then Var TimeoutInstance0 = 0 SAVELOG "Check Cup all" Machine CheckCupAll @@ -69,6 +91,11 @@ If CheckCupStateDoorCupCloseCnt > 0 Then EndIf EndIf + + + + + If HaveCup = "true" Then If CheckCupStateDoorCupClose = "" Then diff --git a/inc/select_drink_current.inc b/inc/select_drink_current.inc index d6409c37..df398ed7 100644 --- a/inc/select_drink_current.inc +++ b/inc/select_drink_current.inc @@ -1,4 +1,5 @@ + Topping "Select" Seeker.selected_a_drink ; Set option toppinng and pack @@ -17,4 +18,8 @@ ; Pack Topping "Pack" ExtendDataCurr + If SaveOrderNameAndPictureEnable = 1 Then + Menu "set-name" Seeker.showname + Menu "set-image" Seeker.PictureDrink + EndIf diff --git a/inc/video.inc b/inc/video.inc index e80ec1c9..db659618 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -18,6 +18,7 @@ Var DefaultLargeBanner = PepsiLargeBanner Var DefaultNormBanner = PepsiNormBanner EndIf + If showMultiAds = "true" Then @@ -46,6 +47,11 @@ If CountDownPauseVideo2 = -1 Then Var CountDownPauseVideo2 = 0 EndIf + + + ; Default. Do not edit here. + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" DEBUGVAR CurrentXMLFileName2 DEBUGVAR PreviousFileName @@ -54,6 +60,7 @@ DEBUGVAR CountryName + If CountryName = "Singapore" Then If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then @@ -77,10 +84,6 @@ Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf EndIf - - Else - Var AdvTaobinMenu = DefaultNormBanner - Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf If CountryName = "Malaysia" Then @@ -108,7 +111,7 @@ EndIf EndIf - + ; showMultiAds=false Else DEBUGVAR a_video_menu[ads_idx] If CountryName = "Singapore" Then @@ -126,7 +129,6 @@ If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then - DEBUGVAR CurrentXMLFileName2 DEBUGVAR CurrentXMLFileName2 DEBUGVAR PreviseXMLFileName2 DEBUGVAR CurrPageInst0 @@ -236,6 +238,10 @@ DEBUGVAR a_video_menu[ads_idx] Var ads_idx = 0 EndIf + + ; Default. Do not edit here. + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" If CountryName = "Singapore" Then DEBUGVAR CountryName @@ -268,8 +274,6 @@ EndIf Else - Var AdvTaobinMenu = DefaultNormBanner - Var DisplayAds = AdvTaobinMenu + ".mp4" If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then Var AdvTaobinMenu = DefaultLargeBanner diff --git a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png new file mode 100644 index 00000000..df8d66ee Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png new file mode 100644 index 00000000..1ba4ea2b Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png new file mode 100644 index 00000000..35d234aa Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png new file mode 100644 index 00000000..7a51dd5d Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png new file mode 100644 index 00000000..7ca14d99 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png new file mode 100644 index 00000000..603931ca Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png new file mode 100644 index 00000000..4de10a65 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png new file mode 100644 index 00000000..9a6de3d3 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png new file mode 100644 index 00000000..3da0fc3c Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png new file mode 100644 index 00000000..d5d2ff4b Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea-1.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea-1.png new file mode 100644 index 00000000..31191847 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea-1.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png new file mode 100644 index 00000000..25a56897 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png new file mode 100644 index 00000000..f3c4768d Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png new file mode 100644 index 00000000..7efd72a5 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png new file mode 100644 index 00000000..0446dd3c Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png new file mode 100644 index 00000000..c07b4fe4 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png new file mode 100644 index 00000000..cd4afa85 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png new file mode 100644 index 00000000..e90583c9 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png new file mode 100644 index 00000000..7fd32650 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png new file mode 100644 index 00000000..10b5e7e6 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png new file mode 100644 index 00000000..fbf69e31 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png new file mode 100644 index 00000000..ee5f23c2 Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png new file mode 100644 index 00000000..7e256cc0 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png new file mode 100644 index 00000000..ac1c11e2 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png new file mode 100644 index 00000000..eeac82bf Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png new file mode 100644 index 00000000..425759b2 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png new file mode 100644 index 00000000..5739452a Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png new file mode 100644 index 00000000..122698d2 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png new file mode 100644 index 00000000..6b30929b Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png new file mode 100644 index 00000000..169946ad Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png new file mode 100644 index 00000000..764e7b4a Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png new file mode 100644 index 00000000..d33eaf68 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea-1.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea-1.png new file mode 100644 index 00000000..267fdb03 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea-1.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png new file mode 100644 index 00000000..cb911d28 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png new file mode 100644 index 00000000..bfce5f84 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png new file mode 100644 index 00000000..558792f1 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png new file mode 100644 index 00000000..7ab50f8a Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png new file mode 100644 index 00000000..f10d7731 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png new file mode 100644 index 00000000..9c2d709c Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png new file mode 100644 index 00000000..e1748575 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png index 8affa2d0..22537472 100644 Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png new file mode 100644 index 00000000..bb64a98c Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_n/bn_protein_Vanilla.png new file mode 100644 index 00000000..11981a96 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png new file mode 100644 index 00000000..17c520c3 Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png new file mode 100644 index 00000000..4c2f6407 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png new file mode 100644 index 00000000..b51e02a4 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png b/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png new file mode 100644 index 00000000..52f4c228 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png new file mode 100644 index 00000000..be420fb9 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png b/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png new file mode 100644 index 00000000..5566c702 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png new file mode 100644 index 00000000..6b931795 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Vanilla_caramel_latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png new file mode 100644 index 00000000..d0dad09a Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_matcha_iced_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png b/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png new file mode 100644 index 00000000..1a3f660a Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_hot_Bananoffee_milkshake.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png b/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png new file mode 100644 index 00000000..0ff9c089 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png new file mode 100644 index 00000000..18a47ed1 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Caramel_mocha.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea-1.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea-1.png new file mode 100644 index 00000000..8b537ae3 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea-1.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png new file mode 100644 index 00000000..fbb51c4e Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png new file mode 100644 index 00000000..99147c3d Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png new file mode 100644 index 00000000..bc9323ba Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png b/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png new file mode 100644 index 00000000..055c8168 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_Yuzu_jasmine_tea.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png new file mode 100644 index 00000000..c761d530 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png new file mode 100644 index 00000000..d12c82ee Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda-1.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png new file mode 100644 index 00000000..6f058c91 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png index 056e818e..a33efd04 100644 Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png b/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png new file mode 100644 index 00000000..bc603f16 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_pepsi_Lychee.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png b/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png new file mode 100644 index 00000000..480bccd2 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png differ diff --git a/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png new file mode 100644 index 00000000..fd8f2f19 Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png differ diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml index 02e3c867..4e15398a 100644 --- a/inter/aus/xml/page_catalog_group_coffee.lxml +++ b/inter/aus/xml/page_catalog_group_coffee.lxml @@ -22716,6 +22716,1372 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-21-01-0076 - - + + 33 + 22 + 225 + 296 + Flag( 51-21-01-0076.Button,$Sum5121010076) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LATTE WITH\nA TWIST + + LATTE WITH\nA TWIST + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Milk, Biscoff, Oreo + + Espresso, Milk, Biscoff, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-21-01-0076.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-01-0076.Button + StringFmt( $51-21-01-0076.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5121010076 = "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 $Sum5121010076 = "Disable" Then + STRCONTAIN "ERR" $51-21-01-0076.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 + "disable-show" + $Sum5121010076 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-21-01-0077 51-21-02-0077 51-21-03-0077 + + 33 + 22 + 225 + 296 + Flag( 51-21-01-0077.Button,51-21-02-0077.Button,51-21-03-0077.Button,$Sum512101007751210200775121030077) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + CARAMEL CHOC\nESPRESSO + + CARAMEL CHOC\nESPRESSO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Caramel, Cocoa, Espresso, Milk + + Caramel, Cocoa, Espresso, Milk + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-21-01-0077.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-01-0077.Button + StringFmt( $51-21-01-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-21-02-0077.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-02-0077.Button + StringFmt( $51-21-02-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-21-03-0077.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-03-0077.Button + StringFmt( $51-21-03-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum512101007751210200775121030077 = "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 $Sum512101007751210200775121030077 = "Disable" Then + STRCONTAIN "ERR" $51-21-01-0077.TAG tag1_is_disable + STRCONTAIN "ERR" $51-21-02-0077.TAG tag2_is_disable + STRCONTAIN "ERR" $51-21-03-0077.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 + "disable-show" + $Sum512101007751210200775121030077 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-21-01-0078 51-21-02-0078 - + + 33 + 22 + 225 + 296 + Flag( 51-21-01-0078.Button,51-21-02-0078.Button,$Sum51210100785121020078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + BANANOFFEE\nLATTE + + BANANOFFEE\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Milk, Caramel, Banana + + Espresso, Milk, Caramel, Banana + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-21-01-0078.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-01-0078.Button + StringFmt( $51-21-01-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-21-02-0078.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-02-0078.Button + StringFmt( $51-21-02-0078.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum51210100785121020078 = "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 $Sum51210100785121020078 = "Disable" Then + STRCONTAIN "ERR" $51-21-01-0078.TAG tag1_is_disable + STRCONTAIN "ERR" $51-21-02-0078.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 + "disable-show" + $Sum51210100785121020078 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; 51-21-01-0079 51-21-02-0079 - + + 33 + 22 + 225 + 296 + Flag( 51-21-01-0079.Button,51-21-02-0079.Button,$Sum51210100795121020079) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + VANILLA CARAMEL\nLATTE + + VANILLA CARAMEL\nLATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Milk, Caramel, Vanilla + + Espresso, Milk, Caramel, Vanilla + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-21-01-0079.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-01-0079.Button + StringFmt( $51-21-01-0079.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-21-02-0079.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-02-0079.Button + StringFmt( $51-21-02-0079.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum51210100795121020079 = "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 $Sum51210100795121020079 = "Disable" Then + STRCONTAIN "ERR" $51-21-01-0079.TAG tag1_is_disable + STRCONTAIN "ERR" $51-21-02-0079.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 + "disable-show" + $Sum51210100795121020079 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-21-02-0080 - + + 33 + 22 + 225 + 296 + Flag( 51-21-02-0080.Button,$Sum5121020080) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + CARAMEL MOCHA + + CARAMEL MOCHA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Espresso, Cocoa, Milk, Caramel + + Espresso, Cocoa, Milk, Caramel + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-21-02-0080.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-21-02-0080.Button + StringFmt( $51-21-02-0080.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5121020080 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-21-02-0080.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 + "disable-show" + $Sum5121020080 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml index d74b002d..cce6c579 100644 --- a/inter/aus/xml/page_catalog_group_milk.lxml +++ b/inter/aus/xml/page_catalog_group_milk.lxml @@ -9549,6 +9549,820 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 51-03-01-0077 51-03-02-0077 51-03-03-0077 + + 33 + 22 + 225 + 296 + Flag( 51-03-01-0077.Button,51-03-02-0077.Button,51-03-03-0077.Button,$Sum510301007751030200775103030077) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + BANANOFFEE\nMILKSHAKE + + BANANOFFEE\nMILKSHAKE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Tokyo Banana Syrup, Milk, Caramel Syrup + + Tokyo Banana Syrup, Milk, Caramel Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $51-03-01-0077.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-03-01-0077.Button + StringFmt( $51-03-01-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-03-02-0077.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-03-02-0077.Button + StringFmt( $51-03-02-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-03-03-0077.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-03-03-0077.Button + StringFmt( $51-03-03-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum510301007751030200775103030077 = "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 $Sum510301007751030200775103030077 = "Disable" Then + STRCONTAIN "ERR" $51-03-01-0077.TAG tag1_is_disable + STRCONTAIN "ERR" $51-03-02-0077.TAG tag2_is_disable + STRCONTAIN "ERR" $51-03-03-0077.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 + "disable-show" + $Sum510301007751030200775103030077 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 51-03-03-0078 + + 33 + 22 + 225 + 296 + Flag( 51-03-03-0078.Button,$Sum5103030078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + BANANOFFEE\nPIE + + BANANOFFEE\nPIE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof + + Tokyo Banana Syrup, Milk, Caramel Syrup, Biscof + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-03-03-0078.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-03-03-0078.Button + StringFmt( $51-03-03-0078.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 $Sum5103030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $51-03-03-0078.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 + "disable-show" + $Sum5103030078 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 51-03-03-0079 + + 33 + 22 + 225 + 296 + Flag( 51-03-03-0079.Button,$Sum5103030079) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + CHOC CARAMEL\nCRUMBLE + + CHOC CARAMEL\nCRUMBLE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof + + Cocoa, Milk,Sugar,\nCaramel Syrup, Biscof + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $51-03-03-0079.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $51-03-03-0079.Button + StringFmt( $51-03-03-0079.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 $Sum5103030079 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $51-03-03-0079.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 + "disable-show" + $Sum5103030079 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml index cb2d2ca3..79dd72e8 100644 --- a/inter/aus/xml/page_catalog_group_other.lxml +++ b/inter/aus/xml/page_catalog_group_other.lxml @@ -577,6 +577,276 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0128 - + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0128.Button,$Sum5105020128) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LYCHEE PEPSI + + LYCHEE PEPSI + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Pepsi, Lychee Syrup & Ice + + Pepsi, Lychee Syrup & Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-05-02-0128.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0128.Button + StringFmt( $51-05-02-0128.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5105020128 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0128.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 + "disable-show" + $Sum5105020128 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 51-05-02-0035 51-05-03-0035 @@ -847,6 +1117,1086 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-05-02-0129 - + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0129.Button,$Sum5105020129) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + TURTLE ENERGY\nLYCHEE SODA + + TURTLE ENERGY\nLYCHEE SODA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Energy drink, Lychee Syrup, Soda, Ice + + Energy drink, Lychee Syrup, Soda, Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-05-02-0129.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0129.Button + StringFmt( $51-05-02-0129.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5105020129 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0129.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 + "disable-show" + $Sum5105020129 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-05-02-0130 - + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0130.Button,$Sum5105020130) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + TURTLE ENERGY\nMELON SODA + + TURTLE ENERGY\nMELON SODA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Energy drink, Melon Syrup, Soda, Ice + + Energy drink, Melon Syrup, Soda, Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-05-02-0130.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0130.Button + StringFmt( $51-05-02-0130.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5105020130 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0130.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 + "disable-show" + $Sum5105020130 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-05-02-0131 - + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0131.Button,$Sum5105020131) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + TURTLE ENERGY\nMINT SODA + + TURTLE ENERGY\nMINT SODA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Energy drink, Mint Syrup, Soda, Ice + + Energy drink, Mint Syrup, Soda, Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-05-02-0131.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0131.Button + StringFmt( $51-05-02-0131.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5105020131 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0131.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 + "disable-show" + $Sum5105020131 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-05-02-0132 - + + 33 + 22 + 225 + 296 + Flag( 51-05-02-0132.Button,$Sum5105020132) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + TURTLE ENERGY\nTOKYO BANANA SODA + + TURTLE ENERGY\nTOKYO BANANA SODA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Energy drink, Tokyo Banana Syrup, Soda, Ice + + Energy drink, Tokyo Banana Syrup, Soda, Ice + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-05-02-0132.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-05-02-0132.Button + StringFmt( $51-05-02-0132.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5105020132 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-05-02-0132.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 + "disable-show" + $Sum5105020132 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 51-05-02-0088 51-05-03-0088 diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml index 592967e9..b855ae4c 100644 --- a/inter/aus/xml/page_catalog_group_tea.lxml +++ b/inter/aus/xml/page_catalog_group_tea.lxml @@ -10996,6 +10996,1896 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-02-02-0071 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0071.Button,$Sum5102020071) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + STRAWBERRY\nMATCHA LATTE + + STRAWBERRY\nMATCHA LATTE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha, Milk, Strawberry Syrup + + Matcha, Milk, Strawberry Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0071.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0071.Button + StringFmt( $51-02-02-0071.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020071 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0071.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 + "disable-show" + $Sum5102020071 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0072 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0072.Button,$Sum5102020072) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LYCHEE MATCHA + + LYCHEE MATCHA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha, Hot water, Lychee Syrup + + Matcha, Hot water, Lychee Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0072.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0072.Button + StringFmt( $51-02-02-0072.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020072 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0072.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 + "disable-show" + $Sum5102020072 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0073 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0073.Button,$Sum5102020073) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MELON MATCHA + + MELON MATCHA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha, Hot water, Melon Syrup + + Matcha, Hot water, Melon Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0073.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0073.Button + StringFmt( $51-02-02-0073.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020073 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0073.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 + "disable-show" + $Sum5102020073 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0074 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0074.Button,$Sum5102020074) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + YUZU MATCHA + + YUZU MATCHA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Matcha, Hot water, Yuzu Syrup + + Matcha, Hot water, Yuzu Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0074.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0074.Button + StringFmt( $51-02-02-0074.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020074 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0074.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 + "disable-show" + $Sum5102020074 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0075 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0075.Button,$Sum5102020075) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LYCHEE JASMINE TEA + + LYCHEE JASMINE TEA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Jasmine Tea ,Water, Lychee Syrup + + Jasmine Tea ,Water, Lychee Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0075.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0075.Button + StringFmt( $51-02-02-0075.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020075 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0075.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 + "disable-show" + $Sum5102020075 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0076 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0076.Button,$Sum5102020076) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + MELON JASMINE TEA + + MELON JASMINE TEA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Jasmine Tea ,Water, Melon Syrup + + Jasmine Tea ,Water, Melon Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0076.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0076.Button + StringFmt( $51-02-02-0076.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020076 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0076.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 + "disable-show" + $Sum5102020076 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-02-02-0077 - + + 33 + 22 + 225 + 296 + Flag( 51-02-02-0077.Button,$Sum5102020077) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + YUZU JASMINE TEA + + YUZU JASMINE TEA + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Jasmine Tea ,Water, Yuzu Syrup + + Jasmine Tea ,Water, Yuzu Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-02-02-0077.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-02-02-0077.Button + StringFmt( $51-02-02-0077.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5102020077 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-02-02-0077.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 + "disable-show" + $Sum5102020077 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/aus/xml/page_catalog_group_whey.lxml b/inter/aus/xml/page_catalog_group_whey.lxml index e94ebd7a..e1fbbe5c 100644 --- a/inter/aus/xml/page_catalog_group_whey.lxml +++ b/inter/aus/xml/page_catalog_group_whey.lxml @@ -4633,6 +4633,546 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 51-04-02-0060 - + + 33 + 22 + 225 + 296 + Flag( 51-04-02-0060.Button,$Sum5104020060) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + VANILLA PROTEIN SHAKE + + VANILLA PROTEIN SHAKE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Whey protein, Milk,\nVanilla Syrup + + Whey protein, Milk,\nVanilla Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-04-02-0060.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-04-02-0060.Button + StringFmt( $51-04-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5104020060 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-04-02-0060.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 + "disable-show" + $Sum5104020060 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 51-04-02-0059 - + + 33 + 22 + 225 + 296 + Flag( 51-04-02-0059.Button,$Sum5104020059) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + ESPRESSO CARAMEL\nPROTEIN SHAKE + + ESPRESSO CARAMEL\nPROTEIN SHAKE + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Whey protein, Espresso\n& Milk, Caramel Syrup + + Whey protein, Espresso\n& Milk, Caramel Syrup + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-04-02-0059.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-04-02-0059.Button + StringFmt( $51-04-02-0059.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + 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 $Sum5104020059 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-04-02-0059.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 + "disable-show" + $Sum5104020059 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/uae_dubai/menu/lang.tsv b/inter/uae_dubai/menu/lang.tsv index 35d8d8db..48c8db4a 100644 --- a/inter/uae_dubai/menu/lang.tsv +++ b/inter/uae_dubai/menu/lang.tsv @@ -1076,7 +1076,7 @@ TextID Note English arabic 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml index 4493f895..ab352a6c 100644 --- a/inter/uae_dubai/xml/page_catalog_group_coffee.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_coffee.lxml @@ -14665,7 +14665,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -18239,7 +18239,7 @@ Var DescLang[1][4] = "" Var DescLang[1][5] = "" Var NameLang[2][0] = "THAI TEA CAFÉ LATTE SMOOTHIE" - Var NameLang[2][1] = "عصير الشاي التايلاندي والقهوة واللاتيه" + Var NameLang[2][1] = "شاي تاي كافيه لاتيه سموثي" Var NameLang[2][2] = "" Var NameLang[2][3] = "" Var NameLang[2][4] = "" diff --git a/inter/uae_dubai/xml/page_catalog_group_health.lxml b/inter/uae_dubai/xml/page_catalog_group_health.lxml index 7380f58e..cce16626 100644 --- a/inter/uae_dubai/xml/page_catalog_group_health.lxml +++ b/inter/uae_dubai/xml/page_catalog_group_health.lxml @@ -1848,7 +1848,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" @@ -2122,7 +2122,7 @@ Var DescLang[0][4] = "" Var DescLang[0][5] = "" Var NameLang[1][0] = "Iced MOCHA" - Var NameLang[1][1] = "موكا مثلجة" + Var NameLang[1][1] = "موكا مثلج" Var NameLang[1][2] = "" Var NameLang[1][3] = "" Var NameLang[1][4] = "" diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index cf7d693f..9586ab7d 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -34,7 +34,7 @@ IGNORE เป๊ปซี่นม Pepsi milk เป๊ปซี่ นม Peps อเมริกาโน AMERICANO กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no.png - - - posi1 #REF! #REF! - #REF! #REF! อเมริกาโน AMERICANO กาแฟ และน้ำ Espresso, Water 12-21-01-0003 12-21-02-0001 - bn_hot_america_no.png - - - posi1 - กาแฟดำ STRONG COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-01-0081 - bn_hot_blackcoffee.png 12-21-01-0081 12-21-02-0081 - posi1 + กาแฟดำ BLACK COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee.png 12-21-01-0081 12-21-02-0081 - posi1 อเมริกาโน \nGuji Queen Berry AMERICANO \nETHIOPAI GUJI กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้ กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้ 12-01-01-0014 12-01-02-0011 - bn_hot_americano_light.png - - - posi2 #REF! #REF! - #REF! #REF! อเมริกาโน \nBLUE DADDY BLUE DADDY \nAMERICANO Washed process \nหอมบลูเบอร์รี และดอกไม้ Washed process \nNote: Blue Berry & Floral 12-01-01-0019 12-01-02-0019 - bn_hot_americano_light_bluedaddy.png - - - posi2 #REF! #REF! - #REF! #REF! อเมริกาโน \nMOZART MOZART \nAMERICANO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0021 12-01-02-0021 - bn_hot_americano_light_mozart.png - - - posi2 #REF! #REF! - #REF! #REF! @@ -72,7 +72,7 @@ Name=Coffee,file=page_catalog_group_coffee.skt เอสเพรสโซ่ ESPRESSO กาแฟ (30 ml) Espresso (30 ml) 12-01-01-9901 - - bn_hot_espresso.png 12-21-01-9901 - - posi1 #REF! - - #REF! NN ดับเบิลเอสเพรสโซ่ DOUBLE \nESPRESSO กาแฟ (60 ml) Espresso (60 ml) 12-11-01-9901 - - bn_hot_double_espresso.png 12-31-01-9901 - - posi1 #REF! - - #REF! NN อเมริกาโน AMERICANO กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no.png 12-21-01-0003 12-21-02-0001 - posi1 #REF! #REF! - #REF! #REF! - กาแฟดำ STRONG COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee.png 12-21-01-0081 12-21-02-0081 - posi2 + กาแฟดำ BLACK COFFEE กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee.png 12-21-01-0081 12-21-02-0081 - posi2 เอสเพรสโซ่ช็อต \nGuji Queen Berry ESPRESSO \nETHIOPAI GUJI กาแฟคั่วอ่อน (natural process) \nหอมสตรอว์เบอร์รี ส้ม และดอกไม้ Light roast natural process: \nStrawberry, Orange, Floral 12-01-01-0013 - - bn_hot_espresso_light.png - - - posi2 #REF! - - #REF! NN เอสเพรสโซ่ช็อต \nBLUE DADDY BLUE DADDY \nESPRESSO Washed process \nหอมบลูเบอร์รี และดอกไม้ Washed process \nNote: Blue Berry & Floral 12-01-01-0020 - - bn_hot_espresso_light_bluedaddy.png - - - posi2 #REF! - - #REF! NN เอสเพรสโซ่ช็อต \nCHOPIN CHOPIN \nESPRESSO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0043 - - bn_hot_espresso_light_chopin.png - - - posi2 #REF! - - #REF! NN @@ -550,6 +550,23 @@ Name=Health,file=page_catalog_group_health.skt ชาดำ BLACK TEA ชาไทย และน้ำ Thai tea and Water 12-02-01-1039 12-02-02-1039 - bn_thai_black_tea_SingPark_Healthy.png - - - posi1 ชาดำมะนาว BLACK TEA LIMENADE ชาไทย ผงมะนาว และน้ำ Thai tea, Limenade and Water 12-02-01-1040 12-02-02-1040 - bn_limeblack_tea_SingPark_Healthy.png - - - posi1 - - - + เจมิลานม JEMILA MILK เจมิลา นม และน้ำแข็ง Jemila, Milk and Ice - 12-03-02-0075 12-03-03-0075 bn_iced_milk_jemila.png - - - posi1 + เจมิลาออรจินอล JEMILA ORIGINAL เจมิลา น้ำ และน้ำแข็ง Jemila, Water and Ice - 12-05-02-0124 12-05-03-0124 bn_water_roomtemp_jemila.png - - - posi1 + เจมิลาชาไทย JEMILA THAI TEA เจมิลา ชาไทย และน้ำแข็ง Jemila, Thai tea and Ice - 12-02-02-0068 12-02-03-0068 bn_hot_thai_tea_jemila.png - - - posi1 + เจมิลาโซดา JEMILA SODA เจมิลา โซดา และน้ำแข็ง Jemila, Soda and Ice - 12-05-02-0125 - bn_soda_jemila.png - - - posi1 + เจมิลากาโน่ JEMILA AMERICANO เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso and Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - 12-21-02-0075 - posi1 + เจมิลาโกโก้ JEMILA COCOA เจมิลา โกโก้ และน้ำแข็ง Jemila, Cocoa and Ice - 12-03-02-0076 12-03-03-0076 bn_iced_cocoa_jemila.png - - - posi1 + เจมิลาขิง JEMILA GINGER เจมิลา ขิง และน้ำแข็ง Jemila, Ginger and Ice - 12-02-02-0069 12-02-03-0069 bn_hot_Ginger_tea_jemila.png - - - posi1 + เจมิลาเซเว่นอัพโซดา JEMILA 7UP SODA เจมิลา 7up และน้ำแข็ง Jemila, 7 up and Ice - 12-05-02-0126 12-05-03-0126 bn_iced_7up_jemila.png - - - posi1 + เจมิลามะนาว JEMILA LIME เจมิลา มะนาว และน้ำแข็ง Jemila, Lime and Ice - 12-05-02-0127 12-05-03-0127 bn_iced_lemonade_jemila.png - - - posi1 + เจมิลามะลิ JEMILA JASMINE เจมิลา ชามะลิ และน้ำแข็ง Jemila, Jasmine tea and Ice - 12-02-02-0070 12-02-03-0070 bn_jasmine_tea_jemila.png - - - posi1 + + + + + + + Name=Health,file=page_catalog_group_songkran.skt โอเลี้ยงจ้ำบ๊ะ SEXY DANCE\nAMERICANO กาแฟ น้ำ และ น้ำแดง Espresso, Salak Syrup,\nwater - 12-01-02-0053 - bn_iced_sexy_dance_americano.png - - - posi1 โอยั๊วะเมียงู SNAKE WIFE\nAMERICANO กาแฟ น้ำ และ กล้วย Espresso, Tokyo Banana Syrup,\n Water - 12-01-02-0054 - bn_iced_snake_wife_americano.png - - - posi1 @@ -930,33 +947,33 @@ Name=banana_and_mint_lucky_draw_x3,file=page_catalog_group_pro_banana_mint_lucky เต่าทรงพลังโตเกียวบานาน่าโซดาเย็น TOKYO BANANA POWER DRINK SODA น้ำเชื่อมกล้วย เต่าทรงพลัง (มีคาเฟอีน) Banana Syrup, Medicine drink, Soda and Ice - 12-05-02-0078 - - - - posi1 Name=jemila,file=page_catalog_group_pro_jemila.skt - หงส์ ดราก้อนมิลค์ HONG'S DRAGON\nMILK เจมิลา นม และน้ำแข็ง Jemila, Milk and Ice - 12-03-02-0075 12-03-03-0075 bn_iced_milk_jemila.png - - - posi1 - มุนินทร์ดริ๊งก์ MUNIN'S FAVORITE\nDRINK เจมิลา น้ำ และน้ำแข็ง Jemila, Water and Ice - 12-05-02-0124 12-05-03-0124 bn_water_roomtemp_jemila.png - - - posi1 - มุตตาดื่ม MUTA DRINK เจมิลา ชาไทย และน้ำแข็ง Jemila, Thai tea and Ice - 12-02-02-0068 12-02-03-0068 bn_hot_thai_milk_tea_jemila.png - - - posi1 - ใจเริงซ่าพอตัว JAI RERNG QUITE\nFIZZY เจมิลา โซดา และน้ำแข็ง Jemila, Soda and Ice - 12-05-02-0125 - bn_soda_jemila.png - - - posi1 - ประกายดาวขอเข้ม ๆ PRAGLAIDAO WANT\nIT STRONG เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso and Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - 12-21-02-0075 - posi1 - เกล้ามาศมหัศจรรย์ GAOMART 'S\nMIRACLES เจมิลา โกโก้ และน้ำแข็ง Jemila, Cocoa and Ice - 12-03-02-0076 12-03-03-0076 bn_iced_cocoa_jemila.png - - - posi1 - ภัทรลดาจิงเจอ PATRADA'S GINGER เจมิลา ขิง และน้ำแข็ง Jemila, Ginger and Ice - 12-02-02-0069 12-02-03-0069 bn_hot_Ginger_tea_jemila.png - - - posi1 - ราวีน่าเซเว่นอัพ RAVEENA'S 7UP\nSODA เจมิลา 7up และน้ำแข็ง Jemila, 7 up and Ice - 12-05-02-0126 12-05-03-0126 bn_iced_7up_jemila.png - - - posi1 - ขวัญอุมามะนาว KWANUMA'S LIME เจมิลา มะนาว และน้ำแข็ง Jemila, Lime and Ice - 12-05-02-0127 12-05-03-0127 bn_iced_lemonade_jemila.png - - - posi1 - รวินทร์วรกานต์มะลิ RAVINWORAGARN'S\nJASMINE เจมิลา ชามะลิ และน้ำแข็ง Jemila, Jasmine tea and Ice - 12-02-02-0070 12-02-03-0070 bn_jasmine_tea_jemila.png - - - posi1 - -Name = halloween - - - - - - - - - - - - - - + หงส์ ดราก้อนมิลค์ HONG'S DRAGON\nMILK เจมิลา นม และน้ำแข็ง Jemila, Milk and Ice - 12-03-02-0075 12-03-03-0075 bn_iced_milk_jemila_pro.png - - - posi1 + มุนินทร์ดริ๊งก์ MUNIN'S FAVORITE\nDRINK เจมิลา น้ำ และน้ำแข็ง Jemila, Water and Ice - 12-05-02-0124 12-05-03-0124 bn_water_roomtemp_jemila_pro.png - - - posi1 + มุตตาดื่ม MUTA DRINK เจมิลา ชาไทย และน้ำแข็ง Jemila, Thai tea and Ice - 12-02-02-0068 12-02-03-0068 bn_hot_thai_tea_jemila_pro.png - - - posi1 + ใจเริงซ่าพอตัว JAI RERNG QUITE\nFIZZY เจมิลา โซดา และน้ำแข็ง Jemila, Soda and Ice - 12-05-02-0125 - bn_soda_jemila_pro.png - - - posi1 + ประกายดาวขอเข้ม ๆ PRAGLAIDAO WANT\nIT STRONG เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso and Ice - 12-01-02-0075 - bn_hot_america_no_jemila_pro.png - 12-21-02-0075 - posi1 + เกล้ามาศมหัศจรรย์ GAOMART 'S\nMIRACLES เจมิลา โกโก้ และน้ำแข็ง Jemila, Cocoa and Ice - 12-03-02-0076 12-03-03-0076 bn_iced_cocoa_jemila_pro.png - - - posi1 + ภัทรลดาจิงเจอ PATRADA'S GINGER เจมิลา ขิง และน้ำแข็ง Jemila, Ginger and Ice - 12-02-02-0069 12-02-03-0069 bn_hot_Ginger_tea_jemila_pro.png - - - posi1 + ราวีน่าเซเว่นอัพ RAVEENA'S 7UP\nSODA เจมิลา 7up และน้ำแข็ง Jemila, 7 up and Ice - 12-05-02-0126 12-05-03-0126 bn_iced_7up_jemila_pro.png - - - posi1 + ขวัญอุมามะนาว KWANUMA'S LIME เจมิลา มะนาว และน้ำแข็ง Jemila, Lime and Ice - 12-05-02-0127 12-05-03-0127 bn_iced_lemonade_jemila_pro.png - - - posi1 + รวินทร์วรกานต์มะลิ RAVINWORAGARN'S\nJASMINE เจมิลา ชามะลิ และน้ำแข็ง Jemila, Jasmine tea and Ice - 12-02-02-0070 12-02-03-0070 bn_jasmine_tea_jemila_pro.png - - - posi1 +Name=halloween,file=page_catalog_group_pro_halloween.skt + โหด โฉด สยอง BRUTAL, WICKED, HORRIFYING Matcha, 7Up, Lime and Soda - 12-02-02-0080 posi1 + ปอบเมืองลับแล LIVER OF THE LOST Strawberry syrup, Energy drink syrup, 7Up and Lime - - 12-05-03-0128 posi1 + หมู่บ้านเลี้ยงผี THE VILLAGE THAT FEEDS GHOSTS Strawberry syrup, Milk, 7Up and Lime - - 12-03-03-0084 posi1 + วิวาห์อาถรรพ์ CURSED CUISINE Lychee syrup, Milk, 7Up and Lime - - 12-03-03-0085 posi1 + เสน่ห์-บาตรแตก Broken Bowl Charm Thai tea, Strawberry syrup and 7Up - 12-02-02-0081 - posi1 + เมตามหาโสมม Foul Metta Jasmine tea, Ume syrup, 7Up and Soda - 12-02-02-0082 - posi1 + Ghost House กินอยู่กับผี GHOSTLY GRUB Ginger, Strawberry Syrup and 7Up 12-02-01-0079 - - posi1 + ผงกระดูกสัมภเวสี BONE-CHILLING BITES Caramel syrup, Milk, 7Up and Ovaltine - - 12-03-03-0081 posi1 + Cast แสดงเพื่อนผี PHANTOM ACTRESS Coffee, 7Up, Lime and Soda - 12-01-02-0082 - posi1 + ไสยเวทย์สังหาร SPOOKY SPELLS Pepsi, Thai tea , Milk and Ice - 12-03-02-0080 - posi1 + Mortuary ห้องเก็บเธอ MORTUARY: STORING HER Pepsi, Caramel, Milk and Ice - - 12-03-03-0080 posi1 + โค้งต้องคำสาป CURSED CURVE Pepsi, Lime, Ginger, Jasmin tea 12-02-01-0078 - - posi1 + เสกซากผี SUMMONING THE CORPSE Strawberry syrup, Coffee, 7Up and Soda - 12-01-02-0083 - posi1 + คนทรงผี SPIRIT MEDIUM Caramel syrup, Milk, 7Up and Ice - - 12-03-03-0082 posi1 + เลี้ยงลูกผี RAISING A GHOST CHILD Strawberry syrup, Milk, 7Up, Lime and Ovaltine - - 12-03-03-0083 posi1 Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt ลาเต้ LATTE กาแฟ นม และ ฟองนม Espresso, Milk, Foamed milk - 12-21-62-0002 12-21-63-0002 diff --git a/ui/lang.tsv b/ui/lang.tsv index 06d2e4fb..f70f9e69 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -1076,7 +1076,7 @@ 1300016 Brew time:sec เวลาชง: วินาที 1300017 Test grind sizes ทดสอบขนาดบด 1300018 Coffee module type : ประเภทชุดกาแฟ : -1300019 1. Select grind sizes 1. เลือกขนาดบด +1300019 1. Select grind sizes 1. เลือกขนาดการบด 1300020 More coarse หยาบขึ้น 1300021 More fine ละเอียดขึ้น 1300022 2. Test grinding 2. ทดสอบการบด diff --git a/video/brewing_adv15.mp4 b/video/brewing_adv15.mp4 new file mode 100755 index 00000000..2038a244 Binary files /dev/null and b/video/brewing_adv15.mp4 differ diff --git a/video/brewing_txt_adv15.png b/video/brewing_txt_adv15.png new file mode 100644 index 00000000..1bc11590 Binary files /dev/null and b/video/brewing_txt_adv15.png differ diff --git a/video/brewing_txt_adv15_en.png b/video/brewing_txt_adv15_en.png new file mode 100644 index 00000000..21b2ada7 Binary files /dev/null and b/video/brewing_txt_adv15_en.png differ diff --git a/video/script3_first_brewing.ev b/video/script3_first_brewing.ev index 828d37c8..2b14b377 100644 --- a/video/script3_first_brewing.ev +++ b/video/script3_first_brewing.ev @@ -6,14 +6,25 @@ If BrewingAdvertiseShowSlot = "" Then EndIf -If SystemDateMonthInt = 9 Then - Var ShopeePayLaterOn = 1 +If SystemDateMonthInt = 10 Then - If SystemDateDayInt > 14 Then - + If SystemDateDayInt > 21 Then + Var EDC_ThailandOn = 1 EndIf EndIf +If SystemDateMonthInt = 11 Then + + Var EDC_ThailandOn = 1 +EndIf + +If SystemDateMonthInt = 12 Then + + Var EDC_ThailandOn = 1 +EndIf + + + If BoxID = 175599 Then Var ShopeePayLaterOn = 0 EndIf @@ -33,6 +44,7 @@ EndIf ; ; + Var BrewingAdvertiseEnable[0] = 0 Var BrewingAdvertiseEnable[1] = 0 Var BrewingAdvertiseEnable[2] = 0 @@ -113,7 +125,7 @@ If brewing_adv13_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size EndIf -DEBUGVAR brewing_adv_size +DEBUGVAR brewing_adv13_size If brewing_adv13_size = 9295686 Then If EDC_ThailandOn = 1 Then Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 @@ -137,7 +149,7 @@ If brewing_adv14_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv14.mp4" brewing_adv14_size EndIf -DEBUGVAR brewing_adv_size +DEBUGVAR brewing_adv14_size If brewing_adv14_size = 9673549 Then Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv14.mp4"; @@ -154,6 +166,35 @@ If brewing_adv14_size = 9673549 Then EndIf +If brewing_adv15_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv15.mp4" brewing_adv15_size +EndIf + + +DEBUGVAR brewing_adv15_size +If brewing_adv15_size = 8455461 Then + If JemilaPro = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv15_en.png" + Else + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv15.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + + + + + + + DEBUGVAR BrewingAdvertiseShowSlot Var brew_vdo1 = BrewingAdvertiseVideo[BrewingAdvertiseShowSlot] diff --git a/video/sync_1.file b/video/sync_1.file index 27540512..4163c168 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,8 +1,9 @@ -total 175976 +total 184336 -rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4 -rw-rw---- 1 root sdcard_rw 9673549 2024-07-25 10:29 brewing_adv14.mp4 +-rw-rw---- 1 root sdcard_rw 8455461 2024-10-04 09:52 brewing_adv15.mp4 -rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9368231 2024-07-19 15:00 brewing_adv4.mp4 -rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png @@ -14,6 +15,8 @@ total 175976 -rw-rw---- 1 root sdcard_rw 48681 2024-08-29 11:30 brewing_txt_adv13_en.png -rw-rw---- 1 root sdcard_rw 44623 2024-09-17 14:17 brewing_txt_adv14.png -rw-rw---- 1 root sdcard_rw 41395 2024-09-17 14:18 brewing_txt_adv14_en.png +-rw-rw---- 1 root sdcard_rw 44262 2024-10-04 14:41 brewing_txt_adv15.png +-rw-rw---- 1 root sdcard_rw 43432 2024-10-04 14:41 brewing_txt_adv15_en.png -rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png -rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png -rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png @@ -24,8 +27,8 @@ total 175976 -rw-rw---- 1 root sdcard_rw 1217 2024-07-25 11:20 script1.ev -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev -rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev --rw-rw---- 1 root sdcard_rw 6217 2024-09-17 14:24 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-09-25 12:12 sync_1.file +-rw-rw---- 1 root sdcard_rw 7200 2024-10-04 13:58 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2024-10-04 14:41 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/promotion_cocoa77.xml b/xml/event/promotion_cocoa77.xml index 5fa0604b..40537f2f 100644 --- a/xml/event/promotion_cocoa77.xml +++ b/xml/event/promotion_cocoa77.xml @@ -7408,15 +7408,15 @@ Sugar, Biscof" ; - - - ; ==================> Len = 12 - ; 12-01-01-0081 12-01-01-0081 - + ; 12-01-01-0081 12-01-02-0081 - 33 22 225 296 - Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + Flag( 12-01-01-0081.Button,12-01-02-0081.Button,Disable=Invisible,$Sum12010100811201020081) diff --git a/xml/event/promotion_jemila.xml b/xml/event/promotion_jemila.xml index 38417e88..0a4009ff 100644 --- a/xml/event/promotion_jemila.xml +++ b/xml/event/promotion_jemila.xml @@ -7408,19 +7408,19 @@ Sugar, Biscof" ; - - - ; ==================> Len = 12 - ; 12-01-01-0081 12-01-01-0081 - + ; 12-01-01-0081 12-01-02-0081 - 33 22 225 296 - Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + Flag( 12-01-01-0081.Button,12-01-02-0081.Button,Disable=Invisible,$Sum12010100811201010081) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลานม" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา นม และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Milk and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-03-02-0075.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0075.Button + Var( "฿" + $12-03-02-0075.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-03-03-0075.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0075.Button + Var( "฿" + $12-03-03-0075.Price ) + + + 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 $Sum12030200751203030075 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0075.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0075.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" + $Sum12030200751203030075 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-05-02-0124 12-05-03-0124 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0124.Button,12-05-03-0124.Button,$Sum12050201241205030124) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาออรจินอล" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา น้ำ และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA ORIGINAL" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Water and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-05-02-0124.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0124.Button + Var( "฿" + $12-05-02-0124.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-05-03-0124.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0124.Button + Var( "฿" + $12-05-03-0124.Price ) + + + 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 $Sum12050201241205030124 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0124.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0124.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" + $Sum12050201241205030124 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-02-02-0068 12-02-03-0068 + + 33 + 22 + 225 + 296 + Flag( 12-02-02-0068.Button,12-02-03-0068.Button,$Sum12020200681202030068) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาชาไทย" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา ชาไทย และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA THAI TEA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Thai tea and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-02-02-0068.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0068.Button + Var( "฿" + $12-02-02-0068.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0068.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0068.Button + Var( "฿" + $12-02-03-0068.Price ) + + + 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 $Sum12020200681202030068 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0068.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0068.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" + $Sum12020200681202030068 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-05-02-0125 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0125.Button,$Sum1205020125) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา โซดา และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Soda and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-05-02-0125.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0125.Button + Var( "฿" + $12-05-02-0125.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 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 $Sum1205020125 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0125.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" + $Sum1205020125 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-01-02-0075 - + + 33 + 22 + 225 + 296 + Flag( 12-01-02-0075.Button,$Sum1201020075) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลากาโน่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา กาแฟ และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Espresso and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-01-02-0075.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0075.Button + Var( "฿" + $12-01-02-0075.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 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 $Sum1201020075 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0075.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" + $Sum1201020075 + text_unavailable + center-vertical-horizontal + + + ; - 12-21-02-0075 - + + 33 + 22 + 225 + 296 + Flag( 12-21-02-0075.Button,$Sum1221020075) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลากาโน่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา กาแฟ และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Espresso and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-21-02-0075.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-21-02-0075.Button + Var( "฿" + $12-21-02-0075.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + "Invisible" + + + 183 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 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 $Sum1221020075 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-21-02-0075.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" + $Sum1221020075 + text_unavailable + center-vertical-horizontal + + + ; ==================> Len = 12 + ; - 12-03-02-0076 12-03-03-0076 + + 33 + 22 + 225 + 296 + Flag( 12-03-02-0076.Button,12-03-03-0076.Button,$Sum12030200761203030076) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาโกโก้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา โกโก้ และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Cocoa and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-03-02-0076.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0076.Button + Var( "฿" + $12-03-02-0076.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-03-03-0076.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0076.Button + Var( "฿" + $12-03-03-0076.Price ) + + + 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 $Sum12030200761203030076 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0076.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0076.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" + $Sum12030200761203030076 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-02-02-0069 12-02-03-0069 + + 33 + 22 + 225 + 296 + Flag( 12-02-02-0069.Button,12-02-03-0069.Button,$Sum12020200691202030069) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาขิง" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา ขิง และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA GINGER" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Ginger and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-02-02-0069.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0069.Button + Var( "฿" + $12-02-02-0069.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0069.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0069.Button + Var( "฿" + $12-02-03-0069.Price ) + + + 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 $Sum12020200691202030069 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0069.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0069.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" + $Sum12020200691202030069 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-05-02-0126 12-05-03-0126 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0126.Button,12-05-03-0126.Button,$Sum12050201261205030126) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลาเซเว่นอัพโซดา" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา 7up และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA 7UP SODA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, 7 up and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-05-02-0126.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0126.Button + Var( "฿" + $12-05-02-0126.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-05-03-0126.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0126.Button + Var( "฿" + $12-05-03-0126.Price ) + + + 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 $Sum12050201261205030126 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0126.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0126.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" + $Sum12050201261205030126 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-05-02-0127 12-05-03-0127 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0127.Button,12-05-03-0127.Button,$Sum12050201271205030127) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลามะนาว" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา มะนาว และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA LIME" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Lime and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-05-02-0127.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0127.Button + Var( "฿" + $12-05-02-0127.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-05-03-0127.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0127.Button + Var( "฿" + $12-05-03-0127.Price ) + + + 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 $Sum12050201271205030127 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0127.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0127.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" + $Sum12050201271205030127 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-02-02-0070 12-02-03-0070 + + 33 + 22 + 225 + 296 + Flag( 12-02-02-0070.Button,12-02-03-0070.Button,$Sum12020200701202030070) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เจมิลามะลิ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เจมิลา ชามะลิ และน้ำแข็ง" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JEMILA JASMINE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jemila, Jasmine tea and Ice" + + + 16 + 264 + Var( DirImageDrinkOption + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImageDrinkOption + "hot.png" ) + Var( DirImageDrinkOption + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImageDrinkOption + "cold.png" ) + Var( DirImageDrinkOption + "cold_db.png" ) + $12-02-02-0070.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0070.Button + Var( "฿" + $12-02-02-0070.Price ) + + + 146 + 264 + Var( DirImageDrinkOption + "blend.png" ) + Var( DirImageDrinkOption + "blend_db.png" ) + $12-02-03-0070.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-03-0070.Button + Var( "฿" + $12-02-03-0070.Price ) + + + 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 $Sum12020200701202030070 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0070.TAG tag2_is_disable + STRCONTAIN "ERR" $12-02-03-0070.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" + $Sum12020200701202030070 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index 45a31a70..001cc634 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -329,6 +329,7 @@ 102 diff --git a/xml/page_catalog_group_pro_jemila.xml b/xml/page_catalog_group_pro_jemila.xml index 56aeafa9..3661fe98 100644 --- a/xml/page_catalog_group_pro_jemila.xml +++ b/xml/page_catalog_group_pro_jemila.xml @@ -2839,6 +2839,7 @@ JASMINE" Machine RemoveCup Machine DoorLidOpen Var buttonRemoveCup = "Invisible" + Refresh diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index 4fc6b279..cd8b8598 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -72,6 +72,7 @@ Machine RemoveCup Machine DoorLidOpen Var buttonRemoveCup = "Invisible" + Refresh diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 494fde90..dc823759 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -6429,15 +6429,15 @@ Sugar, Biscof" ; - - - ; ==================> Len = 12 - ; 12-01-01-0081 12-01-01-0081 - + ; 12-01-01-0081 12-01-02-0081 - 33 22 225 296 - Flag( 12-01-01-0081.Button,12-01-01-0081.Button,Disable=Invisible,$Sum12010100811201010081) + Flag( 12-01-01-0081.Button,12-01-02-0081.Button,Disable=Invisible,$Sum12010100811201020081) diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 3b7b4c6c..cbd18e4c 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -216,6 +216,8 @@ AddData 50 dummyPhone param1 param2 param3 EndIf + SAVELOG "drinkok.xml version 1" + 500 @@ -244,39 +246,13 @@ EndIf - ; 420 sec + ; 420 sec + ; to be obsolete If Timeout > 840 Then Var CountForRetryStuck = 1 Open "ROOT/taobin_project/xml/page_drink_stuck.xml" EndIf - ; obsolete - If Timeout > TimeDelayDefault Then - SAVELOG "Longer Time out" - DEBUGVAR TimeDelayDefault - - If NextOrder = "true" Then - - Var NextOrder = "false" - TransferVar "next" "curr" - Var Seeker = "curr" - SAVELOG "Make next order by take-cup with close-maintenance" - - Var error_code_stop_now = 1221 - - If DoorCupPosition = "bottom" Then - - Else - Var error_code_stop_now = 1296 - __CMD "error-code-1296" 0 "-" "-" - EndIf - - Open "ROOT/taobin_project/xml/page_cannotConti.xml" - - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf If Timeout = 2 Then RefreshAll EndIf @@ -293,200 +269,58 @@ Var next_pic_bg = DirImage + "/Preparing.png" Var BlinkImg = 1 EndIf - EndIf - - ; Do not change ; If MachineStage = "show-menu" Then - If CART_INDEX < CART_COUNT Then + Var Seeker.TNumberTaobinMember = "" + If NextOrder = "true" Then - If HaveCup = "false" Then - If CupChecking = "false" Then + ; next order set. Havecup and checkup value must false. Certain cup not on any arm. + + If DoorCupPosition = "bottom" Then + ; BEGIN + Var NextOrder = "false" - Var CART_INDEX = CART_INDEX + 1 - Cart "PreparID" CART_INDEX - Cart "MakeID" CART_INDEX - Open "ROOT/taobin_project/xml/page_thankyouMore.xml" + TransferVar "next" "curr" + Var Seeker = "curr" + SAVELOG "Make next order by take-cup" + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + ; END - EndIf Else - - If DoorCupPosition = "bottom" Then - If HaveCup = "true" Then - If MaybeHaveCup = "true" Then - - Else - If CupChecking = "true" Then - - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - EndIf - EndIf - EndIf - - If CupOnArm = "true" Then - If MaybeHaveCup = "true" Then - - Else - If CupChecking = "true" Then - - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - EndIf - EndIf - EndIf - Else - Var buttonRemoveCup = "Invisible" - EndIf - + Machine DoorClose EndIf - Else - If sendPayMultiFlag = 1 Then - - - If DoorCupPosition = "bottom" Then - If HaveCup = "true" Then - If MaybeHaveCup = "true" Then - - Else - If CupChecking = "true" Then - - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - EndIf - EndIf - EndIf - - If CupOnArm = "true" Then - If MaybeHaveCup = "true" Then - - Else - If CupChecking = "true" Then - - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - EndIf - EndIf - EndIf - Else - Var buttonRemoveCup = "Invisible" - EndIf - - Var Seeker.TNumberTaobinMember = "" - - If FailedCount > 0 Then - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - Else - If NextOrder = "true" Then - - ; Fast-forward to page_cannotConti - If RejectOrder = "true" Then - ; BEGIN - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - - SAVELOG "Make next order by RejectOrder" - Open "ROOT/taobin_project/xml/page_cannotConti.xml" - ; END - EndIf - - ; next order set. Havecup and checkup value must false. Certain cup not on any arm. - - If PaySuccessWithDaemonTask = 1 Then - Var NextOrder = "false" - SAVELOG "Make next order by pass" - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" - Else - If HaveCup = "false" Then - If MaybeHaveCup = "true" Then - - Else - If CupChecking = "true" Then - - Else - If CupOnArm = "false" Then - - If DoorCupPosition = "bottom" Then - ; BEGIN - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - SAVELOG "Make next order by take-cup" - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" - ; END - - Else - Machine DoorClose - EndIf - EndIf - EndIf - EndIf - EndIf - EndIf - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - EndIf + Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf - EndIf - ; - + ; this stage for remove cup If MachineStage = "remove-cup" Then - If CART_COUNT = 0 Then - If NextOrder = "false" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - - Var Timeout2 = Timeout2 + 1 - - If Timeout2 > 15 Then - If InternationalEnable = 1 Then - - Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" - EndIf - Var Timeout2 = 0 - EndIf - - EndIf + If NextOrder = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" + If DoorCupPosition = "bottom" Then + ; BEGIN + Var NextOrder = "false" + TransferVar "next" "curr" + Var Seeker = "curr" + SAVELOG "Make next order by take-cup" + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + ; END - Var Timeout2 = Timeout2 + 1 - - If Timeout2 > 15 Then - If InternationalEnable = 1 Then - - Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" - EndIf - Var Timeout2 = 0 + Else + Machine DoorClose EndIf EndIf - EndIf If Timeout = 5 Then @@ -664,21 +498,21 @@ - +; ;500 ;1180 @@ -844,9 +678,15 @@ + - Var MachineStage = "show-menu" + Var Timeout2 = 0 + __CMD "UpdateCupOnArm" UserSelectProductCode "-" "-" + + Open "ROOT/xml/page_drinkok.xml" + + diff --git a/xml/page_make_drink_again.xml b/xml/page_make_drink_again.xml new file mode 100644 index 00000000..0c187118 --- /dev/null +++ b/xml/page_make_drink_again.xml @@ -0,0 +1,145 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + + Var Timeout = 0 + Var Timeout2 = 0 + SAVELOG "page_make_drink_again.xml" + + DEBUGVAR EnableDoubleCupNoError + DEBUGVAR HURR_FOREVER + + + DEBUGVAR Seeker.showname + DEBUGVAR UserSelectProductCode + DEBUGVAR topping1 + DEBUGVAR topping2 + DEBUGVAR topping3 + DEBUGVAR topping4 + DEBUGVAR topping5 + DEBUGVAR topping6 + DEBUGVAR topping7 + DEBUGVAR topping8 + DEBUGVAR topping9 + DEBUGVAR topping10 + + Var PayCredit = 1 + ; MACHINE_BREW_THAI_CUP_ERROR_OVER_WEIGHT_SCALE_ARM_3 1030 + ; MACHINE_BREW_THAI_CUP_ERROR_NO_WEIGHT_SCALE_ARM_3 1026 + ; Clear eror 0xA6 + + + 1000 + + + Var Timeout = Timeout + 1 + + DEBUGVAR MachineStage + + DEBUGVAR HaveCup + DEBUGVAR CHECKCUP + DEBUGVAR DoorCupPosition + + + DEBUGVAR Timeout + DEBUGVAR Timeout2 + + If Timeout > 240 Then + SAVELOG "Timeout 240 from can not close door" + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + EndIf + + + + + ; Do not change + ; + If MachineStage = "show-menu" Then + If HaveCup = "false" Then + If DoorCupPosition = "bottom" Then + Var Timeout2 = Timeout2 + 1 + EndIf + EndIf + EndIf + + If DoorCupPosition = "bottom" Then + Var buttonRemoveCup = "Enable" + Else + Var buttonRemoveCup = "Invisible" + EndIf + + If MachineStage = "close-maintenance" Then + Var buttonRemoveCup = "Disable" + EndIf + + If Timeout2 = 1 Then + ;include="ROOT/taobin_project/inc/select_drink_current.inc" + + EndIf + + If Timeout2 = 5 Then + + MakeDrinkV1 UserSelectProductCode SelectSugarID + Var HURR_FOREVER = "F:1115" + Var MachineState_Result = 0 + Var LastMakeDrinkResult = "-" + Open "ROOT/taobin_project/xml/page_Newbrewing3Conti.xml" + + EndIf + + + TimerReset + Refresh + + + + + If ChangeStatus = "payout-end" Then + Var MultiGo = 1 + EndIf + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + 335 + 1090 + "ROOT/taobin_project/image/user_take_cup_th/img_take_cup.png" + + + + + + 0 + 609 + Var(DirImage + "/img_take_cup_for_next_brew.png") + + + + + + + Var MachineStage = "show-menu" + + + + diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index 6ca9aa3d..e0e7a002 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -45,6 +45,8 @@ LED LedDoorDoor 5 255 255 255 255 ;include=ROOT/taobin_project/inc/remove_cup_event_open.inc + + Var ShowMenuNameAndImage = "Invisible" 1000 @@ -135,6 +137,37 @@ + + 125 + 1700 + 300 + 320 + ShowMenuNameAndImage + Seeker.PictureDrink + + + + 300 + 1750 + ShowMenuNameAndImage + 1080 + Center + KanitLightTTF + 48 + HeadlineColor + + eval( + STRCONTAIN "size" Seeker.showname SizeFromSheet + If SizeFromSheet = "true" Then + SPLIT Seeker.showname "###" 1 PureName + Var return = PureName + Else + Var return = Seeker.showname + EndIf + ) + + + diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 71b4082e..2459c1b6 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -74,31 +74,26 @@ If Seeker = "curr" Then SAVELOG "Call from thankyou Conti" + If Seeker.get_a_straw = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" + Var SaveTheWorldCount = SaveTheWorldCount + 1 - If PaySuccessWithDaemonTask = 1 Then - - Else - If Seeker.get_a_straw = "Press" Then - 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 - - ;include="ROOT/taobin_project/inc/select_drink_current.inc" - - - Topping "ClearNextOrder" "-" + 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 + + ;include="ROOT/taobin_project/inc/select_drink_current.inc" + + + Topping "ClearNextOrder" "-" EndIf @@ -126,7 +121,13 @@ ;include=ROOT/taobin_project/inc/remove_cup_event_open.inc + SAVELOG "Thank you conti version 2" + ;PendingFlag InternationalEnable + ;PendingFlag New_Payment + ;PendingFlag New_Payment + + 1000 @@ -181,6 +182,7 @@ EndIf + If HaveCup = "false" Then If MachineStage = "show-menu" Then @@ -224,21 +226,23 @@ Var MachineState_Result = 0 If MachineStage = "show-menu" Then - If PaySuccessWithDaemonTask = 1 Then - - Else - Var LastMakeDrinkResult = "-" - If New_Payment = 1 Then - __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID - EndIf - MakeDrinkV1 Seeker.selected_a_drink SelectSugarID + + Var LastMakeDrinkResult = "-" + If New_Payment = 1 Then + __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID + EndIf + MakeDrinkV1 Seeker.selected_a_drink SelectSugarID - EndIf + If InternationalEnable = 1 Then Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" Open Brew3Inter Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" + If New_Payment = 1 Then + Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" + Else + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf EndIf EndIf @@ -261,7 +265,27 @@ ;include=ROOT/taobin_project/inc/remove_cup_step.inc - + If buttonRemoveCup = "Invisible" Then + If show_eng = "true" Then + Var MachineErrorDetailAll = " Please take cup." + Else + Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" + EndIf + Else + If CupChecking = "true" Then + If show_eng = "true" Then + Var MachineErrorDetailAll = " Please take a cup." + Else + Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" + EndIf + Else + If show_eng = "true" Then + Var MachineErrorDetailAll = " Press button for take a cup." + Else + Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ" + EndIf + EndIf + EndIf Refresh TimerReset @@ -348,8 +372,39 @@ 1080 end 0xFF0000 - "THK" + "TCT1 " + + + 5 + 1868 + 24 + Center + 1080 + RobotoRegular + 0xDE794E + MachineErrorDetailAll + + + + + + Var Timeout2 = 0 + __CMD "UpdateCupOnArm" UserSelectProductCode "-" "-" + + + + Open "ROOT/xml/page_thankyouConti.xml" + + + + + + + + + + diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 083a1309..0bae9fae 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -7910,13 +7910,10 @@ ; - Var PromotionOreoToppingFreeEnable = 1 - DEBUGVAR PromotionOreoToppingFreeEnable + __CMD "UpdateCupOnArm" UserSelectProductCode "-" - Var PromotionOreoToppingFreeEnable = 0 - DEBUGVAR PromotionOreoToppingFreeEnable diff --git a/xml/sold_cup_count.xml b/xml/sold_cup_count.xml index e353119f..6fed5925 100644 --- a/xml/sold_cup_count.xml +++ b/xml/sold_cup_count.xml @@ -19,7 +19,11 @@ Var XMLFileVideo = "true" DEBUGVAR XMLFileVideo - + Var SoldCupStage = "Enable" + If CountryName = "Singapore" Then + Var SoldCupStage = "Invisible" + EndIf + ;include="ROOT/taobin_project/inc/video.inc" @@ -52,117 +56,63 @@ 39 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 148 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 257 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 383 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 492 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 601 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 730 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 839 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage 948 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + SoldCupStage @@ -177,13 +127,9 @@ 1500 center-vertical-horizontal SoldCupDigit[0] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -198,13 +144,9 @@ 1500 center-vertical-horizontal SoldCupDigit[1] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -219,13 +161,9 @@ 1500 center-vertical-horizontal SoldCupDigit[2] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -240,13 +178,9 @@ 1500 center-vertical-horizontal SoldCupDigit[3] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -261,13 +195,9 @@ 1500 center-vertical-horizontal SoldCupDigit[4] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -282,13 +212,9 @@ 1500 center-vertical-horizontal SoldCupDigit[5] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -303,13 +229,9 @@ 1500 center-vertical-horizontal SoldCupDigit[6] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -324,13 +246,9 @@ 1500 center-vertical-horizontal SoldCupDigit[7] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -345,13 +263,9 @@ 1500 center-vertical-horizontal SoldCupDigit[8] - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -362,13 +276,9 @@ KanitMediumTTF HeadlineColor cups_sold_text - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -380,13 +290,9 @@ KanitMediumTTF HeadlineColor "," - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + @@ -398,13 +304,9 @@ KanitMediumTTF HeadlineColor "," - eval( - If CountryName = "Singapore" Then - Var return = "Invisible" - Else - Var return = "Enable" - EndIf -) + + SoldCupStage + diff --git a/xml/vending_info.xml b/xml/vending_info.xml index db862ec9..b837b312 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -167,6 +167,12 @@ Var EnableNewBrewUI = "false" EndIf + Var Index = 1 + DEBUGVAR TestArrary[0] + DEBUGVAR TestArrary[Index] + DEBUGVAR TestArrary[2] + DEBUGVAR TestArrary[3] + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 8fbae7e7..a09255db 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.97" - Var XMLPageVersionInt = 897 + Var XMLPageVersion = "9.00" + Var XMLPageVersionInt = 900 ;Oreo Var OreoGuarantee = 0