diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 7f0c6607..4562aee6 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-0053 1 21 3 4 5 23 24 49 1 23 -SNAKE WIFE AMERICANO 12-01-02-0054 1 56 3 4 5 23 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-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/image/page_drink_disable_n2/bn_iced_Matcha_Haunted_House.png b/image/page_drink_disable_n2/bn_iced_Matcha_Haunted_House.png new file mode 100644 index 00000000..c83d2bac Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_Matcha_Haunted_House.png differ diff --git a/image/page_drink_n/bn_iced_Matcha_Haunted_House.png b/image/page_drink_n/bn_iced_Matcha_Haunted_House.png new file mode 100644 index 00000000..6a175289 Binary files /dev/null and b/image/page_drink_n/bn_iced_Matcha_Haunted_House.png differ diff --git a/image/page_drink_picture2_n/bn_iced_Matcha_Haunted_House.png b/image/page_drink_picture2_n/bn_iced_Matcha_Haunted_House.png new file mode 100644 index 00000000..614768c1 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_Matcha_Haunted_House.png differ diff --git a/image/page_drink_press_n/bn_iced_Matcha_Haunted_House.png b/image/page_drink_press_n/bn_iced_Matcha_Haunted_House.png new file mode 100644 index 00000000..3f0dcb4d Binary files /dev/null and b/image/page_drink_press_n/bn_iced_Matcha_Haunted_House.png differ diff --git a/video/main_page_event.mp4 b/video/main_page_event.mp4 index 43054f34..45fd52f7 100644 Binary files a/video/main_page_event.mp4 and b/video/main_page_event.mp4 differ diff --git a/video/main_page_event_en.mp4 b/video/main_page_event_en.mp4 index d13dbe74..742c36a2 100644 Binary files a/video/main_page_event_en.mp4 and b/video/main_page_event_en.mp4 differ diff --git a/video/script1.ev b/video/script1.ev index eb757788..b6480e60 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -1,22 +1,18 @@ Var MainfileSize = 0 -GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize -DEBUGVAR MainfileSize -If MainfileSize = 12988884 Then - +If SystemDateMonthInt = 4 Then + GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize + DEBUGVAR MainfileSize + If MainfileSize = 8071197 Then + - Var EventTurnOn = 0 - - If SystemDateMonthInt = 2 Then - If SystemDateDayInt < 15 Then - Var EventTurnOn = 1 + 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 + - - If EventTurnOn = 1 Then - Var CountDownShowButton = 0 - Var ShowButtonClickFull = "Invisible" - Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" - EndIf EndIf - diff --git a/video/script2.ev b/video/script2.ev index 812ecfa8..f40c86b6 100644 --- a/video/script2.ev +++ b/video/script2.ev @@ -3,12 +3,12 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize -If MainfileSize = 3939597 Then - - If EventTurnOn = 1 Then +If EventTurnOn = 1 Then + If MainfileSize = 7539282 Then + Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" + EndIf EndIf - DEBUGVAR video_file_name diff --git a/video/taobin_thank1_event.mp4 b/video/taobin_thank1_event.mp4 index eb464024..67c16c54 100644 Binary files a/video/taobin_thank1_event.mp4 and b/video/taobin_thank1_event.mp4 differ diff --git a/xml/eventopen_menu.ev b/xml/eventopen_menu.ev new file mode 100644 index 00000000..98008d76 --- /dev/null +++ b/xml/eventopen_menu.ev @@ -0,0 +1,55 @@ + + +; Original +;Var SoundThaiIndex = 0 +; north +;Var SoundThaiIndex = 1 +; northeast +;Var SoundThaiIndex = 2 +; south +;Var SoundThaiIndex = 3 + +;Var SongkranEnable = 0 + +If BoxID = 173149 Then + Var SongkranEnable = 1 +EndIf +If BoxID = 172527 Then + Var SongkranEnable = 1 +EndIf +If BoxID = 172644 Then + Var SongkranEnable = 1 +EndIf +If BoxID = 200001 Then + Var SongkranEnable = 1 +EndIf + +If SongkranEnable = 1 Then + + If SoundThaiIndex = 0 Then + Var SoundThaiIndex = 1 + Else + If SoundThaiIndex = 1 Then + Var SoundThaiIndex = 2 + Else + If SoundThaiIndex = 2 Then + Var SoundThaiIndex = 3 + Else + Var SoundThaiIndex = 0 + EndIf + EndIf + EndIf +Else + Var SongkranEnable = 0 + Var $12-01-02-0054.Button = "Inivisble" + Var $12-01-02-0053.Button = "Inivisble" + Var $12-02-02-0043.Button = "Inivisble" + Var $12-02-02-0044.Button = "Inivisble" + Var $12-03-02-0026.Button = "Inivisble" + Var $12-05-02-0055.Button = "Inivisble" + Var $12-05-02-0056.Button = "Inivisble" +EndIf + +DEBUGVAR SongkranEnable +DEBUGVAR SoundThaiIndex + diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index 85217a6f..aad27c30 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -103,3 +103,5 @@ EndIf ; + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" diff --git a/xml/page_board.xml b/xml/page_board.xml index 87d71e6b..107b6039 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -782,51 +782,16 @@ Var PromotionOreoToppingFreeEnable = 0 Var ShowPromoitonOreo = 0 EndIf - - - DEBUGVAR PromotionOreoToppingFreeEnable - DEBUGVAR PromotionOreoVolcanoEnable - DEBUGVAR OreoEnable - - DEBUGVAR $12-03-03-0026.Button - - ; Original - ;Var SoundThaiIndex = 0 - ; north - ;Var SoundThaiIndex = 1 - ; northeast - ;Var SoundThaiIndex = 2 - ; south - ;Var SoundThaiIndex = 3 - - If SoundThaiIndex = 0 Then - Var SoundThaiIndex = 1 - Else - If SoundThaiIndex = 1 Then - Var SoundThaiIndex = 2 - Else - If SoundThaiIndex = 2 Then - Var SoundThaiIndex = 3 - Else - Var SoundThaiIndex = 0 - EndIf - EndIf - EndIf - - - DEBUGVAR SoundThaiIndex RootLayoutVisible 3 "hide" - Var PromotionOreoVolcanoEnable = 0 - Var PromotionOreoToppingFreeEnable = 1 + Var SongkranEnable = 0 - Var PromotionOreoVolcanoEnable = 1 - Var PromotionOreoToppingFreeEnable = 0 + Var SongkranEnable = 1 diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index cccaf002..6f9b7700 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -85,9 +85,6 @@ Var PromotionIDCurrentOrder = 0 - DEBUGVAR PromotionOreoToppingFreeEnable - DEBUGVAR PromotionOreoVolcanoEnable - If SystemDateMonthInt = 3 Then If SystemDateDayInt = 30 Then diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 27936687..406234b2 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + If AppFastEnable = "true" Then diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 68f63c48..ba2af102 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu8Selected = "PressForever" diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 9c7292d9..a1124223 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu2Selected = "PressForever" @@ -19226,15 +19228,15 @@ Sugar, Water" ; ==================> Len = 11 - ; - 12-01-02-0052 - + ; - 12-01-02-0053 - 33 22 225 296 - Flag( 12-01-02-0052.Button,$Sum1201020052) + Flag( 12-01-02-0053.Button,$Sum1201020053) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอเลี้ยงจ้ำบ๊ะ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ น้ำ และ น้ำแดง" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "SEXY DANCE AMERICANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso, Salak Syrup, -water" - - - 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-01-02-0052.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0052.Button - StringFmt( $12-01-02-0052.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 $Sum1201020052 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-02-0052.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" - $Sum1201020052 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 11 - ; - 12-01-02-0053 - - - 33 - 22 - 225 - 296 - Flag( 12-01-02-0053.Button,$Sum1201020053) - + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โอยั๊วะเมียงู" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "กาแฟ น้ำ และ กล้วย" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "SNAKE WIFE AMERICANO" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Espresso, Tokyo Banana Syrup, + Water" + + + 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-01-02-0054.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-01-02-0054.Button + StringFmt( $12-01-02-0054.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 $Sum1201020054 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-01-02-0054.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" + $Sum1201020054 + text_unavailable + center-vertical-horizontal + ; - - - diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 5d14e764..8018dcc5 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + ; protein If AppFastEnable = "true" Then diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index d8d55cb0..90c4f587 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu22Selected = "PressForever" diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 4dbc6443..9eeba083 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu4Selected = "PressForever" diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index c75740d7..228f0d8e 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 80f08afa..1b7187e3 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + ; soda and other Var Menu6Selected = "PressForever" @@ -6013,7 +6015,7 @@ SODA" SoundVolume Var NameDrink = "BUCKET POPSICLE PEPSI" - Var NameDrinkTH = "โคล่าติมหลอด" + Var NameDrinkTH = "เป๊ปซี่ไอติมแท่ง" Var DrinkDescriptionTH = "เป๊ปซี่ น้ำแดงกลิ่นสละ โซดา" Var DrinkDescription = "Pepsi, Salak ryrup, soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_bucket_popsicle_pepsi.png" @@ -6084,7 +6086,7 @@ SODA" KanitMediumTTF 0x322B26 showthaiText - "โคล่าติมหลอด" + "เป๊ปซี่ไอติมแท่ง" 16 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index b253ca45..3a951fd0 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu1Selected = "PressForever" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 7dc478ff..2b7dfab3 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + Var Menu3Selected = "PressForever" diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 28868b53..404e464b 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -114,6 +114,8 @@ ; + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" + If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index bcda7b70..2fb65e7d 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -224,7 +224,15 @@ Var NOCashFlag = 1 EndIf + + If SongkranEnable = 1 Then + If UserSelectProductCode = "12-01-02-0053" Then + Var PromotionIDCurrentOrder = 3 + EndIf + EndIf + DEBUGVAR PromotionIDCurrentOrder + diff --git a/xml/page_preview_video.xml b/xml/page_preview_video.xml new file mode 100644 index 00000000..8a267ca2 --- /dev/null +++ b/xml/page_preview_video.xml @@ -0,0 +1,66 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + + Var videoAll = 0 + + + 1000 + + + + + + + + + + + + + + + + + + diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 0df72768..62aa2458 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -308,6 +308,7 @@ Var PromotionIDCurrentOrder = 2 EndIf EndIf + If PromotionOreoToppingFreeEnable = 1 Then @@ -330,6 +331,7 @@ DEBUGVAR PromotionIDCurrentOrder + 1000 @@ -3465,6 +3467,7 @@ If UserSelectProductCode = "-" Then Else + If SelectDrinkType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" @@ -3495,7 +3498,7 @@ Var LastTimeClickOrder = 0 - + @@ -3950,7 +3953,7 @@ 1080 end 0xFF0000 - "#5" + "#6"