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/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/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png
--- a/image/page_drink_picture2_n/bn_hot_blacktea.png
+++ b/image/page_drink_picture2_n/bn_hot_blacktea.png
--- a/Show more
+++ b/Show more