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

2025-02-17 09:12:50 +07:00 · 2025-02-17 09:12:50 +07:00 · ab2c6e6976
commit ab2c6e6976
parent b008ab55fe 62c44f8c17
1068 changed files with 345745 additions and 284584 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/display_point_mmr/bn_useCoupon.png
+++ b/image/display_point_mmr/bn_useCoupon.png
--- a/image/display_point_mmr/bp_useCoupon.png
+++ b/image/display_point_mmr/bp_useCoupon.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/lucky_draw_ads/bn_close_mmr.png
+++ b/image/event/lucky_draw_ads/bn_close_mmr.png
--- a/image/event/lucky_draw_ads/bp_close_mmr.png
+++ b/image/event/lucky_draw_ads/bp_close_mmr.png
--- a/image/event/ovaltine_school/ovaltine_school.mp4
+++ b/image/event/ovaltine_school/ovaltine_school.mp4
--- 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/event/swensen/bn_swensen_pay_code.png
+++ b/image/event/swensen/bn_swensen_pay_code.png
--- a/image/page3/bg1.png
+++ b/image/page3/bg1.png
--- a/image/page_doing/brewing_txt_adv14.png
+++ b/image/page_doing/brewing_txt_adv14.png
--- a/image/page_doing/brewing_txt_adv14_en.png
+++ b/image/page_doing/brewing_txt_adv14_en.png
--- a/image/page_doing/brewing_txt_adv15.png
+++ b/image/page_doing/brewing_txt_adv15.png
--- a/image/page_doing/brewing_txt_adv17.png
+++ b/image/page_doing/brewing_txt_adv17.png
--- a/image/page_doing/brewing_txt_adv17_en.png
+++ b/image/page_doing/brewing_txt_adv17_en.png
--- a/image/page_doing_mmr/txt_10_mmr.png
+++ b/image/page_doing_mmr/txt_10_mmr.png
--- a/image/page_doing_mmr/txt_11_mmr.png
+++ b/image/page_doing_mmr/txt_11_mmr.png
--- a/image/page_doing_mmr/txt_12_mmr.png
+++ b/image/page_doing_mmr/txt_12_mmr.png
--- a/image/page_doing_mmr/txt_13_mmr.png
+++ b/image/page_doing_mmr/txt_13_mmr.png
--- a/image/page_doing_mmr/txt_14_mmr.png
+++ b/image/page_doing_mmr/txt_14_mmr.png
--- a/image/page_doing_mmr/txt_15_mmr.png
+++ b/image/page_doing_mmr/txt_15_mmr.png
--- a/image/page_doing_mmr/txt_16_mmr.png
+++ b/image/page_doing_mmr/txt_16_mmr.png
--- a/image/page_doing_mmr/txt_17_mmr.png
+++ b/image/page_doing_mmr/txt_17_mmr.png
--- a/image/page_doing_mmr/txt_18_mmr.png
+++ b/image/page_doing_mmr/txt_18_mmr.png
--- a/image/page_doing_mmr/txt_19_mmr.png
+++ b/image/page_doing_mmr/txt_19_mmr.png
--- a/image/page_doing_mmr/txt_1_mmr.png
+++ b/image/page_doing_mmr/txt_1_mmr.png
--- a/image/page_doing_mmr/txt_20_mmr.png
+++ b/image/page_doing_mmr/txt_20_mmr.png
--- a/image/page_doing_mmr/txt_21_mmr.png
+++ b/image/page_doing_mmr/txt_21_mmr.png
--- a/image/page_doing_mmr/txt_22_mmr.png
+++ b/image/page_doing_mmr/txt_22_mmr.png
--- a/image/page_doing_mmr/txt_23_mmr.png
+++ b/image/page_doing_mmr/txt_23_mmr.png
--- a/image/page_doing_mmr/txt_25_mmr.png
+++ b/image/page_doing_mmr/txt_25_mmr.png
--- a/image/page_doing_mmr/txt_26_mmr.png
+++ b/image/page_doing_mmr/txt_26_mmr.png
--- a/image/page_doing_mmr/txt_27_mmr.png
+++ b/image/page_doing_mmr/txt_27_mmr.png
--- a/image/page_doing_mmr/txt_2_mmr.png
+++ b/image/page_doing_mmr/txt_2_mmr.png
--- a/image/page_doing_mmr/txt_31_mmr.png
+++ b/image/page_doing_mmr/txt_31_mmr.png
--- a/image/page_doing_mmr/txt_32_mmr.png
+++ b/image/page_doing_mmr/txt_32_mmr.png
--- a/image/page_doing_mmr/txt_33_mmr.png
+++ b/image/page_doing_mmr/txt_33_mmr.png
--- a/image/page_doing_mmr/txt_34_mmr.png
+++ b/image/page_doing_mmr/txt_34_mmr.png
--- a/image/page_doing_mmr/txt_35_mmr.png
+++ b/image/page_doing_mmr/txt_35_mmr.png
--- a/image/page_doing_mmr/txt_36_mmr.png
+++ b/image/page_doing_mmr/txt_36_mmr.png
--- a/image/page_doing_mmr/txt_37_mmr.png
+++ b/image/page_doing_mmr/txt_37_mmr.png
--- a/image/page_doing_mmr/txt_3_mmr.png
+++ b/image/page_doing_mmr/txt_3_mmr.png
--- a/image/page_doing_mmr/txt_40_mmr.png
+++ b/image/page_doing_mmr/txt_40_mmr.png
--- a/image/page_doing_mmr/txt_41_mmr.png
+++ b/image/page_doing_mmr/txt_41_mmr.png
--- a/image/page_doing_mmr/txt_42_mmr.png
+++ b/image/page_doing_mmr/txt_42_mmr.png
--- a/image/page_doing_mmr/txt_43_mmr.png
+++ b/image/page_doing_mmr/txt_43_mmr.png
--- a/image/page_doing_mmr/txt_44_mmr.png
+++ b/image/page_doing_mmr/txt_44_mmr.png
--- a/image/page_doing_mmr/txt_45_mmr.png
+++ b/image/page_doing_mmr/txt_45_mmr.png
--- a/image/page_doing_mmr/txt_46_mmr.png
+++ b/image/page_doing_mmr/txt_46_mmr.png
--- a/image/page_doing_mmr/txt_47_mmr.png
+++ b/image/page_doing_mmr/txt_47_mmr.png
--- a/image/page_doing_mmr/txt_48_mmr.png
+++ b/image/page_doing_mmr/txt_48_mmr.png
--- a/image/page_doing_mmr/txt_49_mmr.png
+++ b/image/page_doing_mmr/txt_49_mmr.png
--- a/image/page_doing_mmr/txt_4_mmr.png
+++ b/image/page_doing_mmr/txt_4_mmr.png
--- a/image/page_doing_mmr/txt_50_mmr.png
+++ b/image/page_doing_mmr/txt_50_mmr.png
--- a/image/page_doing_mmr/txt_51_mmr.png
+++ b/image/page_doing_mmr/txt_51_mmr.png
--- a/image/page_doing_mmr/txt_52_mmr.png
+++ b/image/page_doing_mmr/txt_52_mmr.png
--- a/image/page_doing_mmr/txt_53_mmr.png
+++ b/image/page_doing_mmr/txt_53_mmr.png
--- a/image/page_doing_mmr/txt_55_mmr.png
+++ b/image/page_doing_mmr/txt_55_mmr.png
--- a/image/page_doing_mmr/txt_56_mmr.png
+++ b/image/page_doing_mmr/txt_56_mmr.png
--- a/image/page_doing_mmr/txt_57_mmr.png
+++ b/image/page_doing_mmr/txt_57_mmr.png
--- a/image/page_doing_mmr/txt_59_mmr.png
+++ b/image/page_doing_mmr/txt_59_mmr.png
--- a/image/page_doing_mmr/txt_5_mmr.png
+++ b/image/page_doing_mmr/txt_5_mmr.png
--- a/image/page_doing_mmr/txt_60_mmr.png
+++ b/image/page_doing_mmr/txt_60_mmr.png
--- a/image/page_doing_mmr/txt_61_mmr.png
+++ b/image/page_doing_mmr/txt_61_mmr.png
--- a/image/page_doing_mmr/txt_62_mmr.png
+++ b/image/page_doing_mmr/txt_62_mmr.png
--- a/image/page_doing_mmr/txt_63_mmr.png
+++ b/image/page_doing_mmr/txt_63_mmr.png
--- a/image/page_doing_mmr/txt_6_mmr.png
+++ b/image/page_doing_mmr/txt_6_mmr.png
--- a/image/page_doing_mmr/txt_70_mmr.png
+++ b/image/page_doing_mmr/txt_70_mmr.png
--- a/image/page_doing_mmr/txt_7_mmr.png
+++ b/image/page_doing_mmr/txt_7_mmr.png
--- a/image/page_doing_mmr/txt_81_mmr.png
+++ b/image/page_doing_mmr/txt_81_mmr.png
--- a/image/page_doing_mmr/txt_8_mmr.png
+++ b/image/page_doing_mmr/txt_8_mmr.png
--- a/image/page_doing_mmr/txt_9_mmr.png
+++ b/image/page_doing_mmr/txt_9_mmr.png
--- a/image/page_drink_disable_n2/IcedCocoax2.png
+++ b/image/page_drink_disable_n2/IcedCocoax2.png
--- a/image/page_drink_disable_n2/IcedCocoax3.png
+++ b/image/page_drink_disable_n2/IcedCocoax3.png
--- a/image/page_drink_disable_n2/bn_Azalea.png
+++ b/image/page_drink_disable_n2/bn_Azalea.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/Show more
+++ b/Show more