diff --git a/image/event/bd_3anniversary_oreo_en.png b/image/event/bd_3anniversary_oreo_en.png new file mode 100644 index 00000000..bbcbcd41 Binary files /dev/null and b/image/event/bd_3anniversary_oreo_en.png differ diff --git a/image/event/bd_3anniversary_oreo_th.png b/image/event/bd_3anniversary_oreo_th.png new file mode 100644 index 00000000..a6311617 Binary files /dev/null and b/image/event/bd_3anniversary_oreo_th.png differ diff --git a/image/event/bn_3anniversary_oreo_en.png b/image/event/bn_3anniversary_oreo_en.png new file mode 100644 index 00000000..766e42e8 Binary files /dev/null and b/image/event/bn_3anniversary_oreo_en.png differ diff --git a/image/event/bn_3anniversary_oreo_th.png b/image/event/bn_3anniversary_oreo_th.png new file mode 100644 index 00000000..e4b9b3ea Binary files /dev/null and b/image/event/bn_3anniversary_oreo_th.png differ diff --git a/image/event/image_template1 b/image/event/image_template1 index e3b890aa..9e9db508 100644 --- a/image/event/image_template1 +++ b/image/event/image_template1 @@ -1,6 +1,6 @@ -normal_eng=ROOT/taobin_project/image/event/welcomedrink_en.png -normal_thai=ROOT/taobin_project/image/event/welcomedrink.png -press_eng=ROOT/taobin_project/image/event/welcomedrink_en.png -press_thai=ROOT/taobin_project/image/event/welcomedrink.png -disable_eng=ROOT/taobin_project/image/event/welcomedrink_en.png -disable_thai=ROOT/taobin_project/image/event/welcomedrink.png +normal_eng=ROOT/taobin_project/image/event/bn_3anniversary_oreo_en.png +normal_thai=ROOT/taobin_project/image/event/bn_3anniversary_oreo_th.png +press_eng=ROOT/taobin_project/image/event/bn_3anniversary_oreo_en.png +press_thai=ROOT/taobin_project/image/event/bn_3anniversary_oreo_th.png +disable_eng=ROOT/taobin_project/image/event/bd_3anniversary_oreo_en.png +disable_thai=ROOT/taobin_project/image/event/bd_3anniversary_oreo_th.png diff --git a/image/event/welcomedrink.png b/image/event/welcomedrink.png deleted file mode 100644 index 0b61a1c5..00000000 Binary files a/image/event/welcomedrink.png and /dev/null differ diff --git a/image/event/welcomedrink_en.png b/image/event/welcomedrink_en.png deleted file mode 100644 index 370b82b1..00000000 Binary files a/image/event/welcomedrink_en.png and /dev/null differ diff --git a/image/liveness/bg3_.png b/image/liveness/bg3_.png new file mode 100644 index 00000000..f4a5052b Binary files /dev/null and b/image/liveness/bg3_.png differ diff --git a/image/programmer.png b/image/programmer.png new file mode 100644 index 00000000..26eced4e Binary files /dev/null and b/image/programmer.png differ diff --git a/video/sync_1.file b/video/sync_1.file index 079ae535..f6c79886 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,15 +1,17 @@ -total 90200 +total 135172 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 --rw-rw---- 1 root sdcard_rw 7057670 2023-06-07 10:20 brewing_adv3.mp4 --rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 +-rw-rw---- 1 root sdcard_rw 10307404 2023-07-19 10:04 brewing_adv3.mp4 +-rw-rw---- 1 root sdcard_rw 7265712 2021-03-06 13:03 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 7184295 2023-05-23 11:02 main_page_event.mp4 -rw-rw---- 1 root sdcard_rw 7185758 2023-05-23 11:02 main_page_event_en.mp4 --rw-rw---- 1 root sdcard_rw 587 2023-06-09 13:35 script1.ev --rw-rw---- 1 root sdcard_rw 322 2023-06-13 13:21 script2.ev --rw-rw---- 1 root sdcard_rw 0 2023-06-13 03:04 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 523 2023-07-13 21:51 script1.ev +-rw-rw---- 1 root sdcard_rw 405 2023-06-14 16:29 script2.ev +-rw-rw---- 1 root sdcard_rw 0 2023-07-19 14:49 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 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 diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 54f9ba18..e65a6a7c 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -81,12 +81,7 @@ EndIf If SystemDateMonthInt = 7 Then - If SystemDateDayInt = 24 Then - Var OreoWelcomeDrinkEnable = 1 - EndIf - If SystemDateDayInt = 25 Then - Var OreoWelcomeDrinkEnable = 1 - EndIf + If SystemDateDayInt = 26 Then Var OreoWelcomeDrinkEnable = 1 EndIf @@ -108,6 +103,37 @@ If SystemDateMonthInt = 7 Then EndIf + + +If SystemDateMonthInt = 8 Then + + If SystemDateDayInt = 1 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + If SystemDateDayInt = 2 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + If SystemDateDayInt = 3 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + If SystemDateDayInt = 4 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + If SystemDateDayInt = 5 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + If SystemDateDayInt = 6 Then + Var OreoWelcomeDrinkEnable = 1 + EndIf + +EndIf + +;/mnt/sdcard/oreo_for_free_limit + + + + + If SystemDateMonthInt = 7 Then If SystemDateDayInt > 19 Then If SystemDateDayInt < 30 Then @@ -120,6 +146,8 @@ If SystemDateMonthInt = 7 Then EndIf + + If BoxID = 173149 Then Var MysteryProEnable = 0 Var OreoWelcomeDrinkEnable = 1 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 4a045f7f..f4e9b245 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -1157,7 +1157,7 @@ Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 0 - If brewing_adv_size = 8854143 Then + If brewing_adv_size = 10307404 Then If Anniversary3VideoEnable = 1 Then Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 20 diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index dd6c60e1..e80e2b4e 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -233,7 +233,9 @@ Var LivenessShowString = "Pass " Var load_gif_stage = "Enable" - CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" 170 FrameOfFaceCropImageYPosition 380 500 "/mnt/sdcard/camera1.jpg" + ;CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" 170 FrameOfFaceCropImageYPosition 380 500 "/mnt/sdcard/camera1.jpg" + + CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" LivenessFramePositionX FrameOfFaceCropImageYPosition 200 200 "/mnt/sdcard/camera1.jpg" Open "ROOT/taobin_project/xml/page_face_compare.xml" EndIff @@ -437,6 +439,8 @@ LivenessFramePositionX FrameOfFaceYPosition + 200 + 200 CameraStage "ROOT/taobin_project/image/liveness/bg3.png"