diff --git a/animation01/sync_1.file b/animation01/sync_1.file index 20f17bbd..a989b25c 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,4 +1,4 @@ -total 249512 +total 249484 -rw-rw---- 1 root sdcard_rw 948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4 @@ -58,5 +58,5 @@ total 249512 -rw-rw---- 1 root sdcard_rw 3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4 -rw-rw---- 1 root sdcard_rw 9159813 2024-09-04 13:55 TaoBinShowCoffeeProcess.mp4 -rw-rw---- 1 root sdcard_rw 326 2024-08-26 13:31 last-cmd --rw-rw---- 1 root sdcard_rw 71508 2024-09-27 13:25 play_list.tsv --rw-rw---- 1 root sdcard_rw 0 2024-09-27 13:27 sync_1.file +-rw-rw---- 1 root sdcard_rw 71508 2024-09-27 14:02 play_list.tsv +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:06 sync_1.file diff --git a/inc/remove_cup_step.inc b/inc/remove_cup_step.inc index b6a68bbe..b0b5d4bc 100644 --- a/inc/remove_cup_step.inc +++ b/inc/remove_cup_step.inc @@ -3,7 +3,7 @@ DEBUGVAR TimeoutForProtectButtonHideLongTime Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1 -If TimeoutForProtectButtonHideLongTime > 120 Then +If TimeoutForProtectButtonHideLongTime > 60 Then Var TimeoutForProtectButtonHideLongTime = 0 If buttonRemoveCup = "Enable" Then diff --git a/ui/lang.tsv b/ui/lang.tsv index a5f39d20..f70f9e69 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -1063,7 +1063,7 @@ 1300003 Beans module ชุดเมล็ดกาแฟ 1300004 Bean tray ถาดใส่เมล็ดกาแฟ 1300005 Switch tray : สวิตซ์ถาด : -1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด +1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด 1300007 Pay beans จ่ายถั่ว 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง diff --git a/video/sync_1.file b/video/sync_1.file index fecd02de..1656df8b 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 184336 +total 184296 -rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 3687715 2024-08-19 16:53 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4 @@ -27,8 +27,8 @@ total 184336 -rw-rw---- 1 root sdcard_rw 1217 2024-07-25 11:20 script1.ev -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev -rw-rw---- 1 root sdcard_rw 1401 2024-09-02 10:37 script3_brew.ev --rw-rw---- 1 root sdcard_rw 7084 2024-09-27 13:02 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-09-27 13:02 sync_1.file +-rw-rw---- 1 root sdcard_rw 7066 2024-09-27 13:23 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:06 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/tricker.ev b/xml/event/tricker.ev index e97e60ec..ad0c846d 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -439,7 +439,7 @@ EndIf ; If BoxID > 200000 Then - If BoxID < 200520 Then + If BoxID < 201020 Then Var New_Payment = 1 Var NewFlowPaymentCode = 1 EndIf diff --git a/xml/menutab/event/promotion_energy_drink_1_bath.xml b/xml/menutab/event/promotion_energy_drink_1_bath.xml index f2e1070c..c2362345 100644 --- a/xml/menutab/event/promotion_energy_drink_1_bath.xml +++ b/xml/menutab/event/promotion_energy_drink_1_bath.xml @@ -348,6 +348,7 @@ 102