diff --git a/adv/sync_1.file b/adv/sync_1.file index 9b85366c..904ea877 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,6 +1,6 @@ -total 243020 +total 243024 -rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:36 sync_0.file --rw-rw---- 1 root sdcard_rw 0 2023-08-04 15:30 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2023-08-29 16:56 sync_1.file -rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:24 sync_2.file -rw-rw---- 1 root sdcard_rw 2606 2022-02-03 17:03 sync_4.file -rw-rw---- 1 root sdcard_rw 3028 2022-03-15 10:42 sync_5.file @@ -18,7 +18,7 @@ total 243020 -rw-rw---- 1 root sdcard_rw 2461527 2022-06-10 14:31 taobin_adv_09.mp4 -rw-rw---- 1 root sdcard_rw 2722307 2023-07-11 17:03 taobin_adv_10.mp4 -rw-rw---- 1 root sdcard_rw 2734331 2023-01-09 17:30 taobin_adv_11.mp4 --rw-rw---- 1 root sdcard_rw 260278 2023-03-15 10:45 taobin_adv_12.mp4 +-rw-rw---- 1 root sdcard_rw 257107 2023-08-16 14:53 taobin_adv_12.mp4 -rw-rw---- 1 root sdcard_rw 381590 2023-03-17 17:43 taobin_adv_13.mp4 -rw-rw---- 1 root sdcard_rw 5352097 2023-07-12 13:35 taobin_adv_14.mp4 -rw-rw---- 1 root sdcard_rw 3375224 2023-06-20 11:11 taobin_adv_15.mp4 @@ -39,7 +39,7 @@ total 243020 -rw-rw---- 1 root sdcard_rw 2197656 2022-06-10 14:34 taobin_adv_menu2_09.mp4 -rw-rw---- 1 root sdcard_rw 2444223 2023-07-11 17:03 taobin_adv_menu2_10.mp4 -rw-rw---- 1 root sdcard_rw 2599149 2023-01-09 17:30 taobin_adv_menu2_11.mp4 --rw-rw---- 1 root sdcard_rw 182977 2023-03-15 10:45 taobin_adv_menu2_12.mp4 +-rw-rw---- 1 root sdcard_rw 187326 2023-08-16 14:53 taobin_adv_menu2_12.mp4 -rw-rw---- 1 root sdcard_rw 251935 2023-03-17 17:41 taobin_adv_menu2_13.mp4 -rw-rw---- 1 root sdcard_rw 3630430 2023-07-12 13:40 taobin_adv_menu2_14.mp4 -rw-rw---- 1 root sdcard_rw 2592704 2023-06-20 11:11 taobin_adv_menu2_15.mp4 @@ -60,7 +60,7 @@ total 243020 -rw-rw---- 1 root sdcard_rw 1954754 2022-06-10 14:37 taobin_adv_menu_09.mp4 -rw-rw---- 1 root sdcard_rw 2457487 2023-07-11 17:03 taobin_adv_menu_10.mp4 -rw-rw---- 1 root sdcard_rw 2201341 2023-01-09 17:30 taobin_adv_menu_11.mp4 --rw-rw---- 1 root sdcard_rw 187513 2023-03-15 10:45 taobin_adv_menu_12.mp4 +-rw-rw---- 1 root sdcard_rw 190457 2023-08-16 14:53 taobin_adv_menu_12.mp4 -rw-rw---- 1 root sdcard_rw 258907 2023-03-17 17:45 taobin_adv_menu_13.mp4 -rw-rw---- 1 root sdcard_rw 3868333 2023-07-12 13:39 taobin_adv_menu_14.mp4 -rw-rw---- 1 root sdcard_rw 2641030 2023-06-20 11:11 taobin_adv_menu_15.mp4 diff --git a/app/game/game01.apk b/app/game/game01.apk index d102cc09..b70a2ee5 100644 Binary files a/app/game/game01.apk and b/app/game/game01.apk differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 8edce791..9808d0ac 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -87,6 +87,20 @@ If BoxID = 172053 Then Var MayDayRunEnable = 1 EndIf +If BoxID = 200863 Then + Var TamatianEnable = 1 + Var GameEnableFromTrickerEv = 1 + Var MayDayRunEnable = 1 +EndIf + +If BoxID = 200580 Then + Var TamatianEnable = 1 + Var GameEnableFromTrickerEv = 1 + Var MayDayRunEnable = 1 +EndIf + + + If BoxID = 33170 Then Var PepsiProEnable = 0 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index beb03957..edbb4b05 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -531,11 +531,23 @@ DEBUGVAR Game01Enable DEBUGVAR BREW_CNT If Game01Enable = 1 Then + + If ButtonGameCountDownState = "Enable" Then + If BREW_CNT < 85 Then + If Game01Enable = 1 Then + SAVELOG "Game01Enable set zero event open 2" + EndIf + Var Game01Enable = 0 + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Invisible" + EndIf + EndIf + If BREW_CNT > 82 Then Else If Game01Enable = 1 Then - SAVELOG "Game01Enable set zero event open" + SAVELOG "Game01Enable set zero event open 1" EndIf Var Game01Enable = 0 Var ButtonGamePressToPlayState = "Invisible" @@ -1496,6 +1508,19 @@ EndIf + + If ButtonGameCountDownState = "Enable" Then + If BREW_CNT < 85 Then + If Game01Enable = 1 Then + SAVELOG "Game01Enable set zero event timeout 2" + EndIf + Var Game01Enable = 0 + Var ButtonGameCountDownState = "Invisible" + Var ButtonGamePressToPlayState = "Invisible" + EndIf + EndIf + + DEBUGVAR ButtonGamePressToPlayState DEBUGVAR BREW_CNT If BREW_CNT > 60 Then diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index e01f0b51..6dacd5b0 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -849,8 +849,8 @@ ;Var ShowStawOnly = "Invisible" - Var StrawState = "Disable" - Var LidState = "Disable" + ;Var StrawState = "Disable" + ;Var LidState = "Disable" EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 6ab2b5ea..4a5dd184 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.56" - Var XMLPageVersionInt = 756 + Var XMLPageVersion = "7.57" + Var XMLPageVersionInt = 757 ;Oreo Var OreoGuarantee = 0