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

2025-04-23 14:28:04 +07:00 · 2025-04-23 14:28:04 +07:00 · 776aa8df4a
commit 776aa8df4a
parent 0ae735e180 8fbed2ac9b
2533 changed files with 364687 additions and 11070 deletions
--- a/image/collectiing_en/img_popup11-GBR.png
+++ b/image/collectiing_en/img_popup11-GBR.png
--- a/image/collectiing_en/img_popup15-GBR.png
+++ b/image/collectiing_en/img_popup15-GBR.png
--- a/image/collectiing_mmr/img_popup11-GBR.png
+++ b/image/collectiing_mmr/img_popup11-GBR.png
--- a/image/collectiing_mmr/img_popup15-GBR.png
+++ b/image/collectiing_mmr/img_popup15-GBR.png
--- a/image/collectiing_msc/img_popup11-GBR.png
+++ b/image/collectiing_msc/img_popup11-GBR.png
--- a/image/collectiing_msc/img_popup15-GBR.png
+++ b/image/collectiing_msc/img_popup15-GBR.png
--- a/image/display_point_en/text5-GBR.png
+++ b/image/display_point_en/text5-GBR.png
--- a/image/display_point_mmr/text5-GBR.png
+++ b/image/display_point_mmr/text5-GBR.png
--- a/image/display_point_msc/text5-GBR.png
+++ b/image/display_point_msc/text5-GBR.png
--- a/image/event/boost_energy/boost_energy.png
+++ b/image/event/boost_energy/boost_energy.png
--- a/image/event/boost_energy/got_discount_code_en.png
+++ b/image/event/boost_energy/got_discount_code_en.png
--- a/image/event/boost_energy/got_discount_code_th.png
+++ b/image/event/boost_energy/got_discount_code_th.png
--- a/image/event/boost_energy/send_code_fail_en.png
+++ b/image/event/boost_energy/send_code_fail_en.png
--- a/image/event/boost_energy/send_code_fail_th.png
+++ b/image/event/boost_energy/send_code_fail_th.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,3 +1,3 @@
-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
+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
--- a/image/event/oreo_volcano/oreo_volcano_banner.png
+++ b/image/event/oreo_volcano/oreo_volcano_banner.png
--- a/image/page2_inter/bn_frozen_smoothie.png
+++ b/image/page2_inter/bn_frozen_smoothie.png
--- a/image/page2_inter/bp_frozen_smoothie.png
+++ b/image/page2_inter/bp_frozen_smoothie.png
--- a/image/page3_2/bn_tao_pun.png
+++ b/image/page3_2/bn_tao_pun.png
--- a/image/page3_2/bp_tao_pun.png
+++ b/image/page3_2/bp_tao_pun.png
--- a/image/page3_2_en/bn_tao_pun.png
+++ b/image/page3_2_en/bn_tao_pun.png
--- a/image/page3_2_en/bp_tao_pun.png
+++ b/image/page3_2_en/bp_tao_pun.png
--- a/image/page3_2_v2/bn_Pepsi_7up.png
+++ b/image/page3_2_v2/bn_Pepsi_7up.png
--- a/image/page3_2_v2/bn_TAO_PAN.png
+++ b/image/page3_2_v2/bn_TAO_PAN.png
--- a/image/page3_2_v2/bn_appfast2.png
+++ b/image/page3_2_v2/bn_appfast2.png
--- a/image/page3_2_v2/bn_cho_ca2.png
+++ b/image/page3_2_v2/bn_cho_ca2.png
--- a/image/page3_2_v2/bn_cocktail.png
+++ b/image/page3_2_v2/bn_cocktail.png
--- a/image/page3_2_v2/bn_coffee2.png
+++ b/image/page3_2_v2/bn_coffee2.png
--- a/image/page3_2_v2/bn_forkid2.png
+++ b/image/page3_2_v2/bn_forkid2.png
--- a/image/page3_2_v2/bn_health.png
+++ b/image/page3_2_v2/bn_health.png
--- a/image/page3_2_v2/bn_protein2.png
+++ b/image/page3_2_v2/bn_protein2.png
--- a/image/page3_2_v2/bn_recommend2.png
+++ b/image/page3_2_v2/bn_recommend2.png
--- a/image/page3_2_v2/bn_sodada2.png
+++ b/image/page3_2_v2/bn_sodada2.png
--- a/image/page3_2_v2/bn_tao_pun.png
+++ b/image/page3_2_v2/bn_tao_pun.png
--- a/image/page3_2_v2/bn_tea2.png
+++ b/image/page3_2_v2/bn_tea2.png
--- a/image/page3_2_v2/bn_vending2.png
+++ b/image/page3_2_v2/bn_vending2.png
--- a/image/page3_2_v2/bp_Pepsi_7up.png
+++ b/image/page3_2_v2/bp_Pepsi_7up.png
--- a/image/page3_2_v2/bp_TAO_PAN.png
+++ b/image/page3_2_v2/bp_TAO_PAN.png
--- a/image/page3_2_v2/bp_appfast2.png
+++ b/image/page3_2_v2/bp_appfast2.png
--- a/image/page3_2_v2/bp_cho_ca2.png
+++ b/image/page3_2_v2/bp_cho_ca2.png
--- a/image/page3_2_v2/bp_cocktail.png
+++ b/image/page3_2_v2/bp_cocktail.png
--- a/image/page3_2_v2/bp_coffee2.png
+++ b/image/page3_2_v2/bp_coffee2.png
--- a/image/page3_2_v2/bp_forkid2.png
+++ b/image/page3_2_v2/bp_forkid2.png
--- a/image/page3_2_v2/bp_health.png
+++ b/image/page3_2_v2/bp_health.png
--- a/image/page3_2_v2/bp_protein2.png
+++ b/image/page3_2_v2/bp_protein2.png
--- a/image/page3_2_v2/bp_recommend2.png
+++ b/image/page3_2_v2/bp_recommend2.png
--- a/image/page3_2_v2/bp_sodada2.png
+++ b/image/page3_2_v2/bp_sodada2.png
--- a/image/page3_2_v2/bp_tao_pun.png
+++ b/image/page3_2_v2/bp_tao_pun.png
--- a/image/page3_2_v2/bp_tea2.png
+++ b/image/page3_2_v2/bp_tea2.png
--- a/image/page3_2_v2/bp_vending2.png
+++ b/image/page3_2_v2/bp_vending2.png
--- a/image/page3_2_v2_en/bn_Pepsi_7up.png
+++ b/image/page3_2_v2_en/bn_Pepsi_7up.png
--- a/image/page3_2_v2_en/bn_TAO_PAN.png
+++ b/image/page3_2_v2_en/bn_TAO_PAN.png
--- a/image/page3_2_v2_en/bn_appfast2.png
+++ b/image/page3_2_v2_en/bn_appfast2.png
--- a/image/page3_2_v2_en/bn_cho_ca2.png
+++ b/image/page3_2_v2_en/bn_cho_ca2.png
--- a/image/page3_2_v2_en/bn_cocktail.png
+++ b/image/page3_2_v2_en/bn_cocktail.png
--- a/image/page3_2_v2_en/bn_coffee2.png
+++ b/image/page3_2_v2_en/bn_coffee2.png
--- a/image/page3_2_v2_en/bn_forkid2.png
+++ b/image/page3_2_v2_en/bn_forkid2.png
--- a/image/page3_2_v2_en/bn_health.png
+++ b/image/page3_2_v2_en/bn_health.png
--- a/image/page3_2_v2_en/bn_protein2.png
+++ b/image/page3_2_v2_en/bn_protein2.png
--- a/image/page3_2_v2_en/bn_recommend2.png
+++ b/image/page3_2_v2_en/bn_recommend2.png
--- a/image/page3_2_v2_en/bn_sodada2.png
+++ b/image/page3_2_v2_en/bn_sodada2.png
--- a/image/page3_2_v2_en/bn_tao_pun.png
+++ b/image/page3_2_v2_en/bn_tao_pun.png
--- a/image/page3_2_v2_en/bn_tea2.png
+++ b/image/page3_2_v2_en/bn_tea2.png
--- a/image/page3_2_v2_en/bn_vending2.png
+++ b/image/page3_2_v2_en/bn_vending2.png
--- a/image/page3_2_v2_en/bp_Pepsi_7up.png
+++ b/image/page3_2_v2_en/bp_Pepsi_7up.png
--- a/image/page3_2_v2_en/bp_appfast2.png
+++ b/image/page3_2_v2_en/bp_appfast2.png
--- a/image/page3_2_v2_en/bp_cho_ca2.png
+++ b/image/page3_2_v2_en/bp_cho_ca2.png
--- a/image/page3_2_v2_en/bp_cocktail.png
+++ b/image/page3_2_v2_en/bp_cocktail.png
--- a/image/page3_2_v2_en/bp_coffee2.png
+++ b/image/page3_2_v2_en/bp_coffee2.png
--- a/image/page3_2_v2_en/bp_forkid2.png
+++ b/image/page3_2_v2_en/bp_forkid2.png
--- a/image/page3_2_v2_en/bp_health.png
+++ b/image/page3_2_v2_en/bp_health.png
--- a/image/page3_2_v2_en/bp_protein2.png
+++ b/image/page3_2_v2_en/bp_protein2.png
--- a/image/page3_2_v2_en/bp_recommend2.png
+++ b/image/page3_2_v2_en/bp_recommend2.png
--- a/image/page3_2_v2_en/bp_sodada2.png
+++ b/image/page3_2_v2_en/bp_sodada2.png
--- a/image/page3_2_v2_en/bp_tao_pun.png
+++ b/image/page3_2_v2_en/bp_tao_pun.png
--- a/image/page3_2_v2_en/bp_tea2.png
+++ b/image/page3_2_v2_en/bp_tea2.png
--- a/image/page3_2_v2_en/bp_vending2.png
+++ b/image/page3_2_v2_en/bp_vending2.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png
--- 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_ChocoOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_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_Coconut_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Coconut_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Ginger_milk_Oreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_HojichaOreo_smoothie.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_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_MelonOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_MelonOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/Show more
+++ b/Show more