diff --git a/inter/aus/support_langs b/inter/aus/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/aus/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/hkg/support_langs b/inter/hkg/support_langs new file mode 100644 index 00000000..062e5982 --- /dev/null +++ b/inter/hkg/support_langs @@ -0,0 +1 @@ +ENG \ No newline at end of file diff --git a/inter/mys/adv/taobin_adv_menu_25.mp4 b/inter/mys/adv/taobin_adv_menu_25.mp4 index f4989ed2..080c4332 100644 Binary files a/inter/mys/adv/taobin_adv_menu_25.mp4 and b/inter/mys/adv/taobin_adv_menu_25.mp4 differ diff --git a/inter/mys/support_langs b/inter/mys/support_langs index 9ea36cbe..c3d30223 100644 --- a/inter/mys/support_langs +++ b/inter/mys/support_langs @@ -1 +1 @@ -ENG,THAI,CHINA,JAPAN,MALAY \ No newline at end of file +ENG,-,CHINA,JAPAN,MALAY diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 4e868931..a60a1c16 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -5,75 +5,121 @@ DEBUGVAR XMLProfile STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce -DEBUGVAR HasProYuzu250Concat -DEBUGVAR ProReducedPriceEnable -DEBUGVAR IgnoreProfileFromRunEV +Var refresh_str = "-RefreshProf" +STRCONTAIN refresh_str XMLProfile HasRefreshProf -If ProReducedPriceEnable = 1 Then +DEBUGVAR HasRefreshProf +DEBUGVAR NeedRefreshProfile -Else - DEBUGVAR "Case pro reduce end" - ; case-pro-reduce-end - If IgnoreProfileFromRunEV = 1 Then - DEBUGVAR "Pro yuzu ongoing" - ; concat-profile - If HasProYuzu250Concat = "true" Then - DEBUGVAR "Pro yuzu concat" +; refresh-profile-after-promo-end +If NeedRefreshProfile = 1 Then + + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS + READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS + + STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop + STRCONTAIN "Drop" ProfileSlot4MYS PromoYuzuDis50Drop + + DEBUGVAR PromoYuzuDrop + DEBUGVAR PromoYuzuDis50Drop + + If HasRefreshProf = "true" Then + + DEBUGVAR "case already refresh" + + ; restore-profile + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + Var NeedRefreshProfile = 0 + Else + ; save-current-as-pre + CacheVarStr "put" XMLProfilePreEvent + + If PromoYuzuDrop = "true" Then + DEBUGVAR "case yuzu drop --> refresh" + Var XMLProfile = XMLProfile + refresh_str Else + If PromoYuzuDis50Drop = "true" Then + DEBUGVAR "case yuzu drop discount 50% --> refresh" + Var XMLProfile = XMLProfile + refresh_str + EndIf + EndIf + + EndIf +Else + + DEBUGVAR HasProYuzu250Concat + DEBUGVAR ProReducedPriceEnable + DEBUGVAR IgnoreProfileFromRunEV + + If ProReducedPriceEnable = 1 Then + + Else + DEBUGVAR "Case pro reduce end" + ; case-pro-reduce-end + If IgnoreProfileFromRunEV = 1 Then + DEBUGVAR "Pro yuzu ongoing" + ; concat-profile + If HasProYuzu250Concat = "true" Then + DEBUGVAR "Pro yuzu concat" + Else + + If IsProfileReduce = "true" Then + DEBUGVAR "Pro reduce was set but disabled from trick" + CacheVarStr "get" XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "Get PreEvent Empty" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event, also concat Yuzu" + DEBUGVAR XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + "-" + Var XMLProfile = XMLProfile + "PromoYuzu250" + + EndIf - If IsProfileReduce = "true" Then - DEBUGVAR "Pro reduce was set but disabled from trick" - CacheVarStr "get" XMLProfilePreEvent - If XMLProfilePreEvent = "" Then - DEBUGVAR "Get PreEvent Empty" - Var XMLProfile = "General" Else - DEBUGVAR "Restore profile by pre-event, also concat Yuzu" - DEBUGVAR XMLProfilePreEvent - Var XMLProfile = XMLProfilePreEvent + "-" + DEBUGVAR "No pro reduce, concat pro yuzu" + CacheVarStr "put" XMLProfilePreEvent + + Var XMLProfile = XMLProfile + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" EndIf - - Else - DEBUGVAR "No pro reduce, concat pro yuzu" - CacheVarStr "put" XMLProfilePreEvent - - Var XMLProfile = XMLProfile + "-" - Var XMLProfile = XMLProfile + "PromoYuzu250" - EndIf - EndIf - Else - If IsProfileReduce = "true" Then - DEBUGVAR "No yuzu but set pro reduce" - CacheVarStr "get" XMLProfilePreEvent - If XMLProfilePreEvent = "" Then - DEBUGVAR "PreEvent empty, set General" - Var XMLProfile = "General" - Else - DEBUGVAR "Restore profile by pre-event" - Var XMLProfile = XMLProfilePreEvent - EndIf - Else - - If HasProYuzu250Concat = "true" Then + If IsProfileReduce = "true" Then + DEBUGVAR "No yuzu but set pro reduce" CacheVarStr "get" XMLProfilePreEvent - Var XMLProfile = XMLProfilePreEvent + If XMLProfilePreEvent = "" Then + DEBUGVAR "PreEvent empty, set General" + Var XMLProfile = "General" + Else + DEBUGVAR "Restore profile by pre-event" + Var XMLProfile = XMLProfilePreEvent + EndIf + + Else + + If HasProYuzu250Concat = "true" Then + CacheVarStr "get" XMLProfilePreEvent + Var XMLProfile = XMLProfilePreEvent + EndIf + + DEBUGVAR "Store profile pre event" + DEBUGVAR XMLProfilePreEvent + CacheVarStr "put" XMLProfilePreEvent EndIf - DEBUGVAR "Store profile pre event" - DEBUGVAR XMLProfilePreEvent - CacheVarStr "put" XMLProfilePreEvent EndIf EndIf -EndIf - - - -If IgnoreProfileFromRunEV = 1 Then - Var ToggleAfterEventProfileOff = 1 + + + If IgnoreProfileFromRunEV = 1 Then + Var ToggleAfterEventProfileOff = 1 + EndIf + + EndIf diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index fd1c1581..0fc1ba68 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -58,8 +58,25 @@ If SystemDateMonthInt = 9 Then EndIf EndIf +If SystemDateMonthInt = 10 Then + + Var IgnoreProfileFromRunEV = 0 + +EndIf + +If SystemDateMonthInt = 11 Then + + Var IgnoreProfileFromRunEV = 0 +EndIf + +If SystemDateMonthInt = 12 Then + Var IgnoreProfileFromRunEV = 0 + +EndIf + If SystemDateMonthInt < 10 Then Var ProReducedPriceEnable = 0 + Var IgnoreProfileFromRunEV = 0 EndIf If ProReducedPriceEnable = 0 Then @@ -69,6 +86,23 @@ If ProReducedPriceEnable = 0 Then EndIf EndIf + +; zone-refresh-once + +READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr +STRCONTAIN "1" NeedRefreshStr need_refresh + +If need_refresh = "true" Then + + Var NeedRefreshProfile = 1 + WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0" + +Else + Var NeedRefreshProfile = 0 +EndIf + + + If BoxID = 177746 Then Var ProThaiTeaEnable = 1 Var ProYuzuEnable = 1 diff --git a/inter/sgp/animation01/play_list.tsv b/inter/sgp/animation01/play_list.tsv index d0e86aa0..a3a1ca45 100644 --- a/inter/sgp/animation01/play_list.tsv +++ b/inter/sgp/animation01/play_list.tsv @@ -570,9 +570,9 @@ Coke 52-05-03-0019 1 23 37 13 41 24 49 0:49 23 ไมโลเย็น 52-03-03-0048 1 7 61 16 23 41 24 120 8:00 23 ไมโลปั่นภูเขาไฟ 52-03-03-0049 1 7 15 61 41 61 24 120 8:00 23 - - - +รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้ 52-21-03-0078 1 2 3 4 14 23 41 24 49 11:01 23 +พรีเมียมมัทฉะคาราเมลโอริโอ้ 52-02-03-0057 1 6 22 40 8 9 23 41 24 133 14:13 22 +พรีเมียมชาไทยคาราเมลโอริโอ้ 52-02-03-0058 1 1 6 10 22 40 23 41 24 133 14:13 22 diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..eec67da2 Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..a6897c4a Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8ec58b6d Binary files /dev/null and b/inter/sgp/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..cb6d7c78 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..589c6fb8 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..0d04e424 Binary files /dev/null and b/inter/sgp/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4ecab465 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..4aea8004 Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..8149b0aa Binary files /dev/null and b/inter/sgp/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..9dae84a7 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..f4390602 Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png new file mode 100644 index 00000000..25af310f Binary files /dev/null and b/inter/sgp/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount.png differ diff --git a/inter/sgp/support_langs b/inter/sgp/support_langs new file mode 100644 index 00000000..16c4bfe8 --- /dev/null +++ b/inter/sgp/support_langs @@ -0,0 +1 @@ +ENG diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev index a79dcdd2..6910325e 100644 --- a/inter/sgp/video/script_thank.ev +++ b/inter/sgp/video/script_thank.ev @@ -11,3 +11,17 @@ If EventTurnOn = 1 Then EndIf +If UsePepsiTheme = 1 Then + + ; expect-wtc + If SaveTheWorldCount = 0 Then + GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 5184722 Then + Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" + EndIf + Else + + EndIf + +EndIf diff --git a/inter/sgp/xml/page_catalog_group_coffee.lxml b/inter/sgp/xml/page_catalog_group_coffee.lxml index 46691448..f97879c4 100644 --- a/inter/sgp/xml/page_catalog_group_coffee.lxml +++ b/inter/sgp/xml/page_catalog_group_coffee.lxml @@ -690,7 +690,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 60 +; menu_new_list 61 ; ==================> Len = 3 ; 52-01-01-0001 - - @@ -23279,6 +23279,281 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-21-03-0078 + + 33 + 22 + 225 + 296 + Flag( 52-21-03-0078.Button,$Sum5221030078) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM ESPRESSO\nCARAMEL OREO + + PREMIUM ESPRESSO\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Coffee, Milk, Caramel Syrup, Oreo + + Coffee, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-21-03-0078.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-21-03-0078.Button + StringFmt( $52-21-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 $Sum5221030078 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-21-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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5221030078 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/sgp/xml/page_catalog_group_tea.lxml b/inter/sgp/xml/page_catalog_group_tea.lxml index bf5dbacc..82850d37 100644 --- a/inter/sgp/xml/page_catalog_group_tea.lxml +++ b/inter/sgp/xml/page_catalog_group_tea.lxml @@ -692,7 +692,7 @@ Var block_index_move = 0 ;dummy_layout.inc -; menu_new_list 46 +; menu_new_list 48 ; ==================> Len = 3 ; 52-02-01-0001 52-02-02-0001 52-02-03-0001 @@ -13865,6 +13865,556 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - - 52-02-03-0057 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0057.Button,$Sum5202030057) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM GREEN TEA\nCARAMEL OREO + + PREMIUM GREEN TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Matcha, Milk, Caramel Syrup, Oreo + + Matcha, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0057.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0057.Button + StringFmt( $52-02-03-0057.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 $Sum5202030057 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0057.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030057 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - - 52-02-03-0058 + + 33 + 22 + 225 + 296 + Flag( 52-02-03-0058.Button,$Sum5202030058) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + HeadlineColor + + PREMIUM THAI TEA\nCARAMEL OREO + + PREMIUM THAI TEA\nCARAMEL OREO + + + + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + BodyTextColor + + Thai Tea, Milk, Caramel Syrup, Oreo + + Thai Tea, Milk, Caramel Syrup, Oreo + + + + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + WTCBlueColor + WTCWhiteColor + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $52-02-03-0058.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + WTCBlueColor + WTCWhiteColor + $52-02-03-0058.Button + StringFmt( $52-02-03-0058.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 $Sum5202030058 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $52-02-03-0058.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 + WTCMediumBlueColor + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5202030058 + + 000013 + + center-vertical-horizontal + ; Cart diff --git a/inter/whatthecup/common/video/wtc_thankyou.mp4 b/inter/whatthecup/common/video/wtc_thankyou.mp4 new file mode 100644 index 00000000..52a5ea4c Binary files /dev/null and b/inter/whatthecup/common/video/wtc_thankyou.mp4 differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 50c18676..e6ab9cb2 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -667,6 +667,7 @@ Var UsePepsiTheme = 0 Var NoTrickPriceProfile = 0 + Var NeedRefreshProfile = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1502,7 +1503,7 @@ PRICE "Reset" "-" - Var XMLProfile = "Discount50" + Var XMLProfile = "General" Var TimeProfilePrice = 0 @@ -2188,5 +2189,46 @@ PRICE "Reset" "-" ShowNetworkProblemText + + + + eval( + If LangProcess = "LoadConfig" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0x000000 + eval( + If LangProcess = "LoadConfig" Then + Var return = "Loading ..." + Else + Var return = "" + EndIf +) + + diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index c9eda745..435c871b 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -161,6 +161,14 @@ Else TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev" EndIf + Else + If InternationalEnable = 1 Then + If UsePepsiTheme = 1 Then + Var script_thankyou = CountryRootPath + "video/script_thank.ev" + TRY script_thankyou + EndIf + EndIf + EndIf