Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece

2024-08-01 10:22:12 +07:00 · 2024-08-01 10:22:12 +07:00 · a152fa833a
commit a152fa833a
parent 9197772248 1565acb063
1065 changed files with 140313 additions and 16047 deletions
--- a/image/collectiing/cash_warning_bg.png
+++ b/image/collectiing/cash_warning_bg.png
--- a/image/collectiing/cash_warning_text.png
+++ b/image/collectiing/cash_warning_text.png
--- a/image/collectiing_en/cash_warning_text.png
+++ b/image/collectiing_en/cash_warning_text.png
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.mp4
--- a/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+++ b/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-normal_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-press_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-press_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
-disable_eng=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_EN.png
-disable_thai=ROOT/taobin_project/image/event/coffee_drink_1_bath/1_baht_coffee_TH.png
+normal_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+normal_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+press_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+press_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+disable_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
+disable_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-normal_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-press_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-press_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
-disable_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
-disable_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+normal_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+normal_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+press_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_eng=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
+disable_thai=ROOT/taobin_project/image/event/passion_mint/passion_mint_th.png
--- a/image/event/lucky_draw_ads/bn_check_coupon.png
+++ b/image/event/lucky_draw_ads/bn_check_coupon.png
--- a/image/event/lucky_draw_ads/bn_check_coupon_en.png
+++ b/image/event/lucky_draw_ads/bn_check_coupon_en.png
--- a/image/event/lucky_draw_ads/bn_close.png
+++ b/image/event/lucky_draw_ads/bn_close.png
--- a/image/event/lucky_draw_ads/bn_close_en.png
+++ b/image/event/lucky_draw_ads/bn_close_en.png
--- a/image/event/lucky_draw_ads/bn_interested.png
+++ b/image/event/lucky_draw_ads/bn_interested.png
--- a/image/event/lucky_draw_ads/bn_interested_en.png
+++ b/image/event/lucky_draw_ads/bn_interested_en.png
--- a/image/event/lucky_draw_ads/bn_next.png
+++ b/image/event/lucky_draw_ads/bn_next.png
--- a/image/event/lucky_draw_ads/bn_skip.png
+++ b/image/event/lucky_draw_ads/bn_skip.png
--- a/image/event/lucky_draw_ads/bn_skip_en.png
+++ b/image/event/lucky_draw_ads/bn_skip_en.png
--- a/image/event/lucky_draw_ads/bn_topup_credit.png
+++ b/image/event/lucky_draw_ads/bn_topup_credit.png
--- a/image/event/lucky_draw_ads/bn_topup_credit_en.png
+++ b/image/event/lucky_draw_ads/bn_topup_credit_en.png
--- a/image/event/lucky_draw_ads/bp_check_coupon.png
+++ b/image/event/lucky_draw_ads/bp_check_coupon.png
--- a/image/event/lucky_draw_ads/bp_check_coupon_en.png
+++ b/image/event/lucky_draw_ads/bp_check_coupon_en.png
--- a/image/event/lucky_draw_ads/bp_close.png
+++ b/image/event/lucky_draw_ads/bp_close.png
--- a/image/event/lucky_draw_ads/bp_close_en.png
+++ b/image/event/lucky_draw_ads/bp_close_en.png
--- a/image/event/lucky_draw_ads/bp_interested.png
+++ b/image/event/lucky_draw_ads/bp_interested.png
--- a/image/event/lucky_draw_ads/bp_interested_en.png
+++ b/image/event/lucky_draw_ads/bp_interested_en.png
--- a/image/event/lucky_draw_ads/bp_next.png
+++ b/image/event/lucky_draw_ads/bp_next.png
--- a/image/event/lucky_draw_ads/bp_skip.png
+++ b/image/event/lucky_draw_ads/bp_skip.png
--- a/image/event/lucky_draw_ads/bp_skip_en.png
+++ b/image/event/lucky_draw_ads/bp_skip_en.png
--- a/image/event/lucky_draw_ads/bp_topup_credit.png
+++ b/image/event/lucky_draw_ads/bp_topup_credit.png
--- a/image/event/lucky_draw_ads/bp_topup_credit_en.png
+++ b/image/event/lucky_draw_ads/bp_topup_credit_en.png
--- a/image/event/lucky_draw_ads/popup_bg.png
+++ b/image/event/lucky_draw_ads/popup_bg.png
--- a/image/event/lucky_draw_ads/qr_popup.png
+++ b/image/event/lucky_draw_ads/qr_popup.png
--- a/image/event/lucky_draw_ads/text.png
+++ b/image/event/lucky_draw_ads/text.png
--- a/image/event/lucky_draw_ads/text_en.png
+++ b/image/event/lucky_draw_ads/text_en.png
--- a/image/event/lucky_draw_collect_point/base_bg.png
+++ b/image/event/lucky_draw_collect_point/base_bg.png
--- a/image/event/lucky_draw_collect_point/bg.png
+++ b/image/event/lucky_draw_collect_point/bg.png
--- a/image/event/lucky_draw_collect_point/goal_BYD.png
+++ b/image/event/lucky_draw_collect_point/goal_BYD.png
--- a/image/event/lucky_draw_collect_point/goal_ORA.png
+++ b/image/event/lucky_draw_collect_point/goal_ORA.png
--- a/image/event/lucky_draw_collect_point/goal_Tesla.png
+++ b/image/event/lucky_draw_collect_point/goal_Tesla.png
--- a/image/event/lucky_draw_collect_point/goal_regular.png
+++ b/image/event/lucky_draw_collect_point/goal_regular.png
--- a/image/event/lucky_draw_collect_point/head_slider_level2.png
+++ b/image/event/lucky_draw_collect_point/head_slider_level2.png
--- a/image/event/lucky_draw_collect_point/head_slider_level3.png
+++ b/image/event/lucky_draw_collect_point/head_slider_level3.png
--- a/image/event/lucky_draw_collect_point/head_slider_level4.png
+++ b/image/event/lucky_draw_collect_point/head_slider_level4.png
--- a/image/event/lucky_draw_collect_point/level1.png
+++ b/image/event/lucky_draw_collect_point/level1.png
--- a/image/event/lucky_draw_collect_point/level2.png
+++ b/image/event/lucky_draw_collect_point/level2.png
--- a/image/event/lucky_draw_collect_point/level3.png
+++ b/image/event/lucky_draw_collect_point/level3.png
--- a/image/event/lucky_draw_collect_point/level4.png
+++ b/image/event/lucky_draw_collect_point/level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_ads.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_ads.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_ads_en.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_ads_en.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_1-5_level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_11-15_level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_16-20_level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_21-25_level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_26-30_level4.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level2.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level2.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level3.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level3.png
--- a/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level4.png
+++ b/image/event/lucky_draw_collect_point/lucky_draw_progress_bar_day_6-10_level4.png
--- a/image/event/lucky_draw_collect_point/slider.png
+++ b/image/event/lucky_draw_collect_point/slider.png
--- a/image/event/passion_mint/passion_mint_th.png
+++ b/image/event/passion_mint/passion_mint_th.png
--- a/image/main_page/bn_main_page_member.png
+++ b/image/main_page/bn_main_page_member.png
--- a/image/main_page/bp_main_page_member.png
+++ b/image/main_page/bp_main_page_member.png
--- a/image/page2/bn_main_page_member.png
+++ b/image/page2/bn_main_page_member.png
--- a/image/page2/bp_main_page_member.png
+++ b/image/page2/bp_main_page_member.png
--- a/image/page2_en/page2/bn_main_page_member.png
+++ b/image/page2_en/page2/bn_main_page_member.png
--- a/image/page2_en/page2/bp_main_page_member.png
+++ b/image/page2_en/page2/bp_main_page_member.png
--- a/image/page_doing/brewing_txt_adv4.png
+++ b/image/page_doing/brewing_txt_adv4.png
--- a/image/page_doing/brewing_txt_adv4_en.png
+++ b/image/page_doing/brewing_txt_adv4_en.png
--- a/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
+++ b/image/page_drink_disable_n2/BN_Yuzu_Mint_Soda_passion.png
--- a/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
+++ b/image/page_drink_disable_n2/Mint_SuperVocano_passion.png
--- a/image/page_drink_disable_n2/bn_7UP_BANANA_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_BANANA_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Coconut_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Energy_PLUM_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Lime_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_MELON_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_MELON_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Mint_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Mint_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_PLUM_strawberry_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Peach_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Peach_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Plum_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_Sala_COFFEE_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Lychee_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2-1.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_Yuzu_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_lime_sala_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
+++ b/image/page_drink_disable_n2/bn_7UP_soda_lucky_draw_x2.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Latte_passion.png
--- a/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
+++ b/image/page_drink_disable_n2/bn_Iced_Mint_Mocha_passion.png
--- a/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
+++ b/image/page_drink_disable_n2/bn_Matcha_latte_mint_smoothie_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Americano_passion.png
--- a/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
+++ b/image/page_drink_disable_n2/bn_Mint_Cocoa_passion.png
--- a/Show more
+++ b/Show more