diff --git a/image/collectiing_en/img_popup11-AUS.png b/image/collectiing_en/img_popup11-AUS.png new file mode 100644 index 00000000..354116ea Binary files /dev/null and b/image/collectiing_en/img_popup11-AUS.png differ diff --git a/image/collectiing_en/img_popup15-AUS.png b/image/collectiing_en/img_popup15-AUS.png new file mode 100644 index 00000000..0c0c24fe Binary files /dev/null and b/image/collectiing_en/img_popup15-AUS.png differ diff --git a/image/page_payment_cash_extend_en/img_popup12_uae.png b/image/page_payment_cash_extend_en/img_popup12_uae.png new file mode 100644 index 00000000..d75d1863 Binary files /dev/null and b/image/page_payment_cash_extend_en/img_popup12_uae.png differ diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 5ef342da..25e7e9e2 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -449,6 +449,7 @@ DEBUGVAR Seeker If game_mode_enable = "true" Then + CheckApp "com.NDF.taobin" GameInstalled DEBUGVAR GameInstalled @@ -721,14 +722,15 @@ Var Timeout = Timeout + 1 If Timeout < 2 Then - If Game01Enable = 0 Then - If game_mode_enable = "true" Then - If BREW_CNT > 75 Then - SAVELOG "Button game enable from EventTimeout" - Var Game01Enable = 1 - Var ButtonGameCountDownState = "Invisible" - Var ButtonGamePressToPlayState = "Enable" - + If GameInstalled = "true" Then + If Game01Enable = 0 Then + If game_mode_enable = "true" Then + If BREW_CNT > 75 Then + SAVELOG "Button game enable from EventTimeout" + Var Game01Enable = 1 + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Enable" + EndIf EndIf EndIf EndIf diff --git a/inter/uae_dubai/xml/page_topping_select6.lxml b/inter/uae_dubai/xml/page_topping_select6.lxml index 972a36a9..3e8b8db3 100644 --- a/inter/uae_dubai/xml/page_topping_select6.lxml +++ b/inter/uae_dubai/xml/page_topping_select6.lxml @@ -113,22 +113,14 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var SugarZeroCalPrice_X = 540 - Else - - Var DirImage = "ROOT/taobin_project/image/topping2" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Var showname = NameDrinkTH - Var showdesc = DrinkDescriptionTH + EndIf - Var text_show_thai = "Enable" - Var text_show_eng = "Invisible" - - Var topping_shot_price_x = 600 - Var text_x_add_oreo_price = 490 - Var text_show_normal_x = 386 - Var SugarZeroCalPrice_X = 482 - + If LanguageShow = "UAE_DUBAI" Then + Var topping_shot_price_x = 630 + Var text_x_add_oreo_price = 620 + Var text_show_normal_x = 535 + Var text_milk_choice_price_x = 325 + Var SugarZeroCalPrice_X = 540 EndIf Var bg_strawlid = DirImage + "/bg_strawlid.png" @@ -491,13 +483,14 @@ If SugarSoundFlag = 1 Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" EndIf + EndIf If LanguageShow = "UAE_DUBAI" Then Var topping_shot_price_x = 630 - Var text_x_add_oreo_price = 600 - Var text_show_normal_x = 528 - Var text_milk_choice_price_x = 295 + Var text_x_add_oreo_price = 620 + Var text_show_normal_x = 535 + Var text_milk_choice_price_x = 325 Var SugarZeroCalPrice_X = 540 EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index 360b06a5..f7c2ad0a 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -924,7 +924,7 @@ Var UsePepsiTheme = 1 Var TargetThemeNum = 2 - Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + ;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" @@ -1343,7 +1343,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Var OpenFromPageBoard = 1 @@ -1609,7 +1609,8 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + Var OpenFromPageBoard = 1 @@ -1807,10 +1808,10 @@ ; Handle penetrator If Only18 = "true" Then - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml" Else - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" EndIf @@ -1846,7 +1847,7 @@ SoundVolume - OpenInst 1 VideoAdvert + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" Else @@ -1884,7 +1885,7 @@ Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If InternationalEnable = 1 Then ;inter-xml-open @@ -1938,7 +1939,7 @@ SAVELOG "click ShowButtonClickFull" Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If SpiralOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" @@ -2009,7 +2010,7 @@ If IgnoreNetCore = "true" Then Var NextPage = "-" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" @@ -2032,7 +2033,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 VideoAdvert + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" Var OpenFromPageBoard = 1 diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml index 4c68e904..ccac8116 100644 --- a/xml/page_get_yourchange.xml +++ b/xml/page_get_yourchange.xml @@ -18,6 +18,10 @@ If CountryName = "HongKong" Then Var LangButtonEnable = "Invisible" EndIf + + If CountryName = "UnitedArabEmirates Dubai" Then + Var LangButtonEnable = "Invisible" + EndIf DEBUGVAR LangButtonEnable diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml index 05d1457c..e4409e04 100644 --- a/xml/page_payment_cash-AUS.xml +++ b/xml/page_payment_cash-AUS.xml @@ -1646,7 +1646,7 @@ EndIf 748 ;inter-image alphaState2 - Var( DirImage2 + "/img_popup11-MYR.png" ) + Var( DirImage2 + "/img_popup11-AUS.png" ) diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml index 79e70389..8ecbfcfb 100644 --- a/xml/page_payment_cash-UAE.xml +++ b/xml/page_payment_cash-UAE.xml @@ -1266,11 +1266,11 @@ Var alphaState3_offline = "Enable" EndIf - If show_eng = "true" Then - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" - Else - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" - EndIf + ;If show_eng = "true" Then + ; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3" + ;Else + ; PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3" + ;EndIf EndIf @@ -1949,22 +1949,22 @@ EndIf 182 748 alphaState3 - Var( DirImage + "/img_popup12.png" ) + Var( DirImage2 + "/img_popup12_uae.png" ) - +;