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

2025-06-17 14:02:56 +07:00 · 2025-06-17 14:02:56 +07:00 · decac96cba
commit decac96cba
parent 0ab45a7053 62f4c1ef03
560 changed files with 233482 additions and 69931 deletions
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-press_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-disable_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
+normal_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+press_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+disable_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,3 +1,3 @@
-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
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
--- a/image/event/school_ovaltine/school_ovaltine2.png
+++ b/image/event/school_ovaltine/school_ovaltine2.png
--- a/image/event/taiwanese_tea/taiwanese_tea_banner.png
+++ b/image/event/taiwanese_tea/taiwanese_tea_banner.png
--- a/image/page_doing/brewing_txt_adv13.png
+++ b/image/page_doing/brewing_txt_adv13.png
--- a/image/page_doing/brewing_txt_adv13_en.png
+++ b/image/page_doing/brewing_txt_adv13_en.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_disable_n2/bn_Taiwanese
+++ b/image/page_drink_disable_n2/bn_Taiwanese
--- a/image/page_drink_disable_n2/bn_Taiwanese
+++ b/image/page_drink_disable_n2/bn_Taiwanese
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_disable_n2/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_disable_n2/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_n/bn_Taiwanese
+++ b/image/page_drink_n/bn_Taiwanese
--- a/image/page_drink_n/bn_Taiwanese
+++ b/image/page_drink_n/bn_Taiwanese
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_n/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_picture2_n/bn_Taiwanese
+++ b/image/page_drink_picture2_n/bn_Taiwanese
--- a/image/page_drink_picture2_n/bn_Taiwanese
+++ b/image/page_drink_picture2_n/bn_Taiwanese
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_picture2_n/bn_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_taiwanese
+++ b/image/page_drink_picture2_n/bn_taiwanese
--- a/image/page_drink_picture2_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_picture2_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_picture2_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_picture2_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_picture2_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_picture2_n/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_press_n/bn_Taiwanese
+++ b/image/page_drink_press_n/bn_Taiwanese
--- a/image/page_drink_press_n/bn_Taiwanese
+++ b/image/page_drink_press_n/bn_Taiwanese
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_press_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_press_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_press_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_press_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_press_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_press_n/bn_thai_milk_tea_SALAK.png
--- a/image/page_payment_en/page_payment/img_popup_ukb.png
+++ b/image/page_payment_en/page_payment/img_popup_ukb.png
--- a/image/topping_revamp_inter/bg_custom_espesso_healthy_level.png
+++ b/image/topping_revamp_inter/bg_custom_espesso_healthy_level.png
--- a/image/topping_revamp_inter/bg_custom_taiwanese_tea_powder.png
+++ b/image/topping_revamp_inter/bg_custom_taiwanese_tea_powder.png
--- a/image/topping_revamp_mmr/bg_top_cocoa.png
+++ b/image/topping_revamp_mmr/bg_top_cocoa.png
--- a/image/topping_revamp_mmr/bg_top_oreo.png
+++ b/image/topping_revamp_mmr/bg_top_oreo.png
--- a/image/topping_revamp_mmr/bg_top_ovaltine.png
+++ b/image/topping_revamp_mmr/bg_top_ovaltine.png
--- a/image/topping_revamp_mmr/bg_top_popup.png
+++ b/image/topping_revamp_mmr/bg_top_popup.png
--- a/image/topping_revamp_mmr/bn_accept.png
+++ b/image/topping_revamp_mmr/bn_accept.png
--- a/image/topping_revamp_mmr/bn_accept2.png
+++ b/image/topping_revamp_mmr/bn_accept2.png
--- a/image/topping_revamp_mmr/bp_accept.png
+++ b/image/topping_revamp_mmr/bp_accept.png
--- a/image/topping_revamp_mmr/bp_accept2.png
+++ b/image/topping_revamp_mmr/bp_accept2.png
--- a/image/topping_revamp_msc/bg_bottom.png
+++ b/image/topping_revamp_msc/bg_bottom.png
--- a/image/topping_revamp_msc/bg_top_cocoa.png
+++ b/image/topping_revamp_msc/bg_top_cocoa.png
--- a/image/topping_revamp_msc/bg_top_oreo.png
+++ b/image/topping_revamp_msc/bg_top_oreo.png
--- a/image/topping_revamp_msc/bg_top_ovaltine.png
+++ b/image/topping_revamp_msc/bg_top_ovaltine.png
--- a/image/topping_revamp_msc/bg_top_popup.png
+++ b/image/topping_revamp_msc/bg_top_popup.png
--- a/image/topping_revamp_msc/bn_accept.png
+++ b/image/topping_revamp_msc/bn_accept.png
--- a/image/topping_revamp_msc/bn_accept2.png
+++ b/image/topping_revamp_msc/bn_accept2.png
--- a/image/topping_revamp_msc/bp_accept.png
+++ b/image/topping_revamp_msc/bp_accept.png
--- a/image/topping_revamp_msc/bp_accept2.png
+++ b/image/topping_revamp_msc/bp_accept2.png