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

2025-03-06 15:09:41 +07:00 · 2025-03-06 15:09:41 +07:00 · 4df9405451
commit 4df9405451
parent 27bba53b09 93fa5c540b
968 changed files with 222810 additions and 141824 deletions
--- a/image/event/coconut_milk/coconut_milk.mp4
+++ b/image/event/coconut_milk/coconut_milk.mp4
--- a/image/event/coconut_milk/coconut_milk.png
+++ b/image/event/coconut_milk/coconut_milk.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,3 @@
-normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
+normal_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+press_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+disable_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
--- a/image/event/matcha_every_day/matcha_every_day.png
+++ b/image/event/matcha_every_day/matcha_every_day.png
--- a/image/event/swensen/bn_swensen_pay_code.png
+++ b/image/event/swensen/bn_swensen_pay_code.png
--- a/image/page_doing/brewing_txt_adv11.png
+++ b/image/page_doing/brewing_txt_adv11.png
--- a/image/page_doing/brewing_txt_adv11_en.png
+++ b/image/page_doing/brewing_txt_adv11_en.png
--- a/image/page_doing/brewing_txt_adv15.png
+++ b/image/page_doing/brewing_txt_adv15.png
--- a/image/page_doing/brewing_txt_adv15_en.png
+++ b/image/page_doing/brewing_txt_adv15_en.png
--- a/image/page_doing/brewing_txt_adv17.png
+++ b/image/page_doing/brewing_txt_adv17.png
--- a/image/page_doing/brewing_txt_adv17_en.png
+++ b/image/page_doing/brewing_txt_adv17_en.png
--- a/image/page_drink_disable_n2/bn_Azalea.png
+++ b/image/page_drink_disable_n2/bn_Azalea.png
--- a/image/page_drink_disable_n2/bn_Balvenie
+++ b/image/page_drink_disable_n2/bn_Balvenie
--- a/image/page_drink_disable_n2/bn_Balvenie
+++ b/image/page_drink_disable_n2/bn_Balvenie
--- 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_Coconut_Milk_Cocoa_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_Cocoa_Smoothie.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_Smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Milk_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_Glenfiddich
+++ b/image/page_drink_disable_n2/bn_Glenfiddich
--- a/image/page_drink_disable_n2/bn_Glenfiddich
+++ b/image/page_drink_disable_n2/bn_Glenfiddich
--- a/image/page_drink_disable_n2/bn_Highland_Straw_Fling.png
+++ b/image/page_drink_disable_n2/bn_Highland_Straw_Fling.png
--- a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png
+++ b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_milk.png
--- a/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_chrysanthemum_tea.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_Macallan
+++ b/image/page_drink_disable_n2/bn_Macallan
--- a/image/page_drink_disable_n2/bn_Macallan
+++ b/image/page_drink_disable_n2/bn_Macallan
--- a/image/page_drink_disable_n2/bn_Mint_Julep.png
+++ b/image/page_drink_disable_n2/bn_Mint_Julep.png
--- a/image/page_drink_disable_n2/bn_Scotch_Pineapple_Sour.png
+++ b/image/page_drink_disable_n2/bn_Scotch_Pineapple_Sour.png
--- a/image/page_drink_disable_n2/bn_Strawberr_milk_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Strawberr_milk_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_TAO_Island_Beach.png
+++ b/image/page_drink_disable_n2/bn_TAO_Island_Beach.png
--- a/image/page_drink_disable_n2/bn_Turtle_Hole.png
+++ b/image/page_drink_disable_n2/bn_Turtle_Hole.png
--- a/image/page_drink_disable_n2/bn_Turtle_of_BKK.png
+++ b/image/page_drink_disable_n2/bn_Turtle_of_BKK.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Fizzy.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Fizzy.png
--- a/image/page_drink_disable_n2/bn_black_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_black_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_hot_Strawberry_caramel_latte.png
+++ b/image/page_drink_disable_n2/bn_hot_Strawberry_caramel_latte.png
--- a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
--- a/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_disable_n2/bn_hot_lime_Matcha.png
+++ b/image/page_drink_disable_n2/bn_hot_lime_Matcha.png
--- a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png
--- a/image/page_drink_disable_n2/bn_hot_limeblack_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_limeblack_tea.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/image/page_drink_disable_n2/bn_hot_oolong_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_oolong_tea.png
--- a/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_hot_thai_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_tea.png
--- a/image/page_drink_disable_n2/bn_hot_ume_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_ume_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_Oliang.png
+++ b/image/page_drink_disable_n2/bn_iced_Oliang.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_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_iced_strawberry.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberry.png
--- a/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/image/page_drink_disable_n2/bn_match_milk_coconut.png
+++ b/image/page_drink_disable_n2/bn_match_milk_coconut.png
--- a/image/page_drink_disable_n2/bn_southern_fusion_tea.png
+++ b/image/page_drink_disable_n2/bn_southern_fusion_tea.png
--- a/image/page_drink_disable_n2/bn_strawberry_lime_soda.png
+++ b/image/page_drink_disable_n2/bn_strawberry_lime_soda.png
--- a/image/page_drink_disable_n2/bn_traditional_green_tea.png
+++ b/image/page_drink_disable_n2/bn_traditional_green_tea.png
--- a/image/page_drink_n/bn_Azalea.png
+++ b/image/page_drink_n/bn_Azalea.png
--- a/image/page_drink_n/bn_Balvenie
+++ b/image/page_drink_n/bn_Balvenie
--- a/image/page_drink_n/bn_Balvenie
+++ b/image/page_drink_n/bn_Balvenie
--- 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_Coconut_Milk_Cocoa_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_Cocoa_Smoothie.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_Smoothie.png
+++ b/image/page_drink_n/bn_Coconut_Milk_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_Glenfiddich
+++ b/image/page_drink_n/bn_Glenfiddich
--- a/image/page_drink_n/bn_Glenfiddich
+++ b/image/page_drink_n/bn_Glenfiddich
--- a/image/page_drink_n/bn_Highland_Straw_Fling.png
+++ b/image/page_drink_n/bn_Highland_Straw_Fling.png
--- a/image/page_drink_n/bn_Iced_chrysanthemum_milk.png
+++ b/image/page_drink_n/bn_Iced_chrysanthemum_milk.png
--- a/image/page_drink_n/bn_Iced_chrysanthemum_tea.png
+++ b/image/page_drink_n/bn_Iced_chrysanthemum_tea.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_Macallan
+++ b/image/page_drink_n/bn_Macallan
--- a/image/page_drink_n/bn_Macallan
+++ b/image/page_drink_n/bn_Macallan
--- a/image/page_drink_n/bn_Mint_Julep.png
+++ b/image/page_drink_n/bn_Mint_Julep.png
--- a/image/page_drink_n/bn_Scotch_Pineapple_Sour.png
+++ b/image/page_drink_n/bn_Scotch_Pineapple_Sour.png
--- a/image/page_drink_n/bn_Strawberr_milk_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Strawberr_milk_Oreo_smoothie.png
--- a/image/page_drink_n/bn_TAO_Island_Beach.png
+++ b/image/page_drink_n/bn_TAO_Island_Beach.png
--- a/image/page_drink_n/bn_Turtle_Hole.png
+++ b/image/page_drink_n/bn_Turtle_Hole.png
--- a/image/page_drink_n/bn_Turtle_of_BKK.png
+++ b/image/page_drink_n/bn_Turtle_of_BKK.png
--- a/image/page_drink_n/bn_Yuzu_Fizzy.png
+++ b/image/page_drink_n/bn_Yuzu_Fizzy.png
--- a/image/page_drink_n/bn_black_tea_coconut.png
+++ b/image/page_drink_n/bn_black_tea_coconut.png
--- a/image/page_drink_n/bn_hot_Strawberry_caramel_latte.png
+++ b/image/page_drink_n/bn_hot_Strawberry_caramel_latte.png
--- a/image/page_drink_n/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_n/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_n/bn_hot_lime_Matcha.png
+++ b/image/page_drink_n/bn_hot_lime_Matcha.png
--- a/Show more
+++ b/Show more