diff --git a/adv/sync_1.file b/adv/sync_1.file index 71e9ca2a..98590a5a 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,8 +1,8 @@ -total 131968 --rw-rw---- 1 root sdcard_rw 0 2025-06-12 15:11 sync_1.file +total 133608 +-rw-rw---- 1 root sdcard_rw 0 2025-06-20 21:26 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4 --rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4 +-rw-rw---- 1 root sdcard_rw 9129355 2025-06-18 11:18 taobin_adv_menu_01.mp4 -rw-rw---- 1 root sdcard_rw 7570852 2025-05-16 09:08 taobin_adv_menu_02.mp4 -rw-rw---- 1 root sdcard_rw 11272524 2025-06-12 15:08 taobin_adv_menu_03.mp4 -rw-rw---- 1 root sdcard_rw 1209432 1980-01-01 00:00 taobin_adv_menu_04.mp4 @@ -17,7 +17,7 @@ total 131968 -rw-rw---- 1 root sdcard_rw 258907 2023-09-18 18:44 taobin_adv_menu_13.mp4 -rw-rw---- 1 root sdcard_rw 3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4 -rw-rw---- 1 root sdcard_rw 3178714 1980-01-01 00:00 taobin_adv_menu_15.mp4 --rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4 +-rw-rw---- 1 root sdcard_rw 8649951 2025-06-23 15:01 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4 diff --git a/image/event/americano/americano_banner.mp4 b/image/event/americano/americano_banner.mp4 new file mode 100755 index 00000000..a50b0978 Binary files /dev/null and b/image/event/americano/americano_banner.mp4 differ diff --git a/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json b/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json index c4225431..e8d3c165 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json +++ b/inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json @@ -2,8 +2,8 @@ "start": "2025-07-01T00:00:00", "end": "2025-07-31T00:00:00", "state": "AmericanoProState", - "type": "IMAGE", - "media_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "media_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", + "type": "VIDEO", + "media_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "media_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml\"" } diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml index 238ca8f7..95d4394c 100644 --- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml +++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml @@ -110,13 +110,13 @@ AmericanoProState - IMAGE + VIDEO eval( If show_eng = "true" Then - Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png" + Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4" Else - Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png" + Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4" EndIf ) diff --git a/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml b/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml index 4b484ee3..ab659fb2 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml @@ -83,7 +83,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Banner.png" - Solar God’s\nExplosion + Solar God’s\nExplosion (Americano) ระเบิดเทพสุริยัน - - @@ -94,7 +94,7 @@ Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ\n(อเมริกาโน) - - - @@ -182,10 +182,10 @@ Var PD_CODE2 = "12-01-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Solar God’s\nExplosion" + Var aliasName[0] = "Solar God’s\nExplosion (Americano)" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "ระเบิดเทพสุริยัน" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ\n(อเมริกาโน)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -311,7 +311,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_america_no_Banner.png" - Solar God’s\nExplosion + Solar God’s\nExplosion (Americano) ระเบิดเทพสุริยัน - - @@ -322,7 +322,7 @@ Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ\n(อเมริกาโน) - - - @@ -410,10 +410,10 @@ Var PD_CODE2 = "12-21-02-0001" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Solar God’s\nExplosion" + Var aliasName[0] = "Solar God’s\nExplosion (Americano)" Var aliasDesc[0] = "Espresso, Water" Var aliasName[1] = "ระเบิดเทพสุริยัน" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ\n(อเมริกาโน)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -2819,7 +2819,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blackcoffee_Banner.png" - Lion’s Mountain\nSlayer + Lion’s Mountain\nSlayer (Black Coffee) สิงหลโค่นภูผา - - @@ -2830,7 +2830,7 @@ Dark shot Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ (กาแฟดำ) - - - @@ -2918,10 +2918,10 @@ Var PD_CODE2 = "12-01-02-0081" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Lion’s Mountain\nSlayer" + Var aliasName[0] = "Lion’s Mountain\nSlayer (Black Coffee)" Var aliasDesc[0] = "Dark shot Espresso, Water" Var aliasName[1] = "สิงหลโค่นภูผา" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ (กาแฟดำ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3047,7 +3047,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_blackcoffee_Banner.png" - Lion’s Mountain\nSlayer + Lion’s Mountain\nSlayer (Black Coffee) สิงหลโค่นภูผา - - @@ -3058,7 +3058,7 @@ Dark shot Espresso, Water - กาแฟ และน้ำ + กาแฟ และน้ำ (กาแฟดำ) - - - @@ -3146,10 +3146,10 @@ Var PD_CODE2 = "12-21-02-0081" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Lion’s Mountain\nSlayer" + Var aliasName[0] = "Lion’s Mountain\nSlayer (Black Coffee)" Var aliasDesc[0] = "Dark shot Espresso, Water" Var aliasName[1] = "สิงหลโค่นภูผา" - Var aliasDesc[1] = "กาแฟ และน้ำ" + Var aliasDesc[1] = "กาแฟ และน้ำ (กาแฟดำ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3275,7 +3275,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Americano_Banner.png" - 100 Hp Snow White + 100 Hp Snow White\n(Apple Americano) สโนไวท์ร้อยแรงม้า - - @@ -3286,7 +3286,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล) - - - @@ -3374,10 +3374,10 @@ Var PD_CODE2 = "12-01-02-0088" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "100 Hp Snow White" + Var aliasName[0] = "100 Hp Snow White\n(Apple Americano)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "สโนไวท์ร้อยแรงม้า" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3503,7 +3503,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Americano_Banner.png" - 100 Hp Snow White + 100 Hp Snow White\n(Apple Americano) สโนไวท์ร้อยแรงม้า - - @@ -3514,7 +3514,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล) - - - @@ -3602,10 +3602,10 @@ Var PD_CODE2 = "12-21-02-0088" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "100 Hp Snow White" + Var aliasName[0] = "100 Hp Snow White\n(Apple Americano)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "สโนไวท์ร้อยแรงม้า" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(อเมริกาโนแอปเปิ้ล)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3731,7 +3731,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Frop_Longback_Banner.png" - Firestorm of Colors + Firestorm of Colors\n(Apple Frop Longback) อัคคาสาดสี - - @@ -3742,7 +3742,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ) - - - @@ -3830,10 +3830,10 @@ Var PD_CODE2 = "12-01-02-0091" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Firestorm of Colors" + Var aliasName[0] = "Firestorm of Colors\n(Apple Frop Longback)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "อัคคาสาดสี" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" @@ -3959,7 +3959,7 @@ "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Apple_Frop_Longback_Banner.png" - Firestorm of Colors + Firestorm of Colors\n(Apple Frop Longback) อัคคาสาดสี - - @@ -3970,7 +3970,7 @@ Coffee Apple - กาแฟ แอปเปิ้ล + กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ) - - - @@ -4058,10 +4058,10 @@ Var PD_CODE2 = "12-21-02-0091" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "Firestorm of Colors" + Var aliasName[0] = "Firestorm of Colors\n(Apple Frop Longback)" Var aliasDesc[0] = "Coffee Apple" Var aliasName[1] = "อัคคาสาดสี" - Var aliasDesc[1] = "กาแฟ แอปเปิ้ล" + Var aliasDesc[1] = "กาแฟ แอปเปิ้ล\n(ลองแบล็คแอปเปิ้ลฟรอฟ)" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" diff --git a/video/brewing_adv15.mp4 b/video/brewing_adv15.mp4 index 7ef9c7f1..cd9e7b78 100755 Binary files a/video/brewing_adv15.mp4 and b/video/brewing_adv15.mp4 differ diff --git a/video/brewing_adv15_long.mp4 b/video/brewing_adv15_long.mp4 index 7ef9c7f1..cd9e7b78 100755 Binary files a/video/brewing_adv15_long.mp4 and b/video/brewing_adv15_long.mp4 differ diff --git a/video/brewing_adv16 long.mp4 b/video/brewing_adv16_long.mp4 similarity index 100% rename from video/brewing_adv16 long.mp4 rename to video/brewing_adv16_long.mp4 diff --git a/video/brewing_txt_adv16.png b/video/brewing_txt_adv16.png index d0043d05..69604645 100644 Binary files a/video/brewing_txt_adv16.png and b/video/brewing_txt_adv16.png differ diff --git a/video/brewing_txt_adv16_en.png b/video/brewing_txt_adv16_en.png index 25da78a3..87d2fa17 100644 Binary files a/video/brewing_txt_adv16_en.png and b/video/brewing_txt_adv16_en.png differ diff --git a/video/script1.ev b/video/script1.ev index b1846bc5..420a6c85 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -169,8 +169,8 @@ If brewing_adv15_long_size = "" Then GetFileSizeK "taobin_project/video/brewing_adv15_long.mp4" brewing_adv15_long_size EndIf DEBUGVAR brewing_adv15_long_size -If brewing_adv15_long_size = 13110372 Then - If KingdomThaiTeaPro = 1 Then +If brewing_adv15_long_size = 9336295 Then + If AmericanoPro = 1 Then Var MainAdvertiseFileName[MainAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv15_long.mp4" Var MainAdvertiseVideoEnd[MainAdvertiseRunSlot] = 0 diff --git a/video/sync_1.file b/video/sync_1.file index caccb42a..78987572 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 350212 +total 350088 -rw-rw---- 1 root sdcard_rw 12354151 2025-05-08 10:24 Mixer_proof3.mp4 -rw-rw---- 1 root sdcard_rw 10151578 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3.mp4 -rw-rw---- 1 root sdcard_rw 76993 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3_pause.mp4 @@ -10,10 +10,10 @@ total 350212 -rw-rw---- 1 root sdcard_rw 10365289 2025-06-09 18:13 brewing_adv13_long.mp4 -rw-rw---- 1 root sdcard_rw 9260622 2025-01-09 17:28 brewing_adv14.mp4 -rw-rw---- 1 root sdcard_rw 5353047 2025-01-23 13:08 brewing_adv14_long.mp4 --rw-rw---- 1 root sdcard_rw 9340625 2025-06-16 10:53 brewing_adv15.mp4 --rw-rw---- 1 root sdcard_rw 9340625 2025-06-16 10:53 brewing_adv15_long.mp4 --rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16 long.mp4 +-rw-rw---- 1 root sdcard_rw 9336295 2025-06-24 18:02 brewing_adv15.mp4 +-rw-rw---- 1 root sdcard_rw 9336295 2025-06-24 18:02 brewing_adv15_long.mp4 -rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16.mp4 +-rw-rw---- 1 root sdcard_rw 9254300 2025-06-18 11:19 brewing_adv16_long.mp4 -rw-rw---- 1 root sdcard_rw 9371529 2025-04-30 16:22 brewing_adv17.mp4 -rw-rw---- 1 root sdcard_rw 9371529 2025-04-30 16:22 brewing_adv17_long.mp4 -rw-rw---- 1 root sdcard_rw 9701195 2024-11-28 13:34 brewing_adv21.mp4 @@ -46,11 +46,11 @@ total 350212 -rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 10065192 2025-02-21 16:58 remove_cup_how_to.mp4 --rw-rw---- 1 root sdcard_rw 8500 2025-06-19 10:49 script1.ev +-rw-rw---- 1 root sdcard_rw 8494 2025-06-24 18:27 script1.ev -rw-rw---- 1 root sdcard_rw 1020 2025-04-10 18:50 script2.ev -rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev -rw-rw---- 1 root sdcard_rw 11041 2025-06-11 17:39 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2025-06-19 10:50 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2025-06-20 21:25 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/double_promotion_americano_and_taiwanese_tea.xml b/xml/event/double_promotion_americano_and_taiwanese_tea.xml index 80e1575e..3865fc5f 100644 --- a/xml/event/double_promotion_americano_and_taiwanese_tea.xml +++ b/xml/event/double_promotion_americano_and_taiwanese_tea.xml @@ -66,43 +66,23 @@ 22 484 602 - ;endblock1 diff --git a/xml/event/multi_promotion_config_americano_taiwanese_tea.json b/xml/event/multi_promotion_config_americano_taiwanese_tea.json index f55a81e5..8f2ddafa 100644 --- a/xml/event/multi_promotion_config_americano_taiwanese_tea.json +++ b/xml/event/multi_promotion_config_americano_taiwanese_tea.json @@ -3,12 +3,12 @@ "name": "americano", "template": "/event/promotion_template.inc", "config": { - "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png", - "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png", + "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", + "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4", "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" } }, diff --git a/xml/event/promotion_americano.xml b/xml/event/promotion_americano.xml index 45609328..a4a031f9 100644 --- a/xml/event/promotion_americano.xml +++ b/xml/event/promotion_americano.xml @@ -19155,9 +19155,14 @@ Limenade Soda" 518 BigButtonEnable - "ROOT/taobin_project/image/event/americano/americano_banner.png" - "ROOT/taobin_project/image/event/americano/americano_banner.png" - "ROOT/taobin_project/image/event/americano/americano_banner.png" + Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" diff --git a/xml/event/promotion_template3.inc b/xml/event/promotion_template3.inc index adf7974a..f73bbacc 100644 --- a/xml/event/promotion_template3.inc +++ b/xml/event/promotion_template3.inc @@ -5,11 +5,27 @@ BigButtonEnable ###normal_thai - ###press_thai - ###disable_thai + ###normal_thai + ###normal_thai - - ###EventOnClick - + Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml" + + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh +