Merge branch 'masterpiece' tf ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

nu :wq
2025-05-02 17:52:17 +07:00 · 2025-05-02 17:52:17 +07:00 · 46f6a4532f
commit 46f6a4532f
parent b01bbd81b9 01a57b8469
194 changed files with 35365 additions and 68486 deletions
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-press_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-disable_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
--- a/image/event/ovaltine_school/ovaltine_school.mp4
+++ b/image/event/ovaltine_school/ovaltine_school.mp4
--- a/image/event/ovaltine_school/ovaltine_school.png
+++ b/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/school_ovaltine/school_ovaltine.jpg
+++ b/image/event/school_ovaltine/school_ovaltine.jpg
--- a/image/event/school_ovaltine/school_ovaltine.mp4
+++ b/image/event/school_ovaltine/school_ovaltine.mp4
--- 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_Salak.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.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_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_Salak.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Salak.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_picture2_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_picture2_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_press_n/bn_Ovaltine_Latte.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_press_n/bn_Ovaltine_Milk_ThaiTea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_smoothie_oreo.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_smoothie_oreo.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_americano.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_americano.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_america_no.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_cappuccino.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_melon_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_melon_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
--- a/inter/aus/image/page_drink_disable_n2/bn_melon_americano.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_melon_americano.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
--- a/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
--- a/Show more
+++ b/Show more