diff --git a/image/page_doing/brewing_txt_adv4.png b/image/page_doing/brewing_txt_adv4.png new file mode 100644 index 00000000..b35f717e Binary files /dev/null and b/image/page_doing/brewing_txt_adv4.png differ diff --git a/image/page_doing/brewing_txt_adv4_en.png b/image/page_doing/brewing_txt_adv4_en.png new file mode 100644 index 00000000..b7d2a396 Binary files /dev/null and b/image/page_doing/brewing_txt_adv4_en.png differ diff --git a/video/brewing_txt_adv4.png b/video/brewing_txt_adv4.png new file mode 100644 index 00000000..b35f717e Binary files /dev/null and b/video/brewing_txt_adv4.png differ diff --git a/video/brewing_txt_adv4_en.png b/video/brewing_txt_adv4_en.png new file mode 100644 index 00000000..b7d2a396 Binary files /dev/null and b/video/brewing_txt_adv4_en.png differ diff --git a/video/script3_brew.ev b/video/script3_brew.ev index cc2a5127..32484485 100644 --- a/video/script3_brew.ev +++ b/video/script3_brew.ev @@ -5,26 +5,30 @@ If MayDayRunEnable = 1 Then Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 16 - Var brew_vdo2 = "taobin_project/video/brewing_adv3.mp4" - Var brew_txt2 = "taobin_project/video/brewing_txt_adv3.png" + Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv3.mp4" + Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png" + + SAVELOG "Play adv3" EndIf +Else + + ; comment for change this file size + + If TamatianEnable = 1 Then + GetFileSizeK "taobin_project/video/brewing_adv4.mp4" brewing_adv_size + DEBUGVAR brewing_adv_size + If brewing_adv_size = 9693030 Then + + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 16 + + Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv4.mp4" + Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv4.png" + SAVELOG "Play adv4" + EndIf + EndIf + + ; comment for change this file size + EndIf -; comment for change this file size - -If TamatianEnable = 1 Then - GetFileSizeK "taobin_project/video/brewing_adv4.mp4" brewing_adv_size - DEBUGVAR brewing_adv_size - If brewing_adv_size = 9693030 Then - - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 16 - - Var brew_vdo2 = "taobin_project/video/brewing_adv4.mp4" - Var brew_txt2 = "taobin_project/video/brewing_txt_adv4.png" - EndIf -EndIf - -; comment for change this file size - - diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 1d05eb9d..461fd358 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -98,7 +98,7 @@ EndIf If BoxID = 172053 Then Var TamatianEnable = 1 Var GameEnableFromTrickerEv = 1 - Var MayDayRunEnable = 0 + Var MayDayRunEnable = 1 EndIf If BoxID = 172644 Then diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 2e5bc672..6b95cb94 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -1314,7 +1314,8 @@ If AnimationOn = "true" Then If adver_brewing_playing = 1 Then - + + DEBUGVAR adver_brewing_play_index If adver_brewing_play_index = 2 Then DEBUGVAR adver_brewing_count_down @@ -1339,6 +1340,7 @@ If adver_brewing_play_index = 1 Then DEBUGVAR adver_brewing_count_down + DEBUGVAR brew_vdo2 If adver_brewing_count_down > 0 Then Var adver_brewing_count_down = adver_brewing_count_down - 1 @@ -1346,7 +1348,7 @@ If brew_vdo2 = "" Then Var VideoPlayFile = "ROOT/taobin_project/video/brewing_adv3.mp4" Else - Var brew_vdo2 = VideoPlayFile + Var VideoPlayFile = brew_vdo2 EndIf Var PictureFile = brew_txt2 diff --git a/xml/sometime/script_thankyou.ev b/xml/sometime/script_thankyou.ev index 78a17348..756f4859 100644 --- a/xml/sometime/script_thankyou.ev +++ b/xml/sometime/script_thankyou.ev @@ -9,12 +9,16 @@ If Seeker = "curr" Then If BoxID = 173149 Then Var CountUpPlayMayDay = CountUpPlayMayDay + 3 EndIf + If BoxID = 176757 Then Var CountUpPlayMayDay = CountUpPlayMayDay + 3 EndIf If BoxID = 172644 Then Var CountUpPlayMayDay = CountUpPlayMayDay + 3 EndIf + If BoxID = 172053 Then + Var CountUpPlayMayDay = CountUpPlayMayDay + 3 + EndIf DEBUGVAR CountUpPlayMayDay If CountUpPlayMayDay > 3 Then diff --git a/xml_main/startup.xml b/xml_main/startup.xml index fcfcb61d..3a917db5 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.59" - Var XMLPageVersionInt = 759 + Var XMLPageVersion = "7.60" + Var XMLPageVersionInt = 760 ;Oreo Var OreoGuarantee = 0