diff --git a/image/page_doing/brewing_txt_adv3.png b/image/page_doing/brewing_txt_adv3.png new file mode 100644 index 00000000..50485370 Binary files /dev/null and b/image/page_doing/brewing_txt_adv3.png differ diff --git a/image/page_doing/brewing_txt_adv3_en.png b/image/page_doing/brewing_txt_adv3_en.png new file mode 100644 index 00000000..9486809c Binary files /dev/null and b/image/page_doing/brewing_txt_adv3_en.png differ diff --git a/video/brewing_adv3.mp4 b/video/brewing_adv3.mp4 new file mode 100755 index 00000000..518f5e18 Binary files /dev/null and b/video/brewing_adv3.mp4 differ diff --git a/video/sync_1.file b/video/sync_1.file index 4e7693e4..613f783d 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,11 +1,12 @@ -total 71856 +total 76360 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 +-rw-rw---- 1 root sdcard_rw 4606739 2023-02-10 08:48 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 -rw-rw---- 1 root sdcard_rw 12988884 2023-02-02 09:37 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 11934977 2023-02-02 09:38 main_page_event_en.mp4 -rw-rw---- 1 root sdcard_rw 454 2023-02-02 10:35 script1.ev -rw-rw---- 1 root sdcard_rw 292 2023-02-02 10:35 script2.ev --rw-rw---- 1 root sdcard_rw 0 2023-02-02 10:32 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2023-02-10 04:38 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 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 4bee3844..d04e23fe 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -64,7 +64,7 @@ Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png" Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png" - Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv2_en.png" + Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv3_en.png" Var brew_txt1 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1_en.png" Var XStraw = 336 @@ -87,7 +87,7 @@ Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png" Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png" - Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv2.png" + Var brew_txt2 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv3.png" Var brew_txt1 = "ROOT/taobin_project/image/page_doing/brewing_txt_adv1.png" Var XStraw = 382 @@ -291,7 +291,7 @@ Var bg_strawProblem_ST = "Enable" Var EnableGetMoreStrawFileName = "Invisible" EndIf - + If RoadShow = "true" Then Var EnableSelectMenuBetweenBrewBlink = "Invisible" EndIf @@ -1042,13 +1042,15 @@ EndIf If adver_brewing_count_down = 0 Then - If PromoteYuzuEnable = "true" Then + GetFileSizeK "taobin_project/video/brewing_adv3.mp4" brewing_adv_size + DEBUGVAR brewing_adv_size + If brewing_adv_size = 4606739 Then Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 20 Else - Var adver_brewing_play_index = 0 - Var adver_brewing_playing = 0 - EndIf + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 0 + EndIf EndIf EndIf @@ -1058,7 +1060,7 @@ If adver_brewing_count_down > 0 Then Var adver_brewing_count_down = adver_brewing_count_down - 1 - Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv1.mp4" + Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv3.mp4" Var PictureFile = brew_txt2 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 42135756..e1eea752 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -106,8 +106,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.96" - Var XMLPageVersionInt = 696 + Var XMLPageVersion = "6.98" + Var XMLPageVersionInt = 698