From 3db96510bc1a3a58137f999666e0d4615e8c761e Mon Sep 17 00:00:00 2001 From: kong Date: Sun, 26 Mar 2023 21:19:33 +0700 Subject: [PATCH] Release video songkarn --- animation01/play_list.tsv | 4 +- video/script1.ev | 19 +- video/sync_1.file | 21 +-- xml/page_catalog_group_coffee.xml | 10 +- xml/page_catalog_group_recommend.xml | 18 +- xml/page_catalog_group_tea.xml | 248 +++++++++++++++++++++++++++ 6 files changed, 286 insertions(+), 34 deletions(-) diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 4562aee6..093e2eb1 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -372,8 +372,8 @@ OPUS-ONE-ESP 12-01-01-0049 1 2 59 3 3 5 24 49 1 23 -น้ำเมียงู 12-01-02-0054 1 21 3 4 5 23 24 49 1 23 -SNAKE WIFE AMERICANO 12-01-02-0053 1 56 3 4 5 23 24 49 1 23 +น้ำเมียงู 12-01-02-0054 1 56 3 4 5 23 24 49 1 23 +SNAKE WIFE AMERICANO 12-01-02-0053 1 21 3 4 5 23 24 49 1 23 ชาดำปาโป่ง 12-02-02-0043 1 10 12 23 13 24 49 1 23 บ้านผีปอบ 12-02-02-0044 1 19 8 9 23 13 24 49 1 23 โอวัลตินรถโรงเรียน 12-03-02-0026 1 51 17 23 24 49 1 23 diff --git a/video/script1.ev b/video/script1.ev index b6480e60..94cf16b7 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,18 +1,21 @@ Var MainfileSize = 0 +DEBUGVAR BoxID +If BoxID = 173149 Then + Var EventTurnOn = 1 +EndIf + If SystemDateMonthInt = 4 Then GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize DEBUGVAR MainfileSize If MainfileSize = 8071197 Then - Var EventTurnOn = 1 - - If EventTurnOn = 1 Then - Var CountDownShowButton = 0 - Var ShowButtonClickFull = "Invisible" - Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" - EndIf + EndIf - +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/sync_1.file b/video/sync_1.file index 613f783d..f346f5db 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,17 +1,18 @@ -total 76360 +total 104512 -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 8321419 2023-03-10 14:23 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-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 19087285 2023-01-23 16:15 main_page_en.mp4 +-rw-rw---- 1 root sdcard_rw 8071197 2023-03-16 17:27 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 8071833 2023-03-16 17:26 main_page_event_en.mp4 +-rw-rw---- 1 root sdcard_rw 455 2023-03-26 21:18 script1.ev +-rw-rw---- 1 root sdcard_rw 295 2023-03-23 15:22 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:08 sync_1.file -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 3939597 2023-02-02 09:36 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 7539282 2023-03-16 10:25 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/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index a1124223..c779b8b1 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -2798,7 +2798,7 @@ Note: Strawberry & Floral" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0046 - - 33 @@ -3052,7 +3052,7 @@ ESPRESSO" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0049 - - 33 @@ -6100,7 +6100,7 @@ Note: Blue Berry & Floral" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0044 12-01-02-0044 - 33 @@ -6356,7 +6356,7 @@ Note: Strawberry & Floral" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0047 12-01-02-0047 - 33 @@ -6610,7 +6610,7 @@ AMERICANO" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0050 12-01-02-0050 - 33 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 3a951fd0..22517d41 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -5128,7 +5128,7 @@ Note: Strawberry & Floral" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0046 - - 33 @@ -5382,7 +5382,7 @@ ESPRESSO" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0049 - - 33 @@ -7937,7 +7937,7 @@ Pink​ Rose & Berry" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0044 12-01-02-0044 - 33 @@ -8193,7 +8193,7 @@ Note: Strawberry & Floral" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0047 12-01-02-0047 - 33 @@ -8447,7 +8447,7 @@ AMERICANO" ; - - - - ; ==================> Len = 14 + ; ==================> Len = 16 ; 12-01-01-0050 12-01-02-0050 - 33 @@ -8457,9 +8457,9 @@ AMERICANO" Flag( 12-01-01-0050.Button,12-01-02-0050.Button,Disable=Invisible,$Sum12010100501201020050) + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชาเขียวบ้านผีปอบ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชาเขียว น้ำเชื่อมสตรอเบอรี โซดา" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "MATCHA HAUNTED HOUSE " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Match, Strawberry Syrup,Soda" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0044.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0044.Button + StringFmt( $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1202020044 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0044.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1202020044 + text_unavailable + center-vertical-horizontal + ; - - -