diff --git a/app/game/game01.apk b/app/game/game01.apk index 23481350..309bf5b3 100644 Binary files a/app/game/game01.apk and b/app/game/game01.apk differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index d5fd05f2..f62c1ca5 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -65,7 +65,7 @@ Name=Coffee,file=page_catalog_group_coffee.skt อเมริกาโน \nBLUE DADDY BLUE DADDY \nAMERICANO Washed process \nหอมบลูเบอร์รี และดอกไม้ Washed process \nNote: Blue Berry & Floral 12-01-01-0019 12-01-02-0019 - bn_hot_americano_light_bluedaddy.png - - - #N/A #N/A - #N/A #N/A อเมริกาโน \nCHOPIN CHOPIN \nAMERICANO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0044 12-01-02-0044 - bn_hot_americano_light_chopin.png - - - #N/A #N/A - #N/A #N/A อเมริกาโน \nMANDARINE MANDARINE \nAMERICANO กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar. 12-01-01-0047 12-01-02-0047 - bn_hot_americano_light_Mandarine.png - - - #N/A #N/A - #N/A #N/A - อเมริกาโน \nOPUS ONE OPUS ONE \nAMERICANO กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint. 12-01-01-0050 12-01-02-0050 - bn_hot_americano_light_chopin.png - - - #N/A #N/A - #N/A #N/A + อเมริกาโน \nOPUS ONE OPUS ONE \nAMERICANO กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint. 12-01-01-0050 12-01-02-0050 - bn_hot_americano_light_opus_one.png - - - #N/A #N/A - #N/A #N/A อเมริกาโน \nMOZART MOZART \nAMERICANO Raisin Honey process \nหอมสตรอว์เบอร์รี กุหลาบ มะลิ Raisin Honey process \nNote: Strawberry & Floral 12-01-01-0021 12-01-02-0021 - bn_hot_americano_light_mozart.png - - - #N/A #N/A - #N/A #N/A อเมริกาโน \nWHISKY DUDE WHISKY DUDE \nAMERICANO Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา Washed Sherry cask ferment \nNote: Whisky & Vanilla 12-01-01-0025 12-01-02-0025 - bn_hot_americano_light_whiskydude.png - - - #N/A #N/A - #N/A #N/A อเมริกาโน\nSNOWWHITE SNOWWHITE \nAMERICANO Anaerobic process \nหอมมะลิ น้ำผึ้ง เมเปิล Anaerobic process \nNote: Jasmine & Honey 12-01-01-0023 12-01-02-0023 - bn_hot_americano_light_snowwhite.png - - - #N/A #N/A - #N/A #N/A diff --git a/menu/page_catalog_group_pro_melon.skt b/menu/page_catalog_group_pro_melon.skt deleted file mode 100644 index 441a25f7..00000000 --- a/menu/page_catalog_group_pro_melon.skt +++ /dev/null @@ -1,34 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - - - Var Timeout = 0 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/video/sync_1.file b/video/sync_1.file index 801a77bd..33db7486 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 154284 +total 145944 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 -rw-rw---- 1 root sdcard_rw 9526548 2023-06-30 10:44 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9693030 2023-09-05 11:38 brewing_adv4.mp4 @@ -9,21 +9,20 @@ total 154284 -rw-rw---- 1 root sdcard_rw 35492 2023-09-05 14:42 brewing_txt_adv4.png -rw-rw---- 1 root sdcard_rw 31414 2023-09-05 14:41 brewing_txt_adv4_en.png -rw-rw---- 1 root sdcard_rw 6546655 2023-09-01 17:20 event_1.mp4 --rw-rw---- 1 root sdcard_rw 7265712 2021-03-06 13:03 main_page.mp4 +-rw-rw---- 1 root sdcard_rw 23054056 2023-09-12 15:54 event_2.mp4 +-rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 -rw-rw---- 1 root sdcard_rw 19087285 2023-01-23 16:15 main_page_en.mp4 -rw-rw---- 1 root sdcard_rw 11040774 2023-08-09 17:39 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 7185758 2023-05-23 11:02 main_page_event_en.mp4 -rw-rw---- 1 root sdcard_rw 527 2023-08-09 17:56 script1.ev -rw-rw---- 1 root sdcard_rw 384 2023-08-25 16:57 script2.ev -rw-rw---- 1 root sdcard_rw 900 2023-09-05 14:58 script3_brew.ev --rw-rw---- 1 root sdcard_rw 0 2023-09-05 15:22 sync_1.file --rw-rw---- 1 root sdcard_rw 14168973 2021-02-19 17:11 taobin_adv1.mp4 --rw-rw---- 1 root sdcard_rw 9135672 2021-02-16 17:41 taobin_adv2.mp4 --rw-rw---- 1 root sdcard_rw 8980019 2021-03-05 13:35 taobin_adv2_1.mp4 --rw-rw---- 1 root sdcard_rw 13986695 2021-03-01 15:58 taobin_adv3.mp4 +-rw-rw---- 1 root sdcard_rw 0 2023-09-04 21:03 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 7137292 2023-08-10 10:33 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/event/tricker.ev b/xml/event/tricker.ev index bd0fbc25..f319238d 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -1,6 +1,6 @@ - +; Thailand ;DEBUGVAR SystemDateMonthInt ;DEBUGVAR SystemDateDayInt @@ -158,6 +158,21 @@ If BoxID = 33170 Then EndIf +Var adver_brewing_video_full_file_name = "" +DEBUGVAR TamatianEnable +If TamatianEnable = 1 Then + If BrewingAdvPlayfileSize = "" Then + GetFileSizeK "taobin_project/video/event_2.mp4" BrewingAdvPlayfileSize + EndIf + + DEBUGVAR BrewingAdvPlayfileSize + + If BrewingAdvPlayfileSize = 23054056 Then + Var adver_brewing_video_full_file_name = "ROOT/taobin_project/video/event_2.mp4" + EndIf + DEBUGVAR adver_brewing_video_full_file_name +EndIf + If InternationalEnable = 1 Then Var GameEnableFromTrickerEv = 0 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 6b95cb94..339dfe97 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -14,6 +14,7 @@ SAVELOG "page_brewing3.xml" DEBUGVAR MachineStage + Var PictureFileTextDesctionState = "Enable" If CART_COUNT >= 1 Then @@ -409,6 +410,7 @@ DEBUGVAR SelectMenuBetweenBrewEnable1 DEBUGVAR SelectMenuBetweenBrewEnable2 + Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1 ; echo 1 > /mnt/sdcard/game_enable @@ -1286,6 +1288,7 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf If SelectMenuBetweenBrewEnable1 = "Enable" Then @@ -1313,6 +1316,7 @@ ; animation video loop If AnimationOn = "true" Then + If adver_brewing_playing = 1 Then DEBUGVAR adver_brewing_play_index @@ -1356,88 +1360,111 @@ If adver_brewing_count_down = 0 Then Var adver_brewing_play_index = 0 - Var adver_brewing_playing = 0 + If adver_brewing_video_full_file_name = "" Then + Var adver_brewing_playing = 0 + Else + Var adver_brewing_playing = 2 + EndIf EndIf EndIf Else - - Var CountUpBrewing = CountUpBrewing + 1 - - ;CampaignEnable - Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime - - If PreviseStepVideo = SlotVideo Then - ;SAVELOG SlotVideo - Else - Var PreviseStepVideo = SlotVideo - ;SAVELOG PreviseStepVideo - ;SAVELOG SlotVideo - ;SAVELOG CountUpBrewing - - ;Var CountDownVideoTime = CountDownVideoTimeReload - - Var StepVideo = SlotVideo + 2 - - ;SAVELOG StepVideo - - If StepVideo = 1 Then - Var videoID = VideoID1 - EndIf - If StepVideo = 2 Then - Var videoID = VideoID2 - EndIf - If StepVideo = 3 Then - Var videoID = VideoID3 - EndIf - If StepVideo = 4 Then - Var videoID = VideoID4 - EndIf - If StepVideo = 5 Then - Var videoID = VideoID5 - EndIf - If StepVideo = 6 Then - Var videoID = VideoID6 - EndIf - If StepVideo = 7 Then - Var videoID = VideoID7 - EndIf - If StepVideo = 8 Then - Var videoID = VideoID8 - EndIf - If StepVideo = 9 Then - Var videoID = VideoID9 - EndIf - - ;SAVELOG videoID - - If videoID = 0 Then - + If adver_brewing_playing = 2 Then + DEBUGVAR adver_brewing_video_full_file_name + If adver_brewing_video_full_file_name = "" Then + Var adver_brewing_playing = 0 Else - If videoID = "---" Then + Var VideoPlayFile = adver_brewing_video_full_file_name + Var PictureFile = brew_txt2 + Var PictureFileTextDesctionState = "Invisible" + + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1Text = "Invisible" + EndIf + + + + + Else + + Var CountUpBrewing = CountUpBrewing + 1 + + ;CampaignEnable + Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime + + If PreviseStepVideo = SlotVideo Then + ;SAVELOG SlotVideo + Else + Var PreviseStepVideo = SlotVideo + ;SAVELOG PreviseStepVideo + ;SAVELOG SlotVideo + ;SAVELOG CountUpBrewing + + ;Var CountDownVideoTime = CountDownVideoTimeReload + + Var StepVideo = SlotVideo + 2 + + ;SAVELOG StepVideo + + If StepVideo = 1 Then + Var videoID = VideoID1 + EndIf + If StepVideo = 2 Then + Var videoID = VideoID2 + EndIf + If StepVideo = 3 Then + Var videoID = VideoID3 + EndIf + If StepVideo = 4 Then + Var videoID = VideoID4 + EndIf + If StepVideo = 5 Then + Var videoID = VideoID5 + EndIf + If StepVideo = 6 Then + Var videoID = VideoID6 + EndIf + If StepVideo = 7 Then + Var videoID = VideoID7 + EndIf + If StepVideo = 8 Then + Var videoID = VideoID8 + EndIf + If StepVideo = 9 Then + Var videoID = VideoID9 + EndIf + + ;SAVELOG videoID + + If videoID = 0 Then Else + If videoID = "---" Then - Var VideoPlayFile = VideoPath - Var VideoPlayFile = VideoPlayFile + VideoFileBegin - Var VideoPlayFile = VideoPlayFile + videoID - Var VideoPlayFile = VideoPlayFile + VideoFileEnd + Else - Var PictureFile = PicturePath - Var PictureFile = PictureFile + PictureBegin - Var PictureFile = PictureFile + videoID - Var PictureFile = PictureFile + PictureEnd - - DEBUGVAR VideoPlayFile - DEBUGVAR PictureFile + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + videoID + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + Var PictureFile = PicturePath + Var PictureFile = PictureFile + PictureBegin + Var PictureFile = PictureFile + videoID + Var PictureFile = PictureFile + PictureEnd + + DEBUGVAR VideoPlayFile + DEBUGVAR PictureFile + EndIf EndIf EndIf EndIf EndIf ; CampaignEnable EndIf + ; AnimationOn = true If IgnoreNetCore = "true" Then @@ -1603,11 +1630,19 @@ EndIf + + + + 60 + 1290 + PictureFileTextDesctionState" + PictureFile + + +