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

2025-05-22 12:45:48 +07:00 · 2025-05-22 12:45:48 +07:00 · fa49f87ae3
commit fa49f87ae3
parent 168cee5868 da4c4ec1a3
115 changed files with 54219 additions and 25062 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/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_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_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/image/page_drink_picture2_n/bn_Apple_Punch_Drink.png
+++ b/image/page_drink_picture2_n/bn_Apple_Punch_Drink.png
--- a/image/page_drink_picture2_n/bn_Apple_Pure_matcha.png
+++ b/image/page_drink_picture2_n/bn_Apple_Pure_matcha.png
--- a/image/page_drink_picture2_n/bn_Apple_Soda.png
+++ b/image/page_drink_picture2_n/bn_Apple_Soda.png
--- a/image/page_drink_press_n/bn_Apple_Americano.png
+++ b/image/page_drink_press_n/bn_Apple_Americano.png
--- a/image/page_drink_press_n/bn_Apple_Frop_Longback.png
+++ b/image/page_drink_press_n/bn_Apple_Frop_Longback.png
--- a/image/page_drink_press_n/bn_Apple_Ginger.png
+++ b/image/page_drink_press_n/bn_Apple_Ginger.png
--- a/image/page_drink_press_n/bn_Apple_Jasmine_Tea.png
+++ b/image/page_drink_press_n/bn_Apple_Jasmine_Tea.png
--- a/image/page_drink_press_n/bn_Apple_Juice.png
+++ b/image/page_drink_press_n/bn_Apple_Juice.png
--- a/image/page_drink_press_n/bn_Apple_Oolong.png
+++ b/image/page_drink_press_n/bn_Apple_Oolong.png
--- a/image/page_drink_press_n/bn_Apple_Oreo_Volcano.png
+++ b/image/page_drink_press_n/bn_Apple_Oreo_Volcano.png
--- a/image/page_drink_press_n/bn_Apple_Punch_Drink.png
+++ b/image/page_drink_press_n/bn_Apple_Punch_Drink.png
--- a/image/page_drink_press_n/bn_Apple_Pure_matcha.png
+++ b/image/page_drink_press_n/bn_Apple_Pure_matcha.png
--- a/image/page_drink_press_n/bn_Apple_Soda.png
+++ b/image/page_drink_press_n/bn_Apple_Soda.png
--- a/image/page_help_center/bg_empty.png
+++ b/image/page_help_center/bg_empty.png