diff --git a/app/game/game01.tgz.aa b/app/game/game01.tgz.aa index 9dfad902..e8f35f7a 100644 Binary files a/app/game/game01.tgz.aa and b/app/game/game01.tgz.aa differ diff --git a/app/game/game01.tgz.ab b/app/game/game01.tgz.ab index 22c99e1a..a62135a4 100644 Binary files a/app/game/game01.tgz.ab and b/app/game/game01.tgz.ab differ diff --git a/app/game/game01.tgz.ac b/app/game/game01.tgz.ac index 0e11575c..cafe7f1c 100644 Binary files a/app/game/game01.tgz.ac and b/app/game/game01.tgz.ac differ diff --git a/app/game/game01.tgz.ad b/app/game/game01.tgz.ad index 361e4a67..162fdfaa 100644 Binary files a/app/game/game01.tgz.ad and b/app/game/game01.tgz.ad differ diff --git a/app/game/game01.tgz.ae b/app/game/game01.tgz.ae index 4d1d7202..4a9cc2c6 100644 Binary files a/app/game/game01.tgz.ae and b/app/game/game01.tgz.ae differ diff --git a/app/game/game01.tgz.af b/app/game/game01.tgz.af new file mode 100644 index 00000000..d6858a3a Binary files /dev/null and b/app/game/game01.tgz.af differ diff --git a/app/game/game01.tgz.ag b/app/game/game01.tgz.ag new file mode 100644 index 00000000..101d2b08 Binary files /dev/null and b/app/game/game01.tgz.ag differ diff --git a/app/game/game01.tgz.ah b/app/game/game01.tgz.ah new file mode 100644 index 00000000..b957a2b5 Binary files /dev/null and b/app/game/game01.tgz.ah differ diff --git a/app/game/game01.tgz.ai b/app/game/game01.tgz.ai new file mode 100644 index 00000000..1e6d9b05 Binary files /dev/null and b/app/game/game01.tgz.ai differ diff --git a/app/game/sync_1.file b/app/game/sync_1.file index 0627fcdd..df447aba 100644 --- a/app/game/sync_1.file +++ b/app/game/sync_1.file @@ -1,16 +1,16 @@ total 94764 -rw-rw---- 1 root sdcard_rw 4081021 2024-02-11 21:51 TAMATIAN-01.gif -rw-rw---- 1 root sdcard_rw 4778152 2024-08-23 13:54 TAMATIAN-01_en.gif --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.aa --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ab --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ac --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ad --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ae --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.af --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ag --rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 16:32 game01.tgz.ah --rw-rw---- 1 root sdcard_rw 4200190 2021-03-19 16:32 game01.tgz.ai +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.aa +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ab +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ac +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ad +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ae +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.af +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ag +-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ah +-rw-rw---- 1 root sdcard_rw 4200190 2024-10-16 14:12 game01.tgz.ai -rw-rw---- 1 root sdcard_rw 82 2024-02-11 21:51 last-cmd -rw-rw---- 1 root sdcard_rw 10 2024-02-11 21:51 need_upgrade -rw-rw---- 1 root sdcard_rw 402 2024-02-11 21:51 readme --rw-rw---- 1 root sdcard_rw 0 2021-03-19 16:32 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2024-10-16 14:12 sync_1.file diff --git a/image/page_doing/brewing_txt_adv11.png b/image/page_doing/brewing_txt_adv11.png index d1141d91..10124675 100644 Binary files a/image/page_doing/brewing_txt_adv11.png and b/image/page_doing/brewing_txt_adv11.png differ diff --git a/image/page_doing/brewing_txt_adv11_en.png b/image/page_doing/brewing_txt_adv11_en.png index 1c02f7a8..4a0ba91e 100644 Binary files a/image/page_doing/brewing_txt_adv11_en.png and b/image/page_doing/brewing_txt_adv11_en.png differ diff --git a/inter/tha/.special/RoadShow.ev b/inter/tha/.special/RoadShow.ev index faa7c18a..4d8d4676 100644 --- a/inter/tha/.special/RoadShow.ev +++ b/inter/tha/.special/RoadShow.ev @@ -13,28 +13,13 @@ If SystemDateYearInt = 2024 Then DEBUGVAR SystemTimeHourInt If BoxID = 201193 Then - If SystemDateDayInt = 18 Then - Var RoadShow = "true" - EndIf + Var HalloweenPro = 1 EndIf - If BoxID = 201316 Then - If SystemDateDayInt = 18 Then - Var RoadShow = "true" - EndIf + If BoxID = 173249 Then + Var HalloweenPro = 1 EndIf - If BoxID = 201193 Then - If SystemDateDayInt = 19 Then - Var RoadShow = "true" - EndIf - EndIf - - If BoxID = 201316 Then - If SystemDateDayInt = 19 Then - Var RoadShow = "true" - EndIf - EndIf EndIf diff --git a/video/brewing_adv11.mp4 b/video/brewing_adv11.mp4 index ae97814c..4ae7e27f 100755 Binary files a/video/brewing_adv11.mp4 and b/video/brewing_adv11.mp4 differ diff --git a/video/brewing_txt_adv11.png b/video/brewing_txt_adv11.png index d1141d91..10124675 100644 Binary files a/video/brewing_txt_adv11.png and b/video/brewing_txt_adv11.png differ diff --git a/video/brewing_txt_adv11_en.png b/video/brewing_txt_adv11_en.png index 1c02f7a8..4a0ba91e 100644 Binary files a/video/brewing_txt_adv11_en.png and b/video/brewing_txt_adv11_en.png differ diff --git a/video/script3_first_brewing.ev b/video/script3_first_brewing.ev index 2b14b377..0cd8e6c9 100644 --- a/video/script3_first_brewing.ev +++ b/video/script3_first_brewing.ev @@ -72,14 +72,15 @@ Var BrewingAdvertiseShowTextNextToOrder[ BrewingAdvertiseRunSlot] = 1 Var BrewingAdvertiseRunSlot = BrewingAdvertiseRunSlot + 1 -; RobinsonBeautyPro for test -;If brewing_adv11_size = "" Then -; GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size -;EndIf +If brewing_adv11_size = "" Then + GetFileSizeK "taobin_project/video/brewing_adv11.mp4" brewing_adv11_size +EndIf + +Var HalloweenPro = 1 DEBUGVAR brewing_adv11_size -If brewing_adv11_size = 9358730 Then - If RobinsonBeautyPro = 1 Then +If brewing_adv11_size = 9800005 Then + If HalloweenPro = 1 Then Var BrewingAdvertiseEnable[ BrewingAdvertiseRunSlot] = 1 Var BrewingAdvertiseVideo[ BrewingAdvertiseRunSlot] = "ROOT/taobin_project/video/brewing_adv11.mp4"; If show_eng = "true" Then diff --git a/video/sync_1.file b/video/sync_1.file index e60613b7..4eeca675 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,5 +1,5 @@ -total 189932 --rw-rw---- 1 root sdcard_rw 9358730 2024-08-21 16:00 brewing_adv11.mp4 +total 190372 +-rw-rw---- 1 root sdcard_rw 9800005 2024-10-10 14:37 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 9295686 2024-08-27 11:33 brewing_adv13.mp4 -rw-rw---- 1 root sdcard_rw 9673549 2024-07-25 10:29 brewing_adv14.mp4 @@ -7,8 +7,8 @@ total 189932 -rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9368231 2024-07-19 15:00 brewing_adv4.mp4 -rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png --rw-rw---- 1 root sdcard_rw 51866 2024-08-29 11:30 brewing_txt_adv11.png --rw-rw---- 1 root sdcard_rw 50184 2024-08-29 11:31 brewing_txt_adv11_en.png +-rw-rw---- 1 root sdcard_rw 60184 2024-10-16 16:35 brewing_txt_adv11.png +-rw-rw---- 1 root sdcard_rw 53138 2024-10-16 16:35 brewing_txt_adv11_en.png -rw-rw---- 1 root sdcard_rw 43166 2024-08-29 11:31 brewing_txt_adv12.png -rw-rw---- 1 root sdcard_rw 42692 2024-08-29 11:31 brewing_txt_adv12_en.png -rw-rw---- 1 root sdcard_rw 53750 2024-08-29 11:30 brewing_txt_adv13.png @@ -27,8 +27,8 @@ total 189932 -rw-rw---- 1 root sdcard_rw 1217 2024-10-09 16:15 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 7200 2024-10-04 13:58 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2021-03-18 16:20 sync_1.file +-rw-rw---- 1 root sdcard_rw 7185 2024-10-16 16:55 script3_first_brewing.ev +-rw-rw---- 1 root sdcard_rw 0 2024-10-16 16:54 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/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 9ab5700f..cd8776a8 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -17,17 +17,11 @@ SAVELOG "page_Newbrewing3.xml version 2" DEBUGVAR MachineStage -<<<<<<< HEAD DEBUGVAR Seeker.ORDER_ID __CMD "PayWasSent" Seeker.ORDER_ID "-" "-" -======= - DEBUGVAR Seeker.ORDER_ID - - __CMD "PayWasSent" Seeker.ORDER_ID "-" "-" ->>>>>>> a27f8c94eb6df022194c4c644404ecfa103696c4 - + Var PictureFileTextDesctionState = "Enable" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index becf7968..c7a1ff3e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.04" - Var XMLPageVersionInt = 904 + Var XMLPageVersion = "9.06" + Var XMLPageVersionInt = 906 ;Oreo Var OreoGuarantee = 0