diff --git a/animation01/sync_1.file b/animation01/sync_1.file index ce33e949..de2d5023 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,4 +1,4 @@ -total 241268 +total 241224 -rw-rw---- 1 root sdcard_rw 948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4 @@ -57,5 +57,5 @@ total 241268 -rw-rw---- 1 root sdcard_rw 3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4 -rw-rw---- 1 root sdcard_rw 9159102 2024-08-19 12:59 TaoBinShowCoffeeProcess.mp4 -rw-rw---- 1 root sdcard_rw 326 2024-08-26 13:31 last-cmd --rw-rw---- 1 root sdcard_rw 69541 2024-08-24 18:46 play_list.tsv --rw-rw---- 1 root sdcard_rw 0 2024-08-26 13:32 sync_1.file +-rw-rw---- 1 root sdcard_rw 69541 2024-08-31 09:10 play_list.tsv +-rw-rw---- 1 root sdcard_rw 0 2024-08-22 23:16 sync_1.file diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 229528dc..70ad3d68 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -928,6 +928,17 @@ Name=banana_and_mint_lucky_draw_x3,file=page_catalog_group_pro_banana_mint_lucky นมโตเกียวบานาน่าเย็น TOKYO BANANA MILK น้ำเชื่อมโตเกียวบานาน่า นม น้ำตาลและน้ำแข็ง Tokyo Banana Syrup, Milk, Sugar, Ice - 12-03-02-0023 12-03-03-0023 - - - posi1 เต่าทรงพลังโตเกียวบานาน่าโซดาเย็น TOKYO BANANA POWER DRINK SODA น้ำเชื่อมกล้วย เต่าทรงพลัง (มีคาเฟอีน) Banana Syrup, Medicine drink, Soda and Ice - 12-05-02-0078 - - - - posi1 +Name=jemila,file=page_catalog_group_pro_jemila.skt + เจมิลานม Jemila Milk เจมิลา นม และน้ำแข็ง Jemila, Milk and Ice - 12-03-02-0075 - bn_iced_milk_jemila.png - - - posi1 + เจมิลาออรจินอล Jemila Original เจมิลา น้ำ และน้ำแข็ง Jemila, Water and Ice - 12-05-02-0124 - bn_water_roomtemp_jemila.png - - - posi1 + เจมิลาชาไทย Jemila Thai tea เจมิลา ชาไทย และน้ำแข็ง Jemila, Thai tea and Ice - 12-02-02-0068 - bn_hot_thai_milk_tea_jemila.png - - - posi1 + เจมิลาโซดา Jemila Soda เจมิลา โซดา และน้ำแข็ง Jemila, Soda and Ice - 12-05-02-0125 - bn_soda_jemila.png - - - posi1 + เจมิลากาโน่ Jemila Americano เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso and Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - - - posi1 + เจมิลาโกโก้ Jemila Cocoa เจมิลา โกโก้ และน้ำแข็ง Jemila, Cocoa and Ice - 12-03-02-0076 - bn_iced_cocoa_jemila.png - - - posi1 + เจมิลาขิง Jemila Ginger เจมิลา ขิง และน้ำแข็ง Jemila, Ginger and Ice - 12-02-02-0069 - bn_hot_Ginger_tea_jemila.png - - - posi1 + เจมิลาเซเว่นอัพโซดา Jemila 7UP soda เจมิลา 7up และน้ำแข็ง Jemila, 7 up and Ice - 12-05-02-0126 - bn_iced_7up_jemila.png - - - posi1 + เจมิลามะนาว Jemila Lime เจมิลา มะนาว และน้ำแข็ง Jemila, Lime and Ice - 12-05-02-0127 - bn_iced_lemonade_jemila.png - - - posi1 + เจมิลามะลิ Jemila Jasmine เจมิลา ชามะลิ และน้ำแข็ง Jemila, Jasmine tea and Ice - 12-02-02-0070 - bn_jasmine_tea_jemila.png - - - posi1 Name=bubble tea,file=page_catalog_group_pro_buble_tea.skt ลาเต้ LATTE กาแฟ นม และ ฟองนม Espresso, Milk, Foamed milk - 12-21-62-0002 12-21-63-0002 diff --git a/video/script3_brew.ev b/video/script3_brew.ev index f49d4078..e6548761 100644 --- a/video/script3_brew.ev +++ b/video/script3_brew.ev @@ -1,74 +1,70 @@ ; Need var brew_vdo2 ; Need var brew_txt2 - -; disable -If RobinsonBeautyPro = 1 Then +DEBUGVAR script3_brewing_ignore +If script3_brewing_ignore = "" Then - - GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv_size - DEBUGVAR brewing_adv_size - If brewing_adv_size = 9358730 Then - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 15 - - Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv11.mp4" - If show_eng = "true" Then - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv11_en.png" - Else - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv11.png" - EndIf - SAVELOG "Play adv11 RobinsonBeautyPro " + If BoxID = 175689 Then + Var ShopeePayLaterOn = 1 + EndIf + If BoxID = 173873 Then + Var ShopeePayLaterOn = 1 + EndIf + If BoxID = 173149 Then + Var ShopeePayLaterOn = 1 + EndIf + If BoxID = 200001 Then + Var ShopeePayLaterOn = 1 EndIf - ; comment for change this file size -EndIf + If SystemDateMonthInt = 9 Then + Var ShopeePayLaterOn = 1 - -If SystemDateMonthInt = 9 Then - Var ShopeePayLaterOn = 1 - - If SystemDateDayInt > 14 Then - Var EDC_ThailandOn = 1 - EndIf -EndIf - - -If SystemDateMonthInt = 10 Then - - Var EDC_ThailandOn = 1 -EndIf - -If SystemDateMonthInt = 11 Then - - Var EDC_ThailandOn = 1 -EndIf - -Var ShopeePayLaterOn = 1 - -If ShopeePayLaterOn = 1 Then - - - GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv_size - DEBUGVAR brewing_adv_size - If brewing_adv_size = 3687715 Then - - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 15 - - Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv12.mp4" - If show_eng = "true" Then - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12_en.png" - Else - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12.png" + If SystemDateDayInt > 14 Then + Var EDC_ThailandOn = 1 EndIf - SAVELOG "Play adv11 ShopeePayLaterOn " EndIf - ; comment for change this file size -EndIf + If SystemDateMonthInt = 10 Then + + Var EDC_ThailandOn = 1 + EndIf + + If SystemDateMonthInt = 11 Then + + Var EDC_ThailandOn = 1 + EndIf + + + If ShopeePayLaterOn = 1 Then + GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv_size + DEBUGVAR brewing_adv_size + If brewing_adv_size = 3687715 Then + + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 15 + + Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv12.mp4" + If show_eng = "true" Then + Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12_en.png" + Else + Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv12.png" + EndIf + SAVELOG "Play adv11 ShopeePayLaterOn " + EndIf + + ; comment for change this file size + + EndIf +Else + Var adver_brewing_play_index = 1 + Var adver_brewing_count_down = 0 + Var SelectMenuBetweenBrewEnable1Blink = "Enable" + Var SelectMenuBetweenBrewEnable1Text = "Enable" + +EndIf diff --git a/video/script3_first_brewing.ev b/video/script3_first_brewing.ev index a68c6d7d..6c0da0d9 100644 --- a/video/script3_first_brewing.ev +++ b/video/script3_first_brewing.ev @@ -1,5 +1,5 @@ -; Need var brew_vdo2 -; Need var brew_txt2 +; Need var brew_vdo1 +; Need var brew_txt1 If BrewingAdvertiseShowSlot = "" Then Var BrewingAdvertiseShowSlot = 0 @@ -25,63 +25,165 @@ If SystemDateMonthInt = 11 Then Var EDC_ThailandOn = 1 EndIf +; +; +; +; +Var ShopeePayLaterOn = 1 +;Var RobinsonBeautyPro = 1 +;Var EDC_ThailandOn = 1 +; +; +; +; +; + +Var BrewingAdvertiseEnable[0] = 0 +Var BrewingAdvertiseEnable[1] = 0 +Var BrewingAdvertiseEnable[2] = 0 +Var BrewingAdvertiseEnable[3] = 0 +Var BrewingAdvertiseEnable[4] = 0 +Var BrewingAdvertiseEnable[5] = 0 DEBUGVAR RobinsonBeautyPro DEBUGVAR EDC_ThailandOn DEBUGVAR ShopeePayLaterOn +Var BrewingAdvertiseRunSlot = 0 -GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv_size -DEBUGVAR brewing_adv_size -If brewing_adv_size = 9358730 Then - +Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 +Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/image/page_doing/tao_adv1.png"; +If show_eng = "true" Then + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv1_en.png" +Else + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv1.png" EndIf -GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv_size -DEBUGVAR brewing_adv_size -If brewing_adv_size = 3687715 Then - +Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 10 +Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 1 + +Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + +If brewing_adv11_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size EndIf - -GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv_size -DEBUGVAR brewing_adv_size -If brewing_adv_size = 9295686 Then - -EndIf - - - -If RobinsonBeautyPro = 1 Then - -EndIf - - -; disable -If RobinsonBeautyPro = 1 Then - - - GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv_size - DEBUGVAR brewing_adv_size - If brewing_adv_size = 9358730 Then - - Var adver_brewing_play_index = 1 - Var adver_brewing_count_down = 15 - - Var brew_vdo2 = "ROOT/taobin_project/video/brewing_adv11.mp4" +DEBUGVAR brewing_adv11_size +If brewing_adv11_size = 9358730 Then + If RobinsonBeautyPro = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11.mp4"; If show_eng = "true" Then - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv11_en.png" + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv11_en.png" Else - Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv11.png" + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv11.png" EndIf - SAVELOG "Play adv11 RobinsonBeautyPro " + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 EndIf +EndIf - ; comment for change this file size +DEBUGVAR BrewingAdvertiseRunSlot -EndIf +If brewing_adv12_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv12.mp4" brewing_adv12_size +EndIf + +DEBUGVAR brewing_adv12_size +If brewing_adv12_size = 3687715 Then + If ShopeePayLaterOn = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv12.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv12_en.png" + Else + Var BrewingAdvertiseImage[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv12.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 15 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + +DEBUGVAR BrewingAdvertiseRunSlot + +If brewing_adv13_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv13.mp4" brewing_adv13_size +EndIf + +DEBUGVAR brewing_adv_size +If brewing_adv13_size = 9295686 Then + If EDC_ThailandOn = 1 Then + Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 + Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv13.mp4"; + If show_eng = "true" Then + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv13_en.png" + Else + Var BrewingAdvertiseImage[BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_txt_adv13.png" + EndIf + + Var BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] = 12 + Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 0 + + Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 + EndIf +EndIf + +DEBUGVAR BrewingAdvertiseShowSlot + +Var brew_vdo1 = BrewingAdvertiseVideo[BrewingAdvertiseShowSlot] +Var brew_txt1 = BrewingAdvertiseImage[BrewingAdvertiseShowSlot] + +Var adver_brewing_count_down = BrewingAdvertiseDurationTime[BrewingAdvertiseShowSlot] + +DEBUGVAR BrewingAdvertiseShowTextNextToOrder[BrewingAdvertiseShowSlot] + +If BrewingAdvertiseShowTextNextToOrder[BrewingAdvertiseShowSlot] = 1 Then + + Var SelectMenuBetweenBrewEnable1Blink = "Enable" + Var SelectMenuBetweenBrewEnable1Text = "Enable" +Else + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1Text = "Invisible" + +EndIf + +DEBUGVAR brew_vdo1 +DEBUGVAR brew_txt1 +DEBUGVAR SelectMenuBetweenBrewEnable1Blink +DEBUGVAR SelectMenuBetweenBrewEnable1Text -Var script3_brewing_ignore = 1 \ No newline at end of file +DEBUGVAR BrewingAdvertiseEnable[0] +DEBUGVAR BrewingAdvertiseEnable[1] +DEBUGVAR BrewingAdvertiseEnable[2] +DEBUGVAR BrewingAdvertiseEnable[3] +DEBUGVAR BrewingAdvertiseEnable[4] + +DEBUGVAR BrewingAdvertiseVideo[0] +DEBUGVAR BrewingAdvertiseVideo[1] +DEBUGVAR BrewingAdvertiseVideo[2] +DEBUGVAR BrewingAdvertiseVideo[3] +DEBUGVAR BrewingAdvertiseVideo[4] + + +Var BrewingAdvertiseShowSlot = BrewingAdvertiseShowSlot + 1 + +DEBUGVAR BrewingAdvertiseEnable[BrewingAdvertiseShowSlot] +If BrewingAdvertiseEnable[BrewingAdvertiseShowSlot] = 0 Then + Var BrewingAdvertiseShowSlot = 0 +EndIf +If BrewingAdvertiseEnable[BrewingAdvertiseShowSlot] = "" Then + Var BrewingAdvertiseShowSlot = 0 +EndIf + +DEBUGVAR BrewingAdvertiseShowSlot + +Var script3_brewing_ignore = "set" \ No newline at end of file diff --git a/video/sync_1.file b/video/sync_1.file index 612f572f..fa55a894 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 166444 +total 166396 -rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4 @@ -20,9 +20,9 @@ total 166444 -rw-rw---- 1 root sdcard_rw 9673549 2024-07-25 10:29 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 1217 2024-07-25 11:20 script1.ev -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev --rw-rw---- 1 root sdcard_rw 1523 2024-08-30 10:53 script3_brew.ev --rw-rw---- 1 root sdcard_rw 1574 2024-08-30 10:37 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-08-30 10:53 sync_1.file +-rw-rw---- 1 root sdcard_rw 1301 2024-08-31 09:25 script3_brew.ev +-rw-rw---- 1 root sdcard_rw 4526 2024-08-31 09:04 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2024-08-23 08:37 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 668fb4c7..143b03b2 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -212,9 +212,6 @@ If BoxID = 105005 Then EndIf - - - Var XMLLiveInfoEnable = 1 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index ed3ddf79..3f79a9ed 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -383,22 +383,7 @@ Var CreditCardVoid = 0 - If InternationalEnable = 1 Then - Var adver_brewing_en = 0 - RootLayoutVisible 3 "hide" - EndIf - If adver_brewing_en = 1 Then - Var adver_brewing_playing = 1 - Var adver_brewing_play_index = 2 - Var adver_brewing_count_down = 10 - Var VideoPlayFile = "ROOT/taobin_project/image/page_doing/tao_adv1.png" - Var PictureFile = brew_txt1 - - TRY "ROOT/taobin_project/video/script3_frist_brewing.ev" - - - EndIf Var CampaignEnable = 0 @@ -594,7 +579,32 @@ EndIf EndIf + + + + If InternationalEnable = 1 Then + Var adver_brewing_en = 0 + RootLayoutVisible 3 "hide" + EndIf + + + If adver_brewing_en = 1 Then + Var adver_brewing_playing = 1 + Var adver_brewing_play_index = 2 + Var adver_brewing_count_down = 10 + Var brew_vdo1 = "ROOT/taobin_project/image/page_doing/tao_adv1.png" + TRY "ROOT/taobin_project/video/script3_first_brewing.ev" + + + Var VideoPlayFile = brew_vdo1 + Var PictureFile = brew_txt1 + + + + EndIf + + Var XPosiShowCountDownBrew = 768 @@ -1456,8 +1466,6 @@ Var PictureFile = brew_txt2 Var PictureFileTextDesctionState = "Invisible" - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 1ce5fcff..3b4ddad1 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.84" - Var XMLPageVersionInt = 884 + Var XMLPageVersion = "8.85" + Var XMLPageVersionInt = 885 ;Oreo Var OreoGuarantee = 0