Merge remote-tracking branch 'origin/masterpiece' into th_mmr

2025-01-21 14:44:29 +07:00 · 2025-01-21 14:44:29 +07:00 · 020098b2af
commit 020098b2af
parent 59f72b6add f293402ef6
457 changed files with 95264 additions and 50614 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 143068
-rw-rw---- 1 root sdcard_rw        0 2024-12-04 17:12 sync_1.file
+total 143048
+-rw-rw---- 1 root sdcard_rw        0 2025-01-06 15:28 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1202,3 +1202,22 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13


 สตรอเบอร์รี่มินต์โซดา	12-05-03-0023	1	19	12	13	23	41				24	120	20:00	23
+
+เต่าทรงพลังสตรอเบอรีโซดา	12-05-02-0136	1	19	34	13	23					24	100	6:40	32
+เต่าทรงพลังสตรอเบอรีโซดาปั่น	12-05-03-0136	1	19	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังบ๊วยโซดา	12-05-02-0137	1	33	34	13	23					24	100	6:40	32
+เต่าทรงพลังบ๊วยโซดาปั่น	12-05-03-0137	1	33	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังลิ้นจี่โซดา	12-05-02-0138	1	11	34	13	23					24	100	6:40	32
+เต่าทรงพลังลิ้นจี่โซดาปั่น	12-05-03-0138	1	11	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังมะนาวโซดา	12-05-02-0139	1	12	34	13	23					24	100	6:40	32
+เต่าทรงพลังมะนาวโซดาปั่น	12-05-03-0139	1	12	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังคาราเมลโซดา	12-05-02-0140	1	22	34	13	23					24	100	6:40	32
+เต่าทรงพลังคาราเมลโซดาปั่น	12-05-03-0140	1	22	34	13	23	41				24	100	6:40	32
+เต่าทรงพลังสละโซดา	12-05-02-0141	1	21	34	13	23					24	100	6:40	32
+เต่าทรงพลังสละโซดาปั่น	12-05-03-0141	1	21	34	13	23	41				24	100	6:40	32
+เต่าทรงพลัง (เพิ่มปริมาณ)	12-05-02-0142	1	34	13	23						24	100	6:40	32
+เต่าทรงพลังปั่น (เพิ่มปริมาณ)	12-05-03-0142	1	34	13	23	41					24	100	6:40	32
+เต่าพลังโซดา (เพิ่มปริมาณ)	12-05-02-0143	1	34	13	23						24	100	6:40	32
+เต่าพลังโซดาปั่น (เพิ่มปริมาณ)	12-05-03-0143	1	34	13	23	41					24	100	6:40	32
+
+PEPSI EXTRA	12-05-02-0133	1	23	14							24	49	0:49	23
--- a/image/clean_feedback/bn_feedback_level_1.png
+++ b/image/clean_feedback/bn_feedback_level_1.png
--- a/image/clean_feedback/bn_feedback_level_1_en.png
+++ b/image/clean_feedback/bn_feedback_level_1_en.png
--- a/image/clean_feedback/bn_feedback_level_2.png
+++ b/image/clean_feedback/bn_feedback_level_2.png
--- a/image/clean_feedback/bn_feedback_level_2_en.png
+++ b/image/clean_feedback/bn_feedback_level_2_en.png
--- a/image/clean_feedback/bn_feedback_level_3.png
+++ b/image/clean_feedback/bn_feedback_level_3.png
--- a/image/clean_feedback/bn_feedback_level_3_en.png
+++ b/image/clean_feedback/bn_feedback_level_3_en.png
--- a/image/clean_feedback/bn_feedback_level_4.png
+++ b/image/clean_feedback/bn_feedback_level_4.png
--- a/image/clean_feedback/bn_feedback_level_4_en.png
+++ b/image/clean_feedback/bn_feedback_level_4_en.png
--- a/image/clean_feedback/bn_feedback_level_5.png
+++ b/image/clean_feedback/bn_feedback_level_5.png
--- a/image/clean_feedback/bn_feedback_level_5_en.png
+++ b/image/clean_feedback/bn_feedback_level_5_en.png
--- a/image/clean_feedback/bp_feedback_level_1.png
+++ b/image/clean_feedback/bp_feedback_level_1.png
--- a/image/clean_feedback/bp_feedback_level_1_en.png
+++ b/image/clean_feedback/bp_feedback_level_1_en.png
--- a/image/clean_feedback/bp_feedback_level_2.png
+++ b/image/clean_feedback/bp_feedback_level_2.png
--- a/image/clean_feedback/bp_feedback_level_2_en.png
+++ b/image/clean_feedback/bp_feedback_level_2_en.png
--- a/image/clean_feedback/bp_feedback_level_3.png
+++ b/image/clean_feedback/bp_feedback_level_3.png
--- a/image/clean_feedback/bp_feedback_level_3_en.png
+++ b/image/clean_feedback/bp_feedback_level_3_en.png
--- a/image/clean_feedback/bp_feedback_level_4.png
+++ b/image/clean_feedback/bp_feedback_level_4.png
--- a/image/clean_feedback/bp_feedback_level_4_en.png
+++ b/image/clean_feedback/bp_feedback_level_4_en.png
--- a/image/clean_feedback/bp_feedback_level_5.png
+++ b/image/clean_feedback/bp_feedback_level_5.png
--- a/image/clean_feedback/bp_feedback_level_5_en.png
+++ b/image/clean_feedback/bp_feedback_level_5_en.png
--- a/image/clean_feedback/exit_icon.png
+++ b/image/clean_feedback/exit_icon.png
--- a/image/clean_feedback/popup_bg.png
+++ b/image/clean_feedback/popup_bg.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,4 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-normal_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-disable_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
-disable_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
-press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
-disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
-disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
+normal_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+normal_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+press_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+press_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+disable_eng=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
+disable_thai=ROOT/taobin_project/image/event/red_string_of_fate/red_string_of_fate.png
--- a/image/event/ovaltine_school/ovaltine_school.png
+++ b/image/event/ovaltine_school/ovaltine_school.png
--- a/image/event/red_string_of_fate/red_string_of_fate.mp4
+++ b/image/event/red_string_of_fate/red_string_of_fate.mp4
--- a/image/event/red_string_of_fate/red_string_of_fate.png
+++ b/image/event/red_string_of_fate/red_string_of_fate.png
--- a/image/page3/bg1.png
+++ b/image/page3/bg1.png
--- a/image/page_drink_disable_n2/IcedCocoax3.png
+++ b/image/page_drink_disable_n2/IcedCocoax3.png
--- a/image/page_drink_disable_n2/bn_Strawberr_milk_Oreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Strawberr_milk_Oreo_smoothie.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_hot_Strawberry_caramel_latte.png
+++ b/image/page_drink_disable_n2/bn_hot_Strawberry_caramel_latte.png
--- a/image/page_drink_disable_n2/bn_hot_america_no.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_ginger_Strawberry_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_ginger_Strawberry_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_milk_Strawberry_Cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_milk_Strawberry_Cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_milk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_lime_milk_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_disable_n2/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Extra.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Extra.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_caramel_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_caramel_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_lime_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_plum_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_salak_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_salak_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda-1.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda-1.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_soda_Extra.png
--- a/image/page_drink_disable_n2/bn_iced_ovaltine.png
+++ b/image/page_drink_disable_n2/bn_iced_ovaltine.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_extra.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_extra.png
--- a/image/page_drink_disable_n2/bn_iced_strawberry.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberry.png
--- a/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/image/page_drink_disable_n2/bn_royal_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_royal_milk_tea.png
--- a/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/image/page_drink_disable_n2/bn_southern_fusion_tea.png
+++ b/image/page_drink_disable_n2/bn_southern_fusion_tea.png
--- a/image/page_drink_disable_n2/bn_strawberry_lime_soda.png
+++ b/image/page_drink_disable_n2/bn_strawberry_lime_soda.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_traditional_green_tea.png
+++ b/image/page_drink_disable_n2/bn_traditional_green_tea.png
--- a/image/page_drink_n/IcedCocoax3.png
+++ b/image/page_drink_n/IcedCocoax3.png
--- a/image/page_drink_n/bn_Strawberr_milk_Oreo_smoothie.png
+++ b/image/page_drink_n/bn_Strawberr_milk_Oreo_smoothie.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_n/bn_hot_Strawberry_caramel_latte.png
+++ b/image/page_drink_n/bn_hot_Strawberry_caramel_latte.png
--- a/image/page_drink_n/bn_hot_america_no.png
+++ b/image/page_drink_n/bn_hot_america_no.png
--- a/image/page_drink_n/bn_hot_matcha_milk_tea.png
+++ b/image/page_drink_n/bn_hot_matcha_milk_tea.png
--- a/image/page_drink_n/bn_hot_strawberry_tea.png
+++ b/image/page_drink_n/bn_hot_strawberry_tea.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea_tacc.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea_tacc.png
--- a/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_n/bn_iced_Ovaltine_lime_ginger_Strawberry_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_lime_ginger_Strawberry_smoothie.png
--- a/image/page_drink_n/bn_iced_Ovaltine_lime_milk_Strawberry_Cocoa_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_lime_milk_Strawberry_Cocoa_smoothie.png
--- a/image/page_drink_n/bn_iced_Ovaltine_lime_milk_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_lime_milk_smoothie.png
--- a/image/page_drink_n/bn_iced_Strawberry_cocoa.png
+++ b/image/page_drink_n/bn_iced_Strawberry_cocoa.png
--- a/image/page_drink_n/bn_iced_energy_drink.png
+++ b/image/page_drink_n/bn_iced_energy_drink.png
--- a/image/page_drink_n/bn_iced_energy_drink_Extra.png
+++ b/image/page_drink_n/bn_iced_energy_drink_Extra.png
--- a/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_Strawberry_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_Strawberry_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_caramel_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_caramel_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_lime_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_lime_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_plum_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_plum_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_salak_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_salak_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_soda-1.png
+++ b/image/page_drink_n/bn_iced_energy_drink_soda-1.png
--- a/image/page_drink_n/bn_iced_energy_drink_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_soda.png
--- a/image/page_drink_n/bn_iced_energy_drink_soda_Extra.png
+++ b/image/page_drink_n/bn_iced_energy_drink_soda_Extra.png
--- a/image/page_drink_n/bn_iced_ovaltine.png
+++ b/image/page_drink_n/bn_iced_ovaltine.png
--- a/image/page_drink_n/bn_iced_pepsi_extra.png
+++ b/image/page_drink_n/bn_iced_pepsi_extra.png
--- a/image/page_drink_n/bn_iced_strawberry.png
+++ b/image/page_drink_n/bn_iced_strawberry.png
--- a/image/page_drink_n/bn_iced_strawberry_soda.png
+++ b/image/page_drink_n/bn_iced_strawberry_soda.png
--- a/image/page_drink_n/bn_oreo_vo_get1.png
+++ b/image/page_drink_n/bn_oreo_vo_get1.png
--- a/image/page_drink_n/bn_royal_milk_tea.png
+++ b/image/page_drink_n/bn_royal_milk_tea.png
--- a/image/page_drink_n/bn_smoothie_oreo.png
+++ b/image/page_drink_n/bn_smoothie_oreo.png
--- a/image/page_drink_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_n/bn_southern_fusion_tea.png
--- a/image/page_drink_n/bn_strawberry_lime_soda.png
+++ b/image/page_drink_n/bn_strawberry_lime_soda.png
--- a/image/page_drink_n/bn_thai_milk_tea_SingPark.png
+++ b/image/page_drink_n/bn_thai_milk_tea_SingPark.png
--- a/image/page_drink_n/bn_traditional_green_tea.png
+++ b/image/page_drink_n/bn_traditional_green_tea.png
--- a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png
+++ b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png
--- a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png
+++ b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png
--- a/Show more
+++ b/Show more