Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2025-07-16 14:11:01 +07:00 · 2025-07-16 14:11:01 +07:00 · bbc9525c35
commit bbc9525c35
parent 9be94753d3 316696f71a
348 changed files with 126954 additions and 46969 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 133668
-rw-rw---- 1 root sdcard_rw        0 2025-07-02 15:04 sync_1.file
+total 128268
+-rw-rw---- 1 root sdcard_rw        0 2025-07-03 14:41 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  9129355 2025-06-18 11:18 taobin_adv_menu_01.mp4
@ -17,7 +17,7 @@ total 133668
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
 -rw-rw---- 1 root sdcard_rw  3178714 1980-01-01 00:00 taobin_adv_menu_15.mp4
-rw-rw---- 1 root sdcard_rw  8649951 2025-06-23 15:01 taobin_adv_menu_16.mp4
+-rw-rw---- 1 root sdcard_rw  3182528 2025-07-02 15:43 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4
 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4
--- a/adv/taobin_adv_menu_16.mp4
+++ b/adv/taobin_adv_menu_16.mp4
--- a/image/event/pepsi_banner.png
+++ b/image/event/pepsi_banner.png
--- a/image/page2/bn_Dessert.png
+++ b/image/page2/bn_Dessert.png
--- a/image/page2/bp_Dessert.png
+++ b/image/page2/bp_Dessert.png
--- a/image/page2_en/page2/bn_Dessert.png
+++ b/image/page2_en/page2/bn_Dessert.png
--- a/image/page2_en/page2/bp_Dessert.png
+++ b/image/page2_en/page2/bp_Dessert.png
--- a/image/page2_inter/bn_Dessert.png
+++ b/image/page2_inter/bn_Dessert.png
--- a/image/page2_inter/bp_Dessert.png
+++ b/image/page2_inter/bp_Dessert.png
--- a/image/page3_2_v2/bn_dessert.png
+++ b/image/page3_2_v2/bn_dessert.png
--- a/image/page3_2_v2/bp_dessert.png
+++ b/image/page3_2_v2/bp_dessert.png
--- a/image/page3_2_v2_en/bn_dessert.png
+++ b/image/page3_2_v2_en/bn_dessert.png
--- a/image/page3_2_v2_en/bp_dessert.png
+++ b/image/page3_2_v2_en/bp_dessert.png
--- a/image/page_drink_disable_n2/IcedCocoax2.png
+++ b/image/page_drink_disable_n2/IcedCocoax2.png
--- a/image/page_drink_disable_n2/IcedCocoax3.png
+++ b/image/page_drink_disable_n2/IcedCocoax3.png
--- a/image/page_drink_disable_n2/bn_Apple_Oreo_Volcano.png
+++ b/image/page_drink_disable_n2/bn_Apple_Oreo_Volcano.png
--- a/image/page_drink_disable_n2/bn_Apple_Oreo_Volcano_banner.png
+++ b/image/page_drink_disable_n2/bn_Apple_Oreo_Volcano_banner.png
--- a/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_disable_n2/bn_Matcha_Milk_Yuzu.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Milk_Yuzu.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Milk_Oreo_Volcano.png
--- a/image/page_drink_disable_n2/bn_hot_yuzu_Matcha_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_yuzu_Matcha_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_caramel.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel.png
--- a/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_milk.png
+++ b/image/page_drink_disable_n2/bn_iced_milk.png
--- a/image/page_drink_disable_n2/bn_iced_milk_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_extra_m.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_extra_m.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_disable_n2/bn_pink_milk.png
+++ b/image/page_drink_disable_n2/bn_pink_milk.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount.png
--- a/image/page_drink_n/IcedCocoax2.png
+++ b/image/page_drink_n/IcedCocoax2.png
--- a/image/page_drink_n/IcedCocoax3.png
+++ b/image/page_drink_n/IcedCocoax3.png
--- a/image/page_drink_n/bn_Apple_Oreo_Volcano.png
+++ b/image/page_drink_n/bn_Apple_Oreo_Volcano.png
--- a/image/page_drink_n/bn_Apple_Oreo_Volcano_banner.png
+++ b/image/page_drink_n/bn_Apple_Oreo_Volcano_banner.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_n/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_n/bn_ChocoYuzu_milk.png
--- a/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_n/bn_Matcha_Milk_Yuzu.png
+++ b/image/page_drink_n/bn_Matcha_Milk_Yuzu.png
--- a/image/page_drink_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_n/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_n/bn_PinkOreo_smoothie.png
--- a/image/page_drink_n/bn_StrawberrOreo_smoothie.png
+++ b/image/page_drink_n/bn_StrawberrOreo_smoothie.png
--- a/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png
+++ b/image/page_drink_n/bn_Yuzu_Milk_Oreo_Volcano.png
--- a/image/page_drink_n/bn_hot_yuzu_Matcha_tea.png
+++ b/image/page_drink_n/bn_hot_yuzu_Matcha_tea.png
--- a/image/page_drink_n/bn_iced_Cocoa_coconut.png
+++ b/image/page_drink_n/bn_iced_Cocoa_coconut.png
--- a/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_n/bn_iced_caramel.png
+++ b/image/page_drink_n/bn_iced_caramel.png
--- a/image/page_drink_n/bn_iced_caramel_cocoa.png
+++ b/image/page_drink_n/bn_iced_caramel_cocoa.png
--- a/image/page_drink_n/bn_iced_cocoa.png
+++ b/image/page_drink_n/bn_iced_cocoa.png
--- a/image/page_drink_n/bn_iced_milk.png
+++ b/image/page_drink_n/bn_iced_milk.png
--- a/image/page_drink_n/bn_iced_milk_coconut.png
+++ b/image/page_drink_n/bn_iced_milk_coconut.png
--- a/image/page_drink_n/bn_iced_pepsi_extra_m.png
+++ b/image/page_drink_n/bn_iced_pepsi_extra_m.png
--- a/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
--- a/image/page_drink_n/bn_pink_milk.png
+++ b/image/page_drink_n/bn_pink_milk.png
--- a/image/page_drink_n/bn_smoothie_oreo.png
+++ b/image/page_drink_n/bn_smoothie_oreo.png
--- a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount.png
+++ b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount.png
--- a/image/page_drink_picture2_n/IcedCocoax2.png
+++ b/image/page_drink_picture2_n/IcedCocoax2.png
--- a/image/page_drink_picture2_n/IcedCocoax3.png
+++ b/image/page_drink_picture2_n/IcedCocoax3.png
--- a/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano.png
+++ b/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano.png
--- a/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano_banner.png
+++ b/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano_banner.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_ChocoOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_ChocoOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_picture2_n/bn_ChocoYuzu_milk.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Coffee_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Strawberry_Smoothie.png
--- a/image/page_drink_picture2_n/bn_Matcha_Milk_Yuzu.png
+++ b/image/page_drink_picture2_n/bn_Matcha_Milk_Yuzu.png
--- a/Show more
+++ b/Show more