Merge branch 'masterpiece' into feat/sgp-new-payment

2025-04-29 10:57:34 +07:00 · 2025-04-29 10:57:34 +07:00 · 2c769214c9
commit 2c769214c9
parent 93219a983b 2801a06668
3027 changed files with 513353 additions and 237055 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1350,3 +1350,16 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 เป๊ปซี่ทรอปิคอล	12-05-02-0148	1	14	34	62	23					24	100	7:40	32
 เป๊ปซี่มะนาว	12-05-02-0149	1	14	13	12	23					24	100	7:40	32
 เป๊ปซี่คาราเมล	12-05-02-0150	1	14	13	22	23					24	100	7:40	32
+
+มัทฉะลาเต้พรีเมียมร้อน	12-02-01-0103	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้พรีเมียมเย็น	12-02-02-0103	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้พรีเมียมปั่น	12-02-03-0103	1	8	9	70	23	41				24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ร้อน	12-02-01-0104	1	8	9	70						24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 เย็น	12-02-02-0104	1	8	9	70	23					24	100	7:40	32
+มัทฉะลาเต้ คูณ 3 ปั่น	12-02-03-0104	1	8	9	70	23	41				24	100	7:40	32
+
+
+
+
+
+ผลไม้ปั่น	12-01-07-0001	1	41	41	41	41	41				24	100	7:40	32
--- 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/complete_mmr/bn_open
+++ b/image/complete_mmr/bn_open
--- a/image/complete_mmr/bn_open_door.png
+++ b/image/complete_mmr/bn_open_door.png
--- a/image/complete_mmr/bp_open
+++ b/image/complete_mmr/bp_open
--- a/image/complete_mmr/bp_open_door.png
+++ b/image/complete_mmr/bp_open_door.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/Show more
+++ b/Show more