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

2025-06-09 10:00:03 +07:00 · 2025-06-09 10:00:03 +07:00 · fd2225caaf
commit fd2225caaf
parent bc9d9af33f 9f0af7f077
179 changed files with 105204 additions and 26985 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_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