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

2025-05-22 12:26:47 +07:00 · 2025-05-22 12:26:47 +07:00 · e6703097f2
commit e6703097f2
parent 2c769214c9 168cee5868
1117 changed files with 200327 additions and 141852 deletions
--- a/adv/taobin_adv_menu_20.mp4
+++ b/adv/taobin_adv_menu_20.mp4
--- a/animation01/TaoBin2_draft02_art64.mp4
+++ b/animation01/TaoBin2_draft02_art64.mp4
--- a/animation01/TaoBin2_draft02_art65.mp4
+++ b/animation01/TaoBin2_draft02_art65.mp4
--- a/animation01/Taobin_empty.mp4
+++ b/animation01/Taobin_empty.mp4
--- a/animation01/Taobin_pause_art41.mp4
+++ b/animation01/Taobin_pause_art41.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1209,6 +1209,7 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13
 เต่าพลังโซดาปั่น (เพิ่มปริมาณ)	12-05-03-0143	1	34	13	23	41					24	100	6:40	32

 PEPSI EXTRA	12-05-02-0133	1	23	14							24	100	6:40	32
+PEPSI EXTRA	12-05-03-0133	1	23	14	41						24	100	6:40	32
 เพียงพบสบตารัก	12-03-03-0100	1	19	12	15	51	17	23	41		24	100	6:40	32
 วิวาห์หวาน	12-03-03-0101	1	12	51	17	23	41				24	100	6:40	32
 ดั่งรักนิรันด์	12-03-03-0102	1	19	12	51	23	41				24	100	6:40	32
@ -1344,13 +1345,18 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 ยูซุคาราเมลโซดาเย็น	12-05-02-0147	1	53	22	13	23					24	100	7:40	32
 														32
 เป๊ปซี่ยูซุ	12-05-02-0106	1	14	53	23	13					24	100	7:40	32
+เป๊ปซี่ยูซุ	12-05-03-0106	1	14	53	23	13	41				24	100	7:40	32
 เป๊ปซี่มะพร้าว	12-05-02-0114	1	14	62	23	13					24	100	7:40	32
 เป๊ปซี่ลิ้นจี่	12-05-02-0057	1	14	13	11	23					24	100	7:40	32
+เป๊ปซี่ลิ้นจี่	12-05-03-0057	1	14	13	11	23	41				24	100	7:40	32
 เป๊ปซี่สตรอเบอรี	12-05-02-0058	1	14	13	19	23					24	100	7:40	32
+เป๊ปซี่สตรอเบอรี	12-05-03-0058	1	14	13	19	23	41				24	100	7:40	32
 เป๊ปซี่ทรอปิคอล	12-05-02-0148	1	14	34	62	23					24	100	7:40	32
+เป๊ปซี่ทรอปิคอล	12-05-03-0148	1	14	34	62	23	41				24	100	7:40	32
 เป๊ปซี่มะนาว	12-05-02-0149	1	14	13	12	23					24	100	7:40	32
+เป๊ปซี่มะนาว	12-05-03-0149	1	14	13	12	23	41				24	100	7:40	32
 เป๊ปซี่คาราเมล	12-05-02-0150	1	14	13	22	23					24	100	7:40	32
-
+เป๊ปซี่คาราเมล	12-05-03-0150	1	14	13	22	23	41				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
@ -1363,3 +1369,22 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32


 ผลไม้ปั่น	12-01-07-0001	1	41	41	41	41	41				24	100	7:40	32
+
+
+โอวัลตินกาแฟ	12-01-03-0092	1	51	17	2	3	4	5	23	41	24	100	7:40	32
+โอวัลตินกาแฟ	12-21-03-0092	1	51	17	2	3	4	5	23	41	24	100	7:40	32
+โอวัลตินชาไทยนม	12-02-03-0105	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินมัทฉะลาเต้	12-02-03-0106	1	51	17	8	9	23	41			24	100	7:40	32
+โอวัลตินชานม	12-02-03-0107	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินมะลิ	12-02-03-0108	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินน้ำแดง	12-03-03-0108	1	51	17	21	23	41				24	100	7:40	32
+โอวัลตินคาราเมล	12-03-03-0109	1	51	17	22	23	41				24	100	7:40	32
+โอวัลตินมะพร้าว	12-03-03-0110	1	51	17	62	23	41				24	100	7:40	32
+
+มะม่วงปั่น ( test)	12-00-07-0000	1	65								24	100	7:40	32
+มะม่วงเต่าปั่น	12-06-03-0001	1	65								24	100	8:40	32
+มะม่่วงลิ้นจี่เต่าปั่น	12-06-03-0002	1	11	65							24	100	9:40	32
+มะม่วงสตรอเบอรีเต่าปั่น	12-06-03-0003	1	19	65							24	100	10:40	32
+มะม่วงสละเต่าปั่น	12-06-03-0004	1	21	65							24	100	11:40	32
+มะม่วงมัทฉะเต่าปั่น	12-06-03-0005	1	8	9	65						24	100	12:40	32
+มะม่วงชาไต้หวันเต่าปั่น	12-06-03-0006	1	10	65							24	100	13:40	32
--- a/image/complete_en/bn_open_door.png
+++ b/image/complete_en/bn_open_door.png
--- a/image/complete_en/bp_open_door.png
+++ b/image/complete_en/bp_open_door.png
--- a/image/drink_option_inter/block.png
+++ b/image/drink_option_inter/block.png
--- a/image/drink_option_inter/block_db.png
+++ b/image/drink_option_inter/block_db.png
--- a/image/drink_option_inter/option_deactive.png
+++ b/image/drink_option_inter/option_deactive.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-press_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-disable_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
--- a/image/event/ovaltine_school/ovaltine_school.png
+++ b/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/school_ovaltine/school_ovaltine.mp4
+++ b/image/event/school_ovaltine/school_ovaltine.mp4
--- a/image/event/school_ovaltine/school_ovaltine.png
+++ b/image/event/school_ovaltine/school_ovaltine.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/page_doing/txt_64.png
+++ b/image/page_doing/txt_64.png
--- a/image/page_doing/txt_64_en.png
+++ b/image/page_doing/txt_64_en.png
--- a/image/page_doing/txt_65.png
+++ b/image/page_doing/txt_65.png
--- a/image/page_doing/txt_65_en.png
+++ b/image/page_doing/txt_65_en.png
--- a/image/page_drink_disable_n2/blended_mango_greentea.png
+++ b/image/page_drink_disable_n2/blended_mango_greentea.png
--- a/image/page_drink_disable_n2/blended_mango_lychee.png
+++ b/image/page_drink_disable_n2/blended_mango_lychee.png
--- a/image/page_drink_disable_n2/blended_mango_only.png
+++ b/image/page_drink_disable_n2/blended_mango_only.png
--- a/image/page_drink_disable_n2/blended_mango_sala.png
+++ b/image/page_drink_disable_n2/blended_mango_sala.png
--- a/image/page_drink_disable_n2/blended_mango_strawberry.png
+++ b/image/page_drink_disable_n2/blended_mango_strawberry.png
--- a/image/page_drink_disable_n2/blended_mango_taiwanese_tea.png
+++ b/image/page_drink_disable_n2/blended_mango_taiwanese_tea.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_Ovaltine_Latte.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Latte.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.png
+++ b/image/page_drink_disable_n2/bn_Ovaltine_Milk_ThaiTea.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_Pepsi_Tropical_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_Pepsi_Tropical_boost_energy.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_disable_n2/bn__hot_americano_light_opus_one.png
+++ b/image/page_drink_disable_n2/bn__hot_americano_light_opus_one.png
--- a/image/page_drink_disable_n2/bn_dirty_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_geisha.png
--- a/image/page_drink_disable_n2/bn_dirty_light_opus_one.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_opus_one.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_opus_one.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_opus_one.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_opus_one.png
--- a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Extra_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Extra_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_caramel_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_caramel_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_salak_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_salak_soda_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra_boost_energy.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda_boost_energy.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda_boost_energy.png
--- a/image/page_drink_n/blended_mango_greentea.png
+++ b/image/page_drink_n/blended_mango_greentea.png
--- a/image/page_drink_n/blended_mango_lychee.png
+++ b/image/page_drink_n/blended_mango_lychee.png
--- a/image/page_drink_n/blended_mango_only.png
+++ b/image/page_drink_n/blended_mango_only.png
--- a/image/page_drink_n/blended_mango_sala.png
+++ b/image/page_drink_n/blended_mango_sala.png
--- a/image/page_drink_n/blended_mango_strawberry.png
+++ b/image/page_drink_n/blended_mango_strawberry.png
--- a/image/page_drink_n/blended_mango_taiwanese_tea.png
+++ b/image/page_drink_n/blended_mango_taiwanese_tea.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_Ovaltine_Latte.png
+++ b/image/page_drink_n/bn_Ovaltine_Latte.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Caramel.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Coconut.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Jasmine.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Matcha.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Salak.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Salak.png
--- a/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
+++ b/image/page_drink_n/bn_Ovaltine_Milk_Taiwanese_Tea.png
--- a/Show more
+++ b/Show more