diff --git a/font/avenir-next-condensed/avenir-next-condensed-regular.ttf b/font/avenir-next-condensed/avenir-next-condensed-regular.ttf new file mode 100644 index 00000000..2cf373d1 Binary files /dev/null and b/font/avenir-next-condensed/avenir-next-condensed-regular.ttf differ diff --git a/video/script1.ev b/video/script1.ev index 0d6fb46c..627bc472 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,25 +1,29 @@ Var MainfileSize = 0 DEBUGVAR BoxID -If SystemDateMonthInt = 6 Then - GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize - DEBUGVAR MainfileSize - If MainfileSize = 7184295 Then - - Var EventTurnOn = 1 +If CountryName = "Malaysia" Then + Var EventTurnOn = 0 +Else + If SystemDateMonthInt = 6 Then + GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 7184295 Then + + Var EventTurnOn = 1 + EndIf + EndIf + + If BoxID = 173149 Then + Var EventTurnOn = 1 + EndIf + + If BoxID = 172644 Then + Var EventTurnOn = 1 + EndIf + + If EventTurnOn = 1 Then + Var CountDownShowButton = 0 + Var ShowButtonClickFull = "Invisible" + Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" EndIf EndIf - -If BoxID = 173149 Then - Var EventTurnOn = 1 -EndIf - -If BoxID = 172644 Then - Var EventTurnOn = 1 -EndIf - -If EventTurnOn = 1 Then - Var CountDownShowButton = 0 - Var ShowButtonClickFull = "Invisible" - Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" -EndIf diff --git a/video/script2.ev b/video/script2.ev index f472854e..7e64abca 100644 --- a/video/script2.ev +++ b/video/script2.ev @@ -3,6 +3,8 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize +SAVELOG "For change size" + If EventTurnOn = 1 Then If MainfileSize = 7120208 Then diff --git a/video/sync_1.file b/video/sync_1.file index 90097d7c..079ae535 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,18 +1,18 @@ -total 102372 +total 90200 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 --rw-rw---- 1 root sdcard_rw 8321419 2023-03-10 14:23 brewing_adv3.mp4 +-rw-rw---- 1 root sdcard_rw 7057670 2023-06-07 10:20 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 -rw-rw---- 1 root sdcard_rw 19087285 2023-01-23 16:15 main_page_en.mp4 -rw-rw---- 1 root sdcard_rw 7184295 2023-05-23 11:02 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 7185758 2023-05-23 11:02 main_page_event_en.mp4 --rw-rw---- 1 root sdcard_rw 503 2023-05-27 22:13 script1.ev --rw-rw---- 1 root sdcard_rw 295 2023-05-27 22:13 script2.ev --rw-rw---- 1 root sdcard_rw 0 2023-05-05 20:18 sync_1.file +-rw-rw---- 1 root sdcard_rw 587 2023-06-09 13:35 script1.ev +-rw-rw---- 1 root sdcard_rw 322 2023-06-13 13:21 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2023-06-13 03:04 sync_1.file +-rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov +-rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov -rw-rw---- 1 root sdcard_rw 4806758 2022-06-13 18:43 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2022-06-13 18:43 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2022-06-13 18:43 taobin_save_world3.mp4 -rw-rw---- 1 root sdcard_rw 2084830 2022-06-13 18:43 taobin_thank1.mp4 -rw-rw---- 1 root sdcard_rw 7120208 2023-05-23 11:03 taobin_thank1_event.mp4 --rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 1631940 2022-06-13 18:43 taobin_thank2.mp4 diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index dfba8620..ff1f9fb5 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -63,19 +63,20 @@ EndIf If BoxID = 200001 Then Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 + Var PepsiProEnable = 0 EndIf If BoxID = 200000 Then Var OreoDueEnable = 0 Var OreoForFreeEnable = 0 + Var PepsiProEnable = 0 EndIf If BoxID = 172053 Then Var PepsiProEnable = 1 EndIf -If BoxID = 172644 Then - Var PepsiProEnable = 1 -EndIf + + If BoxID = 173149 Then Var PepsiProEnable = 1 EndIf @@ -87,5 +88,11 @@ EndIf DEBUGVAR PepsiProEnable DEBUGVAR PepsiPromoteVideo +If InternationalEnable = 1 Then + Var PepsiProEnable = 0 + Var PepsiPromoteVideo = 0 +EndIf + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 73bcb3cb..7362c533 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -225,15 +225,15 @@ DEBUGVAR SystemDateDayInt ; Zone set video main page. - Var CampaignEnableStr = "false" Var adver_brewing_en = 1 TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev" + + DEBUGVAR CountDownShowButton DEBUGVAR EventTurnOn - DEBUGVAR CampaignEnableStr EndIf If TaobinOnlineX = "false" Then @@ -622,12 +622,16 @@ Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" Var show_eng_button_stage = "Invisible" + + Var CountDownShowButton = 35 EndIf If CountryName = "Indonesia" Then Var TextPriceMenuSize = 14 Var show_eng_button_stage = "Invisible" Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" + + Var CountDownShowButton = 35 EndIf Machine __arm_toggle @@ -1138,6 +1142,8 @@ SoundVolume + SAVELOG "click ShowButtonClickFull" + Var NextPage = "-" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If SpiralOnline = "true" Then diff --git a/xml/page_catalog_group_other.lxml b/xml/page_catalog_group_other.lxml index 8ad5afdb..89f1c1fa 100644 --- a/xml/page_catalog_group_other.lxml +++ b/xml/page_catalog_group_other.lxml @@ -6005,15 +6005,15 @@ ; ==================> Len = 3 - ; - 12-05-02-0051 12-05-03-0051 + ; - 12-05-02-0051 - 33 22 225 296 - Flag( 12-05-02-0051.Button,12-05-03-0051.Button,$Sum12050200511205030051) + Flag( 12-05-02-0051.Button,$Sum1205020051)