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

2025-05-30 11:32:03 +07:00 · 2025-05-30 11:32:03 +07:00 · c75c6a4035
commit c75c6a4035
parent 751cfb4fb1 21a5475cd6
451 changed files with 242145 additions and 59490 deletions
--- a/image/event/apple_farm_festival/apple_farm_festival_banner.png
+++ b/image/event/apple_farm_festival/apple_farm_festival_banner.png
--- a/image/event/happy_trios/happy_trios_2.png
+++ b/image/event/happy_trios/happy_trios_2.png
--- a/image/event/image_template1
+++ b/image/event/image_template1
@ -1 +1 @@
-normal_thai=ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png
+normal_thai=ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-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
+normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
+disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
--- a/image/feature/test_color/Blue.png
+++ b/image/feature/test_color/Blue.png
--- a/image/feature/test_color/BlueP.png
+++ b/image/feature/test_color/BlueP.png
--- a/image/feature/test_color/Green.png
+++ b/image/feature/test_color/Green.png
--- a/image/feature/test_color/GreenP.png
+++ b/image/feature/test_color/GreenP.png
--- a/image/feature/test_color/Indigo.png
+++ b/image/feature/test_color/Indigo.png
--- a/image/feature/test_color/IndigoP.png
+++ b/image/feature/test_color/IndigoP.png
--- a/image/feature/test_color/Orange.png
+++ b/image/feature/test_color/Orange.png
--- a/image/feature/test_color/OrangeP.png
+++ b/image/feature/test_color/OrangeP.png
--- a/image/feature/test_color/Red.png
+++ b/image/feature/test_color/Red.png
--- a/image/feature/test_color/RedP.png
+++ b/image/feature/test_color/RedP.png
--- a/image/feature/test_color/Violet.png
+++ b/image/feature/test_color/Violet.png
--- a/image/feature/test_color/VioletP.png
+++ b/image/feature/test_color/VioletP.png
--- a/image/feature/test_color/White.png
+++ b/image/feature/test_color/White.png
--- a/image/feature/test_color/WhiteP.png
+++ b/image/feature/test_color/WhiteP.png
--- a/image/feature/test_color/Yellow.png
+++ b/image/feature/test_color/Yellow.png
--- a/image/feature/test_color/YellowP.png
+++ b/image/feature/test_color/YellowP.png
--- a/image/feature/test_color/bn_off.png
+++ b/image/feature/test_color/bn_off.png
--- a/image/feature/test_color/bn_on.png
+++ b/image/feature/test_color/bn_on.png
--- a/image/feature/test_color/bp_off.png
+++ b/image/feature/test_color/bp_off.png
--- a/image/feature/test_color/bp_on.png
+++ b/image/feature/test_color/bp_on.png
--- a/image/feature/test_color/btn_toggle_off.png
+++ b/image/feature/test_color/btn_toggle_off.png
--- a/image/feature/test_color/btn_toggle_on.png
+++ b/image/feature/test_color/btn_toggle_on.png
--- a/image/feature/test_color/overview.png
+++ b/image/feature/test_color/overview.png
--- a/image/page2/bn_soda_20B.png
+++ b/image/page2/bn_soda_20B.png
--- a/image/page2/bp_soda_20B.png
+++ b/image/page2/bp_soda_20B.png
--- a/image/page2_en/page2/bn_soda_20B.png
+++ b/image/page2_en/page2/bn_soda_20B.png
--- a/image/page2_en/page2/bp_soda_20B.png
+++ b/image/page2_en/page2/bp_soda_20B.png
--- a/image/page2_inter/bn_soda_20B_EN.png
+++ b/image/page2_inter/bn_soda_20B_EN.png
--- a/image/page2_inter/bn_soda_20B_TH.png
+++ b/image/page2_inter/bn_soda_20B_TH.png
--- a/image/page2_inter/bp_soda_20B_EN.png
+++ b/image/page2_inter/bp_soda_20B_EN.png
--- a/image/page2_inter/bp_soda_20B_TH.png
+++ b/image/page2_inter/bp_soda_20B_TH.png
--- a/image/page3_2/bn_20_baht.png
+++ b/image/page3_2/bn_20_baht.png
--- a/image/page3_2/bp_20_baht.png
+++ b/image/page3_2/bp_20_baht.png
--- a/image/page3_2_en/bn_20_baht.png
+++ b/image/page3_2_en/bn_20_baht.png
--- a/image/page3_2_en/bp_20_baht.png
+++ b/image/page3_2_en/bp_20_baht.png
--- a/image/page3_2_v2/bn_20_baht.png
+++ b/image/page3_2_v2/bn_20_baht.png
--- a/image/page3_2_v2/bp_20_baht.png
+++ b/image/page3_2_v2/bp_20_baht.png
--- a/image/page3_2_v2_en/bn_20_baht.png
+++ b/image/page3_2_v2_en/bn_20_baht.png
--- a/image/page3_2_v2_en/bp_20_baht.png
+++ b/image/page3_2_v2_en/bp_20_baht.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/txt_66.png
+++ b/image/page_doing/txt_66.png
--- a/image/page_doing/txt_66_en.png
+++ b/image/page_doing/txt_66_en.png
--- a/image/page_drink_disable_n2/bn_Apple_Americano.png
+++ b/image/page_drink_disable_n2/bn_Apple_Americano.png
--- a/image/page_drink_disable_n2/bn_Apple_Frop_Longback.png
+++ b/image/page_drink_disable_n2/bn_Apple_Frop_Longback.png
--- a/image/page_drink_disable_n2/bn_Apple_Ginger.png
+++ b/image/page_drink_disable_n2/bn_Apple_Ginger.png
--- a/image/page_drink_disable_n2/bn_Apple_Jasmine_Tea.png
+++ b/image/page_drink_disable_n2/bn_Apple_Jasmine_Tea.png
--- a/image/page_drink_disable_n2/bn_Apple_Juice.png
+++ b/image/page_drink_disable_n2/bn_Apple_Juice.png
--- a/image/page_drink_disable_n2/bn_Apple_Oolong.png
+++ b/image/page_drink_disable_n2/bn_Apple_Oolong.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_Punch_Drink.png
+++ b/image/page_drink_disable_n2/bn_Apple_Punch_Drink.png
--- a/image/page_drink_disable_n2/bn_Apple_Pure_matcha.png
+++ b/image/page_drink_disable_n2/bn_Apple_Pure_matcha.png
--- a/image/page_drink_disable_n2/bn_Apple_Soda.png
+++ b/image/page_drink_disable_n2/bn_Apple_Soda.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Latte_X3.png
--- a/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png
+++ b/image/page_drink_disable_n2/bn_PEPSI_LYCHEE.png
--- a/image/page_drink_disable_n2/bn_PEPSI_YUZU.png
+++ b/image/page_drink_disable_n2/bn_PEPSI_YUZU.png
--- a/image/page_drink_disable_n2/bn_Pepsi
+++ b/image/page_drink_disable_n2/bn_Pepsi
--- a/image/page_drink_disable_n2/bn_Pepsi_Caramel.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Caramel.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Coconut.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Lime.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Lime.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Strawberry.png
--- a/image/page_drink_disable_n2/bn_Pepsi_Tropical.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Tropical.png
--- a/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png
+++ b/image/page_drink_disable_n2/bn_Pure_Matcha_X3.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Caramel_Soda.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_n/bn_Apple_Americano.png
+++ b/image/page_drink_n/bn_Apple_Americano.png
--- a/image/page_drink_n/bn_Apple_Frop_Longback.png
+++ b/image/page_drink_n/bn_Apple_Frop_Longback.png
--- a/image/page_drink_n/bn_Apple_Ginger.png
+++ b/image/page_drink_n/bn_Apple_Ginger.png
--- a/image/page_drink_n/bn_Apple_Jasmine_Tea.png
+++ b/image/page_drink_n/bn_Apple_Jasmine_Tea.png
--- a/image/page_drink_n/bn_Apple_Juice.png
+++ b/image/page_drink_n/bn_Apple_Juice.png
--- a/image/page_drink_n/bn_Apple_Oolong.png
+++ b/image/page_drink_n/bn_Apple_Oolong.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_Punch_Drink.png
+++ b/image/page_drink_n/bn_Apple_Punch_Drink.png
--- a/image/page_drink_n/bn_Apple_Pure_matcha.png
+++ b/image/page_drink_n/bn_Apple_Pure_matcha.png
--- a/image/page_drink_n/bn_Apple_Soda.png
+++ b/image/page_drink_n/bn_Apple_Soda.png
--- a/image/page_drink_n/bn_Matcha_Latte_Premium.png
+++ b/image/page_drink_n/bn_Matcha_Latte_Premium.png
--- a/image/page_drink_n/bn_Matcha_Latte_X3.png
+++ b/image/page_drink_n/bn_Matcha_Latte_X3.png
--- a/image/page_drink_n/bn_PEPSI_LYCHEE.png
+++ b/image/page_drink_n/bn_PEPSI_LYCHEE.png
--- a/image/page_drink_n/bn_PEPSI_YUZU.png
+++ b/image/page_drink_n/bn_PEPSI_YUZU.png
--- a/image/page_drink_n/bn_Pepsi
+++ b/image/page_drink_n/bn_Pepsi
--- a/image/page_drink_n/bn_Pepsi_Caramel.png
+++ b/image/page_drink_n/bn_Pepsi_Caramel.png
--- a/image/page_drink_n/bn_Pepsi_Coconut.png
+++ b/image/page_drink_n/bn_Pepsi_Coconut.png
--- a/image/page_drink_n/bn_Pepsi_Lime.png
+++ b/image/page_drink_n/bn_Pepsi_Lime.png
--- a/image/page_drink_n/bn_Pepsi_Strawberry.png
+++ b/image/page_drink_n/bn_Pepsi_Strawberry.png
--- a/image/page_drink_n/bn_Pepsi_Tropical.png
+++ b/image/page_drink_n/bn_Pepsi_Tropical.png
--- a/image/page_drink_n/bn_Pure_Matcha_X3.png
+++ b/image/page_drink_n/bn_Pure_Matcha_X3.png
--- a/image/page_drink_n/bn_Yuzu_Caramel_Soda.png
+++ b/image/page_drink_n/bn_Yuzu_Caramel_Soda.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_picture2_n/bn_Apple_Americano.png
+++ b/image/page_drink_picture2_n/bn_Apple_Americano.png
--- a/image/page_drink_picture2_n/bn_Apple_Frop_Longback.png
+++ b/image/page_drink_picture2_n/bn_Apple_Frop_Longback.png
--- a/image/page_drink_picture2_n/bn_Apple_Ginger.png
+++ b/image/page_drink_picture2_n/bn_Apple_Ginger.png
--- a/image/page_drink_picture2_n/bn_Apple_Jasmine_Tea.png
+++ b/image/page_drink_picture2_n/bn_Apple_Jasmine_Tea.png
--- a/image/page_drink_picture2_n/bn_Apple_Juice.png
+++ b/image/page_drink_picture2_n/bn_Apple_Juice.png
--- a/image/page_drink_picture2_n/bn_Apple_Oolong.png
+++ b/image/page_drink_picture2_n/bn_Apple_Oolong.png
--- a/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano.png
+++ b/image/page_drink_picture2_n/bn_Apple_Oreo_Volcano.png
--- a/Show more
+++ b/Show more