merge page board

2025-05-16 15:24:15 +07:00 · 2025-05-16 15:24:15 +07:00 · 1516ff2616
commit 1516ff2616
parent a8866f82bf d7b4329dc9
426 changed files with 94322 additions and 115895 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
@ -1374,3 +1380,11 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							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/school_ovaltine/school_ovaltine.jpg
+++ b/image/event/school_ovaltine/school_ovaltine.jpg
--- a/image/event/school_ovaltine/school_ovaltine.png
+++ b/image/event/school_ovaltine/school_ovaltine.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/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_n/bn__hot_americano_light_opus_one.png
+++ b/image/page_drink_n/bn__hot_americano_light_opus_one.png
--- a/image/page_drink_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_n/bn_dirty_light_geisha.png
--- a/image/page_drink_n/bn_dirty_light_opus_one.png
+++ b/image/page_drink_n/bn_dirty_light_opus_one.png
--- a/image/page_drink_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_n/bn_hot_americano_light_opus_one.png
+++ b/image/page_drink_n/bn_hot_americano_light_opus_one.png
--- a/image/page_drink_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_n/bn_hot_espresso_light_opus_one.png
+++ b/image/page_drink_n/bn_hot_espresso_light_opus_one.png
--- a/image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_picture2_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_geisha.png
--- a/image/page_drink_picture2_n/bn_dirty_light_opus_one.png
+++ b/image/page_drink_picture2_n/bn_dirty_light_opus_one.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_light_opus_one.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png
+++ b/image/page_drink_picture2_n/bn_hot_espresso_light_opus_one.png
--- a/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_press_n/bn__hot_americano_light_opus_one.png
+++ b/image/page_drink_press_n/bn__hot_americano_light_opus_one.png
--- a/image/page_drink_press_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_press_n/bn_dirty_light_geisha.png
--- a/image/page_drink_press_n/bn_dirty_light_opus_one.png
+++ b/image/page_drink_press_n/bn_dirty_light_opus_one.png
--- a/image/page_drink_press_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_press_n/bn_hot_americano_light_opus_one.png
+++ b/image/page_drink_press_n/bn_hot_americano_light_opus_one.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png
+++ b/image/page_drink_press_n/bn_hot_espresso_light_opus_one.png
--- a/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_press_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_help_center/Group.png
+++ b/image/page_help_center/Group.png
--- a/image/page_help_center/bn_0.png
+++ b/image/page_help_center/bn_0.png
--- a/image/page_help_center/bn_1.png
+++ b/image/page_help_center/bn_1.png
--- a/image/page_help_center/bn_2.png
+++ b/image/page_help_center/bn_2.png
--- a/image/page_help_center/bn_3.png
+++ b/image/page_help_center/bn_3.png
--- a/image/page_help_center/bn_4.png
+++ b/image/page_help_center/bn_4.png
--- a/image/page_help_center/bn_5.png
+++ b/image/page_help_center/bn_5.png
--- a/image/page_help_center/bn_6.png
+++ b/image/page_help_center/bn_6.png
--- a/image/page_help_center/bn_7.png
+++ b/image/page_help_center/bn_7.png
--- a/image/page_help_center/bn_8.png
+++ b/image/page_help_center/bn_8.png
--- a/image/page_help_center/bn_9.png
+++ b/image/page_help_center/bn_9.png
--- a/image/page_help_center/bn_accept_help.png
+++ b/image/page_help_center/bn_accept_help.png
--- a/image/page_help_center/bn_back-1.png
+++ b/image/page_help_center/bn_back-1.png
--- a/image/page_help_center/bn_back_to_help.png
+++ b/image/page_help_center/bn_back_to_help.png
--- a/image/page_help_center/bn_next_help.png
+++ b/image/page_help_center/bn_next_help.png
--- a/image/page_help_center/bp_0.png
+++ b/image/page_help_center/bp_0.png
--- a/image/page_help_center/bp_1.png
+++ b/image/page_help_center/bp_1.png
--- a/image/page_help_center/bp_2.png
+++ b/image/page_help_center/bp_2.png
--- a/image/page_help_center/bp_3.png
+++ b/image/page_help_center/bp_3.png
--- a/image/page_help_center/bp_4.png
+++ b/image/page_help_center/bp_4.png
--- a/image/page_help_center/bp_5.png
+++ b/image/page_help_center/bp_5.png
--- a/image/page_help_center/bp_6.png
+++ b/image/page_help_center/bp_6.png
--- a/image/page_help_center/bp_7.png
+++ b/image/page_help_center/bp_7.png
--- a/image/page_help_center/bp_8.png
+++ b/image/page_help_center/bp_8.png
--- a/image/page_help_center/bp_9.png
+++ b/image/page_help_center/bp_9.png
--- a/image/page_help_center/bp_accept_help.png
+++ b/image/page_help_center/bp_accept_help.png
--- a/image/page_help_center/bp_back-1.png
+++ b/image/page_help_center/bp_back-1.png
--- a/image/page_help_center/bp_back_to_help.png
+++ b/image/page_help_center/bp_back_to_help.png
--- a/image/page_help_center/bp_next_help.png
+++ b/image/page_help_center/bp_next_help.png
--- a/image/page_help_center/cb_checked_problem.png
+++ b/image/page_help_center/cb_checked_problem.png
--- a/image/page_help_center/cb_uncheck_problem.png
+++ b/image/page_help_center/cb_uncheck_problem.png
--- a/image/page_help_center/help_lead.png
+++ b/image/page_help_center/help_lead.png
--- a/image/page_help_center/helper.png
+++ b/image/page_help_center/helper.png
--- a/image/page_help_center/img3.png
+++ b/image/page_help_center/img3.png
--- a/image/page_help_center/text15.png
+++ b/image/page_help_center/text15.png
--- a/image/page_payment/helper.png
+++ b/image/page_payment/helper.png
--- a/image/pos_midnight/pos_close_midnight_en.png
+++ b/image/pos_midnight/pos_close_midnight_en.png
--- a/image/pos_midnight/pos_close_midnight_th.png
+++ b/image/pos_midnight/pos_close_midnight_th.png
--- a/image/smoothie/proccess/bd_get_blend.png
+++ b/image/smoothie/proccess/bd_get_blend.png
--- a/image/smoothie/proccess/bg_empty.png
+++ b/image/smoothie/proccess/bg_empty.png
--- a/image/smoothie/proccess/bn_back_smoothie.png
+++ b/image/smoothie/proccess/bn_back_smoothie.png
--- a/image/smoothie/proccess/bn_cancel_smoothie.png
+++ b/image/smoothie/proccess/bn_cancel_smoothie.png
--- a/image/smoothie/proccess/bn_cancel_smoothie_2.png
+++ b/image/smoothie/proccess/bn_cancel_smoothie_2.png
--- a/image/smoothie/proccess/bn_get_blend.png
+++ b/image/smoothie/proccess/bn_get_blend.png
--- a/image/smoothie/proccess/bp_back_smoothie.png
+++ b/image/smoothie/proccess/bp_back_smoothie.png
--- a/image/smoothie/proccess/bp_cancel_smoothie.png
+++ b/image/smoothie/proccess/bp_cancel_smoothie.png
--- a/image/smoothie/proccess/bp_get_blend.png
+++ b/image/smoothie/proccess/bp_get_blend.png
--- a/image/smoothie/proccess/clock.png
+++ b/image/smoothie/proccess/clock.png
--- a/image/smoothie/proccess/hand_point.png
+++ b/image/smoothie/proccess/hand_point.png
--- a/image/smoothie/proccess/second.png
+++ b/image/smoothie/proccess/second.png
--- a/image/smoothie/proccess/tao_sad.png
+++ b/image/smoothie/proccess/tao_sad.png
--- a/Show more
+++ b/Show more