diff --git a/inter/common/animation01/TaoBin2_draft02_art37.mp4 b/inter/common/animation01/TaoBin2_draft02_art37.mp4 new file mode 100644 index 00000000..504cf80a Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art37.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art52.mp4 b/inter/common/animation01/TaoBin2_draft02_art52.mp4 new file mode 100644 index 00000000..7eef1e25 Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art52.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art56.mp4 b/inter/common/animation01/TaoBin2_draft02_art56.mp4 new file mode 100644 index 00000000..1b8a26bf Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art56.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art59.mp4 b/inter/common/animation01/TaoBin2_draft02_art59.mp4 new file mode 100644 index 00000000..44ed664f Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art59.mp4 differ diff --git a/inter/common/animation01/TaoBin2_draft02_art60.mp4 b/inter/common/animation01/TaoBin2_draft02_art60.mp4 new file mode 100644 index 00000000..80c077f9 Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art60.mp4 differ diff --git a/video/script2.ev b/video/script2.ev index 738f15e4..bd080ad2 100644 --- a/video/script2.ev +++ b/video/script2.ev @@ -3,11 +3,16 @@ SAVELOG "Happy new hurr." + + + + + If EventTurnOn = 1 Then GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize DEBUGVAR MainfileSize - If MainfileSize = 2927671 Then + If MainfileSize = 6749397 Then Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4" diff --git a/video/sync_1.file b/video/sync_1.file index 27781ce8..f23e5fd1 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 148328 +total 152060 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 -rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 18433289 2023-10-27 16:00 brewing_adv4.mp4 @@ -14,13 +14,13 @@ total 148328 -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 636 2023-12-20 11:07 script1.ev --rw-rw---- 1 root sdcard_rw 304 2023-12-20 10:14 script2.ev +-rw-rw---- 1 root sdcard_rw 309 2023-12-21 13:31 script2.ev -rw-rw---- 1 root sdcard_rw 495 2023-11-14 13:18 script3_brew.ev --rw-rw---- 1 root sdcard_rw 0 2023-12-17 02:53 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2023-12-18 05:11 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 -rw-rw---- 1 root sdcard_rw 2084830 2023-09-18 18:44 taobin_thank1.mp4 --rw-rw---- 1 root sdcard_rw 2927671 2023-12-19 10:05 taobin_thank1_event.mp4 +-rw-rw---- 1 root sdcard_rw 6749397 2023-12-21 13:15 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 2023-09-18 18:44 taobin_thank2.mp4 diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 89768c7d..1919afda 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -6019,6 +6019,18 @@ + Topping "Select" UserSelectProductCode + + ; Set option toppinng and pack + Topping "Select1-ID" topping1 + Topping "Select2-ID" topping2 + Topping "Select3-ID" topping3 + ;Topping "Select6-ID" topping6 + Topping "Select7-ID" topping7 + Topping "Select8-ID" topping8 + Topping "Select9-ID" topping9 + Topping "Select10-ID" topping10 + Topping "ClearMultiTopping" "Test 4" Var strMulti6_1 = "TPID=311,multiply=2" Var strMulti6_2 = "TPID=313,multiply=1" @@ -6026,6 +6038,8 @@ Topping "Multiply6-ID" strMulti6_1 Topping "Multiply6-ID" strMulti6_2 + Topping "Pack" ExtendDataCurr +